knife-spork 1.0.14 → 1.0.16

data/.gitignore

@@ -16,3 +16,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.idea

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.0.15 (12th February, 2013)
+
+Bugfixes:
+
+    - Fixed git plugin so that when working on a submodule, submodules will be git pulled from the parent repo instead
+    - Fixed foodcritic plugin bug where certain tag formats weren't being passed through
+
 ## 1.0.14 (15th January, 2013)
 
 Features:

data/README.md

@@ -75,7 +75,7 @@ plugins:
 ```
 
 #### Default Environments
-The `default_environments` directive allows you to specify a default list of environments you want to promote changes to. If this option is configured and you *ommit* the environment parameter when promoting KnifeSpork will promote to all environments in this list.
+The `default_environments` directive allows you to specify a default list of environments you want to promote changes to. If this option is configured and you *omit* the environment parameter when promoting KnifeSpork will promote to all environments in this list.
 
 #### Version Change Threshold
 The `version_change_threshold` directive allows you to customise the threshold used by a safety check in spork promote which will prompt for confirmation if you're promoting a cookbook by more than version_change_threshold versions. This defaults to 2 if not set, ie promoting a cookbook from v1.0.1 to v 1.0.2 will not trip this check, wheras promoting from v1.0.1 to v1.0.3 will.

data/knife-spork.gemspec

@@ -2,7 +2,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name          = 'knife-spork'
-  gem.version       = '1.0.14'
+  gem.version       = '1.0.16'
   gem.authors       = ["Jon Cowie"]
   gem.email         = 'jonlives@gmail.com'
   gem.homepage      = 'https://github.com/jonlives/knife-spork'

data/lib/knife-spork/plugins/foodcritic.rb

@@ -19,7 +19,7 @@ module KnifeSpork
           cookbook_path = cookbook.root_dir
 
           ui.info cookbook_path
-          
+
           options = {:tags => tags, :fail_tags => fail_tags, :include_rules => include_rules}
           review = ::FoodCritic::Linter.new.check([cookbook_path], options)
 
@@ -38,4 +38,4 @@ module KnifeSpork
       end
     end
   end
-end
+end

data/lib/knife-spork/plugins/git.rb

@@ -79,7 +79,11 @@ module KnifeSpork
       def git_pull_submodules(path)
         if is_repo?(path)
           ui.msg "Pulling latest changes from git submodules (if any)"
-          output = IO.popen("git submodule foreach git pull 2>&1")
+          top_level = `cd #{path} && git rev-parse --show-toplevel 2>&1`.chomp
+          if is_submodule?(top_level)
+            top_level = get_parent_dir(top_level)
+          end
+          output = IO.popen("cd #{top_level} && git submodule foreach git pull 2>&1")
           Process.wait
           exit_code = $?
           if !exit_code.exitstatus ==  0
@@ -138,7 +142,32 @@ module KnifeSpork
             return true
         end
       end
-      
+
+      def is_submodule?(path)
+        top_level = `cd #{path} && git rev-parse --show-toplevel 2>&1`.chomp
+        output = IO.popen("cd #{top_level}/.. && git rev-parse --show-toplevel 2>&1")
+        Process.wait
+        if $? != 0
+          return false
+        else
+          return true
+        end
+      end
+
+      def get_parent_dir(path)
+        top_level = path
+        return_code = 0
+        while return_code == 0
+          output = IO.popen("cd #{top_level}/.. && git rev-parse --show-toplevel 2>&1")
+          Process.wait
+          return_code = $?
+          if return_code == 0
+            top_level = output.read.chomp
+          end
+        end
+        top_level
+      end
+
       def remote
         config.remote || 'origin'
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-spork
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-15 00:00:00.000000000 Z
+date: 2013-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef