knife-spork 1.0.13 → 1.0.14

data/CHANGELOG.md

@@ -1,8 +1,20 @@
+## 1.0.14 (15th January, 2013)
+
+Features:
+
+    -  Campfire plugin changed to use campy gem (thanks to Seth Vargo)
+    -  Organization name now added to messages when present (thanks to Seth Vargo)
+    -  Berkshelf support now added (thanks to Seth Vargo)
+
+Bugfixes:
+
+    - Promote won't try to create a version diff if there is no existing remote version (thanks to Seth Vargo)
+
 ## 1.0.13 (9th January, 2013)
 
 Features:
 
-    -  Jabber Plugin (thanks to Graham McMillan - https://github.com/gmcmillan)
+    -  Made spork promote Use environment_path from spork config if it's set( thanks to Greg Karékinian - https://github.com/gkarekinian)
 
 ## 1.0.12 (22nd November, 2012)
 Bugfixes:

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

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

@@ -2,6 +2,10 @@ require 'chef/knife'
 require 'chef/exceptions'
 require 'knife-spork/runner'
 
+begin
+  require 'berkshelf'
+rescue LoadError; end
+
 module KnifeSpork
   class SporkPromote < Chef::Knife
     include KnifeSpork::Runner
@@ -19,6 +23,14 @@ module KnifeSpork
       :description => 'Save the environment to the chef server in addition to the local JSON file',
       :default => nil
 
+    if defined?(::Berkshelf)
+      option :berksfile,
+        :short => '-b',
+        :long => 'berksfile',
+        :description => 'Path to a Berksfile to operate off of',
+        :default => File.join(Dir.pwd, ::Berkshelf::DEFAULT_FILENAME)
+    end
+
     def run
       self.config = Chef::Config.merge!(config)
 
@@ -77,10 +89,10 @@ module KnifeSpork
       remote_environment = load_remote_environment(environment)
       @environment_diffs ||= Hash.new
       @environment_diffs["#{environment}"] = environment_diff(local_environment, remote_environment)
-      
+
       version_change_threshold = spork_config.version_change_threshold || 2
       env_constraints_diff = constraints_diff(@environment_diffs["#{environment}"]).select{|k,v| v > version_change_threshold}
-      
+
       if env_constraints_diff.size !=0 then
         ui.warn 'You\'re about to promote a significant version number change to 1 or more cookbooks:'
         ui.warn @environment_diffs["#{environment}"].select{|k,v|env_constraints_diff.has_key?(k)}.collect{|k,v| "\t#{k}: #{v}"}.join("\n")
@@ -98,8 +110,8 @@ module KnifeSpork
           raise
         end
       end
-      
-      if  @environment_diffs["#{environment}"].size > 1
+
+      if @environment_diffs["#{environment}"].size > 1
         ui.msg ""
         ui.warn "You're about to promote changes to several cookbooks at once:"
         ui.warn @environment_diffs["#{environment}"].collect{|k,v| "\t#{k}: #{v}"}.join("\n")

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

@@ -10,7 +10,7 @@ module KnifeSpork
       def after_upload
         campfire do |rooms|
           rooms.paste <<-EOH
-#{current_user} froze the following cookbooks on Chef Server:
+#{organization}#{current_user} froze the following cookbooks on Chef Server:
 #{cookbooks.collect{|c| "  #{c.name}@#{c.version}"}.join("\n")}
 EOH
         end
@@ -19,7 +19,7 @@ EOH
       def after_promote_remote
         campfire do |rooms|
           rooms.paste <<-EOH
-#{current_user} promoted cookbooks on Chef Server:
+#{organization}#{current_user} promoted cookbooks on Chef Server:
 
 cookbooks:
 #{cookbooks.collect{|c| "  #{c.name}@#{c.version}"}.join("\n")}
@@ -32,13 +32,17 @@ EOH
 
       private
       def campfire(&block)
-        safe_require 'tinder'
+        safe_require 'campy'
 
         rooms = [config.rooms || config.room].flatten.compact
-        campfire = Tinder::Campfire.new(config.account, :token => config.token)
+        campfire = Campy::Room.new(:account => config.account, :token => config.token)
 
         rooms.each do |room_name|
-          room = campfire.find_room_by_name(room_name)
+          room = Campy::Room.new(
+            :account => config.account,
+            :token => config.token,
+            :room => room_name
+          )
           yield(room) unless room.nil?
         end
       end

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

@@ -14,7 +14,7 @@ module KnifeSpork
           event_data = {
             :tag => 'knife',
             :username => current_user,
-            :status => "#{current_user} has uploaded and frozen #{cookbook.name}@#{cookbook.version}",
+            :status => "#{organization}#{current_user} uploaded and froze #{cookbook.name}@#{cookbook.version}",
             :metadata => {
               :cookbook_name => cookbook.name,
               :cookbook_version => cookbook.version
@@ -30,7 +30,7 @@ module KnifeSpork
             event_data = {
               :tag => 'knife',
               :username => current_user,
-              :status => "#{current_user} has promoted #{cookbook.name}(#{cookbook.version}) to #{environment.name}",
+              :status => "#{organization}#{current_user} promoted #{cookbook.name}(#{cookbook.version}) to #{environment.name}",
               :metadata => {
                 :cookbook_name => cookbook.name,
                 :cookbook_version => cookbook.version

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

@@ -8,11 +8,11 @@ module KnifeSpork
       def perform; end
 
       def after_upload
-        hipchat "#{current_user} uploaded the following cookbooks:\n#{cookbooks.collect{ |c| "  #{c.name}@#{c.version}" }.join("\n")}"
+        hipchat "#{organization}#{current_user} uploaded the following cookbooks:\n#{cookbooks.collect{ |c| "  #{c.name}@#{c.version}" }.join("\n")}"
       end
 
       def after_promote_remote
-        hipchat "#{current_user} promoted the following cookbooks:\n#{cookbooks.collect{ |c| "  #{c.name}@#{c.version}" }.join("\n")} to #{environments.collect{ |e| "#{e.name}" }.join(", ")}"
+        hipchat "#{organization}#{current_user} promoted the following cookbooks:\n#{cookbooks.collect{ |c| "  #{c.name}@#{c.version}" }.join("\n")} to #{environments.collect{ |e| "#{e.name}" }.join(", ")}"
       end
 
       private

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

@@ -8,14 +8,14 @@ module KnifeSpork
       def perform; end
 
       def after_upload
-        irccat("#BOLD#PURPLECHEF:#NORMAL #{current_user} uploaded #TEAL#{cookbooks.collect{ |c| "#{c.name}@#{c.version}" }.join(", ")}#NORMAL")
+        irccat("#BOLD#PURPLECHEF:#NORMAL #{organization}#{current_user} uploaded #TEAL#{cookbooks.collect{ |c| "#{c.name}@#{c.version}" }.join(", ")}#NORMAL")
       end
 
       def after_promote_remote
         environments.each do |environment|
           diff = environment_diffs[environment.name]
           env_gist = gist(environment, diff) if config.gist
-          irccat("#BOLD#PURPLECHEF:#NORMAL #{current_user} promoted #TEAL#{cookbooks.collect{ |c| "#{c.name}@#{c.version}" }.join(", ")}#NORMAL to #{environment.name} #{env_gist}")
+          irccat("#BOLD#PURPLECHEF:#NORMAL #{organization}#{current_user} promoted #TEAL#{cookbooks.collect{ |c| "#{c.name}@#{c.version}" }.join(", ")}#NORMAL to #{environment.name} #{env_gist}")
         end
       end
 
@@ -39,7 +39,7 @@ module KnifeSpork
         msg = "Environment #{environment} uploaded at #{Time.now.getutc} by #{current_user}\n\nConstraints updated on server in this version:\n\n#{diff.collect { |k, v| "#{k}: #{v}\n" }.join}"
         %x[ echo "#{msg}" | #{config.gist}]
       end
-      
+
       def channels
         [ config.channel || config.channels ].flatten
       end

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

@@ -8,11 +8,11 @@ module KnifeSpork
       def perform; end
 
       def after_upload
-        jabber "#{current_user} uploaded the following cookbooks:\n#{cookbooks.collect{ |c| "  #{c.name}@#{c.version}" }.join("\n")}"
+        jabber "#{organization}#{current_user} uploaded the following cookbooks:\n#{cookbooks.collect{ |c| "  #{c.name}@#{c.version}" }.join("\n")}"
       end
 
       def after_promote_remote
-        jabber "#{current_user} promoted the following cookbooks:\n#{cookbooks.collect{ |c| "  #{c.name}@#{c.version}" }.join("\n")} to #{environments.collect{ |e| "#{e.name}" }.join(", ")}"
+        jabber "#{organization}#{current_user} promoted the following cookbooks:\n#{cookbooks.collect{ |c| "  #{c.name}@#{c.version}" }.join("\n")} to #{environments.collect{ |e| "#{e.name}" }.join(", ")}"
       end
 
       private

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

@@ -37,7 +37,18 @@ module KnifeSpork
 
       private
       def config
-          @options[:config].plugins.send(self.class.name.to_sym) unless @options[:config].nil? || @options[:config].plugins.nil?
+        @options[:config].plugins.send(self.class.name.to_sym) unless @options[:config].nil? || @options[:config].plugins.nil?
+      end
+
+      def organization
+        unless ::Chef::Config.chef_server_url.nil?
+          split_server_url = Chef::Config.chef_server_url.gsub(/http(s)?:\/\//,"").split('/')
+          if split_server_url.length > 1
+            return "#{split_server_url.last}: "
+          end
+        end
+
+        nil
       end
 
       def cookbooks
@@ -55,11 +66,11 @@ module KnifeSpork
       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

@@ -28,7 +28,7 @@ module KnifeSpork
         cookbooks = [ @cookbooks || @cookbook ].flatten.compact.collect{|cookbook| cookbook.is_a?(::Chef::CookbookVersion) ? cookbook : load_cookbook(cookbook)}.sort{|a,b| a.name.to_s <=> b.name.to_s}
         environments = [ @environments || @environment ].flatten.compact.collect{|environment| environment.is_a?(::Chef::Environment) ? environment : load_environment(environment)}.sort{|a,b| a.name.to_s <=> b.name.to_s}
         environment_diffs = @environment_diffs
-        
+
         KnifeSpork::Plugins.run(
           :config => spork_config,
           :hook => hook.to_sym,
@@ -89,7 +89,7 @@ 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
@@ -100,8 +100,24 @@ module KnifeSpork
 
       def load_cookbook(cookbook_name)
         return cookbook_name if cookbook_name.is_a?(::Chef::CookbookVersion)
+
+        # Search the local chef repo first
         loader = ::Chef::CookbookLoader.new(Chef::Config.cookbook_path)
-        loader[cookbook_name]
+        if loader.has_key?(cookbook_name)
+          return loader[cookbook_name]
+        end
+
+        # We didn't find the cookbook in our local repo, so check Berkshelf
+        if defined?(::Berkshelf)
+          berksfile = ::Berkshelf::Berksfile.from_file(self.config[:berksfile])
+          if cookbook = berksfile.sources.find{ |source| source.name == cookbook_name }
+            return cookbook
+          end
+        end
+
+        # TODO: add librarian support here
+
+        raise ::Chef::Exceptions::CookbookNotFound, "Could not find cookbook '#{cookbook_name}' in any of the sources!"
       end
 
       def load_cookbooks(cookbook_names)
@@ -119,21 +135,27 @@ module KnifeSpork
         rescue Net::HTTPServerException => e
           ui.error "Could not load #{environment_name} from Chef Server. You must upload the environment manually the first time."
           exit(1)
-        end      
+        end
       end
 
-      def environment_diff (local_environment, remote_environment)
-          local_environment_versions = local_environment.to_hash['cookbook_versions']
-          remote_environment_versions = remote_environment.to_hash['cookbook_versions']
-          remote_environment_versions.diff(local_environment_versions)
+      def environment_diff(local_environment, remote_environment)
+        local_environment_versions = local_environment.to_hash['cookbook_versions']
+        remote_environment_versions = remote_environment.to_hash['cookbook_versions']
+        remote_environment_versions.diff(local_environment_versions)
       end
-      
+
       def constraints_diff (environment_diff)
-        Hash[Hash[environment_diff.map{|k,v| [k, v.split(" changed to ").map{|x|x.gsub("= ","")}]}].map{|k,v|[k,calc_diff(v)]}]
+        Hash[Hash[environment_diff.map{|k,v| [k, v.split(" changed to ").map{|x|x.gsub("= ","")}]}].map{|k,v|[k,calc_diff(k,v)]}]
       end
-      
-      def calc_diff(version)
+
+      def calc_diff(cookbook, version)
         components =  version.map{|v|v.split(".")}
+
+        if components.length < 2
+          ui.warn "#{cookbook} has no remote version to diff against!"
+          return 0
+        end
+
         if components[1][0].to_i != components[0][0].to_i
           return (components[1][0].to_i - components[0][0].to_i)*100
         elsif components[1][1].to_i != components[0][1].to_i
@@ -142,7 +164,7 @@ module KnifeSpork
           return (components[1][2].to_i - components[0][2].to_i)
         end
       end
-      
+
       def ensure_cookbook_path!
         if !config.has_key?(:cookbook_path)
           ui.fatal "No default cookbook_path; Specify with -o or fix your knife.rb."

data/plugins/Campfire.md

@@ -7,7 +7,7 @@ Gem Requirements
 This plugin requires the following gems:
 
 ```ruby
-gem 'tinder'
+gem 'campy'
 ```
 
 Hooks

metadata

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