appengine-tools 0.0.11 → 0.0.12

data/Rakefile

@@ -5,7 +5,7 @@ require 'date'
 require 'spec/rake/spectask'
 
 GEM = "appengine-tools"
-GEM_VERSION = "0.0.11"
+GEM_VERSION = "0.0.12"
 HOMEPAGE = "http://code.google.com/p/appengine-jruby"
 
 spec = Gem::Specification.new do |s|

data/lib/appengine-tools/boot.rb

@@ -19,6 +19,8 @@ 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)
@@ -53,7 +55,7 @@ module AppEngine
 
         jars = AppEngine::SDK::RUNTIME_JARS
 
-        jruby_args = %w(-rappengine_boot) + args
+        jruby_args = ["-r#{BOOT_APP_RB}"] + args
 
         ENV['APPLICATION_ROOT'] = root
         ENV.delete 'GEM_HOME'

data/lib/appengine-tools/boot_app.rb

@@ -0,0 +1,33 @@
+#! /usr/bin/ruby
+# 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.
+
+begin
+  require 'bundler_gems/environment'
+rescue LoadError
+end
+
+begin
+  # Install stubs and environment
+  require 'appengine-apis/testing'
+  AppEngine::Testing.boot
+  require 'appengine-apis/urlfetch'
+  require 'appengine-apis/tempfile'
+rescue Exception => e
+  if ENV['VERBOSE']
+    puts e.inspect
+    puts e.backtrace
+  end
+end

data/lib/appengine-tools/bundler.rb

@@ -28,7 +28,7 @@ module AppEngine
 
     class Application
       attr_reader :root
-      
+
       def initialize(root)
         @root = root
       end
@@ -98,24 +98,20 @@ module AppEngine
       end
 
     end
-    
+
     class AppBundler
       EXISTING_JRUBY = /^(jruby-abridged|appengine-jruby)-.*jar$/
       EXISTING_APIS = /^appengine-api.*jar$/
-      RACKUP = %q{Dir.chdir('..') if Dir.pwd =~ /WEB-INF$/; } +
-               %q{begin; require 'bundler_gems/environment'; } +
-               %q{rescue LoadError; end;} +
-               %q{eval IO.read('config.ru'), nil, 'config.ru', 1}
 
       def initialize(root_path)
         @app = Application.new(root_path)
       end
-      
+
       def bundle(args=[])
         bundle_deps(args)
         convert_config_ru
       end
-      
+
       def bundle_deps(args=[])
         confirm_appdir
         create_webinf
@@ -129,11 +125,11 @@ module AppEngine
         gem_bundler = AppEngine::Admin::GemBundler.new(app.root)
         gem_bundler.bundle(args)
       end
-      
+
       def app
         @app
       end
-      
+
       def confirm_appdir
         unless File.exists?(app.config_ru) or
             File.exists?(app.gemfile) or File.exists?(app.webinf)
@@ -152,16 +148,16 @@ module AppEngine
         Dir.mkdir(app.webinf_lib) unless File.exists?(app.webinf_lib)
         Dir.mkdir(app.generation_dir) unless File.exists?(app.generation_dir)
       end
-      
+
       def create_public
         return unless defined? JRUBY_VERSION
         if app.public_root and !File.exists?(app.public_root)
-          Dir.mkdir(app.public_root) 
+          Dir.mkdir(app.public_root)
         end
         FileUtils.touch(app.favicon_ico) unless File.exists?(app.favicon_ico)
         FileUtils.touch(app.robots_txt) unless File.exists?(app.robots_txt)
       end
-      
+
       def convert_config_ru
         unless File.exists?(app.config_ru)
           puts "=> Generating rackup"
@@ -169,32 +165,32 @@ module AppEngine
               downcase.gsub('_', '-').gsub(/[^-a-z0-9]/, '')
           stock_rackup = <<EOF
 require 'appengine-rack'
