appengine-tools 0.0.4 → 0.0.5

data/Rakefile

@@ -5,7 +5,7 @@ require 'date'
 require 'spec/rake/spectask'
 
 GEM = "appengine-tools"
-GEM_VERSION = "0.0.4"
+GEM_VERSION = "0.0.5"
 AUTHOR = "Ryan Brown"
 EMAIL = "ribrdb@gmail.com"
 HOMEPAGE = "http://code.google.com/p/appengine-jruby"
@@ -29,6 +29,8 @@ spec = Gem::Specification.new do |s|
   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('rubyzip')
 end
 
 task :default => :spec

data/lib/appengine-tools/appcfg.rb

@@ -27,9 +27,6 @@ module AppEngine
       import Java.ComGoogleAppengineToolsAdmin.AppAdminFactory 
       import Java.ComGoogleAppengineToolsAdmin.AppVersionUpload
       import Java.ComGoogleAppengineToolsUtil.Logging
-      import java.io.FileOutputStream
-      import java.util.jar.JarOutputStream
-      import java.util.zip.ZipEntry
     
       class JRubyAppVersionUpload < AppVersionUpload
         def initialize(connection, app)
@@ -76,13 +73,12 @@ module AppEngine
     end
     
     class JRubyAppCfg
-      NO_XML_COMMANDS = [ 'version' ]
-      RUBY_COMMANDS = ['bundle', 'gem', 'help', 'run']
+      NO_XML_COMMANDS = %w{version}
+      RUBY_COMMANDS = %w{gem bundle help run}
       COMMAND_SUMMARY = <<EOF
   run: run jruby in your application environment.
-  gem: run rubygems for your application.
   bundle: package your application for deployment.
-The 'gem' and 'run' commands assume the app directory is the current directory.
+  The 'run' command assumes the app directory is the current directory.
 EOF
       class << self
         def main(args)
@@ -91,7 +87,7 @@ EOF
             send(command, *parsed_args)
             return
           end
-          if command && ! NO_XML_COMMANDS.include?(command)
+          if command && !NO_XML_COMMANDS.include?(command)
             path = parsed_args[0]
             AppEngine::Admin.bundle_app(path)
             AppEngine::Development.boot_jruby
@@ -100,7 +96,7 @@ EOF
           else
             AppEngine::Development.boot_jruby              
           end
-          puts "running AppCfg"
+          puts "=> Running AppCfg"
           run_appcfg(args)
         end
         
@@ -111,98 +107,38 @@ EOF
           AppCfg.new(factory, args.to_java(java.lang.String))
         end
         
-        def bundle(path)
-          AppEngine::Admin.bundle_app(path)
+        def bundle(*args)
+          if File.directory?(args[-1] || '')
+            AppEngine::Admin.bundle_app(*args)
+          else
+            bundle_help
+          end
         end
         
         def bundle_help
           help = <<EOF
-#{$0} bundle app_dir
+#{$0} bundle [gem bundle options] app_dir
 
-Generates files necessary to run an application as a Java Servlet.
-This is run automatically when necessary, so you should not
-need to run it manually.
+Bundles the gems listed in Gemfile and generates files necessary
+to run an application as a servlet. This runs automatically for you,
+but you need to run it manually to update gems if you don't specify
+a version number. Pass --update to refresh bundled gems.
 
 EOF
         end
-        
+
         def gem(*args)
-          AppEngine::Admin.bundle_deps('.')
-          AppEngine::Development.boot_jruby
-          puts "=> Running RubyGems"
-          require 'rubygems'
-          require 'rubygems/command_manager'
-          Gem.configuration = Gem::ConfigFile.new(args)
-          Gem.use_paths('.gems')
-          Gem::Command.add_specific_extra_args(
-              'install', %w(--no-rdoc --no-ri))
-          saved_gems = all_gem_specs
-          begin
-            Gem::CommandManager.instance.run(Gem.configuration.args)
-          rescue Gem::SystemExitException => e
-            exit e.exit_code unless e.exit_code == 0
-          end
-          unless ((all_gem_specs == saved_gems) &&
-                  File.exist?('WEB-INF/lib/gems.jar'))
-            Dir.mkdir 'WEB-INF' unless File.exists? 'WEB-INF'
-            Dir.mkdir 'WEB-INF/lib' unless File.exists? 'WEB-INF/lib'
-            Dir.chdir '.gems'
-            puts '=> Packaging gems'
-            write_jar('../WEB-INF/lib/gems.jar') do |jar|
-              add_to_jar('gems', jar)
-              add_to_jar('specifications', jar)
-            end
-            puts 'If you upgraded any gems, please run `appcfg.rb gem cleanup`'
-            puts 'to remove the old versions.'
-          end
+          gem_help
         end
         
         def gem_help
           help = <<EOF
