knife-spork 1.0.2 → 1.0.3

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 1.0.3 (10th September, 2012)
+Bugfixes:
+
+    - Fix spork upload when using Chef 10.14.0
+    - Optional config override for chef environment location (not documented in README until 1.0.4)
+    
+## 1.0.2 (28th August, 2012)
+Bugfixes:
+
+    - Fix bug which caused plugin errors when no spork config file could be found
+    
+## 1.0.1 (27th August, 2012)
+Bugfixes:
+
+    - Fix require error which broke spork on CentOS 5.6
+    
 ## 1.0.0 (27th August, 2012)
 Features:
 

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

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

@@ -11,6 +11,13 @@ module KnifeSpork
 
     def run
       self.config = Chef::Config.merge!(config)
+      
+      if @name_args.empty?
+        show_usage
+        ui.error("You must specify at least a cookbook name")
+        exit 1
+      end
+      
       @cookbook = load_cookbook(name_args.first)
 
       run_plugins(:before_bump)

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

@@ -62,11 +62,20 @@ module KnifeSpork
       @cookbooks.reverse.each do |cookbook|
         begin
           check_dependencies(cookbook)
-          Chef::CookbookUploader.new(cookbook, ::Chef::Config.cookbook_path).upload_cookbook
-          if name_args.include?(cookbook.name.to_s)
-            ui.info "Freezing #{cookbook.name} at #{cookbook.version}..."
-            cookbook.freeze_version
-            Chef::CookbookUploader.new(cookbook, ::Chef::Config.cookbook_path).upload_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)
+              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)
+              ui.info "Freezing #{cookbook.name} at #{cookbook.version}..."
+              cookbook.freeze_version
+              Chef::CookbookUploader.new(cookbook, ::Chef::Config.cookbook_path).upload_cookbook
+            end
           end
         rescue Net::HTTPServerException => e
           if e.response.code == '409'

data/lib/knife-spork/runner.rb

@@ -14,7 +14,7 @@ module KnifeSpork
         return @spork_config unless @spork_config.nil?
 
         @spork_config = AppConf.new
-        load_paths = [ File.expand_path('config/spork-config.yml'), '/etc/spork-config.yml', File.expand_path('~/.chef/spork-config.yml') ]
+        load_paths = [ File.expand_path("#{cookbook_path.gsub('cookbooks','')}/config/spork-config.yml"), File.expand_path('config/spork-config.yml'), '/etc/spork-config.yml', File.expand_path('~/.chef/spork-config.yml') ]
         load_paths.each do |load_path|
           if File.exists?(load_path)
             @spork_config.load(load_path)
@@ -87,6 +87,10 @@ module KnifeSpork
         ensure_cookbook_path!
         [config[:cookbook_path] ||= ::Chef::Config.cookbook_path].flatten[0]
       end
+      
+      def environment_path
+        spork_config[:environment_path] || cookbook_path.gsub("/cookbooks","/environments")
+      end
 
       def all_cookbooks
         ::Chef::CookbookLoader.new(::Chef::Config.cookbook_path)
@@ -104,7 +108,7 @@ module KnifeSpork
       end
 
       def load_environment(environment_name)
-        loader.load_from('environments', "#{environment_name}.json")
+        loader.object_from_file("#{environment_path}/#{environment_name}.json")
       end
 
       def load_remote_environment(environment_name)

metadata

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