-AppEngine::Rack.configure_app(          
-    :application => "#{app_id}",           
+AppEngine::Rack.configure_app(
+    :application => "#{app_id}",
     :precompilation_enabled => true,
     :version => "1")
-run lambda { Rack::Response.new("Hello").finish }
+run lambda { ::Rack::Response.new("Hello").finish }
 EOF
           File.open(app.config_ru, 'w') {|f| f.write(stock_rackup) }
         end
         generate_xml
         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"
         jars = Dir.glob("#{AppEngine::SDK::SDK_ROOT}/lib/user/#{glob}")
         update_jars('appengine-sdk', EXISTING_APIS, jars)
       end
-      
+
       private
-      
+
       def find_jars(regex)
         Dir.entries(app.webinf_lib).grep(regex) rescue []
       end
@@ -240,7 +236,7 @@ EOF
         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.web_xml).mtime.eql? yaml[:web_xml]
         return false unless File.stat(app.aeweb_xml).mtime.eql? yaml[:aeweb_xml]
         true
       end
@@ -262,7 +258,7 @@ EOF
             end
 
             # Now configure the basic jruby-rack settings.
-            add_jruby_rack_defaults(RACKUP)
+            add_jruby_rack_defaults
           end
           open(app.web_xml, 'w') do |webxml|
             xml = AppEngine::Rack::XmlFormatter.format(builder.to_xml)
@@ -284,11 +280,11 @@ EOF
         end
       end
     end
-    
+
     def self.bundle_app(*args)
       AppBundler.new(args.pop).bundle(args)
     end
-    
+
     def self.bundle_deps(*args)
       AppBundler.new(args.pop).bundle(args)
     end

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

@@ -23,7 +23,7 @@ require 'appengine-rack/java'
 
 class WebXmlBuilder < Rack::Builder
   DUMMY_APP = Proc.new{|env|}
-  
+
   def initialize(&block)
     @path = "/"
     @paths = Hash.new {|h, k| h[k] = []}
@@ -31,7 +31,7 @@ class WebXmlBuilder < Rack::Builder
     @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')
@@ -39,16 +39,15 @@ class WebXmlBuilder < Rack::Builder
       mime.add_element('mime-type').add_text(val)
     end
   end
- 
-  def add_jruby_rack_defaults(rackup)
-    use JavaContextParams, :rackup => rackup
+
+  def add_jruby_rack_defaults
     unless @skip_defaults
-      use JavaServletFilter, 'org.jruby.rack.RackFilter', 
+      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]
@@ -56,7 +55,7 @@ class WebXmlBuilder < Rack::Builder
       @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
@@ -68,7 +67,7 @@ class WebXmlBuilder < Rack::Builder
       end
     end
   end
-  
+
   def run(app)
     @paths[@path] << [app, [], nil]
   end
@@ -89,7 +88,7 @@ class WebXmlBuilder < Rack::Builder
     add_mime_mapping(doc)
     doc
   end
-  
+
   private
   def each_path
     @paths.sort {|a, b| b[0].length - a[0].length}.each do |path, value|

data/spec/rack_spec.rb

@@ -22,7 +22,7 @@ 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('rackup')
+      add_jruby_rack_defaults
       eval rackup, nil, "#{File.dirname(__FILE__)}/config.ru", 1
     end
     xml = AppEngine::Rack::XmlFormatter.format(AppEngine::Rack.app.to_xml)

data/spec/web-xml_spec.rb

@@ -21,7 +21,7 @@ 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('rackup')
+      add_jruby_rack_defaults
       eval rackup, nil, "#{File.dirname(__FILE__)}/config.ru", 1
     end
     xml = AppEngine::Rack::XmlFormatter.format(builder.to_xml)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
 - Ryan Brown
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-08 00:00:00 -07:00
+date: 2010-05-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -102,6 +102,7 @@ files:
 - Rakefile
 - lib/appengine-tools/appcfg.rb
 - lib/appengine-tools/boot.rb
+- lib/appengine-tools/boot_app.rb
 - lib/appengine-tools/bundler.rb
 - lib/appengine-tools/dev_appserver.rb
 - lib/appengine-tools/gem_bundler.rb