knife-spork 1.2.2 → 1.3.0

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

@@ -15,6 +15,70 @@ module KnifeSpork
         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
 
+      def after_rolefromfile
+        jabber "#{organization}#{current_user} uploaded role #{object_name}"
+      end
+
+      def after_roleedit
+        jabber "#{organization}#{current_user} edited role #{object_name}"
+      end
+
+      def after_rolecreate
+        jabber "#{organization}#{current_user} created role #{object_name}"
+      end
+
+      def after_roledelete
+        jabber "#{organization}#{current_user} deleted role #{object_name}"
+      end
+
+      def after_databagedit
+        jabber "#{organization}#{current_user} edited data bag item #{object_name}:#{object_secondary_name}"
+      end
+
+      def after_databagcreate
+        jabber "#{organization}#{current_user} created data bag #{object_name}"
+      end
+
+      def after_databagdelete
+        jabber "#{organization}#{current_user} deleted data bag #{object_name}"
+      end
+
+      def after_databagitemdelete
+        jabber "#{organization}#{current_user} deleted data bag item #{object_name}:#{object_secondary_name}"
+      end
+
+      def after_databagfromfile
+        jabber "#{organization}#{current_user} uploaded data bag item #{object_name}:#{object_secondary_name}"
+      end
+
+      def after_nodeedit
+        jabber "#{organization}#{current_user} edited node #{object_name}"
+      end
+
+      def after_nodedelete
+        jabber "#{organization}#{current_user} deleted node #{object_name}"
+      end
+
+      def after_nodecreate
+        jabber "#{organization}#{current_user} created node #{object_name}"
+      end
+
+      def after_nodefromfile
+        jabber "#{organization}#{current_user} uploaded node #{object_name}"
+      end
+
+      def after_noderunlistadd
+        jabber "#{organization}#{current_user} added run_list items to #{object_name}: #{object_secondary_name}"
+      end
+
+      def after_noderunlistremove
+        jabber "#{organization}#{current_user} removed run_list items from #{object_name}: #{object_secondary_name}"
+      end
+
+      def after_noderunlistset
+        jabber "#{organization}#{current_user} set the run_list for #{object_name} to #{object_secondary_name}"
+      end
+
       private
 
       def jabber(message)

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

@@ -71,6 +71,18 @@ module KnifeSpork
         @options[:cookbook_path]
       end
 
+      def object_name
+        @options[:object_name]
+      end
+
+      def object_secondary_name
+        @options[:object_secondary_name]
+      end
+
+      def object_difference
+        @options[:object_difference]
+      end
+
       def ui
         @options[:ui]
       end

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

@@ -15,6 +15,70 @@ module KnifeSpork
         statusnet "#{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
 
+      def after_rolefromfile
+        statusnet "#{organization}#{current_user} uploaded role #{object_name}"
+      end
+
+      def after_roleedit
+        statusnet "#{organization}#{current_user} edited role #{object_name}"
+      end
+
+      def after_rolecreate
+        statusnet "#{organization}#{current_user} created role #{object_name}"
+      end
+
+      def after_roledelete
+        statusnet "#{organization}#{current_user} deleted role #{object_name}"
+      end
+
+      def after_databagedit
+        statusnet "#{organization}#{current_user} edited data bag item #{object_name}:#{object_secondary_name}"
+      end
+
+      def after_databagcreate
+        statusnet "#{organization}#{current_user} created data bag #{object_name}"
+      end
+
+      def after_databagdelete
+        statusnet "#{organization}#{current_user} deleted data bag #{object_name}"
+      end
+
+      def after_databagitemdelete
+        statusnet "#{organization}#{current_user} deleted data bag item #{object_name}:#{object_secondary_name}"
+      end
+
+      def after_databagfromfile
+        statusnet "#{organization}#{current_user} uploaded data bag item #{object_name}:#{object_secondary_name}"
+      end
+
+      def after_nodeedit
+        statusnet "#{organization}#{current_user} edited node #{object_name}"
+      end
+
+      def after_nodedelete
+        statusnet "#{organization}#{current_user} deleted node #{object_name}"
+      end
+
+      def after_nodecreate
+        statusnet "#{organization}#{current_user} created node #{object_name}"
+      end
+
+      def after_nodefromfile
+        statusnet "#{organization}#{current_user} uploaded node #{object_name}"
+      end
+
+      def after_noderunlistadd
+        statusnet "#{organization}#{current_user} added run_list items to #{object_name}: #{object_secondary_name}"
+      end
+
+      def after_noderunlistremove
+        statusnet "#{organization}#{current_user} removed run_list items from #{object_name}: #{object_secondary_name}"
+      end
+
+      def after_noderunlistset
+        statusnet "#{organization}#{current_user} set the run_list for #{object_name} to #{object_secondary_name}"
+      end
+
       private
 
       def statusnet(message)

data/lib/knife-spork/plugins.rb

@@ -6,6 +6,9 @@ module KnifeSpork
     def self.run(options = {})
       hook = options[:hook].to_sym
 
+      #Load each of the drop-in plugins specified in the custom plugin path
+      Dir[File.expand_path("#{options[:config][:custom_plugin_path]}/*.rb")].each { |f| require f }
+
       klasses.each do |klass|
         plugin = klass.new(options)
         plugin.send(hook) if plugin.respond_to?(hook) && plugin.enabled?

data/lib/knife-spork/runner.rb

@@ -1,4 +1,5 @@
 require 'app_conf'
