appengine-tools 0.0.14 → 0.0.15.pre

data/Rakefile

@@ -3,11 +3,15 @@ require 'rake/gempackagetask'
 require 'rubygems/specification'
 require 'date'
 require 'spec/rake/spectask'
+require 'appengine-sdk'
 
 GEM = "appengine-tools"
-GEM_VERSION = "0.0.14"
+GEM_VERSION = "0.0.15.pre"
 HOMEPAGE = "http://code.google.com/p/appengine-jruby"
 
+PLUGIN_SOURCE = 'src/com/google/appengine/jruby/JRubyYamlPlugin.java'
+JAR_FILE = 'lib/appengine-tools/app_yaml.jar'
+
 spec = Gem::Specification.new do |s|
   s.name = GEM
   s.version = GEM_VERSION
@@ -25,7 +29,7 @@ EOF
   
   s.require_path = 'lib'
   s.files = %w(COPYING LICENSE README.rdoc Rakefile) +
-      Dir.glob("{lib,spec}/**/*.{rb,class}")
+      Dir.glob("{lib,spec}/**/*.{rb,class}") + [JAR_FILE]
   s.executables = [ 'appcfg.rb', 'dev_appserver.rb' ]
   s.add_dependency('appengine-rack')
   s.add_dependency('appengine-sdk')
@@ -56,3 +60,15 @@ task :make_spec do
     file.puts spec.to_ruby
   end
 end
+
+def sh!(*args)
+  sh(*args) do |ok, res|
+    raise "Error #{res} from `#{args.join ' '}`" unless ok
+  end
+end
+
+file JAR_FILE => PLUGIN_SOURCE do
+  path = AppEngine::SDK::TOOLS_JAR
+  sh! "javac -cp #{path} #{PLUGIN_SOURCE}"
+  sh! "jar cf #{JAR_FILE} META-INF -C src com"
+end

data/lib/appengine-tools/appcfg.rb

@@ -22,61 +22,6 @@ require 'yaml'
 
 module AppEngine
   module Admin
-    if defined? Java
-      AppCfg = AppEngine::SDK.load_appcfg
-      import Java.ComGoogleAppengineToolsAdmin.AppAdminFactory 
-      import Java.ComGoogleAppengineToolsUtil.Logging
-    
-      $CLASSPATH << File.dirname(__FILE__)
-      import Java.ComGoogleAppengineJruby.AppVersionUploadDelegate
-      import Java.ComGoogleAppengineJruby.JRubyAppVersionUpload
-
-      class UploadDelegate
-        include AppVersionUploadDelegate
-
-        def index_yaml(app)
-          indexes = merge_indexes(app)
-          if indexes
-            return indexes.to_yaml
-          end
-          ''
-        end
-      
-        def cron_yaml(app)
-          cron = File.join(app.path, 'cron.yaml')
-          if File.exists?(cron)
-            return IO.read(cron)
-          end
-        end
-    
-        def queue_yaml(app)
-          queue = File.join(app.path, 'queue.yaml')
-          if File.exists?(queue)
-            return IO.read(queue)
-          end
-        end
-      
-        def merge_indexes(app)
-          if app.indexes_xml
-            indexes = YAML.load(app.indexes_xml.to_yaml)['indexes']
-          end
-          indexes ||= []
-          index_yaml = File.join(app.path, 'index.yaml')
-          if File.exist?(index_yaml)
-            manual_indexes = YAML.load_file(index_yaml)['indexes'] || []
-            manual_indexes.each do |index|
-              indexes << index unless indexes.include?(index)
-            end
-          end
-          if indexes.size > 0
-            {'indexes' => indexes}
-          else
-            nil
-          end
-        end
-      end
-    end
-    
     class JRubyAppCfg
       NO_XML_COMMANDS = %w{version}
       RUBY_COMMANDS = %w{gem bundle help run generate_app}
@@ -95,22 +40,15 @@ EOF
           if command && !NO_XML_COMMANDS.include?(command)
             path = parsed_args[0]
             AppEngine::Admin.bundle_app(path)
-            AppEngine::Development.boot_jruby
             updater = AppEngine::Admin::UpdateCheck.new(path)
             updater.nag
