knife-spork 1.0.3 → 1.0.4

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.0.4 (14th September, 2012)
+Features:
+
+    - Spork can now run command from any directory, not just the root of your chef repository.
+    
+Bugfixes:
+
+    - Fixed spork uploader to work more cleanly with 10.14.0 and greater
+    - Spork bump will no longer throw errors when no cookbook name is specified
+    
 ## 1.0.3 (10th September, 2012)
 Bugfixes:
 

data/README.md

@@ -38,7 +38,8 @@ Below is a sample config file with all supported options and all shipped plugins
 default_environments:
   - development
   - production
-version_change_threshold: 
+version_change_threshold: 2
+environment_path: "/home/me/environments"
 plugins:
   campfire:
     account: myaccount
@@ -70,6 +71,9 @@ The `default_environments` directive allows you to specify a default list of env
 #### 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.
 
+#### Environment Path
+The `envirinment_path` allows you to specify the path to where you store your chef environment json files. If this parameter is not specified, spork will default to using the first element of your cookbook_path, replacing the word "cookbooks" with "environments"
+
 #### Plugins
 Knife spork supports plugins to allow users to hook it into existing systems such as source control, monitoring and chat systems. Plugins are enabled / disabled by adding / removing their config block from the plugin section of the config file. Any of the default plugins shown above can be disabled by removing their section.
 

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.3'
+  gem.version       = '1.0.4'
   gem.authors       = ["Jon Cowie"]
   gem.email         = 'jonlives@gmail.com'
   gem.homepage      = 'https://github.com/jonlives/knife-spork'

data/lib/chef/knife/spork-upload.rb

@@ -62,19 +62,20 @@ module KnifeSpork
       @cookbooks.reverse.each do |cookbook|
         begin
           check_dependencies(cookbook)
-          if Gem.loaded_specs['chef'].version == Gem::Version.create('10.14.0')
-            uploader = Chef::CookbookUploader.new([cookbook], ::Chef::Config.cookbook_path).upload_cookbooks
-            if name_args.include?(cookbook.name.to_s)
+          if name_args.include?(cookbook.name.to_s)
+            uploader = Chef::CookbookUploader.new(cookbook, ::Chef::Config.cookbook_path)
+            if uploader.respond_to?(:upload_cookbooks)
+              # Chef >= 10.14.0
+              uploader.upload_cookbooks
               ui.info "Freezing #{cookbook.name} at #{cookbook.version}..."
               cookbook.freeze_version
-              Chef::CookbookUploader.new(cookbook, ::Chef::Config.cookbook_path).upload_cookbooks
-            end
-          else
-            uploader = Chef::CookbookUploader.new(cookbook, ::Chef::Config.cookbook_path).upload_cookbook
-            if name_args.include?(cookbook.name.to_s)
+              uploader.upload_cookbooks
+            else
+              uploader.upload_cookbook
               ui.info "Freezing #{cookbook.name} at #{cookbook.version}..."
               cookbook.freeze_version
-              Chef::CookbookUploader.new(cookbook, ::Chef::Config.cookbook_path).upload_cookbook
+              uploader.upload_cookbook
+              
             end
           end
         rescue Net::HTTPServerException => e

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

@@ -8,29 +8,41 @@ module KnifeSpork
       def perform; end
 
       def before_bump
-        git_pull
-        git_pull_submodules
+        git_pull(environment_path) unless cookbook_path.include?(environment_path.gsub"/environments","")
+        git_pull_submodules(environment_path) unless cookbook_path.include?(environment_path.gsub"/environments","")
+        cookbooks.each do |cookbook|
+          git_pull(cookbook.root_dir)
+          git_pull_submodules(cookbook.root_dir)
+        end
       end
 
       def before_upload
-        git_pull
-        git_pull_submodules
+        git_pull(environment_path) unless cookbook_path.include?(environment_path.gsub"/environments","")
+        git_pull_submodules(environment_path) unless cookbook_path.include?(environment_path.gsub"/environments","")
+        cookbooks.each do |cookbook|
+          git_pull(cookbook.root_dir)
+          git_pull_submodules(cookbook.root_dir)
+        end
       end
 
       def before_promote
-        git_pull
-        git_pull_submodules
+        cookbooks.each do |cookbook|
+          git_pull(environment_path) unless cookbook.root_dir.include?(environment_path.gsub"/environments","")
+          git_pull_submodules(environment_path) unless cookbook.root_dir.include?(environment_path.gsub"/environments","")
+          git_pull(cookbook.root_dir)
+          git_pull_submodules(cookbook.root_dir)
+        end
       end
 
       def after_bump
         cookbooks.each do |cookbook|
-          git_add("#{cookbook.root_dir}/metadata.rb")
+          git_add(cookbook.root_dir,"metadata.rb")
         end
       end
 
       def after_promote_local
         environments.each do |environment|
-          git_add("./environments/#{environment}.json")
+          git_add(environment_path,"#{environment}.json")
         end
       end
 
@@ -42,7 +54,7 @@ module KnifeSpork
         @git ||= begin
           ::Git.open('.', :log => log)
         rescue
-          ui.error 'You are not currently in a git repository. Ensure you are in the proper working directory or remove the git plugin from your KnifeSpork configuration!'
+          ui.error 'You are not currently in a git repository. Please ensure you are in a git repo, a repo subdirectory, or remove the git plugin from your KnifeSpork configuration!'
           exit(0)
         end
       end
@@ -51,33 +63,42 @@ module KnifeSpork
       #   - Stash local changes
       #   - Pull from the remote
       #   - Pop the stash
-      def git_pull
-        ui.msg "Pulling latest changes from remote Git repo."
-        begin
-          git.fetch(remote)
-          git.merge("#{remote}/#{branch}")
-        rescue ::Git::GitExecuteError => e
-          ui.error "Could not pull from remote #{remote}/#{branch}. Does it exist?"
+      def git_pull(path)
+        if is_repo?(path)
+          ui.msg "Git: Pulling latest changes from #{path}"
+          output = IO.popen ("git pull 2>&1")
+          Process.wait
+          exit_code = $?
+          if !exit_code.exitstatus ==  0
+            ui.error "#{output.read()}\n"
+            exit 1
+          end
         end
       end
 
-      def git_pull_submodules
-        ui.msg "Pulling latest changes from git submodules (if any)"
-        output = IO.popen ("git submodule foreach git pull 2>&1")
-        Process.wait
-        exit_code = $?
-        if !exit_code.exitstatus ==  0
-            ui.error "#{output.read()}\n"
-            exit 1
+      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")
+          Process.wait
+          exit_code = $?
+          if !exit_code.exitstatus ==  0
+              ui.error "#{output.read()}\n"
+              exit 1
+          end
         end
       end
       
-      def git_add(filepath)
-       begin
-          ui.msg "Git add'ing #{filepath}"
-          git.add("#{filepath}")
-        rescue ::Git::GitExecuteError => e
-          ui.error "Git: Something went wrong with git add #{filepath}. Please try running git add manually."
+      def git_add(filepath,filename)
+        if is_repo?(filepath)
+          ui.msg "Git add'ing #{filepath}/#{filename}"
+          output = IO.popen ("cd #{filepath} && git add #{filename}")
+          Process.wait
+          exit_code = $?
+          if !exit_code.exitstatus ==  0
+              ui.error "#{output.read()}\n"
+              exit 1
+          end
         end
       end
       
@@ -107,6 +128,17 @@ module KnifeSpork
         end
       end
 
+      def is_repo?(path)
+        output = IO.popen ("cd #{path} && git rev-parse --git-dir 2>&1")
+        Process.wait
+        if $? != 0
+            ui.warn "#{path} is not a git repo, skipping..."
+            return false
+        else
+            return true
+        end
+      end
+      
       def remote
         config.remote || 'origin'
       end

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

@@ -52,6 +52,14 @@ module KnifeSpork
         @options[:environment_diffs]
       end
 
+      def environment_path
+        @options[:environment_path]
+      end
+      
+      def cookbook_path
+        @options[:cookbook_path]
+      end
+      
       def ui
         @options[:ui]
       end

data/lib/knife-spork/runner.rb

@@ -35,6 +35,8 @@ module KnifeSpork
           :cookbooks => cookbooks,
           :environments => environments,
           :environment_diffs => environment_diffs,
+          :environment_path => environment_path,
+          :cookbook_path => cookbook_path,
           :ui => ui
         )
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-spork
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-10 00:00:00.000000000 Z
+date: 2012-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &70124426250060 !ruby/object:Gem::Requirement
+  requirement: &70208983407820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.10.4
   type: :runtime
   prerelease: false
-  version_requirements: *70124426250060
+  version_requirements: *70208983407820
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &70124426249560 !ruby/object:Gem::Requirement
+  requirement: &70208983407340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *70124426249560
+  version_requirements: *70208983407340
 - !ruby/object:Gem::Dependency
   name: app_conf
-  requirement: &70124426249100 !ruby/object:Gem::Requirement
+  requirement: &70208983406820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70124426249100
+  version_requirements: *70208983406820
 description: A workflow plugin to help many devs work with the same chef repo/server
 email: jonlives@gmail.com
 executables: []