appengine-tools 0.0.10.1 → 0.0.11

data/Rakefile

@@ -4,15 +4,9 @@ require 'rubygems/specification'
 require 'date'
 require 'spec/rake/spectask'
 
-require File.dirname(__FILE__) + '/lib/jruby-rack-jar'
-
 GEM = "appengine-tools"
-GEM_VERSION = "0.0.10.1"
+GEM_VERSION = "0.0.11"
 HOMEPAGE = "http://code.google.com/p/appengine-jruby"
-JRUBYRACK_VERSION = AppEngine::JRubyJars::JRUBYRACK_VERSION
-JRUBYRACK_JAR = "jruby-rack-#{JRUBYRACK_VERSION}.jar"
-JRUBYRACK_URL = "http://repository.codehaus.org/org/jruby/rack/" +
-                "jruby-rack/#{JRUBYRACK_VERSION}/#{JRUBYRACK_JAR}"
 
 spec = Gem::Specification.new do |s|
   s.name = GEM
@@ -31,7 +25,7 @@ EOF
   
   s.require_path = 'lib'
   s.files = %w(COPYING LICENSE README.rdoc Rakefile) +
-      ["lib/#{JRUBYRACK_JAR}"] + Dir.glob("{lib,spec}/**/*.{rb,class}")
+      Dir.glob("{lib,spec}/**/*.{rb,class}")
   s.executables = [ 'appcfg.rb', 'dev_appserver.rb' ]
   s.add_dependency('appengine-rack')
   s.add_dependency('appengine-sdk')
@@ -49,11 +43,6 @@ Spec::Rake::SpecTask.new do |t|
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|
-  unless File.exist?("lib/#{JRUBYRACK_JAR}")
-    puts "Sorry, #{JRUBYRACK_JAR} is missing!"
-    puts "Please drop it into the lib directory."
-    exit 1
-  end
   pkg.gem_spec = spec
 end
 

data/lib/appengine-tools/bundler.rb

@@ -77,6 +77,10 @@ module AppEngine
         path('WEB-INF', 'appengine-generated', 'build_status.yaml')
       end
 
+      def bundled_jars
+        path('WEB-INF', 'appengine-generated', 'bundled_jars.yaml')
+      end
+
       def public_root
         path(AppEngine::Rack.app.public_root) if AppEngine::Rack.app.public_root
       end
@@ -97,7 +101,6 @@ module AppEngine
     
     class AppBundler
       EXISTING_JRUBY = /^(jruby-abridged|appengine-jruby)-.*jar$/
-      EXISTING_RACK = /^jruby-rack.*jar$/
       EXISTING_APIS = /^appengine-api.*jar$/
       RACKUP = %q{Dir.chdir('..') if Dir.pwd =~ /WEB-INF$/; } +
                %q{begin; require 'bundler_gems/environment'; } +
@@ -118,7 +121,6 @@ module AppEngine
         create_webinf
         bundle_gems(args)
         copy_jruby
-        copy_rack
         copy_sdk
       end
 
@@ -184,12 +186,6 @@ EOF
         update_jars("JRuby", EXISTING_JRUBY, [AppEngine::JRubyJars.jruby_jar])
       end
       
-      def copy_rack
-        require 'jruby-rack-jar'
-        update_jars('JRuby-Rack', EXISTING_RACK,
-            [AppEngine::JRubyJars.jrubyrack_jar])
-      end
-      
       def copy_sdk
         require 'appengine-sdk'
         glob = "appengine-api-{1.0-sdk,labs}-*.jar"

data/lib/appengine-tools/gem_bundler.rb

@@ -76,6 +76,16 @@ module AppEngine
         gem_patch = "require 'bundler_gems/#{target_pair}/environment'"
         File.open("#{bundler_dir}/environment.rb",'w') {|f| f << gem_patch }
         FileUtils.rm app.gems_jar, :force => true # blow away the old jar
+        # cleanup old extension jars
+        if File.exists? app.bundled_jars 
+          YAML.load_file(app.bundled_jars).each do |jar|
+            FileUtils.rm File.join(app.webinf_lib, jar), :force => true 
+          end
+        else
+          stale = 'jruby-rack-0.9.6.jar'
+          FileUtils.rm File.join(app.webinf_lib, stale), :force => true
+        end
+        jars = []
         puts "=> Packaging gems"
         gem_files = Dir["#{bundler_dir}/#{target_pair}/dirs/**/**"] +
                     Dir["#{bundler_dir}/#{target_pair}/gems/**/**"] +
@@ -86,11 +96,13 @@ module AppEngine
             if file[-4..-1].eql? '.jar'
               puts "Installing #{File.basename(file)}"
               FileUtils.cp file, app.webinf_lib
+              jars << File.basename(file)
             else
               jar.add(file.sub("#{app.gems_dir}/",''), file)
             end
           end
         end
+        open(app.bundled_jars, 'w') { |f| YAML.dump(jars, f) }
       end
 
       def verify_gemfile

metadata

@@ -5,9 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 10
-  - 1
-  version: 0.0.10.1
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - Ryan Brown
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-09 00:00:00 -08:00
+date: 2010-04-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -101,7 +100,6 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- lib/jruby-rack-0.9.6.jar
 - lib/appengine-tools/appcfg.rb
 - lib/appengine-tools/boot.rb
 - lib/appengine-tools/bundler.rb