-          else
-            AppEngine::Development.boot_jruby              
           end
           puts "=> Running AppCfg"
           run_appcfg(args)
         end
-        
+
         def run_appcfg(args)
-          JRubyAppVersionUpload.set_delegate(UploadDelegate.new)
-          factory = AppAdminFactory.new
-          factory.setAppVersionUploadClass(JRubyAppVersionUpload.java_class)
-          Logging.initializeLogging
-          AppCfg.new(factory, args.to_java(java.lang.String))
+          exec *(appcfg_command + args)
         end
 
         def generate_app(*args)
@@ -158,7 +96,7 @@ EOF
         def gem(*args)
           gem_help
         end
-        
+
         def gem_help
           help = <<EOF
 
@@ -168,12 +106,12 @@ Simply update the 'Gemfile' and run 'appcfg.rb bundle .' instead.
 EOF
           puts help
         end
-        
+
         def run(*args)
           AppEngine::Admin.bundle_deps('.')
           AppEngine::Development.boot_app('.', args)
         end
-        
+
         def run_help
           help = <<EOF
 #{$0} run [ruby args]
@@ -185,19 +123,24 @@ Must be run from the application directory, after running bundle.
 EOF
         end
 
+        def appcfg_command
+          plugin_jar = File.join(File.dirname(__FILE__), 'app_yaml.jar')
+          command = %W(java -cp #{AppEngine::SDK::TOOLS_JAR})
+          command << "-Dcom.google.appengine.plugin.path=#{plugin_jar}"
+          command << 'com.google.appengine.tools.admin.AppCfg'
+        end
+
         def help(command=nil)
           puts
           if command != 'help' && RUBY_COMMANDS.include?(command)
             puts send("#{command}_help")
           else
-            java_args = %W(java -cp #{AppEngine::SDK::TOOLS_JAR})
-            java_args << 'com.google.appengine.tools.admin.AppCfg'
-            java_args << 'help'
+            java_args = appcfg_command << 'help'
             java_args << command if command
             print_help(%x{#{java_args.map{|x| x.inspect}.join(' ')}}, !command)
           end
         end
-        
+
         def print_help(help, summary)
           help.gsub!('AppCfg', $0)
           count = 0

data/lib/appengine-tools/boot.rb

@@ -18,38 +18,10 @@ require 'appengine-sdk'
 
 module AppEngine
   module Development
-    
+
     BOOT_APP_RB = File.join(File.dirname(__FILE__), 'boot_app.rb')
 
     class << self
-      def boot_jruby(root=nil, options={})
-        unless defined?(JRUBY_VERSION)
-          require 'jruby-jars'
-
-          jars = [
-            JRubyJars.core_jar_path,
-            JRubyJars.stdlib_jar_path,
-            AppEngine::SDK::TOOLS_JAR,
-            ]
-
-          args = options[:args] || ARGV
-          should_exec = options[:exec]
-          should_exec ||= should_exec.nil?
-
-          # TODO This is really ugly. We should just be using -I
-          # for the paths we need (appengine-tools and it's deps)
-          ENV['GEM_HOME'] = Gem.dir
-          ENV['GEM_PATH'] = Gem.path.compact.join(File::SEPARATOR)
-          appcfg = [File.expand_path(File.join(File.dirname($0),
-                                               'appcfg.rb'))]
-          if should_exec
-            exec_jruby(root, jars, appcfg + args)
-          else
-            run_jruby(root, jars, appcfg + args)
-          end
-        end
-      end
-    
       def boot_app(root, args)
         root = File.expand_path(root)
 
@@ -61,7 +33,7 @@ module AppEngine
         ENV.delete 'GEM_HOME'
         exec_jruby(root, jars, jruby_args)
       end
-      
+
       def build_command(root, jars, args)
         app_jars = root ? Dir.glob("#{root}/WEB-INF/lib/*.jar") : []
         classpath = (app_jars + jars).join(File::PATH_SEPARATOR)
@@ -72,18 +44,11 @@ module AppEngine
         end
         command
       end
-      
+
       def exec_jruby(root, jars, args)
         java_command = build_command(root, jars, args)
         exec *java_command
       end
-      
-      def run_jruby(root, jars, args)
-        java_command = build_command(root, jars, args)
-        if !system(*java_command)
-          puts 'Error executing jruby'
-        end
-      end
     end
   end
 end

data/lib/appengine-tools/bundler.rb

@@ -18,8 +18,6 @@
 require 'appengine-rack'
 require 'appengine-tools/boot'
 require 'appengine-tools/gem_bundler'
-require 'appengine-tools/web-xml'
-require 'appengine-tools/xml-formatter'
 require 'fileutils'
 require 'yaml'
 
@@ -65,16 +63,8 @@ module AppEngine
         path('config.ru')
       end
 
-      def web_xml
-        path('WEB-INF', 'web.xml')
-      end
-
-      def aeweb_xml
-        path('WEB-INF', 'appengine-web.xml')
-      end
-
-      def build_status
-        path('WEB-INF', 'appengine-generated', 'build_status.yaml')
+      def app_yaml
+        path('app.yaml')
       end
 
       def bundled_jars
@@ -82,7 +72,13 @@ module AppEngine
       end
 
       def public_root
-        path(AppEngine::Rack.app.public_root) if AppEngine::Rack.app.public_root
+        @public_root ||= begin
+          if File.exist?(app_yaml)
+            app = YAML.load(IO.read(app_yaml))
+            return path(app['public_root']) if app['public_root']
+          end
+          path('public')
+        end
       end
 
       def favicon_ico
@@ -92,11 +88,6 @@ module AppEngine
       def robots_txt
          File.join(public_root ? public_root : @root, 'robots.txt')
       end
-
-      def rack_app
-        AppEngine::Rack.app
-      end
-
     end
 
     class AppBundler
@@ -108,7 +99,9 @@ module AppEngine
 
       def bundle(args=[])
         bundle_deps(args)
-        convert_config_ru
+        generate_config_ru
+        generate_app_yaml
+        create_public
       end
 
       def bundle_deps(args=[])
@@ -118,7 +111,6 @@ module AppEngine
       end
 
       def bundle_gems(args)
-        return if defined? JRUBY_VERSION
         gem_bundler = AppEngine::Admin::GemBundler.new(app.root)
         gem_bundler.bundle(args)
       end
@@ -128,11 +120,10 @@ module AppEngine
       end
 
       def confirm_appdir
-        unless File.exists?(app.config_ru) or
-            File.exists?(app.gemfile) or File.exists?(app.webinf)
+        unless File.exists?(app.app_yaml)or File.exists?(app.webinf)
           puts ""
           puts "Oops, this does not look like an application directory."
-          puts "You need a #{app.gemfile} or #{app.config_ru} file."
+          puts "You need to create #{app.app_yaml}."
           puts ""
           puts "Run 'appcfg.rb generate_app #{app.path}'"
           puts "to generate a skeleton application."
@@ -147,7 +138,6 @@ module AppEngine
       end
 
       def create_public
-        return unless defined? JRUBY_VERSION
         if app.public_root and !File.exists?(app.public_root)
           Dir.mkdir(app.public_root)
         end
@@ -155,23 +145,26 @@ module AppEngine
         FileUtils.touch(app.robots_txt) unless File.exists?(app.robots_txt)
       end
 
-      def convert_config_ru
+      def generate_config_ru
         unless File.exists?(app.config_ru)
           puts "=> Generating rackup"
+          stock_rackup = "run lambda {Rack::Response.new('Hello').finish}\n"
+          File.open(app.config_ru, 'w') {|f| f.write(stock_rackup) }
+        end
+      end
+
+      def generate_app_yaml
+        unless File.exists?(app.app_yaml)
+          puts "=> Generating app.yaml"
           app_id = File.basename(File.expand_path(app.path)).
               downcase.gsub('_', '-').gsub(/[^-a-z0-9]/, '')
-          stock_rackup = <<EOF
-require 'appengine-rack'
-AppEngine::Rack.configure_app(
-    :application => "#{app_id}",
-    :precompilation_enabled => true,
-    :version => "1")
-run lambda { ::Rack::Response.new("Hello").finish }
+          stock_yaml = <<EOF
+application: #{app_id}
+version: 1
+runtime: jruby
 EOF
-          File.open(app.config_ru, 'w') {|f| f.write(stock_rackup) }
+          File.open(app.app_yaml, 'w') {|f| f.write(stock_yaml)}
         end
-        generate_xml
-        create_public
       end
 
       private
@@ -213,57 +206,6 @@ EOF
         end
         FileUtils.rm_f(paths)
       end
-
-      def valid_build
-        return false unless File.exists? app.build_status
-        return false unless File.exists? app.web_xml
-        return false unless File.exists? app.aeweb_xml
-        yaml = YAML.load_file app.build_status
-        return false unless yaml.is_a? Hash
-        return false unless File.stat(app.config_ru).mtime.eql? yaml[:config_ru]
-        return false unless File.stat(app.web_xml).mtime.eql? yaml[:web_xml]
-        return false unless File.stat(app.aeweb_xml).mtime.eql? yaml[:aeweb_xml]
-        true
-      end
-
-      def generate_xml
-        return if valid_build
-        if defined? JRUBY_VERSION
-          puts "=> Generating configuration files"
-          Dir.glob("#{app.webinf_lib}/*.jar").each do |path|
-            $: << path
-          end
-          app_root = app.root
-          builder = WebXmlBuilder.new do
-            # First read the user's rackup file
-            Dir.chdir(app_root) do
-              require File.join(".gems", "bundler_gems",
-                  TARGET_ENGINE, TARGET_VERSION, "environment")
-              eval IO.read('config.ru'), nil, 'config.ru', 1
-            end
-
-            # Now configure the basic jruby-rack settings.
-            add_jruby_rack_defaults
-          end
-          open(app.web_xml, 'w') do |webxml|
-            xml = AppEngine::Rack::XmlFormatter.format(builder.to_xml)
-            webxml.write(xml)
-          end
-          open(app.aeweb_xml, 'w') do |aeweb|
-            xml = AppEngine::Rack::XmlFormatter.format(app.rack_app.to_xml)
-            aeweb.write(xml)
-          end
-          yaml = {
-              :config_ru => File.stat(app.config_ru).mtime,
-              :aeweb_xml => File.stat(app.aeweb_xml).mtime,
-              :web_xml   => File.stat(app.web_xml).mtime }
-          open(app.build_status, 'w') { |f| YAML.dump(yaml, f) }
-        else
-          AppEngine::Development.boot_jruby(app.root,
-                                            :args => ['bundle', app.root],
-                                            :exec => false)
-        end
-      end
     end
 
     def self.bundle_app(*args)

data/lib/appengine-tools/dev_appserver.rb

@@ -15,7 +15,6 @@
 # limitations under the License.
 
 require 'appengine-sdk'
-require 'appengine-tools/boot'
 require 'appengine-tools/bundler'
 require 'appengine-tools/update_check'
 
@@ -27,15 +26,15 @@ module AppEngine
         def run(args)
           path, java_args, server_args = parse_argv(ARGV)
           if path and File::directory?(path)
-            puts  "=> Booting DevAppServer"
-            puts  "=> Press Ctrl-C to shutdown server"
             AppEngine::Admin.bundle_app(path)
             updater = AppEngine::Admin::UpdateCheck.new(path)
             updater.nag if updater.can_nag?
+            puts  "=> Booting DevAppServer"
+            puts  "=> Press Ctrl-C to shutdown server"
           end
           start_java(path, java_args, server_args)
         end
-        
+
         def parse_argv(argv)
           java_args = []
           server_args = []
@@ -59,7 +58,7 @@ module AppEngine
           end
           return server_args[-1], java_args, server_args
         end
-        
+
         def start_java(path, java_args, server_args)
           if path
             jruby_home = get_jruby_home(path)
@@ -70,10 +69,13 @@ module AppEngine
           server_args.unshift '--disable_update_check'
           ENV.delete 'GEM_HOME'
           ENV.delete 'GEM_PATH'
+          plugin_jar = File.join(File.dirname(__FILE__), 'app_yaml.jar')
+
           java_args << '-classpath'
           java_args << AppEngine::SDK::TOOLS_JAR
           java_args << '-Djava.util.logging.config.file=' +
               AppEngine::SDK::SDK_ROOT + '/config/sdk/logging.properties'
+          java_args << "-Dcom.google.appengine.plugin.path=#{plugin_jar}"
           if defined? AppEngine::SDK::AGENT_JAR
             java_args << '-javaagent:' + AppEngine::SDK::AGENT_JAR
           end
@@ -83,7 +85,7 @@ module AppEngine
           end
           exec(*command)
         end
-        
+
         def get_jruby_home(path)
           return unless path
           Dir.chdir("#{path}/WEB-INF/lib") do

data/lib/appengine-tools/gem_bundler.rb

@@ -118,7 +118,7 @@ disable_rubygems
 bundle_path ".gems/bundler_gems"
 
 # List gems to bundle here:
-gem "appengine-rack"
+gem 'appengine-rack', '0.0.11.pre'
 EOF
         File.open(app.gemfile,'w') {|f| f.write(stock_gemfile) }
       end

data/lib/appengine-tools/update_check.rb

@@ -29,13 +29,13 @@ module AppEngine
       NAG_FILE = "~/.appcfg_rb_nag"
       MAX_NAG_FREQUENCY = 60 * 60 * 24 * 7
       DEFAULT_URL = 'http://appengine-jruby.googlecode.com/hg/updatecheck'
-      
+
       def initialize(approot, url=nil, nag_file=nil)
         @url = url || DEFAULT_URL
         @approot = approot
         @nag_file = nag_file || File.expand_path(NAG_FILE)
       end
-      
+
       def local_versions
         sdk_version = Gem::Version.new(AppEngine::VERSION) rescue nil
         {
@@ -44,7 +44,7 @@ module AppEngine
           'dm-appengine' => find_gem_version('dm-appengine'),
         }
       end
-      
+
       def find_gem_version(name)
         IO.foreach("#{@approot}/.gems/bundler_gems/environment.rb") do |line|
           if line =~ %r(/gems/#{name}-(\w+\.\w+.\w+)[/"])
@@ -53,7 +53,7 @@ module AppEngine
         end rescue nil
         nil
       end
-      
+
       def remote_versions
         versions = YAML.load(open(@url).read)
         versions.inject({}) do |versions, (name, version)|
@@ -83,7 +83,7 @@ module AppEngine
           end
         end
       end
-      
+
       def parse_nag_file
         @nag ||= if File.exist?(@nag_file)
           YAML.load_file(@nag_file)
@@ -91,13 +91,13 @@ module AppEngine
           {'opt_in' => true, 'timestamp' => 0}
         end
       end
-      
+
       def write_nag_file(options)
         open(@nag_file, 'w') do |file|
           file.write(YAML.dump(options))
         end
       end
-      
+
       def nag
         nag = parse_nag_file
         return if Time.now.to_i - nag['timestamp'] < MAX_NAG_FREQUENCY
@@ -108,7 +108,7 @@ module AppEngine
         # check_for_updates will raise an error if we're not online
         # just ignore it, and don't update the nag timestamp.
       end
-      
+
       def can_nag?
         parse_nag_file['opt_in']
       end

data/spec/update_check_spec.rb

@@ -10,7 +10,7 @@ describe AppEngine::Admin::UpdateCheck do
   before :each do
     @update_check = AppEngine::Admin::UpdateCheck.new('approot', 'url', 'nag')
   end
-  
+
   def versions(sdk, apis, dm)
     keys = ['google-appengine', 'appengine-apis', 'dm-appengine']
     hash = {}
@@ -19,27 +19,20 @@ describe AppEngine::Admin::UpdateCheck do
     end
     hash
   end
-  
+
   it 'should expand path' do
     File.should_receive(:expand_path).with(
         AppEngine::Admin::UpdateCheck::NAG_FILE)
     uc = AppEngine::Admin::UpdateCheck.new('/')
   end
-  
+
   it 'should support local_versions' do
     expected = versions('3.2.1', '1.2.3', nil)
     @update_check.should_receive(:find_gem_version).twice.and_return(
         Gem::Version.new("1.2.3"), nil)
     @update_check.local_versions.should == expected
   end
-  
-  it 'should support find_gem_version' do
-    Dir.should_receive(:glob).and_return(
-        ['appengine-apis-0.0.20.gemspec','appengine-apis-0.0.3.gemspec'])
-    @update_check.find_gem_version("appengine-apis").should ==
-        Gem::Version.new('0.0.20')
-  end
-  
+
   it 'should support remote_versions' do
     expected = versions('3.2.2', '1.2.4', '2.3.4')
     io = StringIO.new(YAML.dump(expected))
@@ -47,13 +40,13 @@ describe AppEngine::Admin::UpdateCheck do
     @update_check.should_receive(:open).with("url").and_return(io)
     @update_check.remote_versions.should == expected
   end
-  
+
   describe 'check_for_updates' do
     before :each do
       @update_check.stub!(:puts)
     end
-    
-    
+
+
     def expect_puts(*messages)
       length = messages.length
       @update_check.should_receive(:puts) do |arg|
@@ -64,62 +57,62 @@ describe AppEngine::Admin::UpdateCheck do
     it 'should skip check if no sdk version' do
       @update_check.should_receive(:local_versions).and_return(
           versions(nil, nil, nil))
-      expect_puts("Skipping update check")
+      expect_puts("=> Skipping update check")
       @update_check.check_for_updates
     end
-    
+
     it 'should warn about old sdk' do
       @update_check.should_receive(:local_versions).and_return(
         versions('0.0.1', nil, nil))
       @update_check.should_receive(:remote_versions).and_return(
         versions('0.0.2', '0.0.2', '0.0.2'))
       expect_puts(
-        "There is a new version of google-appengine: 0.0.2 (You have 0.0.1)",
-        "Please run sudo gem update google-appengine."
+        "=> There is a new version of google-appengine: 0.0.2 (You have 0.0.1)",
+        "=> Please run sudo gem update google-appengine."
       )
       @update_check.check_for_updates
     end
-    
+
     it 'should warn about old apis' do
       @update_check.should_receive(:local_versions).and_return(
         versions('0.0.2', '0.0.2', '0.0.2'))
       @update_check.should_receive(:remote_versions).and_return(
         versions('0.0.2', '0.0.4', '0.0.2'))
       expect_puts(
-        "There is a new version of appengine-apis: 0.0.4 (You have 0.0.2)",
-        "Please run appcfg.rb gem update appengine-apis."
+        "=> There is a new version of appengine-apis: 0.0.4 (You have 0.0.2)",
+        "=> Please update your Gemfile."
       )
       @update_check.check_for_updates
     end
-    
+
     it 'should warn about old dm adapter' do
       @update_check.should_receive(:local_versions).and_return(
         versions('0.0.2', '0.0.2', '0.0.2'))
       @update_check.should_receive(:remote_versions).and_return(
         versions('0.0.2', '0.0.2', '0.0.3'))
       expect_puts(
-        "There is a new version of dm-appengine: 0.0.3 (You have 0.0.2)",
-        "Please run appcfg.rb gem update dm-appengine."
+        "=> There is a new version of dm-appengine: 0.0.3 (You have 0.0.2)",
+        "=> Please update your Gemfile."
       )
-      @update_check.check_for_updates      
+      @update_check.check_for_updates
     end
 
-    
+
     it 'should warn about multiple old gems' do
       @update_check.should_receive(:local_versions).and_return(
         versions('0.0.1', '0.0.3', '0.0.5'))
       @update_check.should_receive(:remote_versions).and_return(
         versions('0.0.2', '0.0.4', '0.0.5'))
       expect_puts(
-        "There is a new version of google-appengine: 0.0.2 (You have 0.0.1)",
-        "Please run sudo gem update google-appengine.",
-        "There is a new version of appengine-apis: 0.0.4 (You have 0.0.3)",
-        "Please run appcfg.rb gem update appengine-apis."
+        "=> There is a new version of google-appengine: 0.0.2 (You have 0.0.1)",
+        "=> Please run sudo gem update google-appengine.",
+        "=> There is a new version of appengine-apis: 0.0.4 (You have 0.0.3)",
+        "=> Please update your Gemfile."
       )
-      @update_check.check_for_updates      
+      @update_check.check_for_updates
     end
   end
-  
+
   describe 'parse_nag_file' do
     it 'should support missing file' do
       File.should_receive(:exist?).with('nag').and_return(false)
@@ -128,14 +121,14 @@ describe AppEngine::Admin::UpdateCheck do
         'timestamp' => 0
       }
     end
-    
+
     it 'should parse existing file' do
       File.should_receive(:exist?).with('nag').and_return(true)
       YAML.should_receive(:load_file).with('nag').and_return("parsed_yaml")
       @update_check.parse_nag_file.should == "parsed_yaml"
     end
   end
-  
+
   describe 'nag' do
     it 'should nag if old timestamp' do
       @update_check.should_receive(:parse_nag_file).and_return({
@@ -146,7 +139,7 @@ describe AppEngine::Admin::UpdateCheck do
       @update_check.should_receive(:write_nag_file)
       @update_check.nag
     end
-    
+
     it 'should not nag if new timestamp' do
       @update_check.should_receive(:parse_nag_file).and_return({
         'opt_in' => true,
@@ -155,7 +148,7 @@ describe AppEngine::Admin::UpdateCheck do
       @update_check.nag
     end
   end
-  
+
   describe 'can_nag?' do
     it 'should return true of opted in' do
       @update_check.should_receive(:parse_nag_file).and_return({

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: appengine-tools
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 0
   - 0
-  - 14
-  version: 0.0.14
+  - 15
+  - pre
+  version: 0.0.15.pre
 platform: ruby
 authors: 
 - Ryan Brown
@@ -95,15 +96,9 @@ files:
 - lib/appengine-tools/dev_appserver.rb
 - lib/appengine-tools/gem_bundler.rb
 - lib/appengine-tools/update_check.rb
-- lib/appengine-tools/web-xml.rb
-- lib/appengine-tools/xml-formatter.rb
-- lib/jruby-rack-jar.rb
-- lib/appengine-tools/com/google/appengine/jruby/AppVersionUploadDelegate.class
-- lib/appengine-tools/com/google/appengine/jruby/JRubyAppVersionUpload.class
-- spec/rack_spec.rb
 - spec/spec_helper.rb
 - spec/update_check_spec.rb
-- spec/web-xml_spec.rb
+- lib/appengine-tools/app_yaml.jar
 has_rdoc: true
 homepage: http://code.google.com/p/appengine-jruby
 licenses: []
@@ -122,11 +117,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 

data/lib/appengine-tools/web-xml.rb

@@ -1,98 +0,0 @@
-#!/usr/bin/ruby1.8 -w
-#
-# Copyright:: Copyright 2009 Google Inc.
-# Original Author:: Ryan Brown (mailto:ribrdb@google.com)
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'rack'
-require 'rexml/document'
-require 'uri'
-
-require 'appengine-rack/java'
-
-class WebXmlBuilder < Rack::Builder
-  DUMMY_APP = Proc.new{|env|}
-
-  def initialize(&block)
-    @path = "/"
-    @paths = Hash.new {|h, k| h[k] = []}
-    @skip_defaults = false
-    @mime_mapping = {}
-    instance_eval(&block) if block_given?
-  end
-
-  def add_mime_mapping(doc)
-    @mime_mapping.each_pair do |key,val|
-      mime = doc.add_element('mime-mapping')
-      mime.add_element('extension').add_text(key.to_s)
-      mime.add_element('mime-type').add_text(val)
-    end
-  end
-
-  def add_jruby_rack_defaults
-    unless @skip_defaults
-      use JavaServletFilter, 'org.jruby.rack.RackFilter',
-        { :name => 'RackFilter', :wildcard => true }
-    end
-  use JavaContextListener, 'com.google.appengine.jruby.LazyContextListener'
-  end
-
-  def use(middleware, *args, &block)
-    if middleware.respond_to? :append_xml
-      @paths[@path] << [middleware, args, block]
-    else
-      @paths[@path] << [middleware.new(DUMMY_APP, *args, &block)]
-    end
-  end
-
-  def map(path, &block)
-    if URI.parse(path).scheme.nil?  # we can only natively support path matching
-      saved_path = @path
-      @path = [@path, path].join('/').squeeze('/')
-      begin
-        instance_eval(&block) if block_given?
-      ensure
-        @path = saved_path
-      end
-    end
-  end
-
-  def run(app)
-    @paths[@path] << [app, [], nil]
-  end
-
-  def to_xml
-    doc = REXML::Document.new.add_element('web-app')
-    doc.add_attribute("xmlns", "http://java.sun.com/xml/ns/javaee")
-    doc.add_attribute("version", "2.5")
-    each_path do |path, objects|
-      pattern = path.chomp('/')
-      pattern = '/' if pattern.empty?
-      objects.each do |object, args, block|
-        if object.respond_to? :append_xml
-          object.append_xml(doc, pattern, *args, &block)
-        end
-      end
-    end
-    add_mime_mapping(doc)
-    doc
-  end
-
-  private
-  def each_path
-    @paths.sort {|a, b| b[0].length - a[0].length}.each do |path, value|
-      yield path, value
-    end
-  end
-end

data/lib/appengine-tools/xml-formatter.rb

@@ -1,40 +0,0 @@
-#!/usr/bin/ruby1.8 -w
-#
-# Copyright:: Copyright 2009 Google Inc.
-# Original Author:: Ryan Brown (mailto:ribrdb@google.com)
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'rexml/formatters/pretty'
-
-module AppEngine
-  module Rack
-    class XmlFormatter < REXML::Formatters::Pretty
-      def initialize
-        @compact = true
-        super
-      end
-  
-      def write_text( node, output )
-        output << node.to_s()
-      end
-  
-      def self.format(xml)
-        @formatter ||= XmlFormatter.new
-        output = ''
-        @formatter.write(xml, output)
-        return output
-      end
-    end
-  end
-end

data/lib/jruby-rack-jar.rb

@@ -1,26 +0,0 @@
-#!/usr/bin/ruby
-# Copyright:: Copyright 2010 Google Inc.
-# Original Author:: John Woodell (mailto:woodie@google.com)
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-module AppEngine
-  module JRubyJars
-    JRUBYRACK_VERSION = '0.9.6'
-  
-    def self.jrubyrack_jar
-      File.join(File.dirname(__FILE__), "jruby-rack-#{JRUBYRACK_VERSION}.jar")
-    end
-  
-  end
-end

data/spec/rack_spec.rb

@@ -1,31 +0,0 @@
-# Copyright:: Copyright 2009 Google Inc.
-# Original Author:: Ryan Brown (mailto:ribrdb@google.com)
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require File.dirname(__FILE__) + '/spec_helper.rb'
-require 'appengine-rack'
-require 'appengine-tools/web-xml'
-require 'appengine-tools/xml-formatter'
-
-describe AppEngine::Rack do
-  it "should generate correct xml" do
-    rackup = IO.read("#{File.dirname(__FILE__)}/config.ru")
-    builder = WebXmlBuilder.new do
-      add_jruby_rack_defaults
-      eval rackup, nil, "#{File.dirname(__FILE__)}/config.ru", 1
-    end
-    xml = AppEngine::Rack::XmlFormatter.format(AppEngine::Rack.app.to_xml)
-    xml.should == IO.read("#{File.dirname(__FILE__)}/appengine-web.xml")
-  end
-end

data/spec/web-xml_spec.rb

@@ -1,30 +0,0 @@
-# Copyright:: Copyright 2009 Google Inc.
-# Original Author:: Ryan Brown (mailto:ribrdb@google.com)
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require File.dirname(__FILE__) + '/spec_helper.rb'
-require 'appengine-tools/web-xml'
-require 'appengine-tools/xml-formatter'
-
-describe WebXmlBuilder do
-  it "should generate correct xml" do
-    rackup = IO.read("#{File.dirname(__FILE__)}/config.ru")
-    builder = WebXmlBuilder.new do
-      add_jruby_rack_defaults
-      eval rackup, nil, "#{File.dirname(__FILE__)}/config.ru", 1
-    end
-    xml = AppEngine::Rack::XmlFormatter.format(builder.to_xml)
-    xml.should == IO.read("#{File.dirname(__FILE__)}/web.xml")
-  end
-end