ulbrich-jruby-enginize 0.6.5 → 0.7.0

data/README.rdoc

@@ -12,70 +12,83 @@ what's up running Ruby applications on a Java VM.
 == Prerequisites
 
 JRuby-Enginize needs a proper JRuby installation including rake and the
-Google AppEngine SDK for Java. More dependencies depend on the framework
-template to generate an application for:
+Google AppEngine SDK (http://code.google.com/appengine/downloads.html) for
+Java.
 
-For Sinatra (http://www.sinatrarb.com), you will need the "sinatra" gem with
-"haml" and "sass".
-
-For Merb (http://www.merbivore.com), you will need the "merb-core" gem with
-"extlib" and "appengine-apis".
-
-Be sure to install gems with <tt>jgem</tt> or <tt>jruby -S gem</tt> as you
-need them for JRuby and not for Ruby.
-
-You also need an Google AppEngine account to actually publish your code.
-Without account you can still play around with the tool and run applications
-locally.
+More dependencies depend on the framework template to generate an application
+for, but installation of additional gems is done with tools provided by
+Google (so below).
 
 == Installation
 
-Install JRuby-Enginize as a gem with
+The Google people worked hard to make JRuby easier to deploy than it was at
+the beginning, so don't blindly trust all those blog posts and samples you'll
+find but use the newest version of jruby-enginize and have a look at the Wiki
+page of the Google AppEngine JRuby tools
+(http://code.google.com/p/appengine-jruby/wiki/GettingStarted)
+to learn about the details beyond.
+
+These are the steps for installing the Google tools plus JRuby-Enginize
+running on top of it to streamline your first steps:
 
-  sudo jgem sources -a http://gems.github.com  # Only needed once!
-  sudo jgem install ulbrich-jruby-enginize
+  sudo gem sources -a http://gems.github.com  # Only needed once!
+  sudo gem install google-appengine
+  sudo gem install ulbrich-jruby-enginize
 
-and be sure to really install with <tt>jgem</tt> as JRuby-Enginize will
-refuse to work in normal Ruby environment. It is for creating application
-running on Google AppEngine and it makes no sense outside JRuby!
+You also need an Google AppEngine account to actually publish your code.
+Without account you can still play around with the tools and run applications
+locally.
   
 == Using jruby-enginize
 
-The gem includes is a single executable named <tt>jruby-enginize</tt> which is
-inspired by the <tt>rails</tt> tool for generating Rails applications. So just
-call
+JRuby-Enginize includes is a single executable named <tt>jruby-enginize</tt>
+which is inspired by the <tt>rails</tt> tool for generating Rails applications.
+So just call
 
-  jruby -S jruby-enginize
+  jruby-enginize
 
 and have a look at the options.
 
 Here are the steps for creating and deploying a new Sinatra application:
 
-* Register with Google AppEngine and look for a name for your application
-  which is not already taken. If you don't care about this, you will get in
-  trouble upon deploying your application and have to manually reconfigure
-  all files!
+* Register with Google AppEngine and create a new application ID.
+
+* Generate your application with that new ID as directory name. Sample:
+
+  <tt>jruby-enginize --template sinatra jruby-enginize</tt>
+
+* Go to the new directory and install the missing gems first (depends on the
+  template you have chosen):
+
+  <tt>sudo rake template:gems</tt>
+
+  !!Attention: Whenever you want to install additional gems, be sure
+  to use <tt>appcfg.rb gem</tt> provided by the Google AppEngine JRuby tools 
+  and not <tt>jgem</tt> as Google maintains a local repository per project and
+  bundles the files to upload from that information. You will run into missing
+  gems on the server if you bypass this! Best approach is to use a separate
+  JRuby installation for AppEngine development to run into missing gems when
+  running the application locally, too.
 
-* Generate your application. Sample:
+* Learn about the available rake tasks
 
-  <tt>jruby -S jruby-enginize --template sinatra --email foo@bar.com jruby-enginize</tt>
+  <tt>rake --tasks</tt>
 
-* Go to the new directory, learn about the available rake tasks and try out
-  your application: 
+* Try out your application locally running on port 8080: 
 
-  <tt>cd jruby-enginize</tt>
-  <tt>jruby rake --tasks</tt>
+  <tt>rake appengine:run</tt>
 
-  <tt>jruby -S rake sinatra:run</tt>
+* Deploy the application:
 
-* Deploy the application with the application name and e-mail address you 
-  generated with:
+  <tt>rake appengine:deploy</tt>
 
-  <tt>jruby -S rake appengine:deploy</tt>
+  The first time you deploy your application, you will be asked for e-mail and
+  password to confirm your upload to the server.
 
 You can repeat the deployment whenever you want. Be sure to set the version
-number in "appengine-web.xml" to a new value, when you are experimenting with
-an unstable version and don't want to risk your users getting exceptions.
+number in the AppEngine::Rack.configure_app part of "config.ru" to a new
+value, when you are experimenting with an unstable version and don't want to
+risk your users getting exceptions.
 
 You can try the new version by opening e.g.
 

data/bin/jruby-enginize

@@ -1,4 +1,4 @@
-#!//usr/bin/env jruby -S
+#!//usr/bin/env ruby
 # JRuby-Enginize, a generator for Google AppEngine compliant JRuby apps.
 
 require 'lib/script'

data/lib/generator.rb

@@ -60,9 +60,9 @@ module JRubyEnginize # :nodoc:
       raise ArgumentError, "Template \"#{template}\" missing" unless File.stat(templatedir).directory?
 
       if dryrun
-        puts "Dry run which would generate the following files for template \"#{template}\":"
+        puts "Dry run which would generate the following files from template \"#{template}\":"
       else
-        puts "Generating files for template \"#{template}\"."
+        puts "Generating files from template \"#{template}\"."
       end
 
       template_files(shareddir, templatedir).each do |key, path|
@@ -78,8 +78,10 @@ module JRubyEnginize # :nodoc:
       if not dryrun
         puts "Done with directory \"#{self.path}\"."
 
-        puts "\nYour next steps:\n  cd #{self.path}\n\n  jruby -S rake"
-        puts "  jruby -S rake --tasks\n\n  jruby -S rake appengine:deploy"
+        puts "\nYour next steps:\n  cd #{self.path}\n\n  sudo rake template:gems"
+        puts "\n  rake\n  rake --tasks"
+        puts "\n  rake appengine:run # First call may fail: Just retry!"
+        puts "\n  rake appengine:deploy"
       end
     end
 
@@ -159,11 +161,12 @@ module JRubyEnginize # :nodoc:
         content = File.read(source).gsub(/\{\{[^}]*\}\}/) do |variable|
           case variable
           when '{{email}}'
+            raise 'missing e-mail address' if email.nil? or email.empty?
             email
           when '{{name}}'
             name
           else
-            if hexrand = variable.match(/{{hexrand-([0-9]+)}}/) and
+            if hexrand = variable.match(/\{\{hexrand-([0-9]+)\}\}/) and
               hexrand.length == 2 and (len = hexrand[1].to_i) > 0
             then
               str = ''
@@ -173,7 +176,7 @@ module JRubyEnginize # :nodoc:
               end
 
               str[0, len]
-            elsif numrand = variable.match(/{{numrand-([0-9]+)}}/) and
+            elsif numrand = variable.match(/\{\{numrand-([0-9]+)\}\}/) and
               numrand.length == 2 and (len = numrand[1].to_i) > 0
             then
               str = ''

data/lib/script.rb

@@ -26,6 +26,7 @@ module JRubyEnginize # :nodoc:
 
       prog = File.basename($0)
 
+=begin
       # Check for running with JRuby: The whole generator makes no sense if not 
       # running with or at least for JRuby...
 
@@ -35,6 +36,7 @@ module JRubyEnginize # :nodoc:
         $stderr.puts "!!#{prog} makes only sense on JRuby systems. Please try again." 
         exit(1)
       end
+=end
 
       # The AppEngine SDK has to be around, too.
 
@@ -67,7 +69,7 @@ module JRubyEnginize # :nodoc:
           raise 'missing directory name' if (path = ARGV.first).nil? or path.empty?
           raise 'directory already exists' if FileTest.exists? path
           raise 'unknown template' if not JRubyEnginize::Generator.templates.include? template
-
+          
           raise 'missing e-mail address' if email.nil? or email.empty?
         rescue SystemExit
           exit(1)

data/templates/merb/config/framework.rb

@@ -1,7 +1,7 @@
 Merb::Config[:framework] = {
-  :application => Merb.root / "app.rb",
-  :config => [Merb.root / "config", nil],
-  :public => [Merb.root / "public", nil],
-  :view   => Merb.root / "views"
+  :application => Merb.root / 'app.rb',
+  :config => [Merb.root / 'config', nil],
+  :public => [Merb.root / 'public', nil],
+  :view   => Merb.root / 'views'
 }
 

data/templates/merb/config/init.rb

@@ -17,7 +17,7 @@ end
 
 # Move this to app.rb if you want it to be reloadable in dev mode.
 Merb::Router.prepare do
-  match('/').to(:controller => "engine_app", :action =>'index')
+  match('/').to(:controller => 'engine_app', :action =>'index')
 
   default_routes
 end

data/templates/merb/config.ru

@@ -0,0 +1,19 @@
+require 'rubygems'
+require 'appengine-rack'
+
+require 'merb-core'
+
+AppEngine::Rack.configure_app(
+    # :ssl_enabled => true,
+    :application => '{{name}}',
+    :version => 1)
+
+Merb::Config.setup(:merb_root => File.dirname(__FILE__),
+                   :environment => ENV['RACK_ENV'])
+
+Merb.environment = Merb::Config[:environment]
+Merb.root = Merb::Config[:merb_root]
+
+Merb::BootLoader.run
+ 
+run Merb::Rack::Application.new

data/templates/merb/lib/tasks/merb.rake

@@ -1,34 +1,42 @@
-require 'merb-core'
-require 'merb-core/tasks/merb'
+# Tasks provided by Merb are guarded with a rescue block as we need this file
+# to work prior to installation of Merb.
 
-include FileUtils
+begin
+  require 'merb-core'
+  require 'merb-core/tasks/merb'
 
-# Load the basic runtime dependencies; this will include 
-# any plugins and therefore plugin rake tasks.
-init_env = ENV['MERB_ENV'] || 'rake'
-Merb.load_dependencies(:environment => init_env)
+  include FileUtils
+
+  # Load the basic runtime dependencies; this will include 
+  # any plugins and therefore plugin rake tasks.
+  init_env = ENV['MERB_ENV'] || 'rake'
+  Merb.load_dependencies(:environment => init_env)
      
-# Get Merb plugins and dependencies
-Merb::Plugins.rakefiles.each { |r| require r } 
+  # Get Merb plugins and dependencies
+  Merb::Plugins.rakefiles.each { |r| require r } 
 
-# Load any app level custom rakefile extensions from lib/tasks
-tasks_path = File.join(File.dirname(__FILE__), "lib", "tasks")
-rake_files = Dir["#{tasks_path}/*.rake"]
-rake_files.each{|rake_file| load rake_file }
+  # Load any app level custom rakefile extensions from lib/tasks
+  tasks_path = File.join(File.dirname(__FILE__), "lib", "tasks")
+  rake_files = Dir["#{tasks_path}/*.rake"]
+  rake_files.each{|rake_file| load rake_file }
 
-require 'spec/rake/spectask'
-require 'merb-core/test/tasks/spectasks'
+  require 'spec/rake/spectask'
+  require 'merb-core/test/tasks/spectasks'
+rescue Exception
+end
 
-##############################################################################
-# ADD YOUR CUSTOM TASKS IN /lib/tasks
-# NAME YOUR RAKE FILES file_name.rake
-##############################################################################
+# Task for loading gems needed by this template. Bootstrap to get installed...
 
-namespace :merb do
-  desc 'Start a local test server on port 4000'
-  task :run do
-    puts 'Start a local test server on port 4000'
-    `(jruby -S merb -V) 1>&2`
+namespace :template do
+  desc 'Load missing gems to local gem repository'
+  task :gems do
+    puts 'Load missing gems to local gem repository'
+    `(sudo appcfg.rb gem install extlib merb-core) 1>&2`
   end
 end
 
+# Add your own tasks...
+
+namespace :merb do
+end
+

data/templates/merb/views/index.html.erb

@@ -20,7 +20,8 @@
     </center>
   </div>
   <div id='footer'>
-    This tiny sample application was generated by
+    This tiny app was generated by
     <a href='http://github.com/ulbrich/jruby-enginize'>JRuby-Enginize</a>
+    to streamline Google AppEngine development.
   </div>
 </center>

data/templates/shared/README

@@ -3,18 +3,24 @@ README
 This is a generic README generated by jruby-enginize. Please replace with
 something more meaningful... ;-)
 
-GOOGLE APPENGINE DEPLOYMENT
+INSTALL MISSING GEMS
+
+As a basic requirement, you have to install missing gems required by the
+template (this task is implemented individually for each template):
+
+  sudo rake template:gems
 
-!!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).
+!!Attention: Whenever you want to install additional gems, be sure to use
+"appcfg.rb gem" provided by the Google AppEngine JRuby tools and not "jgem" as
+Google maintains a local repository per project and bundles the files to
+upload from that information. You will run into missing gems on the server if
+you bypass this!
+
+GOOGLE APPENGINE DEPLOYMENT
 
 Deploy the application with
 
-  jrake appengine:deploy
+  rake appengine:deploy
 
 and open
 
@@ -22,9 +28,9 @@ and open
 
 to have a first test.
 
-Be sure to set the version number in "appengine-web.xml" to a new value, when
-you are experimenting with an unstable version and don't want to risk your
-users getting exceptions.
+Be sure to set the version number in the AppEngine::Rack.configure_app part
+of "config.ru" to a new value, when you are experimenting with an unstable
+version and don't want to risk your users getting exceptions.
 
 You can try the new version by opening e.g.
 
@@ -38,3 +44,25 @@ opening
   http://appengine.google.com/deployment?&app_id={{name}}
 
 and setting a new default.
+
+SOME MORE INFO
+
+- Gems installed with "appcfg.rb gem" reside in directory ".gems". Again: Do
+  not use "jgem" at all!
+
+- Some gems will throw exceptions during bundling: Have a look for paths
+  assembled using ".." to reach the parent directory and replace with
+  File.dirname(...). Retry and be a good citizen and send in the patch the
+  developer of that gem... ;-)
+
+- Data uploaded to the server is gathered in directory "WEB-INF" as with any
+  Java project. The first time "rake appengine:run" or "rake appengine:deploy"
+  is called, this directory will be created and "jruby-rack-xx.jar" is
+  downloaded from its homepage.
+  
+  The first call to "rake appengine:run" or "rake appengine:deploy" with 
+  downloading the rack jar will fail. Just ignore and retry.
+
+- "WEB-INF/lib/gems.jar" is only created or updated after a call to
+  "appcfg.rb gem". This is enforced by "rake appengine:deploy" but not by
+  "rake appengine:update".

data/templates/shared/Rakefile

@@ -28,82 +28,44 @@ end
 
 desc 'Display some help and the README'
 task :help do
-  puts 'Call "jruby -S rake --tasks" to learn what tasks are available...'
+  puts 'Call "rake --tasks" to learn what tasks are available...'
   puts
   puts File.read('README')
 end
 
 task :default => [:help]
 
-namespace :jruby do
-  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
+namespace :appengine do
+  desc 'Start a local test server on port 8000'
+  task :run do
+    puts 'Start a local test server on port 8000'
+    `(dev_appserver.rb .) 1>&2`
   end
 
-  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(file)
-
-      `(unzip -l #{file}) 2>&1`
-      raise Errno::ENOENT if $? != 0
-
-      puts 'JRuby JAR already exists.'
-    rescue Errno::ENOENT
-      puts 'Need to download JRuby JAR. Downloading now...'
-      Rake::Task['jruby:download'].invoke
-    end
+  desc 'Force rebuilding "WEB-INF/lib/gems.jar"'
+  task :rebuildgems do
+    puts 'Force rebuilding "WEB-INF/lib/gems.jar"'
+    `(appcfg.rb gem help install) 2> /dev/null 1>&2`
   end
-end
 
-namespace :appengine do
-  desc 'Create the WAR file for deployment'
-  task :war do
-    puts 'Create the WAR file for deployment.'
-    `(jruby -S warble) 1>&2`
+  desc 'Build the application package'
+  task :bundle do
+    puts 'Build the application package.'
+    `(appcfg.rb --email={{email}} --enable_jar_splitting bundle .) 1>&2`
   end
 
