engineyard-recipes 0.3.2 → 0.4.0

data/ChangeLog.md

@@ -1,5 +1,9 @@
 # ChangeLog
 
+## v0.4
+
+* `package` - renamed from `recipe`; bug fixes
+
 ## 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

data/README.md

@@ -11,7 +11,7 @@ Tools to generate, upload, test and apply chef recipes for Engine Yard Cloud.
 ```
 $ cd /path/to/my/app
 $ ey-recipes init   # initial scaffolding for cookbooks
-$ ey-recipes recipe somepackage
+$ ey-recipes package somepackage
 $ ey-recipes definition somehelpers specific_helper_method
 $ git clone git://github.com/damm/ey-dnapi.git /tmp/recipes/ey-dnapi
 $ ey-recipes clone /tmp/recipes/ey-dnapi
@@ -25,7 +25,7 @@ Alternately, you can have chef recipes run during deployment rather than by expl
 ```
 $ cd /path/to/my/app
 $ ey-recipes init -d
-$ ey-recipes recipe somepackage
+$ ey-recipes package somepackage
 
 # then deploy to apply recipes
 $ ey deploy
@@ -77,7 +77,7 @@ $ ey-recipes clone /tmp/recipes/ey-dnapi
 Generate scaffolding for a package/service.
 
 ```
-$ ey-recipes recipe newthing
+$ ey-recipes package newthing
     create  cookbooks/newthing/attributes/recipe.rb
     create  cookbooks/newthing/recipes/default.rb
     create  cookbooks/newthing/recipes/install.rb
@@ -87,7 +87,8 @@ $ ey-recipes recipe newthing
 Specify an explicit Gentoo package.
 
 ```