-#{$0} gem [rubygems arguments]
-
 
-Configures rubygems for this application and bundles the gems into a .jar file.
-Must be run from the application directory.
+Sorry, the 'appcfg.rb gem' option is deprecated.
+Simply update the 'Gemfile' and run 'appcfg.rb bundle .' instead.
 
 EOF
-        end
-        
-        def all_gem_specs
-          Gem.source_index.map do |_, spec|
-            spec
-          end
-        end
-        
-        def write_jar(filename)
-          filename = File.expand_path(filename)
-          jar = JarOutputStream.new(FileOutputStream.new(filename))
-          begin
-            yield jar
-          ensure
-            jar.close
-          end
-        end
-        
-        def add_to_jar(path, jar)
-          directory = File.directory?(path)
-          if directory
-            path << '/'
-          end
-          entry = ZipEntry.new(path)
-          jar.put_next_entry(entry)
-          unless directory
-            data = IO.read(path)
-            jar.write(data.to_java_bytes, 0, data.size)
-          end
-          jar.close_entry
-          if directory
-            Dir.entries(path).each do |filename|
-              unless ['.', '..'].include?(filename)
-                add_to_jar(path + filename, jar)
-              end
-            end
-          end
+          puts help
         end
         
         def run(*args)
@@ -214,7 +150,6 @@ EOF
           help = <<EOF
 #{$0} run [ruby args]
 
-
 Starts the jruby interpreter within your application's environment.
 Use `#{$0} run -S command` to run a command such as rake or irb.
 Must be run from the application directory, after running bundle.
@@ -265,4 +200,4 @@ EOF
       end
     end
   end
-end
+end

data/lib/appengine-tools/boot.rb

@@ -22,7 +22,6 @@ module AppEngine
     class << self
       def boot_jruby(root=nil, options={})
         unless defined?(JRUBY_VERSION)
