appengine-tools 0.0.12 → 0.0.13

data/Rakefile

@@ -5,7 +5,7 @@ require 'date'
 require 'spec/rake/spectask'
 
 GEM = "appengine-tools"
-GEM_VERSION = "0.0.12"
+GEM_VERSION = "0.0.13"
 HOMEPAGE = "http://code.google.com/p/appengine-jruby"
 
 spec = Gem::Specification.new do |s|
@@ -29,7 +29,6 @@ EOF
   s.executables = [ 'appcfg.rb', 'dev_appserver.rb' ]
   s.add_dependency('appengine-rack')
   s.add_dependency('appengine-sdk')
-  s.add_dependency('appengine-jruby-jars')
   s.add_dependency('bundler08', ["~> 0.8.4"])
   s.add_dependency('rubyzip')
 end

data/lib/appengine-tools/boot.rb

@@ -24,11 +24,11 @@ module AppEngine
     class << self
       def boot_jruby(root=nil, options={})
         unless defined?(JRUBY_VERSION)
-          require 'appengine-jruby-jars'
+          require 'jruby-jars'
 
           jars = [
-            AppEngine::JRubyJars.jruby_jar,
-            AppEngine::JRubyJars.rubygems_jar,
+            JRubyJars.core_jar_path,
+            JRubyJars.stdlib_jar_path,
             AppEngine::SDK::TOOLS_JAR,
             ]
 

data/lib/appengine-tools/bundler.rb

@@ -100,7 +100,6 @@ module AppEngine
     end
 
     class AppBundler
-      EXISTING_JRUBY = /^(jruby-abridged|appengine-jruby)-.*jar$/
       EXISTING_APIS = /^appengine-api.*jar$/
 
       def initialize(root_path)
@@ -116,7 +115,6 @@ module AppEngine
         confirm_appdir
         create_webinf
         bundle_gems(args)
-        copy_jruby
         copy_sdk
       end
 
@@ -177,11 +175,6 @@ EOF
         create_public
       end
 
-      def copy_jruby
-        require 'appengine-jruby-jars'
-        update_jars("JRuby", EXISTING_JRUBY, [AppEngine::JRubyJars.jruby_jar])
-      end
-
       def copy_sdk
         require 'appengine-sdk'
         glob = "appengine-api-{1.0-sdk,labs}-*.jar"

data/lib/appengine-tools/gem_bundler.rb

@@ -81,9 +81,11 @@ module AppEngine
           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
+        # cleanup stale jars
+        %w(appengine-jruby-0.0.7.pre.jar appengine-jruby-0.0.7.jar
+           appengine-jruby-0.0.8.pre.jar jruby-rack-0.9.6.jar).each do |j|
+          FileUtils.rm File.join(app.webinf_lib, j), :force => true
         end
         jars = []
         puts "=> Packaging gems"
@@ -94,7 +96,7 @@ module AppEngine
         Zip::ZipFile.open(app.gems_jar, 'w') do |jar|
           gem_files.reject {|f| f == app.gems_jar}.each do |file|
             if file[-4..-1].eql? '.jar'
-              puts "Installing #{File.basename(file)}"
+              puts "=> Installing #{File.basename(file)}"
               FileUtils.cp file, app.webinf_lib
               jars << File.basename(file)
             else

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 12
-  version: 0.0.12
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - Ryan Brown
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-04 00:00:00 -07:00
+date: 2010-05-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,22 +42,10 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: appengine-jruby-jars
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: bundler08
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -67,11 +55,11 @@ dependencies:
         - 4
         version: 0.8.4
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rubyzip
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -79,7 +67,7 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id004
 description: |
   Tools and SDK for developing Ruby applications for Google App Engine.
   Includes a local development server and tools for testing and deployment."