engineyard-recipes 0.3.2.pre → 0.3.2

data/.travis.yml

@@ -2,7 +2,6 @@ rvm:
   - 1.8.7
   - 1.9.3
   - rbx
-  - jruby
 notifications:
   recipients:
     - drnicwilliams@gmail.com

data/ChangeLog.md

@@ -14,6 +14,7 @@ Patches:
 ### v0.3.2
 
 * Fix `init-sm` to generate into `deploy/cookbooks` if its present
+* Removed `sm --submodule` - `sm` always vendors/clones/copies the target folder/URI to `/repo` folder
 
 ## v0.2
 

data/features/wrap-sm-extension.feature

@@ -8,11 +8,12 @@ Feature: Wrap SM framework extension
     When I run local executable "ey-recipes" with arguments "init-sm"
 
   Scenario: Wrap an SM extension only
+    Given I mock out git commands
     When I run local executable "ey-recipes" with arguments "sm https://github.com/eystacks/sm_jenkins.git --name jenkins" 
     Then file "cookbooks/jenkins/recipes/default.rb" contains "require_recipe 'jenkins::install_sm_ext'"
-    Then file "cookbooks/jenkins/attributes/recipe.rb" contains "sm_jenkins_uri('https://github.com/eystacks/sm_jenkins.git')"
     Then file "cookbooks/jenkins/recipes/install_sm_ext.rb" contains "command %(sm ext install jenkins #{node[:sm_jenkins_uri]})"
-    Then file ".gitmodules" is not created
+    Then file "cookbooks/jenkins/attributes/recipe.rb" contains "sm_jenkins_uri(File.expand_path('../../repo', __FILE__))"
+    And git command "git clone https://github.com/eystacks/sm_jenkins.git cookbooks/jenkins/repo" is run
     And I should see exactly
       """
              exist  cookbooks
@@ -22,6 +23,14 @@ Feature: Wrap SM framework extension
             append  cookbooks/main/recipes/default.rb
       """
 
+  Scenario: Wrap a local SM extension and vendor it
+    Given project is a git repository
+    And I am have a local sm extension "local_sm_repo" at "/tmp/ey-recipes/local_sm_repo"
+    When I run local executable "ey-recipes" with arguments "sm /tmp/ey-recipes/local_sm_repo --name jenkins --submodule" 
+    Then file "cookbooks/jenkins/attributes/recipe.rb" contains "sm_jenkins_uri(File.expand_path('../../repo', __FILE__))"
+    And git command "git submodule add https://github.com/eystacks/sm_jenkins.git cookbooks/jenkins/repo" is not run
+    And file "cookbooks/jenkins/repo/local_sm_repo_readme.md" is created
+
   Scenario: Wrap an SM extension only and trigger its commands
     When I run local executable "ey-recipes" with arguments "sm https://github.com/eystacks/sm_jenkins.git install configure start --name jenkins"
     Then file "cookbooks/jenkins/recipes/default.rb" contains "require_recipe 'jenkins::install_sm_ext'"
