lib/appengine-tools/bundler.rb in appengine-tools-0.0.10.1 vs lib/appengine-tools/bundler.rb in appengine-tools-0.0.11
- old
+ new
@@ -75,10 +75,14 @@
def build_status
path('WEB-INF', 'appengine-generated', 'build_status.yaml')
end
+ def bundled_jars
+ path('WEB-INF', 'appengine-generated', 'bundled_jars.yaml')
+ end
+
def public_root
path(AppEngine::Rack.app.public_root) if AppEngine::Rack.app.public_root
end
def favicon_ico
@@ -95,11 +99,10 @@
end
class AppBundler
EXISTING_JRUBY = /^(jruby-abridged|appengine-jruby)-.*jar$/
- EXISTING_RACK = /^jruby-rack.*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}
@@ -116,11 +119,10 @@
def bundle_deps(args=[])
confirm_appdir
create_webinf
bundle_gems(args)
copy_jruby
- copy_rack
copy_sdk
end
def bundle_gems(args)
return if defined? JRUBY_VERSION
@@ -180,15 +182,9 @@
end
def copy_jruby
require 'appengine-jruby-jars'
update_jars("JRuby", EXISTING_JRUBY, [AppEngine::JRubyJars.jruby_jar])
- end
-
- def copy_rack
- require 'jruby-rack-jar'
- update_jars('JRuby-Rack', EXISTING_RACK,
- [AppEngine::JRubyJars.jrubyrack_jar])
end
def copy_sdk
require 'appengine-sdk'
glob = "appengine-api-{1.0-sdk,labs}-*.jar"