ulbrich-jruby-enginize 0.3 → 0.4

data/README.rdoc

@@ -72,18 +72,18 @@ an unstable version and don't want to risk your users getting exceptions.
 
 You can try the new version by opening e.g.
 
-  http://3.latest.foobar.appspot.com
+<tt>http://3.latest.foobar.appspot.com</tt>
 
 and replacing "3" with the version number you want to run.
 
 Switch the application to the new version as default (stable version) by
 opening
 
-  http://appengine.google.com/deployment?&app_id=foobar
+<tt>http://appengine.google.com/deployment?&app_id=foobar</tt>
 
 and setting a new default available at
 
-  http://foobar.appspot.com
+<tt>http://foobar.appspot.com</tt>
 
 A small README with these and a few more application specific hints is
 generated along with the source code. Have fun.

data/templates/shared/README

@@ -5,11 +5,12 @@ something more meaningful... ;-)
 
 GOOGLE APPENGINE DEPLOYMENT
 
-As a basic requirement, copy and split the JRuby-JAR calling
-
-  jrake jruby:splitjars
-
-once and after each upgrade to a new version of JRuby.
+!!Attention: As a basic requirement, the JRuby archive "jruby-complete.jar"
+has to be placed in the "lib" directory of your app and this is way to large
+to include it in the generator. If you have this file on your disk, copy it
+over and be sure to rename it to "jruby-complete.jar". If missing, the
+deployment will download the file for you. Expect a 10 MB download (only done
+once).
 
 Deploy the application with
 

data/templates/shared/Rakefile

@@ -2,10 +2,30 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
+require 'net/http'
+
 Dir[File.join(File.dirname(__FILE__), 'lib', 'tasks', '*.rake')].each do |ext|
   load ext
 end
 
+# Helper for retrieving HTML files. Only used to check or trigger things so
+# no highclass implementation...
+
+def fetch(uri, limit = 10)
+  raise ArgumentError, 'HTTP redirect too deep' if limit == 0
+
+  response = Net::HTTP.get_response(URI.parse(uri))
+
+  case response
+  when Net::HTTPSuccess then
+    return response
+  when Net::HTTPRedirection then
+    return fetch(response['location'], limit - 1)
+  else
+    return response.error!
+  end
+end
+
 desc 'Display some help and the README'
 task :help do
   puts 'Call "jruby -S rake --tasks" to learn what tasks are available...'
@@ -16,24 +36,45 @@ end
 task :default => [:help]
 
 namespace :jruby do
-  desc 'Split the way too large JRuby JAR into two smaller files'
-  task :splitjars do  
-    puts 'Split the way too large JRuby JAR into two smaller files.'
-    libdir = File.join(File.dirname(__FILE__), 'lib')
-    puts `#{libdir}/split-jruby.sh`
+  desc 'Download current "jruby-complete.jar" from dist.codehaus.org.'
+  task :download do
+    puts 'Download current "jruby-complete.jar" from dist.codehaus.org.'
+
+    begin
+      baseurl = 'http://dist.codehaus.org/jruby/current'
+      directory = fetch(baseurl)
+  
+      if directory.kind_of? Net::HTTPOK and
+        (match = directory.body.match(/.*"(jruby-complete-[^"]*\.jar)".*/)) and
+        match.length == 2
+      then
+        `(curl -o lib/jruby-complete.jar "#{baseurl}/#{match[1]}") 1>&2`
+        raise Errno::ENOENT if $? != 0
+      else
+        raise Errno::ENOENT
+      end
+    rescue Exception
+      puts '!!Could not download "jruby-complete.jar". Retry or download manually.'
+      exit(1)
+    end
   end
 
-  desc 'Runs the splitjars task if splitted files not already exist'
-  task :check4jars do
-    file1 = File.join(File.dirname(__FILE__), 'lib', 'jruby-core.jar')
-    file2 = File.join(File.dirname(__FILE__), 'lib', 'ruby-stdlib.jar')
+  desc 'Run the jruby:download task if the JRuby JAR is missing.'
+  task :check4jar do
+    file = File.join(File.dirname(__FILE__), 'lib', 'jruby-complete.jar')
+
+    puts 'Run the jruby:download task if the JRuby JAR is missing.'
 
     begin
-      File.stat(file1)
-      File.stat(file2)
+      File.stat(file)
+
+      `(unzip -l #{file}) 2>&1`
+      raise Errno::ENOENT if $? != 0
+
+      puts 'JRuby JAR already exists.'
     rescue Errno::ENOENT
-      puts 'Need to copy and split JAR files. Generating them on the fly now...'
-      Rake::Task['jruby:splitjars'].invoke
+      puts 'Need to download JRuby JAR. Downloading now...'
+      Rake::Task['jruby:download'].invoke
     end
   end
 end
@@ -42,27 +83,27 @@ namespace :appengine do
   desc 'Create the WAR file for deployment'
   task :war do
     puts 'Create the WAR file for deployment.'
-    puts `jruby -S warble`
+    `(jruby -S warble) 1>&2`
   end
 
   desc 'Upload the new application code'
   task :upload do
     puts 'Upload the new application code (this may take a while).'
-    puts `appcfg.sh --enable_jar_splitting --email={{email}} update tmp/war`
+    `(appcfg.sh --enable_jar_splitting --email={{email}} update tmp/war) 1>&2`
   end
 
   desc 'Roll back a blocked and halfway broken deploy'
   task :rollback do
     puts 'Roll back a blocked and halfway broken deploy.'
-    puts `appcfg.sh --enable_jar_splitting rollback tmp/war`
+    `(appcfg.sh --enable_jar_splitting rollback tmp/war) 1>&2`
   end
 
   desc 'Remove temp stuff'
   task :clean do
     puts 'Remove temp stuff.'
-    puts `rm -rf tmp slingyard.war`
+    `rm -rf tmp {{name}}.war`
   end
 
-  desc 'Deploy the application (generating WAR plus uploading files)'
-  task :deploy => ['jruby:check4jars', :war, :upload]
+  desc 'Deploy the application (generating WAR and uploading files)'
+  task :deploy => ['jruby:check4jar', :war, :upload]
 end

data/templates/sinatra/config/warble.rb

@@ -32,17 +32,11 @@ Warbler::Config.new do |config|
  
   # Gems to be included. You need to tell Warbler which gems your application needs
   # so that they can be packaged in the war file.
-  # The Rails gems are included by default unless the vendor/rails directory is present.
-  # config.gems += ["activerecord-jdbcmysql-adapter", "jruby-openssl"]
-  # config.gems << "tzinfo"
   config.gems = ['sinatra', 'haml']
  
-  # Uncomment this if you don't want to package rails gem.
-  # config.gems -= ["rails"]
- 
   # The most recent versions of gems are used.
   # You can specify versions of gems by using a hash assignment:
-  # config.gems["rails"] = "2.0.2"
+  # config.gems["foo"] = "2.0.2"
  
   # You can also use regexps or Gem::Dependency objects for flexibility or
   # fine-grained control.
@@ -59,19 +53,17 @@ Warbler::Config.new do |config|
   # Pathmaps for controlling how public HTML files are copied into the .war
   # config.pathmaps.public_html = ["%{public/,}p"]
  
-  # Name of the war file (without the .war) -- defaults to the basename
-  # of RAILS_ROOT
+  # Name of the war file (without the .war)
   config.war_name = "{{name}}"
  
   # Name of the MANIFEST.MF template for the war file. Defaults to the
   # MANIFEST.MF normally generated by `jar cf`.
   # config.manifest_file = "config/MANIFEST.MF"
  
-  # Value of RAILS_ENV for the webapp -- default as shown below
-  # config.webxml.rails.env = ENV['RAILS_ENV'] || 'production'
+  # Value of environment variables
+  # config.webxml.foo.env = ENV['FOO_ENV']
  
-  # Application booter to use, one of :rack, :rails, or :merb. (Default :rails)
-  # config.webxml.booter = :rack
+  # Application booter to use, one of :rack, :rails, or :merb
   config.webxml.booter = :rack
  
   # When using the :rack booter, "Rackup" script to use.