-  desc 'Upload the new application code'
-  task :upload do
+  desc 'Upload the application code to the server'
+  task :update do
     puts 'Upload the new application code (this may take a while).'
-    `(appcfg.sh --enable_jar_splitting --email={{email}} update tmp/war) 1>&2`
+    `(appcfg.rb --email={{email}} --enable_jar_splitting update .) 1>&2`
   end
 
   desc 'Roll back a blocked and halfway broken deploy'
   task :rollback do
     puts 'Roll back a blocked and halfway broken deploy.'
-    `(appcfg.sh --enable_jar_splitting rollback tmp/war) 1>&2`
-  end
-
-  desc 'Remove temp stuff'
-  task :clean do
-    puts 'Remove temp stuff.'
-    `rm -rf tmp {{name}}.war`
+    `(appcfg.rb --email={{email}} rollback .) 1>&2`
   end
 
-  desc 'Deploy the application (generating WAR and uploading files)'
-  task :deploy => ['jruby:check4jar', :war, :upload]
+  desc 'Deploy the application (build package and upload application code)'
+  task :deploy => [:rebuildgems, :bundle, :update]
 end

data/templates/sinatra/app.rb

@@ -5,10 +5,17 @@ require 'rubygems'
 begin
   require 'haml'
   require 'sass'
