Modified:
/appengine-apis/lib/appengine-apis.rb
/appengine-apis/lib/appengine-apis/testing.rb
/appengine-tools/Rakefile
/appengine-tools/lib/appengine-tools/bundler.rb
/google-appengine/Rakefile
/google-appengine/google_appengine.rb
=======================================
--- /appengine-apis/lib/appengine-apis.rb Wed Jul 14 19:52:08 2010
+++ /appengine-apis/lib/appengine-apis.rb Fri Sep 3 22:01:45 2010
@@ -19,5 +19,5 @@
$:.include?(File.dirname(__FILE__)) ||
$:.include?(File.expand_path(File.dirname(__FILE__)))
module AppEngine
- VERSION = '0.0.18'
+ VERSION = '0.0.19'
end
=======================================
--- /appengine-apis/lib/appengine-apis/testing.rb Wed Jul 14 19:52:08 2010
+++ /appengine-apis/lib/appengine-apis/testing.rb Fri Sep 3 22:01:45 2010
@@ -54,7 +54,7 @@
# testing::LocalTaskQueueTestConfig.new,
testing::LocalURLFetchServiceTestConfig.new,
testing::LocalUserServiceTestConfig.new,
- testing::LocalOAuthServiceTestConfig.new,
+ # testing::LocalOAuthServiceTestConfig.new,
testing::LocalXMPPServiceTestConfig.new,
].to_java(testing::LocalServiceTestConfig)
testing::LocalServiceTestHelper.new(configs)
=======================================
--- /appengine-tools/Rakefile Wed Jul 14 19:52:08 2010
+++ /appengine-tools/Rakefile Fri Sep 3 22:01:45 2010
@@ -6,7 +6,7 @@
require 'appengine-sdk'
GEM = "appengine-tools"
-GEM_VERSION = "0.0.15"
+GEM_VERSION = "0.0.16"
HOMEPAGE = "http://code.google.com/p/appengine-jruby"
PLUGIN_SOURCE = 'src/com/google/appengine/jruby/JRubyYamlPlugin.java'
=======================================
--- /appengine-tools/lib/appengine-tools/bundler.rb Wed Jun 9 07:28:05 2010
+++ /appengine-tools/lib/appengine-tools/bundler.rb Fri Sep 3 22:01:45 2010
@@ -64,6 +64,10 @@
end
def app_yaml
+ path('WEB-INF', 'app.yaml')
+ end
+
+ def old_yaml
path('app.yaml')
end
@@ -120,6 +124,20 @@
end
def confirm_appdir
+ if File.exists?(app.old_yaml)
+ if File.exists?(app.app_yaml)
+ puts ""
+ puts "Warning, you have two versions of app.yaml."
+ puts "We only use the version in the WEB-INF dir."
+ puts ""
+ else
+ puts ""
+ puts "Sorry, app.yaml needs to be inside the WEB-INF dir."
+ puts "Don't worry, we are moving it there now."
+ puts ""
+ FileUtils.mv(app.old_yaml, app.app_yaml)
+ end
+ end
unless File.exists?(app.app_yaml)or File.exists?(app.webinf)
puts ""
puts "Oops, this does not look like an application directory."
=======================================
--- /google-appengine/Rakefile Wed Jul 14 19:52:08 2010
+++ /google-appengine/Rakefile Fri Sep 3 22:01:45 2010
@@ -16,10 +16,10 @@
s.description = s.summary = "Meta gem for Ruby on Google App Engine."
s.platform = Gem::Platform::RUBY
- s.add_dependency "appengine-apis", "0.0.18"
+ s.add_dependency "appengine-apis", "0.0.19"
s.add_dependency "appengine-rack", "0.0.11"
- s.add_dependency "appengine-sdk", "1.3.5"
- s.add_dependency "appengine-tools", "0.0.15"
+ s.add_dependency "appengine-sdk", "1.3.6"
+ s.add_dependency "appengine-tools", "0.0.16"
s.has_rdoc = false
s.require_paths = ['.']
s.files = ['google_appengine.rb']
=======================================
--- /google-appengine/google_appengine.rb Wed Jul 14 19:52:08 2010
+++ /google-appengine/google_appengine.rb Fri Sep 3 22:01:45 2010
@@ -18,5 +18,5 @@
require 'yaml'
module AppEngine
- VERSION = '0.0.15'
+ VERSION = '0.0.16'
end