-          require 'rubygems'
           require 'appengine-jruby-jars'
 
           jars = [
@@ -83,4 +82,4 @@ module AppEngine
       end
     end
   end
-end
+end

data/lib/appengine-tools/bundler.rb

@@ -17,6 +17,7 @@
 
 require 'appengine-rack'
 require 'appengine-tools/boot'
+require 'appengine-tools/gem_bundler'
 require 'appengine-tools/web-xml'
 require 'appengine-tools/xml-formatter'
 require 'fileutils'
@@ -35,43 +36,63 @@ module AppEngine
       def path(*pieces)
         File.join(@root, *pieces)
       end
-      
+
       def webinf
         path('WEB-INF')
       end
-      
+
       def webinf_lib
         path('WEB-INF', 'lib')
       end
-      
+
+      def gems_jar
+        path('WEB-INF', 'lib', 'gems.jar')
+      end
+
       def generation_dir
         path('WEB-INF', 'appengine-generated')
       end
 
+      def gems_dir
+        path('.gems')
+      end
+
+      def gemfile
+        path('Gemfile')
+      end
+
       def config_ru
         path('config.ru')
       end
-      
+
       def web_xml
         path('WEB-INF', 'web.xml')
       end
-      
+
       def aeweb_xml
         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 favicon_ico
+        File.join(public_root ? public_root : @root, 'favicon.ico')
+      end
+
+      def robots_txt
+         File.join(public_root ? public_root : @root, 'robots.txt')
+      end
+
       def rack_app
         AppEngine::Rack.app
       end
-      
+
     end
     
     class AppBundler
@@ -79,8 +100,7 @@ module AppEngine
       EXISTING_RACK = /jruby-rack.*jar$/
       EXISTING_APIS = /^appengine-api.*jar$/
       JRUBY_RACK = 'jruby-rack-0.9.5.jar'
-      JRUBY_RACK_URL = 'http://kenai.com/projects/jruby-rack/' +
-                       "downloads/download/#{JRUBY_RACK}"
+      JRUBY_RACK_URL = "http://kenai.com/downloads/jruby-rack/#{JRUBY_RACK}"
       RACKUP = %q{Dir.chdir('..') if Dir.pwd =~ /WEB-INF$/;} +
                %q{eval IO.read('config.ru'), nil, 'config.ru', 1}
       
@@ -88,17 +108,24 @@ module AppEngine
         @app = Application.new(root_path)
       end
       
-      def bundle
-        bundle_deps
+      def bundle(args=[])
+        bundle_deps(args)
         convert_config_ru
       end
       
-      def bundle_deps
+      def bundle_deps(args=[])
         create_webinf
+        bundle_gems(args)
         copy_jruby
         copy_rack
         copy_sdk
       end
+
+      def bundle_gems(args)
+        return if defined? JRUBY_VERSION
+        gem_bundler = AppEngine::Admin::GemBundler.new(app.root)
+        gem_bundler.bundle(args)
+      end
       
       def app
         @app
@@ -111,21 +138,25 @@ module AppEngine
       end
       
       def create_public
-        return if app.public_root.nil?
-        Dir.mkdir(app.public_root) unless File.exists?(app.public_root)
+        return unless defined? JRUBY_VERSION
+        if app.public_root and !File.exists?(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
         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
@@ -136,9 +167,7 @@ module AppEngine
       
       def copy_jruby
         require 'appengine-jruby-jars'
-        update_jars(
-            "JRuby", EXISTING_JRUBY, [AppEngine::JRubyJars.jruby_jar],
-            /rubygems/, [AppEngine::JRubyJars.rubygems_jar])
+        update_jars("JRuby", EXISTING_JRUBY, [AppEngine::JRubyJars.jruby_jar])
       end
       
       def copy_rack
@@ -173,7 +202,7 @@ module AppEngine
       def update_jars(name, regex, jars, opt_regex=nil, opt_jars=[])
         existing = find_jars(regex)
         if existing.empty?
-          message = "Installing #{name}"
+          message = "=> Installing #{name}"
           jars_to_install = jars + opt_jars
         else
           has_optional_jars = existing.any? {|j| j =~ opt_regex}
@@ -182,7 +211,7 @@ module AppEngine
           expected = expected_jars.map {|path| File.basename(path)}
           if existing.size != expected.size ||
               (expected & existing) != expected
-            message = "Updating #{name}"
+            message = "=> Updating #{name}"
             jars_to_install = expected_jars
           end
         end
@@ -225,14 +254,14 @@ module AppEngine
           end
           app_root = app.root
           builder = WebXmlBuilder.new do
-            # First configure the basic jruby-rack settings.
-            add_jruby_rack_defaults(RACKUP)
-
-            # Now read the user's rackup file
+            # First read the user's rackup file
             # TODO generate a skeleton if it's missing
             Dir.chdir(app_root) do
               eval IO.read('config.ru'), nil, 'config.ru', 1
             end
+
+            # Now configure the basic jruby-rack settings.
+            add_jruby_rack_defaults(RACKUP)
           end
           open(app.web_xml, 'w') do |webxml|
             xml = AppEngine::Rack::XmlFormatter.format(builder.to_xml)
@@ -255,12 +284,12 @@ module AppEngine
       end
     end
 
-    def self.bundle_app(root_path)
-      AppBundler.new(root_path).bundle
+    def self.bundle_app(*args)
+      AppBundler.new(args.pop).bundle(args)
     end
     
-    def self.bundle_deps(root_path)
-      AppBundler.new(root_path).bundle_deps
+    def self.bundle_deps(*args)
+      AppBundler.new(args.pop).bundle(args)
     end
 
   end

data/lib/appengine-tools/dev_appserver.rb

@@ -72,6 +72,11 @@ module AppEngine
           ENV.delete 'GEM_PATH'
           java_args << '-classpath'
           java_args << AppEngine::SDK::TOOLS_JAR
+          java_args << '-Djava.util.logging.config.file=' +
+              AppEngine::SDK::SDK_ROOT + '/config/sdk/logging.properties'
+          if defined? AppEngine::SDK::AGENT_JAR
+            java_args << '-javaagent:' + AppEngine::SDK::AGENT_JAR
+          end
           command = ['java'] + java_args + DEV_APPSERVER + server_args
           if ENV['VERBOSE']
             puts "exec #{command.map{|x| x.inspect}.join(' ')}"

data/lib/appengine-tools/gem_bundler.rb

@@ -0,0 +1,110 @@
+#!/usr/bin/ruby1.8 -w
+#
+# Copyright:: Copyright 2009 Google Inc.
+# Original Author:: John Woodell (mailto:woodie@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.
+
+require 'rubygems'
+require 'fileutils'
+require 'zip/zip'
+require 'zip/zipfilesystem'
+require 'rubygems/command_manager'
+require 'appengine-tools/bundler'
+
+module AppEngine
+  module Admin
+
+    class GemBundler
+
+      def initialize(root)
+        @root = root
+        @app = Application.new(root)
+      end
+
+      def bundle(args)
+        verify_gemfile
+        gem_bundle(args)
+      end
+
+      private
+
+      def app
+        @app
+      end
+
+      def gems_out_of_date
+        if File.exists?(app.gems_jar) and
+            File.stat(app.gems_jar).mtime > File.stat(app.gemfile).mtime
+          return false
+        end
+        return true
+      end
+
+      def gem_bundle(args)
+        return unless args.include?('--update') || gems_out_of_date
+        Gem.platforms = [Gem::Platform::RUBY,
+            Gem::Platform.new('universal-java')]
+        Gem.configuration = Gem::ConfigFile.new(args.unshift('bundle'))
+        puts "=> Bundling gems"
+        begin
+          Dir.chdir(@root) do
+            Gem::CommandManager.instance.run(Gem.configuration.args)
+          end
+        rescue Gem::SystemExitException => e
+          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 0.6.0 for Sinatra 0.9.4
+module Gem
+  def self.dir; ENV['GEM_HOME']; end
+  RubyGemsVersion = "0.0.0" unless defined? RubyGemsVersion
+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"
+        gem_files = Dir["#{bundler_dir}/gems/**/**"] +
+                    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|
+            jar.add(file.sub("#{app.gems_dir}/",''), file)
+          end
+        end
+      end
+
+      def verify_gemfile
+        return if File.exists?(app.gemfile)
+        puts "=> Generating gemfile"
+        
+        # TODO: Maybe we should include the latest
+        #       versions from updatecheck here?
+        stock_gemfile = <<EOF
+# Critical default settings:
+disable_system_gems
+disable_rubygems
+bundle_path ".gems/bundler_gems"
+
+# List gems to bundle here:
+#gem "rack", "1.0.0"
+#gem "dm-appengine"
+#gem "sinatra"
+EOF
+        File.open(app.gemfile,'w') {|f| f.write(stock_gemfile) }
+      end
+    end
+  end
+end
+

data/lib/appengine-tools/update_check.rb

@@ -46,13 +46,12 @@ module AppEngine
       end
       
       def find_gem_version(name)
-        specs = Dir.glob("#{@approot}/.gems/specifications/#{name}-*.gemspec")
-        versions = specs.map do |filename|
-          if filename =~ /-(\w+\.\w+.\w+).gemspec$/
-            Gem::Version.new($1)
+        IO.foreach("#{@approot}/.gems/bundler_gems/environment.rb") do |line|
+          if line =~ %r(/gems/#{name}-(\w+\.\w+.\w+)[/"])
+            return Gem::Version.new($1)
           end
-        end
-        versions.sort[-1]
+        end rescue nil
+        nil
       end
       
       def remote_versions
@@ -66,7 +65,7 @@ module AppEngine
       def check_for_updates
         local = local_versions
         unless local['google-appengine']
-          puts 'Skipping update check'
+          puts '=> Skipping update check'
           return
         end
         latest = remote_versions
@@ -74,13 +73,13 @@ module AppEngine
           current = latest[name]
           if version && version < current
             prefix = if name == 'google-appengine'
-              "sudo"
+              update_msg = "=> Please run sudo gem update google-appengine."
             else
-              "appcfg.rb"
+              update_msg = "=> Please update your Gemfile."
             end
-            puts "There is a new version of #{name}: #{current} " +
+            puts "=> There is a new version of #{name}: #{current} " +
                 "(You have #{version})"
-            puts "Please run #{prefix} gem update #{name}."
+            puts update_msg
           end
         end
       end
@@ -115,4 +114,4 @@ module AppEngine
       end
     end
   end
-end
+end

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

@@ -27,14 +27,21 @@ class WebXmlBuilder < Rack::Builder
   def initialize(&block)
     @path = "/"
     @paths = Hash.new {|h, k| h[k] = []}
+    @skip_defaults = false
     instance_eval(&block) if block_given?
   end
   
+  def skip_rack_servlet
+    @skip_defaults = true
+  end
+  
   def add_jruby_rack_defaults(rackup)
     use JavaContextParams, :rackup => rackup
-    use JavaServletFilter, 'org.jruby.rack.RackFilter', 
-      { :name => 'RackFilter', :wildcard => true } 
-    use JavaContextListener, 'org.jruby.rack.RackServletContextListener'
+    unless @skip_defaults
+      use JavaServletFilter, 'org.jruby.rack.RackFilter', 
+        { :name => 'RackFilter', :wildcard => true }
+    end
+  use JavaContextListener, 'com.google.appengine.jruby.LazyContextListener'
   end
   
   def use(middleware, *args, &block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: appengine-tools
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Ryan Brown
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-15 00:00:00 -07:00
+date: 2009-11-02 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,6 +42,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.6.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rubyzip
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Tools for developing and deploying apps to Google App Engine
 email: ribrdb@gmail.com
 executables: 
@@ -56,21 +76,22 @@ 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/update_check.rb
-- lib/appengine-tools/web-xml.rb
+- lib/appengine-tools/gem_bundler.rb
 - lib/appengine-tools/xml-formatter.rb
+- 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/rack_spec.rb
 - spec/spec.opts
-- spec/spec_helper.rb
+- spec/rack_spec.rb
 - spec/update_check_spec.rb
+- spec/spec_helper.rb
 - spec/web-xml_spec.rb
-- spec/web.xml
 has_rdoc: true
 homepage: http://code.google.com/p/appengine-jruby
 licenses: []