-$ ey-recipes recipe gitosis -p dev-util/gitosis-gentoo -v 0.2_p20081028
+$ ey-recipes package gitosis -p dev-util/gitosis-gentoo -v 0.2_p20081028
+$ ey-recipes package qt-webkit -p x11-libs/qt-webkit -v 4.4.2 -u
 ```
 
 To use a masked package, pass the `--unmasked/-u` flag, and install the `emerge` helper described below.

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

@@ -1,5 +1,5 @@
-Feature: Generate package recipe into cookbook
-  I want to generate a new chef recipe for a package
+Feature: Install a gentoo package
+  I want to generate a new chef recipe that will install a package
   And it is automatically included in the main recipe/run
   
   Background:
@@ -7,12 +7,12 @@ Feature: Generate package recipe into cookbook
     When I run local executable "ey-recipes" with arguments "init"
   
   Scenario: Generate a new recipe
-    When I run local executable "ey-recipes" with arguments "recipe new-component"
+    When I run local executable "ey-recipes" with arguments "package new-component"
     And file "cookbooks/new-component/recipes/default.rb" is created
     And file "cookbooks/new-component/recipes/default.rb" contains "require_recipe 'new-component::install'"
     And file "cookbooks/new-component/recipes/install.rb" is created
     And file "cookbooks/new-component/attributes/recipe.rb" is created
-    And file "cookbooks/new-component/attributes/recipe.rb" contains "# new-component_version('1.0.0')"
+    And file "cookbooks/new-component/attributes/recipe.rb" contains "# new_component_version('1.0.0')"
     And file "cookbooks/main/recipes/default.rb" contains "require_recipe 'new-component'"
     And I should see exactly
       """
@@ -24,8 +24,8 @@ Feature: Generate package recipe into cookbook
       """
   
   Scenario: Generate a recipe that already exists
-    When I run local executable "ey-recipes" with arguments "recipe new-component"
-    When I run local executable "ey-recipes" with arguments "recipe new-component"
+    When I run local executable "ey-recipes" with arguments "package new-component"
+    When I run local executable "ey-recipes" with arguments "package new-component"
     And I should see exactly
       """
              exist  cookbooks
@@ -36,7 +36,7 @@ Feature: Generate package recipe into cookbook
       """
 
   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"
+    When I run local executable "ey-recipes" with arguments "package 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
@@ -57,33 +57,36 @@ Feature: Generate package recipe into cookbook
     """    
 
   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/attributes/recipe.rb" does not contain "# gitosis_version('0.2_p20081028')"
-    And file "cookbooks/gitosis/recipes/install.rb" contains
+    When I run local executable "ey-recipes" with arguments "package qt-webkit -p x11-libs/qt-webkit -v 4.4.2 -u"
+    And file "cookbooks/qt-webkit/recipes/default.rb" is created
+    And file "cookbooks/qt-webkit/recipes/default.rb" contains "require_recipe 'qt-webkit::install'"
+    And file "cookbooks/qt-webkit/recipes/install.rb" is created
+    And file "cookbooks/qt-webkit/attributes/recipe.rb" is created
+    And file "cookbooks/qt-webkit/attributes/recipe.rb" contains
+    """
+    qt_webkit_version('4.4.2')
+  
+    """    
+    And file "cookbooks/qt-webkit/recipes/install.rb" contains
     """
     #
-    # Cookbook Name:: gitosis
+    # Cookbook Name:: qt-webkit
     # Recipe:: install
     #
 
-    enable_package 'dev-util/gitosis-gentoo' do
-      version node[:gitosis_version]
+    enable_package 'x11-libs/qt-webkit' do
+      version node[:qt_webkit_version]
     end
 
-    package 'dev-util/gitosis-gentoo' do
-      version node[:gitosis_version]
+    package 'x11-libs/qt-webkit' do
+      version node[:qt_webkit_version]
       action :install
     end
-    
+
     """    
 
   Scenario: Generate a new recipe into local folder instead of in cookbooks/
-    When I run local executable "ey-recipes" with arguments "recipe component --local"
+    When I run local executable "ey-recipes" with arguments "package 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

data/lib/engineyard-recipes/cli.rb

@@ -24,19 +24,19 @@ module Engineyard
         Engineyard::Recipes::Generators::InitSmGenerator.start
       end
       
-      desc "recipe RECIPE", "Generate recipe for a package"
+      desc "package PACKAGE", "Install a gentoo ebuild 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"
       method_option :local, :aliases => ['-l'], :type => :boolean, :desc => "Generate into local folder, instead of cookbooks/RECIPE_NAME"
-      def recipe(recipe_name)
+      def package(recipe_name)
         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([
+        require 'engineyard-recipes/generators/package_generator'
+        Engineyard::Recipes::Generators::PackageGenerator.start([
           recipe_name, package, version, {:unmasked => unmasked, :local => local}
         ])
       end

data/lib/engineyard-recipes/generators/{recipe_generator.rb → package_generator.rb}

@@ -2,7 +2,7 @@ require 'thor/group'
 
 module Engineyard::Recipes
   module Generators
-    class RecipeGenerator < BaseGenerator
+    class PackageGenerator < BaseGenerator
       include Thor::Actions
       
       argument :recipe_name
@@ -11,7 +11,7 @@ module Engineyard::Recipes
       argument :flags, :type => :hash # :unmasked & :local
 
       def self.source_root
-        File.join(File.dirname(__FILE__), "recipe_generator", "templates")
+        File.join(File.dirname(__FILE__), "package_generator", "templates")
       end
       
       def install_cookbooks
@@ -26,7 +26,11 @@ module Engineyard::Recipes
         end
       end
       
-      private
+      protected
+      def recipe_name_variable_name
+        @recipe_name_variable_name ||= recipe_name.gsub(/\W+/, '_')
+      end
+      
       def known_package?
         package =~ /UNKNOWN/
       end

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

@@ -0,0 +1,5 @@
+<% unless known_package? -%>
+<%= recipe_name_variable_name %>_version('<%= version %>')
+<% else -%>
+# <%= recipe_name_variable_name %>_version('<%= version %>')
+<% end %>

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

@@ -6,17 +6,17 @@
 <% unless known_package? -%>
 <% if unmasked -%>
 enable_package '<%= package %>' do
-  version node[:<%= recipe_name %>_version]
+  version node[:<%= recipe_name_variable_name %>_version]
 end
 
 <% end -%>
 package '<%= package %>' do
-  version node[:<%= recipe_name %>_version]
+  version node[:<%= recipe_name_variable_name %>_version]
   action :install
 end
 <% else -%>
 # package '<%= package %>' do
-#   version node[:<%= recipe_name %>_version]
+#   version node[:<%= recipe_name_variable_name %>_version]
 #   action :install
 # end
 <% end -%>

data/lib/engineyard-recipes/version.rb

@@ -1,5 +1,5 @@
 module Engineyard
   module Recipes
-    VERSION = "0.3.2"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-recipes
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-10 00:00:00.000000000 Z
+date: 2012-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70105552905900 !ruby/object:Gem::Requirement
+  requirement: &70236150882240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70105552905900
+  version_requirements: *70236150882240
 - !ruby/object:Gem::Dependency
   name: engineyard
-  requirement: &70105552905220 !ruby/object:Gem::Requirement
+  requirement: &70236150881400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *70105552905220
+  version_requirements: *70236150881400
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70105552904740 !ruby/object:Gem::Requirement
+  requirement: &70236150880580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70105552904740
+  version_requirements: *70236150880580
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70105552904260 !ruby/object:Gem::Requirement
+  requirement: &70236150879640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *70105552904260
+  version_requirements: *70236150879640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70105552903780 !ruby/object:Gem::Requirement
+  requirement: &70236150878820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70105552903780
+  version_requirements: *70236150878820
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70105552903400 !ruby/object:Gem::Requirement
+  requirement: &70236150877960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70105552903400
+  version_requirements: *70236150877960
 description: Tools to generate, upload, test and apply chef recipes for Engine Yard
   Cloud.
 email:
@@ -97,9 +97,9 @@ files:
 - engineyard-recipes.gemspec
 - features/clone-recipe.feature
 - features/generate-helper-definitions.feature
-- features/generate-recipe-in-cookbook.feature
 - features/init-new-cookbook.feature
 - features/init-sm-framework.feature
+- features/install-package.feature
 - features/step_definitions/api_steps.rb
 - features/step_definitions/common_steps.rb
 - features/step_definitions/fixture_project_steps.rb
@@ -134,10 +134,10 @@ files:
 - lib/engineyard-recipes/generators/init_sm_generator/templates/cookbooks/sm/recipes/install.rb
 - lib/engineyard-recipes/generators/local_recipe_clone_generator.rb
 - lib/engineyard-recipes/generators/local_recipe_clone_generator/templates/cookbooks/%recipe_name%/definitions/%definition_name%.rb.tt
-- lib/engineyard-recipes/generators/recipe_generator.rb
-- lib/engineyard-recipes/generators/recipe_generator/templates/cookbooks/%recipe_name%/attributes/recipe.rb.tt
-- lib/engineyard-recipes/generators/recipe_generator/templates/cookbooks/%recipe_name%/recipes/default.rb.tt
-- lib/engineyard-recipes/generators/recipe_generator/templates/cookbooks/%recipe_name%/recipes/install.rb.tt
+- lib/engineyard-recipes/generators/package_generator.rb
+- lib/engineyard-recipes/generators/package_generator/templates/cookbooks/%recipe_name%/attributes/recipe.rb.tt
+- lib/engineyard-recipes/generators/package_generator/templates/cookbooks/%recipe_name%/recipes/default.rb.tt
+- lib/engineyard-recipes/generators/package_generator/templates/cookbooks/%recipe_name%/recipes/install.rb.tt
 - lib/engineyard-recipes/generators/sm_generator.rb
 - lib/engineyard-recipes/generators/sm_generator/templates/command_recipe.rb.tt
 - lib/engineyard-recipes/generators/sm_generator/templates/cookbooks/%recipe_name%/attributes/recipe.rb.tt
@@ -165,7 +165,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2804550849415327961
+      hash: 979474682271499265
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2804550849415327961
+      hash: 979474682271499265
 requirements: []
 rubyforge_project: engineyard-recipes
 rubygems_version: 1.8.17
@@ -184,9 +184,9 @@ summary: Tools to generate, upload, test and apply chef recipes for Engine Yard
 test_files:
 - features/clone-recipe.feature
 - features/generate-helper-definitions.feature
-- features/generate-recipe-in-cookbook.feature
 - features/init-new-cookbook.feature
 - features/init-sm-framework.feature
+- features/install-package.feature
 - features/step_definitions/api_steps.rb
 - features/step_definitions/common_steps.rb
 - features/step_definitions/fixture_project_steps.rb

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

@@ -1,5 +0,0 @@
-<% unless known_package? -%>
-<%= recipe_name %>_version('<%= version %>')
-<% else -%>
-# <%= recipe_name %>_version('<%= version %>')
-<% end %>