appengine-tools 0.0.7 → 0.0.8.pre

data/COPYING

@@ -0,0 +1,9 @@
+= Appengine-Tools 
+
+This software is provided under the terms of the Apache license. For details
+see http://appengine-jruby.googlecode.com/hg/appengine-tools/LICENSE 
+
+= Additional Bundled Software
+
+JRuby-Rack (jruby-rack-*.jar) is distributed under the terms of the MIT license.
+See http://svn.codehaus.org/jruby-contrib/trunk/rack/LICENSE.txt for details.

data/README.rdoc

@@ -1,10 +1,35 @@
-Generate XML files required by App Engine for JRuby from a rackup file.
-This works from standard Ruby or JRuby, but you'll need the rack gem.         
+= AppEngine Tools
 
-Configure your app from within the 'config.ru' file:
+AppEngine Tools gem provides dev_appserver.rb and appcfg.rb. The development
+server runs your application on your local computer for testing your
+application. The server simulates the App Engine datastore, services and
+sandbox restrictions. A multipurpose tool called appcfg.rb handles all
+command-line interaction with your application running on App Engine.
 
-  AppEngine::Rack.app.configure( :application => 'simple', :version => 2 )
+== Extending the Java Platform to JRuby
 
-Now run xmlgen.rb and and your ready to go:
+These tools work from standard Ruby, no need to install JRuby separately,
+everything you need installs as gems. Your app has access to all the Java APIs.
 
-  jruby -rubygems -e 'require "appengine-tools/genxml"'
+== Rackup for app configuration
+
+The required XML configuration files are generated from the 'config.ru' file.
+
+ require 'appengine-rack'
+ AppEngine::Rack.configure_app(          
+     :application => "application-id",           
+     :precompilation_enabled => true,
+     :version => "1")
+ run lambda { Rack::Response.new("Hello").finish }
+
+== Bundler for Gem Management
+
+Simply list the gems you require in the 'Gemfile'
+
+ # Critical default settings:
+ disable_system_gems
+ disable_rubygems
+ bundle_path ".gems/bundler_gems"
+
+ # List gems to bundle here:
+ gem "appengine-rack"

data/Rakefile

@@ -4,12 +4,15 @@ require 'rubygems/specification'
 require 'date'
 require 'spec/rake/spectask'
 
+require File.dirname(__FILE__) + '/lib/jruby-rack-jar'
+
 GEM = "appengine-tools"
-GEM_VERSION = "0.0.7"
-AUTHOR = "Ryan Brown"
-EMAIL = "ribrdb@gmail.com"
+GEM_VERSION = "0.0.8.pre"
 HOMEPAGE = "http://code.google.com/p/appengine-jruby"
-SUMMARY = "Tools for developing and deploying apps to Google App Engine"
+JRUBYRACK_VERSION = AppEngine::JRubyJars::JRUBYRACK_VERSION
+JRUBYRACK_JAR = "jruby-rack-#{JRUBYRACK_VERSION}.jar"
+JRUBYRACK_URL = "http://repository.codehaus.org/org/jruby/rack/" +
+                "jruby-rack/#{JRUBYRACK_VERSION}/#{JRUBYRACK_JAR}"
 
 spec = Gem::Specification.new do |s|
   s.name = GEM
@@ -17,20 +20,23 @@ spec = Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = true
   s.extra_rdoc_files = ["README.rdoc", "LICENSE"]
-  s.summary = SUMMARY
-  s.description = s.summary
-  s.author = AUTHOR
-  s.email = EMAIL
+  s.summary = "Tools for developing and deploying apps to Google App Engine"
+  s.description = <<-EOF
+Tools and SDK for developing Ruby applications for Google App Engine.
+Includes a local development server and tools for testing and deployment."
+EOF
+  s.authors = ["Ryan Brown", "John Woodell"]
+  s.email = ["ribrdb@google.com", "woodie@google.com"]
   s.homepage = HOMEPAGE
   
   s.require_path = 'lib'
