appengine-tools 0.0.6 → 0.0.7

data/Rakefile

@@ -5,7 +5,7 @@ require 'date'
 require 'spec/rake/spectask'
 
 GEM = "appengine-tools"
-GEM_VERSION = "0.0.6"
+GEM_VERSION = "0.0.7"
 AUTHOR = "Ryan Brown"
 EMAIL = "ribrdb@gmail.com"
 HOMEPAGE = "http://code.google.com/p/appengine-jruby"
@@ -24,12 +24,13 @@ spec = Gem::Specification.new do |s|
   s.homepage = HOMEPAGE
   
   s.require_path = 'lib'
-  s.files = %w(LICENSE README.rdoc Rakefile) + Dir.glob("{lib,spec}/**/*.rb")
+  s.files = %w(LICENSE README.rdoc Rakefile) +
+      Dir.glob("{lib,spec}/**/*.rb") + Dir.glob("lib/**/*.class")
   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('bundler')
+  s.add_dependency('bundler', ["~> 0.7.2"])
   s.add_dependency('rubyzip')
 end
 

data/lib/appengine-tools/appcfg.rb

@@ -25,46 +25,45 @@ module AppEngine
     if defined? Java
       AppCfg = AppEngine::SDK.load_appcfg
       import Java.ComGoogleAppengineToolsAdmin.AppAdminFactory 
-      import Java.ComGoogleAppengineToolsAdmin.AppVersionUpload
       import Java.ComGoogleAppengineToolsUtil.Logging
     
-      class JRubyAppVersionUpload < AppVersionUpload
-        def initialize(connection, app)
-          @connection = connection
-          @app = app
-          super(connection, app)
-        end
-      
-        def getIndexYaml
-          indexes = merge_indexes
+      $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
-          nil
+          ''
         end
       
-        def getCronYaml
+        def cron_yaml(app)
           cron = File.join(app.path, 'cron.yaml')
           if File.exists?(cron)
             return IO.read(cron)
           end
-          nil
+          ''
         end
     
-        def getQueueYaml
+        def queue_yaml(app)
           queue = File.join(app.path, 'queue.yaml')
           if File.exists?(queue)
             return IO.read(queue)
           end
-          nil
+          ''
         end
       
-        def merge_indexes
-          if @app.indexes_xml
-            indexes = YAML.load(@app.indexes_xml.to_yaml)['indexes']
+        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')
+          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|
@@ -109,8 +108,9 @@ EOF
         end
         
         def run_appcfg(args)
+          JRubyAppVersionUpload.set_delegate(UploadDelegate.new)
           factory = AppAdminFactory.new
-          factory.setAppVersionUploadClass(JRubyAppVersionUpload)
+          factory.setAppVersionUploadClass(JRubyAppVersionUpload.java_class)
           Logging.initializeLogging
           AppCfg.new(factory, args.to_java(java.lang.String))
         end

data/lib/appengine-tools/boot.rb

@@ -34,6 +34,8 @@ module AppEngine
           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),

data/lib/appengine-tools/gem_bundler.rb

@@ -22,6 +22,13 @@ require 'zip/zipfilesystem'
 require 'rubygems/command_manager'
 require 'appengine-tools/bundler'
 
+# Support Ruby 1.6, without active_support/extensions/facets
+class Symbol
+  def to_proc
+    Proc.new { |*args| args.shift.__send__(self, *args) }
+  end unless :to_proc.respond_to?(:to_proc)
+end
+
 module AppEngine
   module Admin
 
@@ -65,16 +72,6 @@ module AppEngine
           exit e.exit_code unless e.exit_code == 0
         end
         bundler_dir = "#{app.gems_dir}/bundler_gems"
-        # TODO: this temporary hack should be fixed properly
-        gem_patch = <<MOD
-# Injected by appengine-tools to patch bundler for Sinatra and Rails 3
-module Gem
-  def self.default_dir; ENV['GEM_HOME']; end
-  def self.dir;         ENV['GEM_HOME']; end
-  def self.path;        ENV['GEM_PATH']; end
-end
-MOD
-        File.open("#{bundler_dir}/environment.rb",'a') {|f| f << gem_patch }
         FileUtils.rm app.gems_jar, :force => true # blow away the old jar
         puts "=> Packaging gems"
         gem_files = Dir["#{bundler_dir}/gems/**/**"] +

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: appengine-tools
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Ryan Brown
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-07 00:00:00 -08:00
+date: 2009-12-22 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,9 +48,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.7.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: rubyzip
@@ -76,18 +76,20 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- lib/appengine-tools/update_check.rb
 - lib/appengine-tools/appcfg.rb
+- lib/appengine-tools/boot.rb
 - lib/appengine-tools/bundler.rb
+- lib/appengine-tools/dev_appserver.rb
 - lib/appengine-tools/gem_bundler.rb
-- lib/appengine-tools/xml-formatter.rb
-- lib/appengine-tools/boot.rb
+- lib/appengine-tools/update_check.rb
 - lib/appengine-tools/web-xml.rb
-- lib/appengine-tools/dev_appserver.rb
+- lib/appengine-tools/xml-formatter.rb
 - spec/rack_spec.rb
-- spec/update_check_spec.rb
 - spec/spec_helper.rb
+- spec/update_check_spec.rb
 - spec/web-xml_spec.rb
+- lib/appengine-tools/com/google/appengine/jruby/AppVersionUploadDelegate.class
+- lib/appengine-tools/com/google/appengine/jruby/JRubyAppVersionUpload.class
 has_rdoc: true
 homepage: http://code.google.com/p/appengine-jruby
 licenses: []