appengine-tools 0.0.5 → 0.0.6

data/Rakefile

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

data/lib/appengine-tools/appcfg.rb

@@ -46,7 +46,15 @@ module AppEngine
         def getCronYaml
           cron = File.join(app.path, 'cron.yaml')
           if File.exists?(cron)
-            return cron.to_yaml
+            return IO.read(cron)
+          end
+          nil
+        end
+    
+        def getQueueYaml
+          queue = File.join(app.path, 'queue.yaml')
+          if File.exists?(queue)
+            return IO.read(queue)
           end
           nil
         end

data/lib/appengine-tools/bundler.rb

@@ -101,9 +101,11 @@ module AppEngine
       EXISTING_APIS = /^appengine-api.*jar$/
       JRUBY_RACK = 'jruby-rack-0.9.5.jar'
       JRUBY_RACK_URL = "http://kenai.com/downloads/jruby-rack/#{JRUBY_RACK}"
-      RACKUP = %q{Dir.chdir('..') if Dir.pwd =~ /WEB-INF$/;} +
+      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
@@ -188,7 +190,7 @@ module AppEngine
       
       def copy_sdk
         require 'appengine-sdk'
-        glob = "appengine-api-1.0-sdk-*.jar"
+        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
@@ -257,6 +259,7 @@ module AppEngine
             # First read the user's rackup file
             # TODO generate a skeleton if it's missing
             Dir.chdir(app_root) do
+              require '.gems/bundler_gems/environment'
               eval IO.read('config.ru'), nil, 'config.ru', 1
             end
 

data/lib/appengine-tools/gem_bundler.rb

@@ -67,16 +67,18 @@ module AppEngine
         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 0.6.0 for Sinatra 0.9.4
+# Injected by appengine-tools to patch bundler for Sinatra and Rails 3
 module Gem
-  def self.dir; ENV['GEM_HOME']; end
-  RubyGemsVersion = "0.0.0" unless defined? RubyGemsVersion
+  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 "=> Installing gems"
+        puts "=> Packaging gems"
         gem_files = Dir["#{bundler_dir}/gems/**/**"] +
+                    Dir["#{bundler_dir}/dirs/**/**"] +
                     Dir["#{bundler_dir}/environment.rb"]
         Zip::ZipFile.open(app.gems_jar, 'w') do |jar|
           gem_files.reject {|f| f == app.gems_jar}.each do |file|
@@ -98,7 +100,7 @@ disable_rubygems
 bundle_path ".gems/bundler_gems"
 
 # List gems to bundle here:
-#gem "rack", "1.0.0"
+gem "appengine-rack"
 #gem "dm-appengine"
 #gem "sinatra"
 EOF

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

@@ -28,13 +28,18 @@ class WebXmlBuilder < Rack::Builder
     @path = "/"
     @paths = Hash.new {|h, k| h[k] = []}
     @skip_defaults = false
+    @mime_mapping = {}
     instance_eval(&block) if block_given?
   end
   
-  def skip_rack_servlet
-    @skip_defaults = true
+  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(rackup)
     use JavaContextParams, :rackup => rackup
     unless @skip_defaults
@@ -81,6 +86,7 @@ class WebXmlBuilder < Rack::Builder
         end
       end
     end
+    add_mime_mapping(doc)
     doc
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: appengine-tools
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Ryan Brown
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-02 00:00:00 -08:00
+date: 2009-12-07 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.6.0
+        version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: rubyzip
@@ -84,10 +84,6 @@ files:
 - lib/appengine-tools/boot.rb
 - lib/appengine-tools/web-xml.rb
 - lib/appengine-tools/dev_appserver.rb
-- spec/appengine-web.xml
-- spec/web.xml
-- spec/config.ru
-- spec/spec.opts
 - spec/rack_spec.rb
 - spec/update_check_spec.rb
 - spec/spec_helper.rb

data/spec/appengine-web.xml

@@ -1,19 +0,0 @@
-<appengine-web-app xmlns='http://appengine.google.com/ns/1.0'>
-  <application>tools-test</application>
-  <version>foo</version>
-  <public-root>/public</public-root>
-  <static-files>
-    <include expiration='365d' path='/public/images/**'/>
-    <include path='/public/**'/>
-  </static-files>
-  <resource-files/>
-  <system-properties>
-    <property name='os.arch' value=''/>
-    <property name='jruby.management.enabled' value='false'/>
-    <property name='jruby.rack.input.rewindable' value='false'/>
-  </system-properties>
-  <ssl-enabled>true</ssl-enabled>
-  <inbound-services>
-    <service>xmpp_message</service>
-  </inbound-services>
-</appengine-web-app>

