appengine-tools 0.0.1 → 0.0.2

data/Rakefile

@@ -5,7 +5,7 @@ require 'date'
 require 'spec/rake/spectask'
 
 GEM = "appengine-tools"
-GEM_VERSION = "0.0.1"
+GEM_VERSION = "0.0.2"
 AUTHOR = "Ryan Brown"
 EMAIL = "ribrdb@gmail.com"
 HOMEPAGE = "http://code.google.com/p/appengine-jruby"
@@ -28,7 +28,7 @@ spec = Gem::Specification.new do |s|
   s.executables = [ 'appcfg.rb', 'dev_appserver.rb' ]
   s.add_dependency('appengine-rack')
   s.add_dependency('appengine-sdk')
-  s.add_dependency('jruby-abridged')
+  s.add_dependency('appengine-jruby-jars')
 end
 
 task :default => :spec
@@ -54,4 +54,4 @@ task :make_spec do
   File.open("#{GEM}.gemspec", "w") do |file|
     file.puts spec.to_ruby
   end
-end
+end

data/lib/appengine-tools/boot.rb

@@ -23,11 +23,11 @@ module AppEngine
       def boot_jruby(root=nil)
         unless defined?(JRUBY_VERSION)
           require 'rubygems'
-          require 'jruby-abridged'
+          require 'appengine-jruby-jars'
 
           jars = [
-            JRubyAbridged.jruby_jar,
-            JRubyAbridged.rubygems_jar,
+            AppEngine::JRubyJars.jruby_jar,
+            AppEngine::JRubyJars.rubygems_jar,
             AppEngine::SDK::TOOLS_JAR,
             ]
 

data/lib/appengine-tools/bundler.rb

@@ -18,6 +18,8 @@
 require 'appengine-rack'
 require 'appengine-tools/web-xml'
 require 'appengine-tools/xml-formatter'
+require 'fileutils'
+require 'yaml'
 
 module AppEngine
   module Admin
@@ -41,6 +43,10 @@ module AppEngine
         path('WEB-INF', 'lib')
       end
       
+      def generation_dir
+        path('WEB-INF', 'appengine-generated')
+      end
+
       def config_ru
         path('config.ru')
       end
@@ -53,10 +59,18 @@ module AppEngine
         path('WEB-INF', 'appengine-web.xml')
       end
       
+      def build_status
+        path('WEB-INF', 'appengine-generated', 'build_status.yaml')
+      end
+      
       def public_root
         path(AppEngine::Rack.app.public_root) if AppEngine::Rack.app.public_root
       end
       
+      def persistent_path_token
+        path(public_root, '__preserve__')
+      end
+
       def rack_app
         AppEngine::Rack.app
       end
@@ -64,14 +78,14 @@ module AppEngine
     end
     
     class AppBundler
-      EXISTING_JRUBY = /^jruby(?!-rack).*jar$/
+      EXISTING_JRUBY = /^appengine-jruby-.*jar$/
       EXISTING_RACK = /jruby-rack.*jar$/
       EXISTING_APIS = /^appengine-api.*jar$/
       JRUBY_RACK = 'jruby-rack-0.9.4.jar'
-      JRUBY_RACK_URL = 'http://kenai.com/projects/jruby-rack/downloads/' +
-                       'download/' + JRUBY_RACK
+      JRUBY_RACK_URL = 'http://kenai.com/projects/jruby-rack/' +
+                       "downloads/download/#{JRUBY_RACK}"
       RACKUP = %q{Dir.chdir('..') if Dir.pwd =~ /WEB-INF$/;} +
-        %q{eval IO.read('config.ru'), nil, 'config.ru', 1}
+               %q{eval IO.read('config.ru'), nil, 'config.ru', 1}
       
       def initialize(root_path)
         @app = Application.new(root_path)
@@ -79,7 +93,6 @@ module AppEngine
       
       def bundle
         create_webinf
-        create_public
         copy_jruby
         copy_rack
         copy_sdk
@@ -93,13 +106,14 @@ module AppEngine
       def create_webinf
         Dir.mkdir(app.webinf) unless File.exists?(app.webinf)
         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
-        path = app.public_root
-        if path && !File.exists?(path)
-          Dir.mkdir(path)
-        end
+        return if app.public_root.nil?
+        Dir.mkdir(app.public_root) unless File.exists?(app.public_root)
+        token = app.persistent_path_token
+        FileUtils.touch(token) unless File.exists?(token)
       end
       
       def convert_config_ru
@@ -107,25 +121,28 @@ module AppEngine
         if !File.exists?(app.config_ru)
           if File.exists?(app.web_xml)
             unless File.exists?(app.aeweb_xml)
-              puts "Error: you either need a #{app.config_ru} or "
+              puts "!! Error: you either need a #{app.config_ru} or "
               puts "      #{app.aeweb_xml}."
               exit 1
             end
           else
             # TODO auto generate a config.ru
-            puts "Error: you need to create #{app.config_ru}."
+            puts "!! Error: you need to create #{app.config_ru}."
             exit 1
           end
         else
           generate_xml
+          create_public
         end
       end
       
       def copy_jruby
         current_jruby = find_jars(EXISTING_JRUBY)
         if current_jruby.empty?
