engineyard-recipes 0.4.0 → 0.5.0

data/ChangeLog.md

@@ -1,5 +1,12 @@
 # ChangeLog
 
+## v0.5
+
+* `init --on-deploy --chef` - gives you modern chef, and allows recipes-in-rubygems
+* `gem` - create new recipes that are ready to be packaged as rubygems
+* `gem --helper` - create project of libraries/definitions; no recipes
+* Removed `--local` - recipe generators detect `.../cookbooks/` missing and assume it is a gem-recipe
+
 ## v0.4
 
 * `package` - renamed from `recipe`; bug fixes

data/bin/ey-recipes

@@ -6,6 +6,8 @@ require 'engineyard-recipes/cli'
 
 begin
   Engineyard::Recipes::CLI.start
+rescue Engineyard::Recipes::Generators::CookbooksNotFound => e
+  error "Cannot discover cookbooks folder"
 rescue Interrupt => e
   puts
   puts "Quitting..."

data/engineyard-recipes.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency("thor", ["~> 0.14.6"])
   s.add_dependency("engineyard", ["~> 1.4.6"])
+  s.add_dependency("activesupport", ["~> 3.0"])
 
   s.add_development_dependency("rake", ["~> 0.9.2"])
   s.add_development_dependency("cucumber", ["~> 1.1.2"])

data/features/clone-recipe.feature

@@ -35,15 +35,15 @@ Feature: Clone recipe from git repositories
       """
 
   Scenario: Clone a single recipe from a local folder into local folder instead of in cookbooks/
+    Given I am in the "rails" project folder
     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"
+    When I run local executable "ey-recipes" with arguments "clone /tmp/ey-recipes/blank"
+    And file "README.rdoc" contains "This is a local recipe"
     And I should see exactly
       """
              exist  
-            create  blank/README.rdoc
-            create  blank/recipes/default.rb
+            create  README.rdoc
+            create  recipes/default.rb
       """
 
   Scenario: Clone URI is an unknown local path

data/features/generate-helper-definitions.feature

@@ -26,12 +26,13 @@ Feature: Generate helper definitions recipe
       """
   
   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"
+    Given I am in the "rails" project folder
+    When I run local executable "ey-recipes" with arguments "definition mylibrary helper1"
+    And file "definitions/helper1.rb" is created
+    And file "definitions/helper1.rb" contains "define :helper1 do"
     And I should see exactly
       """
              exist  
-            create  mylibrary/definitions/helper1.rb
+            create  definitions/helper1.rb
       """
 

data/features/generate-recipe-gem.feature

@@ -0,0 +1,41 @@
+Feature: Generate recipe gem
+  I want to create a new recipe
+  And distribute it as a gem
+  
+  Scenario: Generate a new recipe
+    When I run local executable "ey-recipes" with arguments "gem new_thing"
+    And I should see exactly
+      """
+            create  eycloud-recipe-new_thing
+            create  eycloud-recipe-new_thing/eycloud-recipe-new_thing.gemspec
+            create  eycloud-recipe-new_thing/.gitignore
+            create  eycloud-recipe-new_thing/ChangeLog.md
+            create  eycloud-recipe-new_thing/Gemfile
+            create  eycloud-recipe-new_thing/README.md
+            create  eycloud-recipe-new_thing/Rakefile
+             exist  eycloud-recipe-new_thing
+            create  eycloud-recipe-new_thing/metadata.json
+            create  eycloud-recipe-new_thing/metadata.rb
+             exist  eycloud-recipe-new_thing
+            create  eycloud-recipe-new_thing/new_thing/recipes/default.rb
+      """
+  
+  Scenario: Generate a new helper gem (no recipes)
+    When I run local executable "ey-recipes" with arguments "gem new_thing --helper"
+    And I should see exactly
+      """
+            create  eycloud-helper-new_thing
+            create  eycloud-helper-new_thing/eycloud-helper-new_thing.gemspec
+            create  eycloud-helper-new_thing/.gitignore
+            create  eycloud-helper-new_thing/ChangeLog.md
+            create  eycloud-helper-new_thing/Gemfile
+            create  eycloud-helper-new_thing/README.md
+            create  eycloud-helper-new_thing/Rakefile
+             exist  eycloud-helper-new_thing
+            create  eycloud-helper-new_thing/metadata.json
+            create  eycloud-helper-new_thing/metadata.rb
+      """
+
+  
+  
+  

