engineyard-recipes 0.2.0 → 0.3.0

data/ChangeLog.md

@@ -1,5 +1,10 @@
 # ChangeLog
 
+## v0.3.pre
+
+* `--local` (clone, recipes, definitions) - generates into local path instead of cookbooks/ subfolder; useful for developing dedicated recipe repositories instead of an entire cookbook; ignores cookbooks/main/recipes/default.rb
+* `init -d` - enables "run chef during deploy". Cookbooks generated into `deploy/cookbooks/` instead of `cookbooks/`
+
 ## v0.2
 
 Timezones & SM Extensions

data/README.md

@@ -20,6 +20,17 @@ $ ey-recipes clone /tmp/recipes/ey-dnapi
 $ ey recipes upload --apply
 ```
 
+Alternately, you can have chef recipes run during deployment rather than by explicitly running them:
+
+```
+$ cd /path/to/my/app
+$ ey-recipes init -d
+$ ey-recipes recipe somepackage
+
+# then deploy to apply recipes
+$ ey deploy
+```
+
 ## Usage
 
 Getting started:
@@ -32,6 +43,25 @@ $ ey-recipes init
     create  cookbooks/main/libraries/ruby_block.rb
     create  cookbooks/main/libraries/run_for_app.rb
     create  cookbooks/main/recipes/default.rb
+
+$ ey recipes upload
+$ ey recipes apply
+```
+
+The `-d` or `--on-deploy` flag will setup your application to run recipes during each deployment.
+
+```
+$ cd /path/to/my/app
+$ ey-recipes init --on-deploy
+    create  deploy/before_migrate.rb
+    create  deploy/solo.rb
+    create  deploy/cookbooks/main/attributes/recipe.rb
+    create  deploy/cookbooks/main/definitions/ey_cloud_report.rb
+    create  deploy/cookbooks/main/libraries/ruby_block.rb
+    create  deploy/cookbooks/main/libraries/run_for_app.rb
+    create  deploy/cookbooks/main/recipes/default.rb
+
+$ ey deploy
 ```
 
 Quickly generate recipes from git repositories or local folders. See bottom of README for community examples.

data/features/clone-recipe.feature

@@ -34,18 +34,18 @@ Feature: Clone recipe from git repositories
             append  cookbooks/main/recipes/default.rb
       """
 
-  Scenario: Clone recipe repo, do not auto-require if no recipe
-    Given I am have a local recipe "library" at "/tmp/ey-recipes/library"
-    When I run local executable "ey-recipes" with arguments "clone /tmp/ey-recipes/library"
-    Then file "cookbooks/library/libraries/mylib.rb" is created
-    And file "cookbooks/main/recipes/default.rb" does not contain "require_recipe 'library'"
+  Scenario: Clone a single recipe from a local folder into local folder instead of in cookbooks/
+    Given I am have a local recipe "blank" at "/tmp/ey-recipes/blank"
+    When I run local executable "ey-recipes" with arguments "clone /tmp/ey-recipes/blank --local"
+    Then file "blank/README.rdoc" is created
+    And file "blank/README.rdoc" contains "This is a local recipe"
     And I should see exactly
       """
-             exist  cookbooks
-            create  cookbooks/library/README.rdoc
-            create  cookbooks/library/libraries/mylib.rb
+             exist  
+            create  blank/README.rdoc
+            create  blank/recipes/default.rb
       """
-  
+
   Scenario: Clone URI is an unknown local path
     When I run local executable "ey-recipes" with arguments "clone /tmp/ey-recipes/UNKNOWN"
     And I should see exactly

data/features/generate-helper-definitions.feature

@@ -25,5 +25,13 @@ Feature: Generate helper definitions recipe
             create  cookbooks/mylibrary/definitions/helper2.rb
       """
   
-  
-  
+  Scenario: Generate a new recipe into local folder instead of in cookbooks/
+    When I run local executable "ey-recipes" with arguments "definition mylibrary helper1 --local"
+    And file "mylibrary/definitions/helper1.rb" is created
+    And file "mylibrary/definitions/helper1.rb" contains "define :helper1 do"
+    And I should see exactly
+      """
+             exist  
+            create  mylibrary/definitions/helper1.rb
+      """
+

data/features/{generate-recipe.feature → generate-recipe-in-cookbook.feature}

@@ -1,4 +1,4 @@
-Feature: Generate package recipe
+Feature: Generate package recipe into cookbook
   I want to generate a new chef recipe for a package
   And it is automatically included in the main recipe/run
   
@@ -82,6 +82,18 @@ Feature: Generate package recipe
     
     """    
 
-  
-  
-  
+  Scenario: Generate a new recipe into local folder instead of in cookbooks/
+    When I run local executable "ey-recipes" with arguments "recipe component --local"
+    And file "component/recipes/default.rb" is created
+    And file "component/recipes/default.rb" contains "require_recipe 'component::install'"
+    And file "component/recipes/install.rb" is created
+    And file "component/attributes/recipe.rb" is created
+    And file "component/attributes/recipe.rb" contains "# component_version('1.0.0')"
+    And I should see exactly
+      """
+             exist  
+            create  component/attributes/recipe.rb
+            create  component/recipes/default.rb
+            create  component/recipes/install.rb
+      """
+

data/features/init-new-cookbook.feature

@@ -14,3 +14,21 @@ Feature: Generate a new custom cookbook for your EY Cloud environments
             create  cookbooks/main/libraries/run_for_app.rb
             create  cookbooks/main/recipes/default.rb
       """
+
+  Scenario: Run cookbooks during deployments
+    Given I am in the "rails" project folder
+    When I run local executable "ey-recipes" with arguments "init -d"
+    And file "deploy/before_migrate.rb" is created
+    And file "deploy/cookbooks/main/recipes/default.rb" is created
+    And I should see exactly
+      """
+            create  deploy
+            create  deploy/before_migrate.rb
+            create  deploy/solo.rb
+            create  deploy/cookbooks
+            create  deploy/cookbooks/main/attributes/recipe.rb
+            create  deploy/cookbooks/main/definitions/ey_cloud_report.rb
+            create  deploy/cookbooks/main/libraries/ruby_block.rb
+            create  deploy/cookbooks/main/libraries/run_for_app.rb
+            create  deploy/cookbooks/main/recipes/default.rb
+      """

data/features/timezone_override.feature

@@ -3,9 +3,9 @@ Feature: Timezone override
   
   Background:
     Given I am in the "rails" project folder
-    When I run local executable "ey-recipes" with arguments "init"
     
   Scenario: Set the timezone I want
+    When I run local executable "ey-recipes" with arguments "init"
     When I run local executable "ey-recipes" with arguments "timezone Australia/Tasmania"
     Then file "cookbooks/timezone-override/recipes/default.rb" contains
       """
@@ -33,8 +33,22 @@ Feature: Timezone override
             create  cookbooks/timezone-override/recipes/default.rb
             append  cookbooks/main/recipes/default.rb
       """
+
+  Scenario: Set timezone into deploy/cookbooks/ rather than cookbooks/
+    When I run local executable "ey-recipes" with arguments "init -d"
+    When I run local executable "ey-recipes" with arguments "timezone Australia/Tasmania"
+    Then file "deploy/cookbooks/main/recipes/default.rb" contains "require_recipe 'timezone-override'"
+    And I should see exactly
+      """
+             exist  deploy/cookbooks
+            create  deploy/cookbooks/timezone-override/recipes/default.rb
+            append  deploy/cookbooks/main/recipes/default.rb
+      """
+  
+  
   
   Scenario: Cannot set an invalid timezone
+    When I run local executable "ey-recipes" with arguments "init"
     When I run local executable "ey-recipes" with arguments "timezone XXXX"
     And file "cookbooks/main/recipes/default.rb" does not contain "require_recipe 'timezone-override'"
     And I should see exactly

data/lib/engineyard-recipes/cli.rb

@@ -1,16 +1,20 @@
 require 'thor'
 require 'engineyard-recipes/thor-ext/actions/directory'
 require 'engineyard-recipes/fetch_uri'
+require 'engineyard-recipes/generators/base_generator'
 
 module Engineyard
   module Recipes
     class CLI < Thor
 
       desc "init", "Creates cookbooks scaffolding for your recipes"
+      method_option :"on-deploy", :aliases => ['-d'], :type => :boolean, :desc => "Run recipes during deployment"
       method_option :sm, :type => :boolean, :desc => "Also install SM framework support"
       def init
+        on_deploy = options["on-deploy"] || false
+        
         require 'engineyard-recipes/generators/init_generator'
-        Engineyard::Recipes::Generators::InitGenerator.start
+        Engineyard::Recipes::Generators::InitGenerator.start([on_deploy])
         init_sm if options[:sm]
       end
       
@@ -24,19 +28,26 @@ module Engineyard
       method_option :package, :aliases => ['-p'], :desc => "Gentoo package name, e.g. dev-util/gitosis-gentoo"
       method_option :version, :aliases => ['-v'], :desc => "Gentoo package version, e.g. 0.2_p20081028"
       method_options %w( unmasked -u ) => :boolean, :desc => "Unmask the required gentoo package"
+      method_option :local, :aliases => ['-l'], :type => :boolean, :desc => "Generate into local folder, instead of cookbooks/RECIPE_NAME"
       def recipe(recipe_name)
-        package       = options["package"] || "UNKNOWN/#{recipe_name}"
-        version       = options["version"] || '1.0.0'
-        unmasked      = options["unmasked"] || false
-
+        package  = options["package"] || "UNKNOWN/#{recipe_name}"
+        version  = options["version"] || '1.0.0'
+        unmasked = options["unmasked"] || false
+        local    = options["local"] || false
+        
         require 'engineyard-recipes/generators/recipe_generator'
-        Engineyard::Recipes::Generators::RecipeGenerator.start([recipe_name, package, version, unmasked])
+        Engineyard::Recipes::Generators::RecipeGenerator.start([
+          recipe_name, package, version, {:unmasked => unmasked, :local => local}
+        ])
       end
       
       desc "definition RECIPE DEFINITION", "Generate recipe for a package"
+      method_option :local, :aliases => ['-l'], :type => :boolean, :desc => "Generate into local folder, instead of cookbooks/RECIPE_NAME"
       def definition(recipe_name, definition_name)
+        local = options["local"] || false
+
         require 'engineyard-recipes/generators/definition_generator'
-        Engineyard::Recipes::Generators::DefinitionGenerator.start([recipe_name, definition_name])
+        Engineyard::Recipes::Generators::DefinitionGenerator.start([recipe_name, definition_name, {:local => local}])
       end
       
       desc "timezone TIMEZONE", "Generate recipe to set the timezone"
@@ -49,11 +60,15 @@ module Engineyard
       
       desc "clone URI", "Clone a recipe into cookbook. URI can be git or local path."
       method_option :name, :aliases => ['-n'], :desc => "Specify name of recipe. Defaults to base name."
+      method_option :local, :aliases => ['-l'], :type => :boolean, :desc => "Generate into local folder, instead of cookbooks/RECIPE_NAME"
       def clone(folder_path) # TODO support git URIs
+        local = options["local"] || false
+
         require 'engineyard-recipes/generators/local_recipe_clone_generator'
         generator = Engineyard::Recipes::Generators::LocalRecipeCloneGenerator
-        local_cookbook_path, recipe_name = FetchUri.fetch_recipe(folder_path, generator.source_root, options["name"])
-        generator.start([recipe_name])
+        _, recipe_name = FetchUri.fetch_recipe(folder_path, generator.source_root, options["name"])
+        generator.start([recipe_name, {:local => local}])
+        
       rescue Engineyard::Recipes::FetchUri::UnknownPath => e
         error "No recipe found at #{e.message}"
       end

data/lib/engineyard-recipes/generators/base_generator.rb

@@ -0,0 +1,32 @@
+require 'thor/group'
+
+module Engineyard::Recipes
+  module Generators
+    class BaseGenerator < Thor::Group
+      include Thor::Actions
+
+      protected
+      def cookbooks_destination
+        @cookbooks_destination ||= begin
+          return "." if self.respond_to?(:flags) && flags[:local] # check for bonus --local flag in CLI
+          possible_paths = ['deploy/cookbooks', 'cookbooks']
+          destination = possible_paths.find do |cookbooks|
+            Dir.exist?(File.join(destination_root, cookbooks))
+          end
+          unless destination
+            error "Cannot discover cookbooks folder"
+          end
+          destination
+        end
+      end
+      
+      def cookbooks_dir(child_path)
+        File.join(cookbooks_destination, child_path)
+      end
+      
+      def say(msg, color = nil)
+        color ? shell.say(msg, color) : shell.say(msg)
+      end
+    end
+  end
+end

data/lib/engineyard-recipes/generators/definition_generator.rb