+
   require 'sinatra'
 rescue LoadError => exception
-  $stderr.puts '!!missing sinatra. Install sinatra gem and try again.'
-  exit(1)
+end
+
+# Helpers to include...
+
+helpers do
+  include Rack::Utils
+
+  alias_method :h, :escape_html
 end
 
 # GET /

data/templates/sinatra/config.ru

@@ -1,13 +1,13 @@
 require 'rubygems'
+require 'appengine-rack'
+
 require 'sinatra'
- 
-root_dir = File.dirname(__FILE__)
- 
-set :environment, :production
-set :root, root_dir
-set :app_file, File.join(root_dir, 'app.rb')
-disable :run
- 
+
+AppEngine::Rack.configure_app(
+    # :ssl_enabled => true,
+    :application => '{{name}}',
+    :version => 1)
+
 require 'app'
  
 run Sinatra::Application

data/templates/sinatra/lib/tasks/haml-2_2_2-util.patch

@@ -0,0 +1,5 @@
+18c18
+<       File.join(File.dirname(__FILE__), '..', '..', file)
+---
+>       File.join(File.dirname(File.dirname(File.dirname(__FILE__))), file)
+

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

@@ -1,7 +1,16 @@
-namespace :sinatra do
-  desc 'Start a local test server on port 4567'
-  task :run do
-    puts 'Start a local test server on port 4567'
-    `(jruby -S app.rb) 1>&2`
+# Task for loading gems needed by this template. Bootstrap to get installed...
+
+namespace :template do
+  desc 'Load missing gems to local gem repository'
+  task :gems do
+    puts 'Load missing gems to local gem repository'
+    `(sudo appcfg.rb gem install jruby-openssl haml sinatra) 1>&2`
+    puts 'Add patch for Haml 2.2.2 if needed'
+    `(sudo patch --batch --silent .gems/gems/haml-2.2.2/lib/haml/util.rb < lib/tasks/haml-2_2_2-util.patch) 2> /dev/null 1>&2`
   end
 end