@@ -43,25 +52,11 @@ Feature: Wrap SM framework extension
             append  cookbooks/main/recipes/default.rb
       """
 
-  Scenario: Wrap a local SM extension and vendor it
-    Given project is a git repository
-    And I am have a local sm extension "local_sm_repo" at "/tmp/ey-recipes/local_sm_repo"
-    When I run local executable "ey-recipes" with arguments "sm /tmp/ey-recipes/local_sm_repo --name jenkins --submodule repo" 
-    Then file "cookbooks/jenkins/attributes/recipe.rb" contains "sm_jenkins_uri(File.expand_path('../../../../cookbooks/jenkins/repo', __FILE__))"
-    And git command "git submodule add https://github.com/eystacks/sm_jenkins.git cookbooks/jenkins/repo" is not run
-    And file "cookbooks/jenkins/repo/local_sm_repo_readme.md" is created
-
-  Scenario: Wrap a git SM extension and vendor it via submodules
-    Given project is a git repository
+  Scenario: Wrap a git SM extension and vendor it via submodules for chef-on-deploy
+    When I run local executable "ey-recipes" with arguments "init -d"
+    When I run local executable "ey-recipes" with arguments "init-sm"
     And I mock out git commands
-    When I run local executable "ey-recipes" with arguments "sm https://github.com/eystacks/sm_jenkins.git --name jenkins --submodule repo" 
-    Then file "cookbooks/jenkins/attributes/recipe.rb" contains "sm_jenkins_uri(File.expand_path('../../../../cookbooks/jenkins/repo', __FILE__))"
-    And git command "git submodule add https://github.com/eystacks/sm_jenkins.git cookbooks/jenkins/repo" is run
-    
-  Scenario: Do not allow submodules flag if current project is not a git repo
-    Given I mock out git commands
-    When I run local executable "ey-recipes" with arguments "sm https://github.com/eystacks/sm_jenkins.git --name jenkins --submodule repo" 
-    Then I should see exactly
-      """
-      ERROR: This project is not a git repository yet.
-      """
+    When I run local executable "ey-recipes" with arguments "sm https://github.com/eystacks/sm_jenkins.git --name jenkins" 
+    Then file "deploy/cookbooks/jenkins/attributes/recipe.rb" contains "sm_jenkins_uri(File.expand_path('../../repo', __FILE__))"
+    And git command "git clone https://github.com/eystacks/sm_jenkins.git deploy/cookbooks/jenkins/repo" is run
+    And git command "git clone https://github.com/eystacks/sm_jenkins.git cookbooks/jenkins/repo" is not run

data/lib/engineyard-recipes/cli.rb

@@ -75,18 +75,11 @@ module Engineyard
       
       desc "sm URI [COMMANDS]", "Wrap an SM extension as an eychef recipe"
       method_option :name, :aliases => ['-n'], :desc => "Specify name of recipe. Defaults to base name.", :required => true
-      method_option :submodule, :aliases => ['--vendor', '-s'], :desc => "Submodule the URI into recipe folder name"
       def sm(uri, *commands)
         require 'engineyard-recipes/generators/sm_generator'
-        recipe_name      = options["name"]
-        if options["submodule"]
-          error "This project is not a git repository yet." unless File.directory?(".git")
-          sm_vendor_path = File.join("cookbooks", recipe_name, options["submodule"])
-        end
-        Engineyard::Recipes::Generators::SmGenerator.start([recipe_name, uri, commands, sm_vendor_path])
-        if sm_vendor_path
-          FetchUri.vendor_recipe_into_recipe(uri, sm_vendor_path)
-        end
+        recipe_name = options["name"]
+        
+        Engineyard::Recipes::Generators::SmGenerator.start([recipe_name, uri, commands])
       end
       
       desc "version", "show version information"

data/lib/engineyard-recipes/fetch_uri.rb

@@ -21,18 +21,16 @@ module Engineyard::Recipes
       end
     end
     
-    # Vendor/submodule the +uri+ into current git repo at +sm_vendor_path+
-    # If +uri+ is a local folder, then copy folder to +sm_vendor_path+
-    # If +uri+ is a remote git repo, then submodule to +sm_vendor_path+
-    def vendor_recipe_into_recipe(uri, sm_vendor_path)
+    # Vendor/submodule the +uri+ into current git repo at +recipe_vendor_path+
+    # If +uri+ is a local folder, then copy folder to +recipe_vendor_path+
+    # If +uri+ is a remote git repo, then clone/copy to +recipe_vendor_path+
+    def vendor_recipe_into_recipe(uri, recipe_vendor_path)
+      FileUtils.rm_rf(recipe_vendor_path)
       if File.exists?(uri)
-        FileUtils.cp_r(uri, sm_vendor_path)
+        FileUtils.cp_r(uri, recipe_vendor_path)
       else
-        if File.directory?(".git")
-          git "submodule add #{uri} #{sm_vendor_path}"
-        else
-          raise TargetPathNotGitRepository
-        end
+        git "clone #{uri} #{recipe_vendor_path}"
+        FileUtils.rm_rf(File.join(recipe_vendor_path, ".git"))
       end
     end
     

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

@@ -9,7 +9,6 @@ module Engineyard::Recipes
       argument :recipe_name
       argument :sm_ext_uri
       argument :sm_ext_commands, :type => :array
-      argument :sm_vendor_path, :required => false
 
       def self.source_root
         File.join(File.dirname(__FILE__), "sm_generator", "templates")
@@ -34,11 +33,18 @@ module Engineyard::Recipes
         append_to_file file, require_recipe
       end
       
-      private
-      def say(msg, color = nil)
-        color ? shell.say(msg, color) : shell.say(msg)
+      def vendor
+        FetchUri.vendor_recipe_into_recipe(sm_ext_uri, recipe_vendor_path)
       end
       
+      protected
+      def recipe_vendor_path_name
+        "repo"
+      end
+      
+      def recipe_vendor_path
+        cookbooks_dir File.join(recipe_name, "repo")
+      end
     end
   end
 end

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

@@ -1,6 +1,2 @@
-<% if sm_vendor_path -%>
 <% # assumes render file is at 'cookbooks/recipe-name/attributes/recipe.rb' -%>
-sm_<%= recipe_name %>_uri(File.expand_path('../../../../<%= sm_vendor_path %>', __FILE__))
-<% else -%>
-sm_<%= recipe_name %>_uri('<%= sm_ext_uri %>')
-<% end %>
+sm_<%= recipe_name %>_uri(File.expand_path('../../<%= recipe_vendor_path_name %>', __FILE__))

data/lib/engineyard-recipes/version.rb

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

data/spec/fetch_uri_spec.rb

@@ -12,9 +12,9 @@ describe Engineyard::Recipes::FetchUri do
   end
 
 
-  # Vendor/submodule the +uri+ into current git repo at +sm_vendor_path+
-  # If +uri+ is a local folder, then copy folder to +sm_vendor_path+
-  # If +uri+ is a remote git repo, then submodule to +sm_vendor_path+
+  # Vendor/submodule the +uri+ into current git repo at +recipe_vendor_path+
+  # If +uri+ is a local folder, then copy folder to +recipe_vendor_path+
+  # If +uri+ is a remote git repo, then submodule to +recipe_vendor_path+
   describe "#vendor_recipe_into_recipe" do
   end
   

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-recipes
 version: !ruby/object:Gem::Version
-  version: 0.3.2.pre
-  prerelease: 6
+  version: 0.3.2
+  prerelease: 
 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: &70232946389900 !ruby/object:Gem::Requirement
+  requirement: &70105552905900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70232946389900
+  version_requirements: *70105552905900
 - !ruby/object:Gem::Dependency
   name: engineyard
-  requirement: &70232946389360 !ruby/object:Gem::Requirement
+  requirement: &70105552905220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *70232946389360
+  version_requirements: *70105552905220
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70232946388840 !ruby/object:Gem::Requirement
+  requirement: &70105552904740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70232946388840
+  version_requirements: *70105552904740
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70232946388340 !ruby/object:Gem::Requirement
+  requirement: &70105552904260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *70232946388340
+  version_requirements: *70105552904260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70232946387860 !ruby/object:Gem::Requirement
+  requirement: &70105552903780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70232946387860
+  version_requirements: *70105552903780
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70232946387460 !ruby/object:Gem::Requirement
+  requirement: &70105552903400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70232946387460
+  version_requirements: *70105552903400
 description: Tools to generate, upload, test and apply chef recipes for Engine Yard
   Cloud.
 email:
@@ -165,13 +165,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1423764606701020741
+      hash: 2804550849415327961
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 2804550849415327961
 requirements: []
 rubyforge_project: engineyard-recipes
 rubygems_version: 1.8.17