data/features/init-new-cookbook.feature

@@ -32,3 +32,34 @@ Feature: Generate a new custom cookbook for your EY Cloud environments
             create  deploy/cookbooks/main/libraries/run_for_app.rb
             create  deploy/cookbooks/main/recipes/default.rb
       """
+
+  # TODO - make --on-deploy the default
+  # TODO - include emerge definitions
+  Scenario: Cookbooks use modern chef
+    Given I am in the "rails" project folder
+    When I run local executable "ey-recipes" with arguments "init --chef -d"
+    Then file "deploy/before_migrate.rb" contains
+      """
+      # Set up a chef 0.10 dna.json file (for stack-v1 + stack-v2)
+      # TODO does this run on non-app-master/solo?
+      custom_json = node.dup
+      custom_json['run_list'] = 'recipe[main]'
+      File.open("/etc/chef-custom/dna.json", 'w') do |f|
+        f.puts JSON.pretty_generate(custom_json)
+        f.chmod(0600)
+      end
+
+      # Runs application cookbooks
+      run "cd #{latest_release}; sudo bundle exec chef-solo -c #{latest_release}/deploy/solo.rb -j /etc/chef-custom/dna.json"
+      
+      """
+    And I should see exactly
+      """
+            create  deploy
+            create  deploy/before_migrate.rb
+            create  deploy/solo.rb
+            create  deploy/cookbooks
+            create  deploy/cookbooks/main/recipes/default.rb
+            append  Gemfile
+      """
+  

data/features/install-package.feature

@@ -85,18 +85,19 @@ Feature: Install a gentoo package
 
     """    
 
-  Scenario: Generate a new recipe into local folder instead of in cookbooks/
-    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
-    And file "component/attributes/recipe.rb" is created
-    And file "component/attributes/recipe.rb" contains "# component_version('1.0.0')"
+  Scenario: Generate a new recipe into local folder if no deploy/cookbooks/ or cookbooks/ folder
+    Given I am in the "rails" project folder
+    When I run local executable "ey-recipes" with arguments "package component"
+    And file "recipes/default.rb" is created
+    And file "recipes/default.rb" contains "require_recipe 'component::install'"
+    And file "recipes/install.rb" is created
+    And file "attributes/recipe.rb" is created
+    And file "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
+            create  attributes/recipe.rb
+            create  recipes/default.rb
+            create  recipes/install.rb
       """
 

data/features/step_definitions/fixture_project_steps.rb

@@ -1,6 +1,7 @@
 Given /^I am in the "([^\"]*)" project folder$/ do |project|
   project_folder = File.expand_path(File.join(@fixtures_path, "projects", project))
   in_tmp_folder do
+    FileUtils.rm_rf(project)
     FileUtils.cp_r(project_folder, project)
     setup_active_project_folder(project)
   end

data/lib/engineyard-recipes/cli.rb

@@ -9,12 +9,19 @@ module Engineyard
 
       desc "init", "Creates cookbooks scaffolding for your recipes"
       method_option :"on-deploy", :aliases => ['-d'], :type => :boolean, :desc => "Run recipes during deployment"
+      method_option :chef, :type => :boolean, :desc => "Use bundled chef instead of Engine Yard chef version"
       method_option :sm, :type => :boolean, :desc => "Also install SM framework support"
       def init
-        on_deploy = options["on-deploy"] || false
+        on_deploy    = options["on-deploy"] || false
+        bundled_chef = options["chef"] || false
         
-        require 'engineyard-recipes/generators/init_generator'
-        Engineyard::Recipes::Generators::InitGenerator.start([on_deploy])
+        if bundled_chef
+          require 'engineyard-recipes/generators/init_bundled_chef_generator'
+          Engineyard::Recipes::Generators::InitGenerator.start([{:on_deploy => on_deploy}])
+        else
+          require 'engineyard-recipes/generators/init_resin_chef_generator'
+          Engineyard::Recipes::Generators::InitGenerator.start([{:on_deploy => on_deploy}])
+        end
         init_sm if options[:sm]
       end
       
@@ -28,26 +35,32 @@ 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 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/package_generator'
         Engineyard::Recipes::Generators::PackageGenerator.start([
-          recipe_name, package, version, {:unmasked => unmasked, :local => local}
+          recipe_name, package, version, {:unmasked => unmasked}
         ])
       end
       
+      desc "gem NAME", "Name of the recipe"
+      method_option :repo, :aliases => ['-r'], :desc => "Name of the repository. Default: eycloud-recipes-NAME"
+      method_option :helper, :type => :boolean, :desc => "Only helpers/definitions, no recipes included."
+      def gem(recipe_name)
+        recipe_type ||= options["helper"] ? "helper" : "recipe"
+        repo_name ||= options["repo"] || "eycloud-#{recipe_type}-#{recipe_name}"
+
+        require 'engineyard-recipes/generators/gem_generator'
+        Engineyard::Recipes::Generators::GemGenerator.start([recipe_name, repo_name, recipe_type])
+      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, {:local => local}])
+        Engineyard::Recipes::Generators::DefinitionGenerator.start([recipe_name, definition_name])
       end
       
       desc "timezone TIMEZONE", "Generate recipe to set the timezone"
@@ -60,14 +73,11 @@ 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
         _, recipe_name = FetchUri.fetch_recipe(folder_path, generator.source_root, options["name"])
-        generator.start([recipe_name, {:local => local}])
+        generator.start([recipe_name])
         
       rescue Engineyard::Recipes::FetchUri::UnknownPath => e
         error "No recipe found at #{e.message}"

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

@@ -2,20 +2,20 @@ require 'thor/group'
 
 module Engineyard::Recipes
   module Generators
+    class CookbooksNotFound < StandardError; end
+
     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|
             File.directory?(File.join(destination_root, cookbooks))
           end
-          unless destination
-            error "Cannot discover cookbooks folder"
-          end
+          raise CookbooksNotFound unless destination
           destination
         end
       end

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

@@ -7,7 +7,6 @@ module Engineyard::Recipes
       
       argument :recipe_name
       argument :definition_name
-      argument :flags, :type => :hash
 
       def self.source_root
         File.join(File.dirname(__FILE__), "definition_generator", "templates")
@@ -15,9 +14,9 @@ module Engineyard::Recipes
       
       def install_cookbooks
         directory "cookbooks", cookbooks_destination
+      rescue CookbooksNotFound
+        directory "cookbooks/%recipe_name%", "."
       end
-      
-      private
     end
   end
 end

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

@@ -0,0 +1,41 @@
+require 'thor/group'
+require 'active_support/core_ext/string'
+
+module Engineyard::Recipes
+  module Generators
+    class GemGenerator < BaseGenerator
+      include Thor::Actions
+
+      argument :recipe_name
+      argument :repo_name
+      argument :recipe_type
+      
+      def self.source_root
+        File.join(File.dirname(__FILE__), "gem_generator", "templates")
+      end
+      
+      def install_gem
+        directory "gem", repo_name
+      end
+      
+      def install_metadata
+        directory "metadata", repo_name
+      end
+
+      def install_recipe
+        if recipe_type == "recipe"
+          directory "recipe", repo_name
+        end
+      end
+      
+      protected
+      def git_user_name
+        `git config  --global user.name`.strip
+      end
+
+      def git_user_email
+        `git config  --global user.email`.strip
+      end
+    end
+  end
+end

data/lib/engineyard-recipes/generators/gem_generator/templates/gem/%repo_name%.gemspec.tt

@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+
+version = "0.1.0" # TODO get from metadata.json or .rb
+
+Gem::Specification.new do |s|
+  s.name        = "<%= repo_name %>"
+  s.version     = version
+  s.authors     = ["<%= git_user_name %>"]
+  s.email       = ["<%= git_user_email %>"]
+  s.homepage    = ""
+  s.summary     = %q{<%= recipe_name.humanize.titleize %> recipe for EY Cloud} # TODO from metadata
+  s.description = %q{<%= recipe_name.humanize.titleize %> recipe for EY Cloud} # TODO from metadata long_description
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  # s.add_dependency("eycloud-helper-cronjobs")
+  s.add_development_dependency("rake")
+end

data/lib/engineyard-recipes/generators/gem_generator/templates/gem/.gitignore

@@ -0,0 +1,3 @@
+pkg
+tmp
+Gemfile.lock

data/lib/engineyard-recipes/generators/gem_generator/templates/gem/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gemspec

data/lib/engineyard-recipes/generators/gem_generator/templates/gem/README.md.tt

@@ -0,0 +1,19 @@
+# <%= recipe_name.humanize.titleize %> recipe for EY Cloud
+
+DESCRIPTION HERE
+
+## Installation
+
+INSTALLATION HERE
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
+
+## License
+
+MIT LICENSE

data/lib/engineyard-recipes/generators/gem_generator/templates/gem/Rakefile

@@ -0,0 +1,2 @@
+#!/usr/bin/env rake
+require "bundler/gem_tasks"

data/lib/engineyard-recipes/generators/gem_generator/templates/metadata/metadata.json.tt

@@ -0,0 +1,13 @@
+{
+  "name": "<%= recipe_name %>",
+  "description": "<%= recipe_name.humanize.titleize %> recipe for EY Cloud",
+  "long_description": "",
+  "license": "MIT",
+  "maintainer": "<%= git_user_name %>",
+  "maintainer_email": "<%= git_user_email %>",
+  "version": "0.1.0",
+  "attributes": {
+  },
+  "dependencies": {
+  }
+}

data/lib/engineyard-recipes/generators/gem_generator/templates/metadata/metadata.rb.tt

@@ -0,0 +1,7 @@
+name              "<%= recipe_name %>"
+description       "<%= recipe_name.humanize.titleize %> recipe for EY Cloud"
+long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+maintainer        "<%= git_user_name %>"
+maintainer_email  "<%= git_user_email %>"
+version           "0.1.0"
+# depends           "cronjobs"

data/lib/engineyard-recipes/generators/gem_generator/templates/recipe/%recipe_name%/recipes/default.rb.tt

@@ -0,0 +1,5 @@
+#
+# Cookbook Name:: <%= recipe_name %>
+# Recipe:: default
+#
+

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

@@ -0,0 +1,44 @@
+require 'thor/group'
+
+module Engineyard::Recipes
+  module Generators
+    class InitGenerator < BaseGenerator
+      include Thor::Actions
+
+      argument :flags, :type => :hash
+      
+      def self.source_root
+        File.join(File.dirname(__FILE__), "init_bundled_chef_generator", "templates")
+      end
+      
+      def gemfile
+        append_file "Gemfile", <<-GEMS
+
+gem "eycloud-helper-common", :group => :eycloud
+GEMS
+      end
+      
+      def install_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
+      
+      protected
+      def cookbooks_destination
+        if on_deploy?
+          "deploy/cookbooks"
+        else
+          "cookbooks"
+        end
+      end
+      
+      def on_deploy?
+        flags[:on_deploy]
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+# Set up a chef 0.10 dna.json file (for stack-v1 + stack-v2)
+# TODO does this run on non-app-master/solo?
+custom_json = node.dup
+custom_json['run_list'] = 'recipe[main]'
+File.open("/etc/chef-custom/dna.json", 'w') do |f|
+  f.puts JSON.pretty_generate(custom_json)
+  f.chmod(0600)
+end
+
+# Runs application cookbooks
+run "cd #{latest_release}; sudo bundle exec chef-solo -c #{latest_release}/deploy/solo.rb -j /etc/chef-custom/dna.json"

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

@@ -0,0 +1,25 @@
+base_dir = File.dirname(__FILE__)
+node = Yajl::Parser.new.parse(File.new("/etc/chef-custom/dna.json", "r"))
+
+cookbooks_path = "#{base_dir}/cookbooks"
+
+file_store_path   base_dir
+file_cache_path   base_dir
+cookbook_path     cookbooks_path
+role_path         "#{base_dir}/roles"
+node_name         node["engineyard"]["this"]
+
+require "fileutils"
+$LOAD_PATH.each do |path|
+  recipe_path = path.gsub(%r{/lib$},'')
+  if File.exist?(metadata_path = File.join(recipe_path, 'metadata.json'))
+    metadata = Yajl::Parser.new.parse(File.new(metadata_path, "r"))
+    if metadata["name"]
+      puts "Unpacking #{metadata["name"]} recipe into cookbooks from #{cookbooks_path}"
+      FileUtils.cp_r(recipe_path, File.join(cookbooks_path, metadata["name"]))
+    else
+      puts "ERROR: Recipe has no 'name' in metadata.json (#{cookbooks_path})"
+    end
+  end
+end
+

data/lib/engineyard-recipes/generators/{init_generator.rb → init_resin_chef_generator.rb}

@@ -5,14 +5,14 @@ module Engineyard::Recipes
     class InitGenerator < BaseGenerator
       include Thor::Actions
 
-      argument :on_deploy, :optional => true
+      argument :flags, :type => :hash
       
       def self.source_root
-        File.join(File.dirname(__FILE__), "init_generator", "templates")
+        File.join(File.dirname(__FILE__), "init_resin_chef_generator", "templates")
       end
       
       def install_cookbooks
-        if on_deploy
+        if on_deploy?
           directory "deploy"
         end
         unless File.exists?(File.join(destination_root, "#{cookbooks_destination}/main/recipes/default.rb"))
@@ -22,12 +22,20 @@ module Engineyard::Recipes
       
       protected
       def cookbooks_destination
-        if on_deploy
+        if on_deploy?
           "deploy/cookbooks"
         else
           "cookbooks"
         end
       end
+      
+      def on_deploy?
+        flags[:on_deploy]
+      end
+      
+      def bundled_chef?
+        flags[:bundled_chef]
+      end
     end
   end
 end

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

@@ -6,7 +6,6 @@ module Engineyard::Recipes
       include Thor::Actions
       
       argument :recipe_name
-      argument :flags, :type => :hash
 
       def self.source_root
         @tmpdir ||= Dir.mktmpdir
@@ -14,14 +13,16 @@ module Engineyard::Recipes
       
       def install_cookbooks
         directory "cookbooks", cookbooks_destination
+      rescue CookbooksNotFound
+        directory "cookbooks/#{recipe_name}", "."
       end
       
       def auto_require_package
-        unless local?
-          file = cookbooks_dir "main/recipes/default.rb"
-          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
+      rescue CookbooksNotFound
+        # step not required if no cookbooks/ found
       end
       
       private

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

@@ -8,22 +8,26 @@ module Engineyard::Recipes
       argument :recipe_name
       argument :package
       argument :version
-      argument :flags, :type => :hash # :unmasked & :local
+      argument :flags, :type => :hash # :unmasked
 
       def self.source_root
         File.join(File.dirname(__FILE__), "package_generator", "templates")
       end
       
       def install_cookbooks
-        directory "cookbooks", cookbooks_destination
+        begin
+          directory "cookbooks", cookbooks_destination
+        rescue CookbooksNotFound
+          directory "cookbooks/%recipe_name%", "."
+        end
       end
       
       def auto_require_package
-        unless local?
-          file           = cookbooks_dir "main/recipes/default.rb"
-          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
+      rescue CookbooksNotFound
+        # step not required if no cookbooks/ found
       end
       
       protected

data/lib/engineyard-recipes/generators/templates/cookbooks/main/attributes/recipe.rb

@@ -0,0 +1,3 @@
+recipes('main')
+owner_name(@attribute[:users].first[:username])
+owner_pass(@attribute[:users].first[:password])

data/lib/engineyard-recipes/generators/templates/cookbooks/main/definitions/ey_cloud_report.rb

@@ -0,0 +1,6 @@
+define :ey_cloud_report do
+  execute "reporting for #{params[:name]}" do
+    command "ey-enzyme --report '#{params[:message]}'"
+    epic_fail true
+  end
+end

data/lib/engineyard-recipes/generators/templates/cookbooks/main/libraries/ruby_block.rb

@@ -0,0 +1,40 @@
+
+class Chef
+  class Resource
+    class RubyBlock < Chef::Resource
+      def initialize(name, collection=nil, node=nil)
+        super(name, collection, node)
+        @resource_name = :ruby_block
+        @action = :create
+        @allowed_actions.push(:create)
+      end
+ 
+      def block(&block)
+        if block
+          @block = block
+        else
+          @block
+        end
+      end
+    end
+  end
+end
+
+
+class Chef
+  class Provider
+    class RubyBlock < Chef::Provider
+      def load_current_resource
+        Chef::Log.debug(@new_resource.inspect)
+        true
+      end
+ 
+      def action_create
+        @new_resource.block.call
+      end
+    end
+  end
+end
+
+Chef::Platform.platforms[:default].merge! :ruby_block => Chef::Provider::RubyBlock
+

data/lib/engineyard-recipes/generators/templates/cookbooks/main/libraries/run_for_app.rb

@@ -0,0 +1,12 @@
+class Chef
+  class Recipe
+    def run_for_app(*apps, &block)
+      apps.map! {|a| a.to_s }
+      node[:applications].map{|k,v| [k,v] }.sort_by {|a,b| a }.each do |name, app_data|
+        if apps.include?(name)
+          block.call(name, app_data)
+        end
+      end
+    end
+  end
+end

data/lib/engineyard-recipes/generators/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/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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-recipes
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-17 00:00:00.000000000 Z
+date: 2012-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70236150882240 !ruby/object:Gem::Requirement
+  requirement: &70261653662340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70236150882240
+  version_requirements: *70261653662340
 - !ruby/object:Gem::Dependency
   name: engineyard
-  requirement: &70236150881400 !ruby/object:Gem::Requirement
+  requirement: &70261653660900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,21 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *70236150881400
+  version_requirements: *70261653660900
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70261653658540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70261653658540
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70236150880580 !ruby/object:Gem::Requirement
+  requirement: &70261653657600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +54,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70236150880580
+  version_requirements: *70261653657600
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70236150879640 !ruby/object:Gem::Requirement
+  requirement: &70261653656920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +65,10 @@ dependencies:
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *70236150879640
+  version_requirements: *70261653656920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70236150878820 !ruby/object:Gem::Requirement
+  requirement: &70261653656300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +76,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70236150878820
+  version_requirements: *70261653656300
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70236150877960 !ruby/object:Gem::Requirement
+  requirement: &70261653655460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70236150877960
+  version_requirements: *70261653655460
 description: Tools to generate, upload, test and apply chef recipes for Engine Yard
   Cloud.
 email:
@@ -97,6 +108,7 @@ files:
 - engineyard-recipes.gemspec
 - features/clone-recipe.feature
 - features/generate-helper-definitions.feature
+- features/generate-recipe-gem.feature
 - features/init-new-cookbook.feature
 - features/init-sm-framework.feature
 - features/install-package.feature
@@ -120,20 +132,33 @@ files:
 - 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
-- lib/engineyard-recipes/generators/init_generator/templates/cookbooks/main/attributes/recipe.rb
-- lib/engineyard-recipes/generators/init_generator/templates/cookbooks/main/definitions/ey_cloud_report.rb
-- 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/gem_generator.rb
+- lib/engineyard-recipes/generators/gem_generator/templates/gem/%repo_name%.gemspec.tt
+- lib/engineyard-recipes/generators/gem_generator/templates/gem/.gitignore
+- lib/engineyard-recipes/generators/gem_generator/templates/gem/ChangeLog.md
+- lib/engineyard-recipes/generators/gem_generator/templates/gem/Gemfile
+- lib/engineyard-recipes/generators/gem_generator/templates/gem/README.md.tt
+- lib/engineyard-recipes/generators/gem_generator/templates/gem/Rakefile
+- lib/engineyard-recipes/generators/gem_generator/templates/metadata/metadata.json.tt
+- lib/engineyard-recipes/generators/gem_generator/templates/metadata/metadata.rb.tt
+- lib/engineyard-recipes/generators/gem_generator/templates/recipe/%recipe_name%/recipes/default.rb.tt
+- lib/engineyard-recipes/generators/init_bundled_chef_generator.rb
+- lib/engineyard-recipes/generators/init_bundled_chef_generator/templates/cookbooks/main/recipes/default.rb
+- lib/engineyard-recipes/generators/init_bundled_chef_generator/templates/deploy/before_migrate.rb
+- lib/engineyard-recipes/generators/init_bundled_chef_generator/templates/deploy/solo.rb
+- lib/engineyard-recipes/generators/init_resin_chef_generator.rb
+- lib/engineyard-recipes/generators/init_resin_chef_generator/templates/cookbooks/main/attributes/recipe.rb
+- lib/engineyard-recipes/generators/init_resin_chef_generator/templates/cookbooks/main/definitions/ey_cloud_report.rb
+- lib/engineyard-recipes/generators/init_resin_chef_generator/templates/cookbooks/main/libraries/ruby_block.rb
+- lib/engineyard-recipes/generators/init_resin_chef_generator/templates/cookbooks/main/libraries/run_for_app.rb
+- lib/engineyard-recipes/generators/init_resin_chef_generator/templates/cookbooks/main/recipes/default.rb
+- lib/engineyard-recipes/generators/init_resin_chef_generator/templates/deploy/before_migrate.rb
+- lib/engineyard-recipes/generators/init_resin_chef_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
 - 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/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
@@ -143,6 +168,13 @@ files:
 - lib/engineyard-recipes/generators/sm_generator/templates/cookbooks/%recipe_name%/attributes/recipe.rb.tt
 - lib/engineyard-recipes/generators/sm_generator/templates/cookbooks/%recipe_name%/recipes/default.rb.tt
 - lib/engineyard-recipes/generators/sm_generator/templates/cookbooks/%recipe_name%/recipes/install_sm_ext.rb.tt
+- lib/engineyard-recipes/generators/templates/cookbooks/main/attributes/recipe.rb
+- lib/engineyard-recipes/generators/templates/cookbooks/main/definitions/ey_cloud_report.rb
+- lib/engineyard-recipes/generators/templates/cookbooks/main/libraries/ruby_block.rb
+- lib/engineyard-recipes/generators/templates/cookbooks/main/libraries/run_for_app.rb
+- lib/engineyard-recipes/generators/templates/cookbooks/main/recipes/default.rb
+- lib/engineyard-recipes/generators/templates/deploy/before_migrate.rb
+- lib/engineyard-recipes/generators/templates/deploy/solo.rb
 - lib/engineyard-recipes/generators/timezone_generator.rb
 - lib/engineyard-recipes/generators/timezone_generator/templates/cookbooks/%recipe_name%/recipes/default.rb.tt
 - lib/engineyard-recipes/git_cmd.rb
@@ -165,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 979474682271499265
+      hash: 1880085431583266661
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -174,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 979474682271499265
+      hash: 1880085431583266661
 requirements: []
 rubyforge_project: engineyard-recipes
 rubygems_version: 1.8.17
@@ -184,6 +216,7 @@ 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-gem.feature
 - features/init-new-cookbook.feature
 - features/init-sm-framework.feature
 - features/install-package.feature

data/lib/engineyard-recipes/generators/local_recipe_clone_generator/templates/cookbooks/%recipe_name%/definitions/%definition_name%.rb.tt

@@ -1,3 +0,0 @@
-define :<%= definition_name %> do
-  
-end