+require 'diffy'
 require 'json'
 
 require 'chef/cookbook_loader'
@@ -26,6 +27,13 @@ module KnifeSpork
 
       def run_plugins(hook)
         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}
+
+        # Affects promote only:
+        # Set loaded cookbook version if the -v or --version parameter was specified
+        # Otherwise the version on disk, often more recent will be used.
+        # We know cookbooks will only contain one cookbook in the case of promote.
+        cookbooks.map{|c|c.version = config[:version]} if config[:version]
+
         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
 
@@ -37,6 +45,9 @@ module KnifeSpork
           :environment_diffs => environment_diffs,
           :environment_path => environment_path,
           :cookbook_path => cookbook_path,
+          :object_name => @object_name,
+          :object_secondary_name => @object_secondary_name,
+          :object_difference => @object_difference,
           :ui => ui
         )
       end
@@ -88,8 +99,12 @@ module KnifeSpork
         end
       end
 
-      def loader
-        @loader ||= Chef::Knife::Core::ObjectLoader.new(::Chef::Environment, ui)
+      def environment_loader
+        @environment_loader ||= Chef::Knife::Core::ObjectLoader.new(::Chef::Environment, ui)
+      end
+
+      def role_loader
+        @role_loader ||= Chef::Knife::Core::ObjectLoader.new(::Chef::Role, ui)
       end
 
       # It's not feasible to try and "guess" which cookbook path to use, so we will
@@ -103,6 +118,10 @@ module KnifeSpork
         spork_config[:environment_path] || cookbook_path.gsub("/cookbooks","/environments")
       end
 
+      def role_path
+        spork_config[:role_path] || cookbook_path.gsub("/cookbooks","/roles")
+      end
+
       def all_cookbooks
         ::Chef::CookbookLoader.new(::Chef::Config.cookbook_path)
       end
@@ -134,7 +153,9 @@ module KnifeSpork
           berksfile.resolve(lockfile.find(name))[:solution].first
         }
 
-        cookbook
+        #convert Berkshelf::CachedCookbook to Chef::CookbookVersion
+        ::Chef::CookbookLoader.new(File.dirname(cookbook.path))[name]
+
       end
 
       # @todo #opensource
@@ -148,8 +169,28 @@ module KnifeSpork
         cookbook_names.collect{ |cookbook_name| load_cookbook(cookbook_name) }
       end
 
+      def load_role_from_file(role_name)
+        role_loader.object_from_file("#{role_path}/#{role_name}.json")
+      end
+
+      def load_role(role_name)
+        Chef::Role.load(role_name)
+      end
+
+      def load_node(node)
+        Chef::Node.load(node)
+      end
+
+      def load_databag(bag)
+        Chef::DataBag.load(bag)
+      end
+
+      def load_databag_item(bag, item_name)
+        Chef::DataBagItem.load(bag, item_name)
+      end
+
       def load_environment(environment_name)
-        loader.object_from_file("#{environment_path}/#{environment_name}.json")
+        environment_loader.object_from_file("#{environment_path}/#{environment_name}.json")
       end
 
       def load_remote_environment(environment_name)
@@ -167,6 +208,12 @@ module KnifeSpork
         hash_diff remote_environment_versions, local_environment_versions
       end
 
+      def json_diff(a, b)
+        pre_json =  JSON.parse(a.respond_to?(:to_json) ? a.to_json : a)
+        post_json =  JSON.parse(b.respond_to?(:to_json) ? b.to_json : b)
+        Diffy::Diff.new(JSON.pretty_generate(pre_json), JSON.pretty_generate(post_json), :diff=>"-U 3")
+      end
+
       def hash_diff(hash, other)
         hash.keys.inject({}) do |memo, key|
           unless hash[key] == other[key]

data/plugins/Foodcritic.md

@@ -7,7 +7,7 @@ Gem Requirements
 This plugin requires the following gems:
 
 ```ruby
-gem 'foodcritic'
+gem 'foodcritic' >= 3.0.0
 ```
 
 Hooks

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-spork
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
+date: 2013-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 11.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 11.0.0
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: diffy
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.1
 description: A workflow plugin to help many devs work with the same chef repo/server
 email: jonlives@gmail.com
 executables: []
@@ -75,8 +91,24 @@ files:
 - knife-spork.gemspec
 - lib/chef/knife/spork-bump.rb
 - lib/chef/knife/spork-check.rb
+- lib/chef/knife/spork-databag-create.rb
+- lib/chef/knife/spork-databag-delete.rb
+- lib/chef/knife/spork-databag-edit.rb
+- lib/chef/knife/spork-databag-fromfile.rb
 - lib/chef/knife/spork-info.rb
+- lib/chef/knife/spork-node-create.rb
+- lib/chef/knife/spork-node-delete.rb
+- lib/chef/knife/spork-node-edit.rb
+- lib/chef/knife/spork-node-fromfile.rb
+- lib/chef/knife/spork-node-runlistadd.rb
+- lib/chef/knife/spork-node-runlistremove.rb
+- lib/chef/knife/spork-node-runlistset.rb
+- lib/chef/knife/spork-omni.rb
 - lib/chef/knife/spork-promote.rb
+- lib/chef/knife/spork-role-create.rb
+- lib/chef/knife/spork-role-delete.rb
+- lib/chef/knife/spork-role-edit.rb
+- lib/chef/knife/spork-role-fromfile.rb
 - lib/chef/knife/spork-upload.rb
 - lib/knife-spork.rb
 - lib/knife-spork/plugins.rb