@@ -80,7 +72,7 @@ Warbler::Config.new do |config|
   # config.webxml.rackup = %{require './lib/demo'; run Rack::Adapter::Camping.new(Demo)}
   # config.webxml.rackup = require 'cgi' && CGI::escapeHTML(File.read("config.ru"))
  
-  # Control the pool of Rails runtimes. Leaving unspecified means
+  # Control the pool of runtimes. Leaving unspecified means
   # the pool will grow as needed to service requests. It is recommended
   # that you fix these values when running a production server!
   # config.webxml.jruby.min.runtimes = 2
@@ -89,7 +81,5 @@ Warbler::Config.new do |config|
   config.webxml.jruby.max.runtimes = 1
   config.webxml.jruby.init.serial = true
  
-  # JNDI data source name
-  # config.webxml.jndi = 'jdbc/rails'
   config.java_libs = []
 end

data/templates/sinatra/lib/tasks/sinatra.rake

@@ -2,6 +2,6 @@ namespace :sinatra do
   desc 'Start a local test server on part 4567'
   task :run do
     puts 'Start a local test server on part 4567'
-    puts `jruby -S app.rb`
+    `(jruby -S app.rb) 1>&2`
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ulbrich-jruby-enginize
 version: !ruby/object:Gem::Version 
-  version: "0.3"
+  version: "0.4"
 platform: ruby
 authors: 
 - Jan Ulbrich
@@ -36,7 +36,6 @@ files:
 - templates/shared/README
 - templates/shared/Rakefile
 - templates/shared/public/images/appengine_logo.png
-- templates/shared/lib/split-jruby.sh
 - templates/shared/lib/jruby-rack-0.9.4.jar
 - templates/shared/appengine-web.xml
 - README.rdoc

data/templates/shared/lib/split-jruby.sh

@@ -1,67 +0,0 @@
-#!/bin/sh
-# Utility script for splitting the JRuby JAR into two smaller JAR files. This
-# is a workaround for a limitation of the JAR size in Google AppEngine.
-#
-# The code for this script has been taken from hints and links found at
-# http://jruby-rack.appspot.com.
-
-SCRIPTHOME=`dirname $0`
-JRUBY=`which jruby`
-
-if [ ! -x "$JRUBY" ]; then
-  echo "!!Missing jruby executable. Please check installation." > /dev/stderr
-  exit 1
-fi
-
-# See where the jruby binary is installed and find the JRuby JAR from there.
-
-PREFIX=`dirname \`dirname $JRUBY\``
-JARFILE="$PREFIX/share/java/jruby/lib/jruby-complete.jar"
-
-if [ ! -f "$JARFILE" ]; then
-  PREFIX=`dirname \`dirname $JRUBY\``
-  JARFILE="$PREFIX/lib/jruby-complete.jar"
-fi
-
-if [ ! -f "$JARFILE" ]; then
-  echo "!!Missing JRuby JAR. Please check installation." > /dev/stderr
-  exit 1
-fi
-
-echo "Using $JARFILE for splitting"
-echo "and assembling a AppEngine savvy version of the JRuby JAR in the lib "
-echo "directory."
-
-cd $SCRIPTHOME
-
-rm -rf jruby-core.jar
-rm -rf ruby-stdlib.jar
-rm -rf tmp_unpack
-
-mkdir -p tmp_unpack
-cd tmp_unpack
-
-jar xf $JARFILE
-
-cd ..
-
-mkdir -p jruby-core
-
-mv tmp_unpack/org jruby-core
-mv tmp_unpack/com jruby-core
-mv tmp_unpack/jline jruby-core
-mv tmp_unpack/jay jruby-core
-mv tmp_unpack/jruby jruby-core
-
-cd jruby-core
-
-jar cf ../jruby-core.jar .
-
-cd ../tmp_unpack
-
-jar cf ../ruby-stdlib.jar .
-
-cd ..
-
-rm -rf jruby-core
-rm -rf tmp_unpack