engineyard-recipes 0.2.0.pre1 → 0.2.0.pre2

data/features/step_definitions/fixture_project_steps.rb

@@ -27,3 +27,10 @@ Given /^I am have a local sm extension "([^"]*)" at "\/tmp\/ey-recipes\/([^"]*)"
   end
 end
 
+Given /^project is a git repository$/ do
+  in_project_folder do
+    `git init`
+    `git add .`
+    `git commit -m 'Ready for testing'`
+  end
+end

data/features/wrap-sm-extension.feature

@@ -44,14 +44,24 @@ Feature: Wrap SM framework extension
       """
 
   Scenario: Wrap a local SM extension and vendor it
-    Given I am have a local sm extension "local_sm_repo" at "/tmp/ey-recipes/local_sm_repo"
+    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 I mock out git commands
+    Given project is a git repository
+    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
+    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.
+      """

data/lib/engineyard-recipes/cli.rb

@@ -7,7 +7,7 @@ module Engineyard
     class CLI < Thor
 
       desc "init", "Creates cookbooks scaffolding for your recipes"
-      method_option :sm, :type => :boolean
+      method_option :sm, :type => :boolean, :desc => "Also install SM framework support"
       def init
         require 'engineyard-recipes/generators/init_generator'
         Engineyard::Recipes::Generators::InitGenerator.start
@@ -52,11 +52,12 @@ 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, :desc => "Submodule the URI into recipe folder name"
+      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])

data/lib/engineyard-recipes/fetch_uri.rb

@@ -6,6 +6,7 @@ module Engineyard::Recipes
     extend Engineyard::Recipes::GitCmd
     
     class UnknownPath < StandardError; end
+    class TargetPathNotGitRepository < StandardError; end
     
     # Fetch the target at URI (git url or local folder path)
     #
@@ -26,8 +27,12 @@ module Engineyard::Recipes
     def vendor_recipe_into_recipe(uri, sm_vendor_path)
       if File.exists?(uri)
         FileUtils.cp_r(uri, sm_vendor_path)
-      else 
-        git "submodule add #{uri} #{sm_vendor_path}"
+      else
+        if File.directory?(".git")
+          git "submodule add #{uri} #{sm_vendor_path}"
+        else
+          raise TargetPathNotGitRepository
+        end
       end
     end
     

data/lib/engineyard-recipes/git_cmd.rb

@@ -9,6 +9,7 @@ module Engineyard::Recipes
         git_mock_log = File.expand_path("../../../tmp/git.log", __FILE__)
         File.open(git_mock_log, "a") { |file| file << command; file << "\n" }
       else
+        puts "git #{command}"
         `git #{command}`
       end
     end

data/lib/engineyard-recipes/version.rb

@@ -1,5 +1,5 @@
 module Engineyard
   module Recipes
-    VERSION = "0.2.0.pre1"
+    VERSION = "0.2.0.pre2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-recipes
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre1
+  version: 0.2.0.pre2
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70211728365380 !ruby/object:Gem::Requirement
+  requirement: &70101418409680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70211728365380
+  version_requirements: *70101418409680
 - !ruby/object:Gem::Dependency
   name: engineyard
-  requirement: &70211728363740 !ruby/object:Gem::Requirement
+  requirement: &70101418402440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *70211728363740
+  version_requirements: *70101418402440
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70211728363200 !ruby/object:Gem::Requirement
+  requirement: &70101418401200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70211728363200
+  version_requirements: *70101418401200
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70211728362300 !ruby/object:Gem::Requirement
+  requirement: &70101418400060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *70211728362300
+  version_requirements: *70101418400060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70211728360180 !ruby/object:Gem::Requirement
+  requirement: &70101418398320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70211728360180
+  version_requirements: *70101418398320
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70211728357420 !ruby/object:Gem::Requirement
+  requirement: &70101418397180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70211728357420
+  version_requirements: *70101418397180
 description: Tools to generate, upload, test and apply chef recipes for Engine Yard
   Cloud.
 email:
@@ -158,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -734340891019188320
+      hash: -864662858783017475
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: