appengine-tools 0.0.15 → 0.0.16

data/Rakefile

@@ -6,7 +6,7 @@ require 'spec/rake/spectask'
 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'

data/lib/appengine-tools/bundler.rb

@@ -64,6 +64,10 @@ module AppEngine
       end
 
       def app_yaml
+        path('WEB-INF', 'app.yaml')
+      end
+
+      def old_yaml
         path('app.yaml')
       end
 
@@ -120,6 +124,20 @@ module AppEngine
       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."

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 15
-  version: 0.0.15
+  - 16
+  version: 0.0.16
 platform: ruby
 authors: 
 - Ryan Brown
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-14 00:00:00 -07:00
+date: 2010-09-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency