engineyard-recipes 0.3.0 → 0.3.2.pre

data/ChangeLog.md

@@ -1,10 +1,20 @@
 # ChangeLog
 
-## v0.3.pre
+## v0.3
 
 * `--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/`
 
+Patches:
+
+### v0.3.1
+
+* Fixed ruby 1.8 bug - Dir.exist? => File.directory?
+
+### v0.3.2
+
+* Fix `init-sm` to generate into `deploy/cookbooks` if its present
+
 ## v0.2
 
 Timezones & SM Extensions

data/features/init-sm-framework.feature

@@ -22,7 +22,23 @@ Feature: Setup your EY Cloud cookbook to use SM framework extensions
       # create  cookbooks/eyapi/recipes/default.rb
       # create  cookbooks/eyapi/recipes/install.rb
 
-  Scenario: Create new EY CLoud custom cookbooks with SM extensions
+  Scenario: Setup SM extensions within chef-on-deploy
+    Given I am in the "rails" project folder
+    When I run local executable "ey-recipes" with arguments "init --on-deploy"
+    When I run local executable "ey-recipes" with arguments "init-sm"
+    Then I should see exactly
+      """
+             exist  deploy/cookbooks
+            create  deploy/cookbooks/sm/attributes/recipe.rb
+            create  deploy/cookbooks/sm/recipes/default.rb
+            create  deploy/cookbooks/sm/recipes/install.rb
+            append  deploy/cookbooks/main/recipes/default.rb
+      """
+      # create  deploy/cookbooks/eyapi/attributes/recipe.rb
+      # create  deploy/cookbooks/eyapi/recipes/default.rb
+      # create  deploy/cookbooks/eyapi/recipes/install.rb
+
+  Scenario: Create new EY Cloud custom cookbooks with SM extensions
     Given I am in the "rails" project folder
     When I run local executable "ey-recipes" with arguments "init --sm"
     And I should see exactly

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

@@ -11,7 +11,7 @@ module Engineyard::Recipes
           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))
+            File.directory?(File.join(destination_root, cookbooks))
           end
           unless destination
             error "Cannot discover cookbooks folder"

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

@@ -10,7 +10,7 @@ module Engineyard::Recipes
       end
       
       def install_cookbooks
-        directory "cookbooks"
+        directory "cookbooks", cookbooks_destination
       end
       
       def auto_require_package

data/lib/engineyard-recipes/version.rb

@@ -1,5 +1,5 @@
 module Engineyard
   module Recipes
-    VERSION = "0.3.0"
+    VERSION = "0.3.2.pre"
   end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-recipes
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.3.2.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Dr Nic Williams
@@ -13,7 +13,7 @@ date: 2012-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70245634380360 !ruby/object:Gem::Requirement
+  requirement: &70232946389900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70245634380360
+  version_requirements: *70232946389900
 - !ruby/object:Gem::Dependency
   name: engineyard
-  requirement: &70245634379840 !ruby/object:Gem::Requirement
+  requirement: &70232946389360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *70245634379840
+  version_requirements: *70232946389360
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70245634379360 !ruby/object:Gem::Requirement
+  requirement: &70232946388840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70245634379360
+  version_requirements: *70232946388840
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70245634378880 !ruby/object:Gem::Requirement
+  requirement: &70232946388340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *70245634378880
+  version_requirements: *70232946388340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70245634378400 !ruby/object:Gem::Requirement
+  requirement: &70232946387860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70245634378400
+  version_requirements: *70232946387860
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70245634385960 !ruby/object:Gem::Requirement
+  requirement: &70232946387460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70245634385960
+  version_requirements: *70232946387460
 description: Tools to generate, upload, test and apply chef recipes for Engine Yard
   Cloud.
 email:
@@ -165,16 +165,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2456091498518849486
+      hash: -1423764606701020741
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -2456091498518849486
+      version: 1.3.1
 requirements: []
 rubyforge_project: engineyard-recipes
 rubygems_version: 1.8.17