+
+# Add your own tasks...
+
+namespace :sinatra do
+end

data/templates/sinatra/views/index.haml

@@ -14,5 +14,6 @@
       %p
         %img{ :src => '/images/sinatra_logo.png' }
   %div{ :id => 'footer' }
-    This tiny sample application was generated by
+    This tiny app was generated by
     %a{ :href => 'http://github.com/ulbrich/jruby-enginize' } JRuby-Enginize
+    to streamline Google AppEngine development.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ulbrich-jruby-enginize
 version: !ruby/object:Gem::Version 
-  version: 0.6.5
+  version: 0.7.0
 platform: ruby
 authors: 
 - Jan Ulbrich
@@ -30,8 +30,8 @@ files:
 - templates/sinatra/views/index.haml
 - templates/sinatra/public/images/sinatra_logo.png
 - templates/sinatra/lib/tasks/sinatra.rake
+- templates/sinatra/lib/tasks/haml-2_2_2-util.patch
 - templates/sinatra/config.ru
-- templates/sinatra/config/warble.rb
 - templates/sinatra/app.rb
 - templates/sinatra/.gitignore
 - templates/shared/README
@@ -39,15 +39,13 @@ files:
 - templates/shared/public/robots.txt
 - templates/shared/public/images/appengine_logo.png
 - templates/shared/public/favicon.ico