data/spec/config.ru

@@ -1,36 +0,0 @@
-require 'appengine-rack'
-
-AppEngine::Rack.configure_app(
-  :application => 'tools-test', :version => 'foo', :ssl_enabled => true)
-AppEngine::Rack.app.inbound_services << :xmpp_message
-AppEngine::Rack.app.static_files.include('/public/images/**', '365d')
-AppEngine::Rack.app.static_files.include('/public/**')
-
-ruby_app = lambda {|env| [200, {}, "Hello Rack!"]}
-
-map '/admin' do
-  use JavaServletFilter, 'com.example.AdminFilter', :wildcard => true
-  run JavaServlet.new('com.example.AdminServlet', :wildcard => true)
-end
-
-map '/store' do
-  use JavaServletFilter, 'com.example.StoreFilter', :name => 'StoreFilter'
-  run JavaServlet.new('com.example.StoreServlet', :name => 'store')
-end
-
-map '/admin2' do
-  use AppEngine::Rack::AdminRequired
-  run ruby_app
-end
-
-map '/private' do
-  use AppEngine::Rack::LoginRequired
-  run ruby_app
-end
-
-map '/secure' do
-  use AppEngine::Rack::SSLRequired
-  run ruby_app
-end
-
-run ruby_app

data/spec/spec.opts

@@ -1 +0,0 @@
---colour --diff

data/spec/web.xml

@@ -1,84 +0,0 @@
-<web-app version='2.5' xmlns='http://java.sun.com/xml/ns/javaee'>
-  <security-constraint>
-    <web-resource-collection>
-      <url-pattern>/private</url-pattern>
-      <url-pattern>/private/*</url-pattern>
-    </web-resource-collection>
-    <auth-constraint>
-      <role-name>*</role-name>
-    </auth-constraint>
-  </security-constraint>
-  <security-constraint>
-    <web-resource-collection>
-      <url-pattern>/admin2</url-pattern>
-      <url-pattern>/admin2/*</url-pattern>
-    </web-resource-collection>
-    <auth-constraint>
-      <role-name>admin</role-name>
-    </auth-constraint>
-  </security-constraint>
-  <security-constraint>
-    <web-resource-collection>
-      <url-pattern>/secure</url-pattern>
-      <url-pattern>/secure/*</url-pattern>
-    </web-resource-collection>
-    <user-data-constraint>
-      <transport-guarantee>CONFIDENTIAL</transport-guarantee>
-    </user-data-constraint>
-  </security-constraint>
-  <filter>
-    <filter-name>StoreFilter</filter-name>
-    <filter-class>com.example.StoreFilter</filter-class>
-  </filter>
-  <filter-mapping>
-    <filter-name>StoreFilter</filter-name>
-    <url-pattern>/store</url-pattern>
-  </filter-mapping>
-  <servlet>
-    <servlet-name>store</servlet-name>
-    <servlet-class>com.example.StoreServlet</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>store</servlet-name>
-    <url-pattern>/store</url-pattern>
-  </servlet-mapping>
-  <filter>
-    <filter-name>com.example.AdminFilter</filter-name>
-    <filter-class>com.example.AdminFilter</filter-class>
-  </filter>
-  <filter-mapping>
-    <filter-name>com.example.AdminFilter</filter-name>
-    <url-pattern>/admin</url-pattern>
-  </filter-mapping>
-  <filter-mapping>
-    <filter-name>com.example.AdminFilter</filter-name>
-    <url-pattern>/admin/*</url-pattern>
-  </filter-mapping>
-  <servlet>
-    <servlet-name>com.example.AdminServlet</servlet-name>
-    <servlet-class>com.example.AdminServlet</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>com.example.AdminServlet</servlet-name>
-    <url-pattern>/admin</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>com.example.AdminServlet</servlet-name>
-    <url-pattern>/admin/*</url-pattern>
-  </servlet-mapping>
-  <context-param>
-    <param-name>rackup</param-name>
-    <param-value>rackup</param-value>
-  </context-param>
-  <filter>
-    <filter-name>RackFilter</filter-name>
-    <filter-class>org.jruby.rack.RackFilter</filter-class>
-  </filter>
-  <filter-mapping>
-    <filter-name>RackFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-  <listener>
-    <listener-class>org.jruby.rack.RackServletContextListener</listener-class>
-  </listener>
-</web-app>