@@ -2,24 +2,22 @@ require 'thor/group'
 
 module Engineyard::Recipes
   module Generators
-    class DefinitionGenerator < Thor::Group
+    class DefinitionGenerator < BaseGenerator
       include Thor::Actions
       
       argument :recipe_name
       argument :definition_name
+      argument :flags, :type => :hash
 
       def self.source_root
         File.join(File.dirname(__FILE__), "definition_generator", "templates")
       end
       
       def install_cookbooks
-        directory "cookbooks"
+        directory "cookbooks", cookbooks_destination
       end
       
       private
-      def say(msg, color = nil)
-        color ? shell.say(msg, color) : shell.say(msg)
-      end
     end
   end
 end

data/lib/engineyard-recipes/generators/init_generator/templates/deploy/before_migrate.rb

@@ -0,0 +1,2 @@
+# Runs application cookbooks
+sudo "/usr/local/ey_resin/ruby/bin/chef-solo -c #{latest_release}/deploy/solo.rb -j /etc/chef/dna.json"

data/lib/engineyard-recipes/generators/init_generator/templates/deploy/solo.rb

@@ -0,0 +1,7 @@
+require 'dnapi'
+base_dir = File.dirname(__FILE__)
+
+file_store_path   base_dir
+file_cache_path   base_dir
+cookbook_path     "#{base_dir}/cookbooks"
+node_name         DNApi.from(File.read("/etc/chef/dna.json")).id

data/lib/engineyard-recipes/generators/init_generator.rb

@@ -2,23 +2,31 @@ require 'thor/group'
 
 module Engineyard::Recipes
   module Generators
-    class InitGenerator < Thor::Group
+    class InitGenerator < BaseGenerator
       include Thor::Actions
+
+      argument :on_deploy, :optional => true
       
       def self.source_root
         File.join(File.dirname(__FILE__), "init_generator", "templates")
       end
       
       def install_cookbooks
-        file       = "cookbooks/main/recipes/default.rb"
-        unless File.exists?(File.join(destination_root, "cookbooks/main/recipes/default.rb"))
-          directory "cookbooks"
+        if on_deploy
+          directory "deploy"
+        end
+        unless File.exists?(File.join(destination_root, "#{cookbooks_destination}/main/recipes/default.rb"))
+          directory "cookbooks", cookbooks_destination
         end
       end
       
-      private
-      def say(msg, color = nil)
-        color ? shell.say(msg, color) : shell.say(msg)
+      protected
+      def cookbooks_destination
+        if on_deploy
+          "deploy/cookbooks"
+        else
+          "cookbooks"
+        end
       end
     end
   end

data/lib/engineyard-recipes/generators/init_sm_generator.rb

@@ -2,7 +2,7 @@ require 'thor/group'
 
 module Engineyard::Recipes
   module Generators
-    class InitSmGenerator < Thor::Group
+    class InitSmGenerator < BaseGenerator
       include Thor::Actions
       
       def self.source_root
@@ -14,21 +14,12 @@ module Engineyard::Recipes
       end
       
       def auto_require_package
-        file = "cookbooks/main/recipes/default.rb"
-        file_path = File.join(destination_root, "cookbooks/main/recipes/default.rb")
-        unless File.exists?(file_path)
-          puts "Skipping auto-require of package recipe: #{file} is missing"
-        else
-          require_recipe = "\nrequire_recipe '#{recipe_name}'\n"
-          append_to_file file, require_recipe
-        end
-      end
-      
-      private
-      def say(msg, color = nil)
-        color ? shell.say(msg, color) : shell.say(msg)
+        file           = cookbooks_dir("main/recipes/default.rb")
+        require_recipe = "\nrequire_recipe '#{recipe_name}'\n"
+        append_to_file file, require_recipe
       end
       
+      private      
       def recipe_name
         'sm'
       end

data/lib/engineyard-recipes/generators/local_recipe_clone_generator.rb

@@ -2,33 +2,31 @@ require 'thor/group'
 
 module Engineyard::Recipes
   module Generators
-    class LocalRecipeCloneGenerator < Thor::Group
+    class LocalRecipeCloneGenerator < BaseGenerator
       include Thor::Actions
       
       argument :recipe_name
+      argument :flags, :type => :hash
 
       def self.source_root
         @tmpdir ||= Dir.mktmpdir
       end
       
       def install_cookbooks