-  s.files = %w(LICENSE README.rdoc Rakefile) +
-      Dir.glob("{lib,spec}/**/*.rb") + Dir.glob("lib/**/*.class")
+  s.files = %w(COPYING LICENSE README.rdoc Rakefile) +
+      ["lib/#{JRUBYRACK_JAR}"] + Dir.glob("{lib,spec}/**/*.{rb,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', ["~> 0.7.2"])
+  s.add_dependency('bundler', ["~> 0.8.1"])
   s.add_dependency('rubyzip')
 end
 
@@ -44,6 +50,7 @@ end
 
 
 Rake::GemPackageTask.new(spec) do |pkg|
+  system("curl -s -o lib/#{JRUBYRACK_JAR} #{JRUBYRACK_URL}")
   pkg.gem_spec = spec
 end
 

data/lib/appengine-tools/appcfg.rb

@@ -81,7 +81,7 @@ module AppEngine
     
     class JRubyAppCfg
       NO_XML_COMMANDS = %w{version}
-      RUBY_COMMANDS = %w{gem bundle help run}
+      RUBY_COMMANDS = %w{gem bundle help run generate_app}
       COMMAND_SUMMARY = <<EOF
   run: run jruby in your application environment.
   bundle: package your application for deployment.
@@ -114,7 +114,29 @@ EOF
           Logging.initializeLogging
           AppCfg.new(factory, args.to_java(java.lang.String))
         end
-        
+
+        def generate_app(*args)
+          if args and args.size > 0
+            appdir = args.pop
+            webinf = File.join(appdir, 'WEB-INF')
+            FileUtils.mkdir_p(webinf)
+            AppEngine::Admin.bundle_app(appdir)
+          else
+            generate_app_help
+          end
+        end
+
+        def generate_app_help
+          help = <<EOF
+#{$0} generate_app app_dir
+
+Generates a sample Rack application in app_dir.
+The directory is created if it doesn't exist.
+
+EOF
+          puts help
+        end
+
         def bundle(*args)
           if File.directory?(args[-1] || '')
             AppEngine::Admin.bundle_app(*args)
@@ -122,7 +144,7 @@ EOF
             bundle_help
           end
         end
-        
+
         def bundle_help
           help = <<EOF
 #{$0} bundle [gem bundle options] app_dir

data/lib/appengine-tools/bundler.rb

@@ -97,10 +97,8 @@ module AppEngine
     
     class AppBundler
       EXISTING_JRUBY = /^(jruby-abridged|appengine-jruby)-.*jar$/
-      EXISTING_RACK = /jruby-rack.*jar$/
+      EXISTING_RACK = /^jruby-rack.*jar$/
       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$/; } +
                %q{begin; require 'bundler_gems/environment'; } +
                %q{rescue LoadError; end;} +
@@ -116,6 +114,7 @@ module AppEngine
       end
       
       def bundle_deps(args=[])
+        confirm_appdir
         create_webinf
         bundle_gems(args)
         copy_jruby
@@ -133,6 +132,19 @@ module AppEngine
         @app
       end
       
+      def confirm_appdir
+        unless File.exists?(app.config_ru) or
+            File.exists?(app.gemfile) or File.exists?(app.webinf)
+          puts ""
+          puts "Oops, this does not look like an application directory."
+          puts "You need a #{app.gemfile} or #{app.config_ru} file."
+          puts ""
+          puts "Run 'appcfg.rb generate #{app.path}'"
+          puts "to generate a skeleton application."
+          exit 1
+        end
+      end
+
       def create_webinf
         Dir.mkdir(app.webinf) unless File.exists?(app.webinf)
         Dir.mkdir(app.webinf_lib) unless File.exists?(app.webinf_lib)
@@ -149,22 +161,22 @@ module AppEngine
       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 "      #{app.aeweb_xml}."
-              exit 1
-            end
-          else
-            # TODO auto generate a config.ru
-            puts "Error: you need to create #{app.config_ru}."
-            exit 1
-          end
-        else
-          generate_xml
-          create_public
+        unless File.exists?(app.config_ru)
+          puts "=> Generating rackup"
+          app_id = File.basename(File.expand_path(app.path)).
+              downcase.gsub('_', '-').gsub(/[^-a-z0-9]/, '')
+          stock_rackup = <<EOF
+require 'appengine-rack'
+AppEngine::Rack.configure_app(          
+    :application => "#{app_id}",           
+    :precompilation_enabled => true,
+    :version => "1")
+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
@@ -173,19 +185,9 @@ module AppEngine
       end
       
       def copy_rack
-        update_jars('jruby-rack', EXISTING_RACK, [JRUBY_RACK]) do
-          require 'open-uri'
-          begin
-            open(JRUBY_RACK_URL) do |src|
-              open(File.join(app.webinf_lib, JRUBY_RACK), 'wb') do |dest|
-                dest.write(src.read)
-              end
-            end
-          rescue SocketError
-            puts "Unable to download jruby-rack."
-            puts "Please check your internet connection."
-          end
-        end
+        require 'jruby-rack-jar'
+        update_jars('JRuby-Rack', EXISTING_RACK,
+            [AppEngine::JRubyJars.jrubyrack_jar])
       end
       
       def copy_sdk
@@ -257,9 +259,9 @@ module AppEngine
           app_root = app.root
           builder = WebXmlBuilder.new do
             # 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'
+              require File.join(".gems", "bundler_gems",
+                  TARGET_ENGINE, TARGET_VERSION, "environment")
               eval IO.read('config.ru'), nil, 'config.ru', 1
             end
 
@@ -286,7 +288,7 @@ module AppEngine
         end
       end
     end
-
+    
     def self.bundle_app(*args)
       AppBundler.new(args.pop).bundle(args)
     end

data/lib/appengine-tools/gem_bundler.rb

@@ -22,15 +22,11 @@ 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
+    TARGET_VERSION = '1.8'
+    TARGET_ENGINE = 'jruby'
+    GEM_PLATFORM = Gem::Platform.new("universal-java-1.6")
 
     class GemBundler
 
@@ -60,9 +56,11 @@ module AppEngine
 
       def gem_bundle(args)
         return unless args.include?('--update') || gems_out_of_date
-        Gem.platforms = [Gem::Platform::RUBY,
-            Gem::Platform.new('universal-java')]
+        Gem.platforms = [Gem::Platform::RUBY, GEM_PLATFORM]
         Gem.configuration = Gem::ConfigFile.new(args.unshift('bundle'))
+        ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : nil
+        # Override RUBY_ENGINE (we bundle from MRI for JRuby)
+        Object.const_set('RUBY_ENGINE', TARGET_ENGINE)
         puts "=> Bundling gems"
         begin
           Dir.chdir(@root) do
@@ -71,15 +69,26 @@ module AppEngine
         rescue Gem::SystemExitException => e
           exit e.exit_code unless e.exit_code == 0
         end
+        # Restore RUBY_ENGINE (limit the scope of this hack)
+        Object.const_set('RUBY_ENGINE', ruby_engine) unless ruby_engine.nil?
         bundler_dir = "#{app.gems_dir}/bundler_gems"
+        target_pair = "#{TARGET_ENGINE}/#{TARGET_VERSION}"
+        gem_patch = "require 'bundler_gems/#{target_pair}/environment'"
+        File.open("#{bundler_dir}/environment.rb",'w') {|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/**/**"] +
-                    Dir["#{bundler_dir}/dirs/**/**"] +
+        gem_files = Dir["#{bundler_dir}/#{target_pair}/dirs/**/**"] +
+                    Dir["#{bundler_dir}/#{target_pair}/gems/**/**"] +
+                    Dir["#{bundler_dir}/#{target_pair}/environment.rb"] +
                     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)
+            if file[-4..-1].eql? '.jar'
+              puts "Installing #{File.basename(file)}"
+              FileUtils.cp file, app.webinf_lib
+            else
+              jar.add(file.sub("#{app.gems_dir}/",''), file)
+            end
           end
         end
       end
@@ -87,9 +96,7 @@ module AppEngine
       def verify_gemfile
         return if File.exists?(app.gemfile)
         puts "=> Generating gemfile"
-        
-        # TODO: Maybe we should include the latest
-        #       versions from updatecheck here?
+        # TODO: include the latest versions from updatecheck here?
         stock_gemfile = <<EOF
 # Critical default settings:
 disable_system_gems
@@ -98,8 +105,6 @@ bundle_path ".gems/bundler_gems"
 
 # List gems to bundle here:
 gem "appengine-rack"
-#gem "dm-appengine"
-#gem "sinatra"
 EOF
         File.open(app.gemfile,'w') {|f| f.write(stock_gemfile) }
       end

data/lib/jruby-rack-jar.rb

@@ -0,0 +1,26 @@
+#!/usr/bin/ruby
+# Copyright:: Copyright 2010 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.
+
+module AppEngine
+  module JRubyJars
+    JRUBYRACK_VERSION = '0.9.6'
+  
+    def self.jrubyrack_jar
+      File.join(File.dirname(__FILE__), "jruby-rack-#{JRUBYRACK_VERSION}.jar")
+    end
+  
+  end
+end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: appengine-tools
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8.pre
 platform: ruby
 authors: 
 - Ryan Brown
+- John Woodell
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-12-22 00:00:00 -08:00
+date: 2010-01-20 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,7 +51,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.7.2
+        version: 0.8.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: rubyzip
@@ -62,8 +63,13 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: Tools for developing and deploying apps to Google App Engine
-email: ribrdb@gmail.com
+description: |
+  Tools and SDK for developing Ruby applications for Google App Engine.
+  Includes a local development server and tools for testing and deployment."
+
+email: 
+- ribrdb@google.com
+- woodie@google.com
 executables: 
 - appcfg.rb
 - dev_appserver.rb
@@ -73,9 +79,11 @@ extra_rdoc_files:
 - README.rdoc
 - LICENSE
 files: 
+- COPYING
 - LICENSE
 - README.rdoc
 - Rakefile
+- lib/jruby-rack-0.9.6.jar
 - lib/appengine-tools/appcfg.rb
 - lib/appengine-tools/boot.rb
 - lib/appengine-tools/bundler.rb
@@ -84,12 +92,13 @@ files:
 - lib/appengine-tools/update_check.rb
 - lib/appengine-tools/web-xml.rb
 - lib/appengine-tools/xml-formatter.rb
+- lib/jruby-rack-jar.rb
+- lib/appengine-tools/com/google/appengine/jruby/AppVersionUploadDelegate.class
+- lib/appengine-tools/com/google/appengine/jruby/JRubyAppVersionUpload.class
 - spec/rack_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: []
@@ -107,9 +116,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
   version: 
 requirements: []