knife-spork 1.0.9 → 1.0.10

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.0.10 (22nd November, 2012)
+Bugfixes:
+
+    - Load all cookbook versions from remote server when checking dependencies (thanks to gmcmillan)
+
 ## 1.0.9 (28th October, 2012)
 Features:
 

data/README.md

@@ -51,6 +51,15 @@ plugins:
       - Web Operations
     notify: true
     color: yellow
+  jabber:
+    username: YOURUSER
+    password: YOURPASSWORD
+    nickname: Chef Bot
+    server_name: your.jabberserver.com
+    server_port: 5222
+    rooms:
+      - engineering@your.conference.com/spork
+      - systems@your.conference.com/spork
   git:
     enabled: true
   irccat:

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

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

@@ -17,10 +17,14 @@ module KnifeSpork
         ui.error("You must specify at least a cookbook name")
         exit 1
       end
-      
+
+      #First load so plugins etc know what to work with
       @cookbook = load_cookbook(name_args.first)
 
       run_plugins(:before_bump)
+
+      #Reload cookbook in case a VCS plugin found updates
+      @cookbook = load_cookbook(name_args.first)
       bump
       run_plugins(:after_bump)
     end

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

@@ -25,14 +25,14 @@ module KnifeSpork
         exit(1)
       end
 
-      begin
-        @cookbook = load_cookbook(name_args.first)
-      rescue Chef::Exceptions::CookbookNotFoundInRepo => e
-        ui.error "#{name_args.first} does not exist locally in your cookbook path(s), Exiting."
-        exit(1)
-      end
+      #First load so plugins etc know what to work with
+      initial_load
       
       run_plugins(:before_check)
+
+      #Reload cookbook in case a VCS plugin found updates
+      initial_load
+
       check
       run_plugins(:after_check)
     end
@@ -71,6 +71,15 @@ module KnifeSpork
       ui.msg 'Everything looks good!'
     end
 
+    def initial_load
+      begin
+        @cookbook = load_cookbook(name_args.first)
+      rescue Chef::Exceptions::CookbookNotFoundInRepo => e
+        ui.error "#{name_args.first} does not exist locally in your cookbook path(s), Exiting."
+        exit(1)
+      end
+    end
+
     def local_version
       @cookbook.version
     end

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

@@ -28,10 +28,14 @@ module KnifeSpork
         exit 1
       end
 
+      #First load so plugins etc know what to work with
       @environments, @cookbook = load_environments_and_cookbook
 
       run_plugins(:before_promote)
 
+      #Reload cookbook and env in case a VCS plugin found updates
+      @environments, @cookbook = load_environments_and_cookbook
+
       check_cookbook_uploaded(@cookbook)
 
       @environments.each do |e|

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

@@ -40,10 +40,16 @@ module KnifeSpork
         exit 1
       end
 
+      #First load so plugins etc know what to work with
       @cookbooks = load_cookbooks(name_args)
       include_dependencies if config[:depends]
 
       run_plugins(:before_upload)
+
+      #Reload cookbook in case a VCS plugin found updates
+      @cookbooks = load_cookbooks(name_args)
+      include_dependencies if config[:depends]
+
       upload
       run_plugins(:after_upload)
     end
@@ -75,7 +81,7 @@ module KnifeSpork
               ui.info "Freezing #{cookbook.name} at #{cookbook.version}..."
               cookbook.freeze_version
               uploader.upload_cookbook
-              
+
             end
           end
         rescue Net::HTTPServerException => e
@@ -102,7 +108,7 @@ module KnifeSpork
     end
 
     def server_side_cookbooks(cookbook_name, version)
-      @server_side_cookbooks ||= Chef::CookbookVersion.list
+      @server_side_cookbooks ||= Chef::CookbookVersion.list_all_versions
 
       hash = @server_side_cookbooks[cookbook_name]
       hash && hash['versions'] && hash['versions'].any?{ |v| Chef::VersionConstraint.new(version).include?(v['version']) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-spork
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-28 00:00:00.000000000 Z
+date: 2012-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &70361786030120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 0.10.4
   type: :runtime
   prerelease: false
-  version_requirements: *70361786030120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.4
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &70361786029160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 1.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *70361786029160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.5
 - !ruby/object:Gem::Dependency
   name: app_conf
-  requirement: &70361786028040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70361786028040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 description: A workflow plugin to help many devs work with the same chef repo/server
 email: jonlives@gmail.com
 executables: []
@@ -105,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A workflow plugin to help many devs work with the same chef repo/server