bundler.rb in appengine-tools-0.0.16

- old
+ new

@@ -62,10 +62,14 @@
       def config_ru
         path('config.ru')
       end
 
       def app_yaml
+        path('WEB-INF', 'app.yaml')
+      end
+
+      def old_yaml
         path('app.yaml')
       end
 
       def bundled_jars
         path('WEB-INF', 'appengine-generated', 'bundled_jars.yaml')
@@ -118,9 +122,23 @@
       def app
         @app
       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."
           puts "You need to create #{app.app_yaml}."
           puts ""