-        directory "cookbooks"
+        directory "cookbooks", cookbooks_destination
       end
       
       def auto_require_package
-        file = "cookbooks/main/recipes/default.rb"
-        file_path = File.join(destination_root, "cookbooks/main/recipes/default.rb")
-        if !File.exists?(file_path)
-          puts "Skipping auto-require of package recipe: #{file} is missing"
-        elsif File.directory?(File.join(self.class.source_root, "cookbooks", recipe_name, "recipes"))
+        unless local?
+          file = cookbooks_dir "main/recipes/default.rb"
           require_recipe = "\nrequire_recipe '#{recipe_name}'\n"
           append_to_file file, require_recipe
         end
       end
       
       private
-      def say(msg, color = nil)
-        color ? shell.say(msg, color) : shell.say(msg)
+      def local?
+        flags[:local]
       end
     end
   end

data/lib/engineyard-recipes/generators/recipe_generator.rb

@@ -2,41 +2,42 @@ require 'thor/group'
 
 module Engineyard::Recipes
   module Generators
-    class RecipeGenerator < Thor::Group
+    class RecipeGenerator < BaseGenerator
       include Thor::Actions
       
       argument :recipe_name
       argument :package
       argument :version
-      argument :unmasked, :optional => true
+      argument :flags, :type => :hash # :unmasked & :local
 
       def self.source_root
         File.join(File.dirname(__FILE__), "recipe_generator", "templates")
       end
       
       def install_cookbooks
-        directory "cookbooks"
+        directory "cookbooks", cookbooks_destination
       end
       
       def auto_require_package
-        file = "cookbooks/main/recipes/default.rb"
-        file_path = File.join(destination_root, "cookbooks/main/recipes/default.rb")
-        unless File.exists?(file_path)
-          puts "Skipping auto-require of package recipe: #{file} is missing"
-        else
+        unless local?
+          file           = cookbooks_dir "main/recipes/default.rb"
           require_recipe = "\nrequire_recipe '#{recipe_name}'\n"
           append_to_file file, require_recipe
         end
       end
       
       private
-      def say(msg, color = nil)
-        color ? shell.say(msg, color) : shell.say(msg)
-      end
-      
       def known_package?
         package =~ /UNKNOWN/
       end
+      
+      def local?
+        flags[:local]
+      end
+      
+      def unmasked
+        flags[:unmasked]
+      end
     end
   end
 end

data/lib/engineyard-recipes/generators/sm_generator.rb

@@ -2,7 +2,7 @@ require 'thor/group'
 
 module Engineyard::Recipes
   module Generators
-    class SmGenerator < Thor::Group
+    class SmGenerator < BaseGenerator
       include Thor::Actions
       attr_accessor :command
       
@@ -16,27 +16,22 @@ module Engineyard::Recipes
       end
       
       def install_cookbooks
-        directory "cookbooks"
+        directory "cookbooks", cookbooks_destination
       end
       
       def wrap_commands
         template_file = 'command_recipe.rb.tt'
         sm_ext_commands.each do |command|
           self.command = command # for the template
-          recipe = "cookbooks/#{recipe_name}/recipes/#{command}.rb"
+          recipe = cookbooks_dir "#{recipe_name}/recipes/#{command}.rb"
           template(template_file, recipe)
         end
       end
       
       def auto_require_package
-        file = "cookbooks/main/recipes/default.rb"
-        file_path = File.join(destination_root, "cookbooks/main/recipes/default.rb")
-        unless File.exists?(file_path)
-          puts "Skipping auto-require of package recipe: #{file} is missing"
-        else
-          require_recipe = "\nrequire_recipe '#{recipe_name}'\n"
-          append_to_file file, require_recipe
-        end
+        file = cookbooks_dir "main/recipes/default.rb"
+        require_recipe = "\nrequire_recipe '#{recipe_name}'\n"
+        append_to_file file, require_recipe
       end
       
       private

data/lib/engineyard-recipes/generators/timezone_generator.rb

@@ -2,7 +2,7 @@ require 'thor/group'
 
 module Engineyard::Recipes
   module Generators
-    class TimezoneGenerator < Thor::Group
+    class TimezoneGenerator < BaseGenerator
       include Thor::Actions
       class InvalidTimezone < StandardError; end
       
