engineyard-recipes 0.1.0 → 0.1.1

data/ChangeLog.md

@@ -8,3 +8,8 @@ Initial set of commands:
 * `recipe` - generate a scaffold for a new recipe
 * `definition` - generate a scaffold for a helper definition
 
+Patches:
+
+### v0.1.1
+
+* `clone` - When cloning a recipe folder, don't insert require_recipe if the folder doesn't have a recipe folder

data/features/clone-recipe.feature

@@ -16,6 +16,7 @@ Feature: Clone recipe from git repositories
       """
              exist  cookbooks
             create  cookbooks/blank/README.rdoc
+            create  cookbooks/blank/recipes/default.rb
             append  cookbooks/main/recipes/default.rb
       """
 
@@ -29,9 +30,22 @@ Feature: Clone recipe from git repositories
       """
              exist  cookbooks
             create  cookbooks/myrecipe/README.rdoc
+            create  cookbooks/myrecipe/recipes/default.rb
             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'"
+    And I should see exactly
+      """
+             exist  cookbooks
+            create  cookbooks/library/README.rdoc
+            create  cookbooks/library/libraries/mylib.rb
+      """
+  
   @wip
   Scenario: Clone a recipe from engineyard/ey-cloud-recipes repository
     Given I am have a local recipe "blank" at "/tmp/ey-recipes/blank"

data/features/step_definitions/common_steps.rb

@@ -104,6 +104,14 @@ Then /^file "([^"]*)" contains "([^"]*)"$/ do |file, text|
   end
 end
 
+Then /^file "([^"]*)" does not contain "([^"]*)"$/ do |file, text|
+  in_project_folder do
+    actual_output = File.read(file)
+    actual_output.should_not contain(text)
+  end
+end
+
+
 
 Then /gem file "(.*)" and generated file "(.*)" should be the same/ do |gem_file, project_file|
   File.exists?(gem_file).should be_true

data/features/support/env.rb

@@ -10,9 +10,11 @@ Before do
   @home_path     = File.expand_path(File.join(@tmp_root, "home"))
   @lib_path      = File.expand_path(File.dirname(__FILE__) + "/../../lib")
   @fixtures_path = File.expand_path(File.dirname(__FILE__) + "/../../fixtures")
-  @tmp_recipes_path = "/tmp/ey-recipes"
   FileUtils.rm_rf   @tmp_root
   FileUtils.mkdir_p @home_path
+  @tmp_recipes_path = "/tmp/ey-recipes"
+  FileUtils.rm_rf   @tmp_recipes_path
+  FileUtils.mkdir_p @tmp_recipes_path
   ENV['HOME'] = @home_path
   fixture_bin_path = File.expand_path('../../../fixtures/bin', __FILE__)
   ENV['PATH'] = fixture_bin_path + ":" + path

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

@@ -18,10 +18,10 @@ module Engineyard::Recipes
       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)
+        if !File.exists?(file_path)
           puts "Skipping auto-require of package recipe: #{file} is missing"
-        else
-          require_recipe = "require_recipe '#{recipe_name}'"
+        elsif File.directory?(File.join(self.class.source_root, "cookbooks", recipe_name, "recipes"))
+          require_recipe = "\nrequire_recipe '#{recipe_name}'\n"
           append_to_file file, require_recipe
         end
       end

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

@@ -21,7 +21,7 @@ module Engineyard::Recipes
         unless File.exists?(file_path)
           puts "Skipping auto-require of package recipe: #{file} is missing"
         else
-          require_recipe = "require_recipe '#{recipe_name}'"
+          require_recipe = "\nrequire_recipe '#{recipe_name}'\n"
           append_to_file file, require_recipe
         end
       end

data/lib/engineyard-recipes/generators/recipe_generator/templates/cookbooks/%recipe_name%/attributes/recipe.rb.tt

@@ -1 +1 @@
-<%= recipe_name %>_version('1.0.0')
+<%= recipe_name %>_version('1.0.0')

data/lib/engineyard-recipes/generators/recipe_generator/templates/cookbooks/%recipe_name%/recipes/default.rb.tt

@@ -2,4 +2,4 @@
 # Cookbook Name:: <%= recipe_name %>
 # Recipe:: default
 #
-require_recipe '<%= recipe_name %>::install'
+require_recipe '<%= recipe_name %>::install'

data/lib/engineyard-recipes/version.rb

@@ -1,5 +1,5 @@
 module Engineyard
   module Recipes
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-recipes
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-15 00:00:00.000000000Z
+date: 2011-11-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70096827738600 !ruby/object:Gem::Requirement
+  requirement: &70281584606040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70096827738600
+  version_requirements: *70281584606040
 - !ruby/object:Gem::Dependency
   name: engineyard
-  requirement: &70096827735860 !ruby/object:Gem::Requirement
+  requirement: &70281584605520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *70096827735860
+  version_requirements: *70281584605520
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70096827733600 !ruby/object:Gem::Requirement
+  requirement: &70281584604980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70096827733600
+  version_requirements: *70281584604980
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70096827730720 !ruby/object:Gem::Requirement
+  requirement: &70281584604440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *70096827730720
+  version_requirements: *70281584604440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70096827722540 !ruby/object:Gem::Requirement
+  requirement: &70281584603860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70096827722540
+  version_requirements: *70281584603860
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70096827719420 !ruby/object:Gem::Requirement
+  requirement: &70281584603300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70096827719420
+  version_requirements: *70281584603300
 description: Tools to generate, upload, test and apply chef recipes for Engine Yard
   Cloud.
 email:
@@ -107,6 +107,7 @@ files:
 - fixtures/projects/rails/Gemfile
 - fixtures/projects/rails/Rakefile
 - fixtures/recipes/blank/README.rdoc
+- fixtures/recipes/blank/recipes/default.rb
 - lib/engineyard-recipes.rb
 - lib/engineyard-recipes/cli.rb
 - lib/engineyard-recipes/fetch_uri.rb
@@ -140,7 +141,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1147243042889159238
+      hash: -1913390095989605023
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -149,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1147243042889159238
+      hash: -1913390095989605023
 requirements: []
 rubyforge_project: engineyard-recipes
 rubygems_version: 1.8.6