-- templates/shared/lib/jruby-rack-0.9.4.jar
-- templates/shared/appengine-web.xml
 - templates/merb/views/layout.engine_app.html.erb
 - templates/merb/views/index.html.erb
 - templates/merb/spec/spec_helper.rb
 - templates/merb/public/stylesheets/default.css
 - templates/merb/public/images/merb_logo.png
 - templates/merb/lib/tasks/merb.rake
-- templates/merb/config/warble.rb
+- templates/merb/config.ru
 - templates/merb/config/init.rb
 - templates/merb/config/framework.rb
 - templates/merb/app.rb
@@ -55,6 +53,7 @@ files:
 - README.rdoc
 has_rdoc: true
 homepage: http://github.com/ulbrich/jruby-enginize
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --exclude
@@ -83,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: A package for generating Google AppEngine compliant JRuby projects.

data/templates/merb/config/warble.rb

@@ -1,85 +0,0 @@
-# Disable automatic framework detection by uncommenting/setting to false
-# Warbler.framework_detection = false
- 
-# Warbler web application assembly configuration file
-Warbler::Config.new do |config|
-  # Temporary directory where the application is staged
-  # config.staging_dir = "tmp/war"
- 
-  # Application directories to be included in the webapp.
-  config.dirs = %w(lib public views config)
- 
-  # Additional files/directories to include, above those in config.dirs
-  # config.includes = FileList["db"]
-  config.includes = FileList["appengine-web.xml", "app.rb"]
-  # Additional files/directories to exclude
-  # config.excludes = FileList["lib/tasks/*"]
- 
-  # Additional Java .jar files to include.  Note that if .jar files are placed
-  # in lib (and not otherwise excluded) then they need not be mentioned here.
-  # JRuby and JRuby-Rack are pre-loaded in this list.  Be sure to include your
-  # own versions if you directly set the value
-  # config.java_libs += FileList["lib/java/*.jar"]
- 
-  # Loose Java classes and miscellaneous files to be placed in WEB-INF/classes.
-  # config.java_classes = FileList["target/classes/**.*"]
- 
-  # One or more pathmaps defining how the java classes should be copied into
-  # WEB-INF/classes. The example pathmap below accompanies the java_classes
-  # configuration above. See http://rake.rubyforge.org/classes/String.html#M000017
-  # for details of how to specify a pathmap.
-  # config.pathmaps.java_classes << "%{target/classes/,}p"
- 
-  # Gems to be included. You need to tell Warbler which gems your application needs
-  # so that they can be packaged in the war file.
-  config.gems = ['merb-core', 'extlib']
- 
-  # The most recent versions of gems are used.
-  # You can specify versions of gems by using a hash assignment:
-  # config.gems["foo"] = "2.0.2"
- 
-  # You can also use regexps or Gem::Dependency objects for flexibility or
-  # fine-grained control.
-  # config.gems << /^merb-/
-  # config.gems << Gem::Dependency.new("merb-core", "= 0.9.3")
- 
-  # Include gem dependencies not mentioned specifically
-  config.gem_dependencies = true
- 
-  # Files to be included in the root of the webapp.  Note that files in public
-  # will have the leading 'public/' part of the path stripped during staging.
-  # config.public_html = FileList["public/**/*", "doc/**/*"]
- 
-  # 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)
-  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 environment variables
-  # config.webxml.foo.env = ENV['FOO_ENV']
- 
-  # Application booter to use, one of :rack, :rails, or :merb
-  config.webxml.booter = :merb
- 
-  # When using the :rack booter, "Rackup" script to use.
-  # The script is evaluated in a Rack::Builder to load the application.
-  # Examples:
-  # 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 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
-  # config.webxml.jruby.max.runtimes = 4
-  config.webxml.jruby.min.runtimes = 1
-  config.webxml.jruby.max.runtimes = 1
-  config.webxml.jruby.init.serial = true
- 
-  config.java_libs = []
-end

data/templates/shared/appengine-web.xml

@@ -1,21 +0,0 @@
-<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
-    <application>{{name}}</application>
-    <version>1</version>
-    <static-files />
-    <resource-files />
-    <sessions-enabled>false</sessions-enabled>
-    <system-properties>
-      <property name="jruby.management.enabled" value="false" />
-      <property name="os.arch" value="" />
-      <property name="jruby.compile.mode" value="JIT"/> <!-- JIT|FORCE|OFF -->
-      <property name="jruby.compile.fastest" value="true"/>
-      <property name="jruby.compile.frameless" value="true"/>
-      <property name="jruby.compile.positionless" value="true"/>
-      <property name="jruby.compile.threadless" value="false"/>
-      <property name="jruby.compile.fastops" value="false"/>
-      <property name="jruby.compile.fastcase" value="false"/>
-      <property name="jruby.compile.chainsize" value="500"/>
-      <property name="jruby.compile.lazyHandles" value="false"/>
-      <property name="jruby.compile.peephole" value="true"/>
-   </system-properties>
-</appengine-web-app>

data/templates/sinatra/config/warble.rb

@@ -1,85 +0,0 @@
-# Disable automatic framework detection by uncommenting/setting to false
-# Warbler.framework_detection = false
- 
-# Warbler web application assembly configuration file
-Warbler::Config.new do |config|
-  # Temporary directory where the application is staged
-  # config.staging_dir = "tmp/war"
- 
-  # Application directories to be included in the webapp.
-  config.dirs = %w(lib public views)
- 
-  # Additional files/directories to include, above those in config.dirs
-  # config.includes = FileList["db"]
-  config.includes = FileList["appengine-web.xml", "app.rb", "config.ru"]
-  # Additional files/directories to exclude
-  # config.excludes = FileList["lib/tasks/*"]
- 
-  # Additional Java .jar files to include.  Note that if .jar files are placed
-  # in lib (and not otherwise excluded) then they need not be mentioned here.
-  # JRuby and JRuby-Rack are pre-loaded in this list.  Be sure to include your
-  # own versions if you directly set the value
-  # config.java_libs += FileList["lib/java/*.jar"]
- 
-  # Loose Java classes and miscellaneous files to be placed in WEB-INF/classes.
-  # config.java_classes = FileList["target/classes/**.*"]
- 
-  # One or more pathmaps defining how the java classes should be copied into
-  # WEB-INF/classes. The example pathmap below accompanies the java_classes
-  # configuration above. See http://rake.rubyforge.org/classes/String.html#M000017
-  # for details of how to specify a pathmap.
-  # config.pathmaps.java_classes << "%{target/classes/,}p"
- 
-  # Gems to be included. You need to tell Warbler which gems your application needs
-  # so that they can be packaged in the war file.
-  config.gems = ['sinatra', 'haml']
- 
-  # The most recent versions of gems are used.
-  # You can specify versions of gems by using a hash assignment:
-  # config.gems["foo"] = "2.0.2"
- 
-  # You can also use regexps or Gem::Dependency objects for flexibility or
-  # fine-grained control.
-  # config.gems << /^merb-/
-  # config.gems << Gem::Dependency.new("merb-core", "= 0.9.3")
- 
-  # Include gem dependencies not mentioned specifically
-  config.gem_dependencies = true
- 
-  # Files to be included in the root of the webapp.  Note that files in public
-  # will have the leading 'public/' part of the path stripped during staging.
-  # config.public_html = FileList["public/**/*", "doc/**/*"]
- 
-  # 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)
-  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 environment variables
-  # config.webxml.foo.env = ENV['FOO_ENV']
- 
-  # Application booter to use, one of :rack, :rails, or :merb
-  config.webxml.booter = :rack
- 
-  # When using the :rack booter, "Rackup" script to use.
-  # The script is evaluated in a Rack::Builder to load the application.
-  # Examples:
-  # 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 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
-  # config.webxml.jruby.max.runtimes = 4
-  config.webxml.jruby.min.runtimes = 1
-  config.webxml.jruby.max.runtimes = 1
-  config.webxml.jruby.init.serial = true
- 
-  config.java_libs = []
-end