@@ -17,18 +17,13 @@ module Engineyard::Recipes
       end
       
       def install_cookbooks
-        directory "cookbooks"
+        directory "cookbooks", cookbooks_destination
       end
 
       def auto_require_package
-        file = "cookbooks/main/recipes/default.rb"
-        file_path = File.join(destination_root, "cookbooks/main/recipes/default.rb")
-        unless File.exists?(file_path)
-          puts "Skipping auto-require of package recipe: #{file} is missing"
-        else
-          require_recipe = "\nrequire_recipe '#{recipe_name}'\n"
-          append_to_file file, require_recipe
-        end
+        file = cookbooks_dir "main/recipes/default.rb"
+        require_recipe = "\nrequire_recipe '#{recipe_name}'\n"
+        append_to_file file, require_recipe
       end
       
       protected

data/lib/engineyard-recipes/version.rb

@@ -1,5 +1,5 @@
 module Engineyard
   module Recipes
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-recipes
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-01 00:00:00.000000000 Z
+date: 2012-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70249305163460 !ruby/object:Gem::Requirement
+  requirement: &70245634380360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70249305163460
+  version_requirements: *70245634380360
 - !ruby/object:Gem::Dependency
   name: engineyard
-  requirement: &70249305162760 !ruby/object:Gem::Requirement
+  requirement: &70245634379840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *70249305162760
+  version_requirements: *70245634379840
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70249305162080 !ruby/object:Gem::Requirement
+  requirement: &70245634379360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70249305162080
+  version_requirements: *70245634379360
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70249305177800 !ruby/object:Gem::Requirement
+  requirement: &70245634378880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *70249305177800
+  version_requirements: *70245634378880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70249305176900 !ruby/object:Gem::Requirement
+  requirement: &70245634378400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70249305176900
+  version_requirements: *70245634378400
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70249305176100 !ruby/object:Gem::Requirement
+  requirement: &70245634385960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70249305176100
+  version_requirements: *70245634385960
 description: Tools to generate, upload, test and apply chef recipes for Engine Yard
   Cloud.
 email:
@@ -97,7 +97,7 @@ files:
 - engineyard-recipes.gemspec
 - features/clone-recipe.feature
 - features/generate-helper-definitions.feature
-- features/generate-recipe.feature
+- features/generate-recipe-in-cookbook.feature
 - features/init-new-cookbook.feature
 - features/init-sm-framework.feature
 - features/step_definitions/api_steps.rb
@@ -117,6 +117,7 @@ files:
 - lib/engineyard-recipes.rb
 - lib/engineyard-recipes/cli.rb
 - lib/engineyard-recipes/fetch_uri.rb
+- lib/engineyard-recipes/generators/base_generator.rb
 - lib/engineyard-recipes/generators/definition_generator.rb
 - lib/engineyard-recipes/generators/definition_generator/templates/cookbooks/%recipe_name%/definitions/%definition_name%.rb.tt
 - lib/engineyard-recipes/generators/init_generator.rb
@@ -125,6 +126,8 @@ files:
 - lib/engineyard-recipes/generators/init_generator/templates/cookbooks/main/libraries/ruby_block.rb
 - lib/engineyard-recipes/generators/init_generator/templates/cookbooks/main/libraries/run_for_app.rb
 - lib/engineyard-recipes/generators/init_generator/templates/cookbooks/main/recipes/default.rb
+- lib/engineyard-recipes/generators/init_generator/templates/deploy/before_migrate.rb
+- lib/engineyard-recipes/generators/init_generator/templates/deploy/solo.rb
 - lib/engineyard-recipes/generators/init_sm_generator.rb
 - lib/engineyard-recipes/generators/init_sm_generator/templates/cookbooks/sm/attributes/recipe.rb
 - lib/engineyard-recipes/generators/init_sm_generator/templates/cookbooks/sm/recipes/default.rb
@@ -160,22 +163,28 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2456091498518849486
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2456091498518849486
 requirements: []
 rubyforge_project: engineyard-recipes
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Tools to generate, upload, test and apply chef recipes for Engine Yard Cloud.
 test_files:
 - features/clone-recipe.feature
 - features/generate-helper-definitions.feature
-- features/generate-recipe.feature
+- features/generate-recipe-in-cookbook.feature
 - features/init-new-cookbook.feature
 - features/init-sm-framework.feature
 - features/step_definitions/api_steps.rb