engineyard-recipes 0.1.1 → 0.1.2

data/ChangeLog.md

@@ -12,4 +12,8 @@ Patches:
 
 ### v0.1.1
 
-* `clone` - When cloning a recipe folder, don't insert require_recipe if the folder doesn't have a recipe folder
+* `clone` - When cloning a recipe folder, don't insert require_recipe if the folder doesn't have a recipe folder
+
+### v0.1.2
+
+* `recipe` - can take --package/--version/--unmasked options

data/README.md

@@ -113,8 +113,8 @@ Also install ey-dnapi below.
 * ey-emerge - additional helpers to install/use masked packages [[repo](https://github.com/damm/ey-emerge)]
 
 ```
-$ git clone https://github.com/damm/ey-emerge.git /tmp/recipes/ey-emerge
-$ ey-recipes clone /tmp/recipes/ey-emerge -n emerge
+$ git clone https://github.com/engineyard/ey-cloud-recipes.git /tmp/recipes/ey-cloud-recipes
+$ ey-recipes clone /tmp/recipes/ey-cloud-recipes/cookbooks/emerge
 ```
 
 * ey-dnapi - access the internal dna.json metadata via `node[:engineyard]` [[repo](https://github.com/damm/ey-dnapi)]

data/features/generate-recipe.feature

@@ -33,7 +33,53 @@ Feature: Generate package recipe
          identical  cookbooks/new-component/recipes/install.rb
             append  cookbooks/main/recipes/default.rb
       """
-  
+
+  Scenario: Generate a new recipe for a specific package/version that is stable
+    When I run local executable "ey-recipes" with arguments "recipe gitosis -p dev-util/gitosis-gentoo -v 0.2_p20081028"
+    And file "cookbooks/gitosis/recipes/default.rb" is created
+    And file "cookbooks/gitosis/recipes/default.rb" contains "require_recipe 'gitosis::install'"
+    And file "cookbooks/gitosis/recipes/install.rb" is created
+    And file "cookbooks/gitosis/attributes/recipe.rb" is created
+    And file "cookbooks/gitosis/attributes/recipe.rb" contains "gitosis_version('0.2_p20081028')"
+    And file "cookbooks/gitosis/recipes/install.rb" contains
+    """
+    #
+    # Cookbook Name:: gitosis
+    # Recipe:: install
+    #
+
+    package 'dev-util/gitosis-gentoo' do
+      version node[:gitosis_version]
+      action :install
+    end
+
+    """    
+
+  Scenario: Generate a new recipe for a specific package/version that is masked
+    When I run local executable "ey-recipes" with arguments "recipe gitosis -p dev-util/gitosis-gentoo -v 0.2_p20081028 -u"
+    And file "cookbooks/gitosis/recipes/default.rb" is created
+    And file "cookbooks/gitosis/recipes/default.rb" contains "require_recipe 'gitosis::install'"
+    And file "cookbooks/gitosis/recipes/install.rb" is created
+    And file "cookbooks/gitosis/attributes/recipe.rb" is created
+    And file "cookbooks/gitosis/attributes/recipe.rb" contains "gitosis_version('0.2_p20081028')"
+    And file "cookbooks/gitosis/recipes/install.rb" contains
+    """
+    #
+    # Cookbook Name:: gitosis
+    # Recipe:: install
+    #
+
+    enable_package 'dev-util/gitosis-gentoo' do
+      version node[:gitosis_version]
+    end
+
+    package 'dev-util/gitosis-gentoo' do
+      version node[:gitosis_version]
+      action :install
+    end
+    
+    """    
+
   
   
   

data/features/step_definitions/common_steps.rb

@@ -104,6 +104,13 @@ Then /^file "([^"]*)" contains "([^"]*)"$/ do |file, text|
   end
 end
 
+Then /^file "([^"]*)" contains$/ do |file, text|
+  in_project_folder do
+    actual_output = File.read(file)
+    actual_output.should == text
+  end
+end
+
 Then /^file "([^"]*)" does not contain "([^"]*)"$/ do |file, text|
   in_project_folder do
     actual_output = File.read(file)

data/lib/engineyard-recipes/cli.rb

@@ -13,9 +13,16 @@ module Engineyard
       end
       
       desc "recipe RECIPE", "Generate recipe for a package"
+      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"
       def recipe(recipe_name)
+        package       = options["package"] || "UNKNOWN/#{recipe_name}"
+        version       = options["version"] || '1.0.0'
+        unmasked      = options["unmasked"] || false
+
         require 'engineyard-recipes/generators/recipe_generator'
-        Engineyard::Recipes::Generators::RecipeGenerator.start([recipe_name])
+        Engineyard::Recipes::Generators::RecipeGenerator.start([recipe_name, package, version, unmasked])
       end
       
       desc "definition RECIPE DEFINITION", "Generate recipe for a package"

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

@@ -6,6 +6,9 @@ module Engineyard::Recipes
       include Thor::Actions
       
       argument :recipe_name
+      argument :package
+      argument :version
+      argument :unmasked, :optional => true
 
       def self.source_root
         File.join(File.dirname(__FILE__), "recipe_generator", "templates")
@@ -30,6 +33,10 @@ module Engineyard::Recipes
       def say(msg, color = nil)
         color ? shell.say(msg, color) : shell.say(msg)
       end
+      
+      def known_package?
+        package =~ /UNKNOWN/
+      end
     end
   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('<%= version %>')

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

@@ -3,8 +3,20 @@
 # Recipe:: install
 #
 
-# package 'dev-something/<%= recipe_name %>' do
+<% unless known_package? -%>
+<% if unmasked -%>
+enable_package '<%= package %>' do
+  version node[:<%= recipe_name %>_version]
+end
+
+<% end -%>
+package '<%= package %>' do
+  version node[:<%= recipe_name %>_version]
+  action :install
+end
+<% else -%>
+# package '<%= package %>' do
 #   version node[:<%= recipe_name %>_version]
-# 
 #   action :install
 # end
+<% end -%>

data/lib/engineyard-recipes/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-recipes
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70281584606040 !ruby/object:Gem::Requirement
+  requirement: &70215351196580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70281584606040
+  version_requirements: *70215351196580
 - !ruby/object:Gem::Dependency
   name: engineyard
-  requirement: &70281584605520 !ruby/object:Gem::Requirement
+  requirement: &70215351193640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *70281584605520
+  version_requirements: *70215351193640
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70281584604980 !ruby/object:Gem::Requirement
+  requirement: &70215351191920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70281584604980
+  version_requirements: *70215351191920
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70281584604440 !ruby/object:Gem::Requirement
+  requirement: &70215351184680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *70281584604440
+  version_requirements: *70215351184680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70281584603860 !ruby/object:Gem::Requirement
+  requirement: &70215351164040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70281584603860
+  version_requirements: *70215351164040
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70281584603300 !ruby/object:Gem::Requirement
+  requirement: &70215351162720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70281584603300
+  version_requirements: *70215351162720
 description: Tools to generate, upload, test and apply chef recipes for Engine Yard
   Cloud.
 email:
@@ -141,7 +141,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1913390095989605023
+      hash: -3417918562051362064
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1913390095989605023
+      hash: -3417918562051362064
 requirements: []
 rubyforge_project: engineyard-recipes
 rubygems_version: 1.8.6