-          require 'jruby-abridged'
-          FileUtils.cp([JRubyAbridged.jruby_jar, JRubyAbridged.rubygems_jar],
+          puts "=> Installing JRuby"
+          require 'appengine-jruby-jars'
+          FileUtils.cp([AppEngine::JRubyJars.jruby_jar,
+                        AppEngine::JRubyJars.rubygems_jar],
                        app.webinf_lib)
         end
         # TODO else warn if out of date
@@ -135,8 +152,8 @@ module AppEngine
         current_rack = find_jars(EXISTING_RACK)
         if current_rack.empty?
           # TODO cache this somewhere
+          puts "=> Retrieving jruby-rack"
           require 'open-uri'
-          puts 'Downloading jruby-rack...'
           open(JRUBY_RACK_URL) do |src|
             open(File.join(app.webinf_lib, JRUBY_RACK), 'wb') do |dest|
               dest.write(src.read)
@@ -148,6 +165,7 @@ module AppEngine
       def copy_sdk
         current_apis = find_jars(EXISTING_APIS)
         if current_apis.empty?
+          puts "=> Installing appengine-sdk"
           require 'appengine-sdk'
           jars = Dir.glob(
               "#{AppEngine::SDK::SDK_ROOT}/lib/user/appengine-api*.jar")
@@ -161,8 +179,22 @@ module AppEngine
       def find_jars(regex)
         Dir.entries(app.webinf_lib).grep(regex) rescue []
       end
-      
+
+      def valid_build
+        return false unless File.exists? app.build_status
+        return false unless File.exists? app.web_xml
+        return false unless File.exists? app.aeweb_xml
+        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.aeweb_xml).mtime.eql? yaml[:aeweb_xml]
+        true
+      end
+
       def generate_xml
+        return if valid_build 
+        puts "=> Generating configuration files"
         Dir.glob("#{app.webinf_lib}/*.jar").each do |path|
           $: << path
         end
@@ -185,6 +217,11 @@ module AppEngine
           xml = AppEngine::Rack::XmlFormatter.format(app.rack_app.to_xml)
           aeweb.write(xml)
         end
+        yaml = {
+            :config_ru => File.stat(app.config_ru).mtime,
+            :aeweb_xml => File.stat(app.aeweb_xml).mtime,
+            :web_xml   => File.stat(app.web_xml).mtime }
+        open(app.build_status, 'w') { |f| YAML.dump(yaml, f) } 
       end
     end
 

data/lib/appengine-tools/dev_appserver.rb

@@ -29,8 +29,6 @@ module AppEngine
             unless ENV['BOOTING_DEVAPPSERVER']
               puts  "=> Booting DevAppServer"
               puts  "=> Press Ctrl-C to shutdown server"
-              print "=> "
-              $stdout.flush
               ENV['BOOTING_DEVAPPSERVER'] = 'true'
             end
             AppEngine::Admin.bundle_app(path)
@@ -47,8 +45,8 @@ module AppEngine
         def get_jruby_home(path)
           return unless path
           Dir.chdir("#{path}/WEB-INF/lib") do
-            jars = Dir.glob("jruby-abridged-*.jar").grep(
-                /^jruby-abridged-\d+[.]\d+[.]\d+[.]jar$/)
+            jars = Dir.glob("appengine-jruby-*.jar").grep(
+                /^appengine-jruby-\d+[.]\d+[.]\d+[.]jar$/)
             if !jars.empty?
               jar = File.expand_path(jars[0])
               return "file:/#{jar}!/META-INF/jruby.home"

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

@@ -32,8 +32,8 @@ class WebXmlBuilder < Rack::Builder
   
   def add_jruby_rack_defaults(rackup)
     use JavaContextParams, :rackup => rackup
-
-    run JavaServlet.new('org.jruby.rack.RackServlet')
+    use JavaServletFilter, 'org.jruby.rack.RackFilter', 
+      { :name => 'RackFilter', :wildcard => true } 
     use JavaContextListener, 'org.jruby.rack.RackServletContextListener'
   end
   
@@ -83,4 +83,4 @@ class WebXmlBuilder < Rack::Builder
       yield path, value
     end
   end
-end
+end

data/spec/web.xml

@@ -1,6 +1,7 @@
 <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>
@@ -9,6 +10,7 @@
   </security-constraint>
   <security-constraint>
     <web-resource-collection>
+      <url-pattern>/admin2</url-pattern>
       <url-pattern>/admin2/*</url-pattern>
     </web-resource-collection>
     <auth-constraint>
@@ -17,6 +19,7 @@
   </security-constraint>
   <security-constraint>
     <web-resource-collection>
+      <url-pattern>/secure</url-pattern>
       <url-pattern>/secure/*</url-pattern>
     </web-resource-collection>
     <user-data-constraint>
@@ -67,14 +70,14 @@
     <param-name>rackup</param-name>
     <param-value>rackup</param-value>
   </context-param>
-  <servlet>
-    <servlet-name>org.jruby.rack.RackServlet</servlet-name>
-    <servlet-class>org.jruby.rack.RackServlet</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>org.jruby.rack.RackServlet</servlet-name>
-    <url-pattern>/</url-pattern>
-  </servlet-mapping>
+  <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>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: appengine-tools
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Ryan Brown
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-30 00:00:00 -07:00
+date: 2009-08-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: jruby-abridged
+  name: appengine-jruby-jars
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement