knife-spork 1.4.2 → 1.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDQ0OGMxOWQxZjQ5OWQ4OTIxM2NjZjg0ZGFiZmIxYjEwYWRlZDYyZg==
+    ZjE4NDhiY2I4MTA3YjgyZWFmYWMxNDk0MTc0NmQzMDdiZjVmNDNlOA==
   data.tar.gz: !binary |-
-    MDBiYmMzMjMxMjQxNzZhYmMwYzQ0MTVjNzczY2M5NTgxZWZhZTA1Nw==
+    NzFjYTlhOWIyMDhhYzVjZDI3Mjg2YWMwNmI1OGFhMzQyMWJmMTY3OQ==
 SHA512:
   metadata.gz: !binary |-
-    ZDkwOWZmNjEyNzQ3YTgzOWJmOTJkNGU1NTFhYjMwNGMwMWE5ZjAwNjJhY2M4
-    MGYyODgwMDdkMGY2ZTRjY2JiNDgyM2Y2NTlkNWFiYTlhMzMzNjM0YzExZjAy
-    MWJjMzY3YmNmZjk1NDNiYjZlOTA5YmNkZmY0NDcwNDRkZjU3YTA=
+    NmRjNWRkNGQ4YWVkMDZkNjJkZmVkY2VlM2U1MjM3OWFkYTY0ZmNkNzdiMzcw
+    MDRjMzY4YjUyZTgyNDdkNmJjODdkZWM5NmU5YmQ2OTEzNGZiY2E3ZmQxYjE5
+    MjU5MTYxMmQ2MzAzMWIxOGQwMzEwNWQ4NTlmY2IyMGZmOTE5ZjA=
   data.tar.gz: !binary |-
-    MTg4MGRlN2Q5YzgxNWJmZjFkODZjNDZkNTcxZDI5MDIyMTQzOTEyMDY3NGIy
-    MTI1NDRjMmE2OTI3NTU2OWVkY2I4NmQ3MjY0YzA1MjlmNDVkOGFkMGQyMDli
-    YmY5ZTlkYjE4YmRiMDYwM2RlNmI1NjZkNTFmYjVjMjZlM2Y4Nzc=
+    OTIzMWU3YTViODZmZjUzZWI4ZGQzM2QyYzAyMmZlYzc1YzY2ODU2OTJkNzJj
+    OTU4MWE2NWRhZTRiNDc5NGJlN2FjMGU2MWE1MzljY2RhNWZkODQ0Y2Q5ZjM5
+    ZTZlMzM5Y2I0ZGEyMGVkMmRmNTU5NDcyZDE0ODIwNTRhZmEwMjg=

data/.travis.yml

@@ -1,3 +1,3 @@
 language: ruby
 rvm:
-  - 1.9.3
+  - 2.1.1

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+## 1.5.0(26th January, 2015)
+
+Features:
+
+    - InfluxDB Plugin added (Thanks to @vic3lord https://github.com/jonlives/knife-spork/pull/167)
+    - Add gist & diff behavior to the Hipchat plugin (Thanks to @danieleva https://github.com/jonlives/knife-spork/pull/153)
+    - Optional config flag to enforce that role files share the same name as the role they contain (Thanks to @nishansubedi https://github.com/jonlives/knife-spork/pull/152)
+    - Add optional --cookbook-path flag to Spork Promote (Thanks to @bcandrea https://github.com/jonlives/knife-spork/pull/169)
+    - Add --cookbook-path option to spork promote command (Thanks to @bcandrea https://github.com/jonlives/knife-spork/pull/169)
+    - Add verification check to environment create commadn when environment already exists (https://github.com/jonlives/knife-spork/issues/171)
+    - Add save_environment_locally_on_create option to have environment create command save a local copy of the environment file (https://github.com/jonlives/knife-spork/issues/172)
+    - Lazily load Berkshelf to improve overall knife performance (Thanks to @lamont-granquist https://github.com/jonlives/knife-spork/pull/158)
+
+Bugfixes:
+
+    - Add cookbook name metadata field to test cookbook (Thanks to @jdmundrawala https://github.com/jonlives/knife-spork/pull/162)
+    - Add missing require statements to fix specs running against Chef 12 (Thanks to @jdmunrawala https://github.com/jonlives/knife-spork/pull/163)
+    - Fix issues with the slack plugin (Thanks to @therobot https://github.com/jonlives/knife-spork/pull/160)
+    - Fix issue with knife spork omni and skip_berkshelf option when Berkshelf not installed (Thanks to @ctrlok https://github.com/jonlives/knife-spork/pull/168)
+    - Fix yajl error on missing environment files (Thanks to @oker1 https://github.com/jonlives/knife-spork/pull/165)
+    - Fix for changed constant name from Yaj to FFI_Yajl in Chef 12 (Thanks to @jeunito https://github.com/jonlives/knife-spork/pull/154)
+    - Fix Spork DataBag Create to handle specifying a data bag item name too (https://github.com/jonlives/knife-spork/issues/156)
+
+
 ## 1.4.2(3rd November, 2014)
 
 Features:
@@ -14,7 +38,7 @@ Bugfixes:
     - Fix custom plugin loading on Window (Thanks to @carpnick https://github.com/jonlives/knife-spork/pull/150)
     - Fix config loading in CookbookUploader under Chef 12 (Thanks to @jordane https://github.com/jonlives/knife-spork/pull/149)
     - Do not attempt to load Berksfile if not present (Thanks to @redondos https://github.com/jonlives/knife-spork/pull/142)
-    
+
 ## 1.4.1 (21st August, 2014)
 
 Bugfixes:

data/README.md

@@ -50,10 +50,12 @@ environment_groups:
 version_change_threshold: 2
 preserve_constraint_operators: true
 environment_path: "/home/me/environments"
+save_environment_locally_on_create: false
 role_path: "/home/me/roles"
 custom_plugin_path: "/home/me/spork-plugins"
 always_promote_remote: true
 skip_berkshelf: false
+role_match_file_name: true
 json_options:
   indent: "    "
 plugins:
@@ -90,6 +92,13 @@ plugins:
   graphite:
     server: graphite.mydomain.com
     port: 2003
+  influxdb:
+    database: deployments
+    username: deploy
+    password: deploy
+    series: deployments
+    host: influx.example.com
+    port: 8086
   eventinator:
     url: http://eventinator.mydomain.com/events/oneshot
   slack:
@@ -129,11 +138,18 @@ The `skip_berkshelf` directive is a temporary flag added in [#138](https://githu
 The `json_options` directive allows you to tell spork to pass options to [pretty_generate](http://www.ruby-doc.org/stdlib-1.9.3/libdoc/json/rdoc/JSON.html#method-i-pretty_generate) to control the format of the resulting json
 
 #### Environment Path
-The `environment_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"
+The `environment_path` directive 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"
+
+#### Save Environment on Create
+The `save_environment_on_create` directive allows you to have the ```knife spork environment create``` command save a copy of the new environment to your Chef repository. This will default to saving environment files in the location specified by the ```environment_path``` directive. If this parameter is not specified, spork will default to using the first element of your cookbook_path, replacing the word "cookbooks" with "environments"
+
 
 #### Role Path
 The `role_path` allows you to specify the path to where you store your chef role 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 "roles"
 
+#### Role Match File Name
+The `role_match_file_name` flag allows you to check whether the file name that is used to upload a role matches the role name as well. If the parameter is specified, or flag `--match-filename` is set, spork will not let you upload a role from a file unless the name matches the rolename.
+
 #### Custom Plugin Path
 The `custom_plugin_path` allows you to specify an additional directory from which to load knife-spork plugins. If this parameter is not specified or the path set does not exist, only the default plugins shipped with knife-spork will be loaded (if enabled in config)
 

data/Rakefile

@@ -21,8 +21,8 @@ task :preseed_test_environment do
   @server = ChefZero::Server.new(port: 4000)
   @server.start_background
   puts "Uploading test data"
-  `knife cookbook upload example -c spec/unit/fixtures/knife.rb`
-  `knife environment from file spec/unit/fixtures/environments/example.json -c spec/unit/fixtures/knife.rb`
+  system("knife cookbook upload example -c spec/unit/fixtures/knife.rb")
+  system("knife environment from file spec/unit/fixtures/environments/example.json -c spec/unit/fixtures/knife.rb")
 end
 
 task :cleanup_test_environment do

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

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

@@ -10,24 +10,23 @@ module KnifeSpork
     TYPE_INDEX = { :major => 0, :minor => 1, :patch => 2, :manual => 3 }.freeze
 
     option :cookbook_path,
-           :short => '-o PATH:PATH',
-           :long => '--cookbook-path PATH:PATH',
-           :description => 'A colon-separated path to look for cookbooks in',
-           :proc => lambda { |o| o.split(':') }
-
-    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)
-
-      option :skip_dependencies,
-        :short => '-s',
-        :long => '--skip-dependencies',
-        :description => 'Berksfile skips resolving source cookbook dependencies',
-        :default => true
-    end
+      :short => '-o PATH:PATH',
+      :long => '--cookbook-path PATH:PATH',
+      :description => 'A colon-separated path to look for cookbooks in',
+      :proc => lambda { |o| o.split(':') }
+
+    option :berksfile,
+      :short => '-b',
+      :long => 'berksfile',
+      :description => 'Path to a Berksfile to operate off of',
+      :default => nil,
+      :proc => lambda { |o| o || File.join(Dir.pwd, ::Berkshelf::DEFAULT_FILENAME) }
+
+    option :skip_dependencies,
+      :short => '-s',
+      :long => '--skip-dependencies',
+      :description => 'Berksfile skips resolving source cookbook dependencies',
+      :default => true
 
     banner 'knife spork bump COOKBOOK [major|minor|patch|manual]'
 

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

@@ -15,28 +15,27 @@ module KnifeSpork
       :description => 'Show all uploaded versions of the cookbook'
 
     option :fail,
-       :long => "--fail",
-       :description => "If the check fails exit with non-zero exit code"
+      :long => "--fail",
+      :description => "If the check fails exit with non-zero exit code"
 
     option :cookbook_path,
-           :short => '-o PATH:PATH',
-           :long => '--cookbook-path PATH:PATH',
-           :description => 'A colon-separated path to look for cookbooks in',
-           :proc => lambda { |o| o.split(':') }
-
-    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)
-
-      option :skip_dependencies,
-        :short => '-s',
-        :long => '--skip-dependencies',
-        :description => 'Berksfile skips resolving source cookbook dependencies',
-        :default => true
-    end
+      :short => '-o PATH:PATH',
+      :long => '--cookbook-path PATH:PATH',
+      :description => 'A colon-separated path to look for cookbooks in',
+      :proc => lambda { |o| o.split(':') }
+
+    option :berksfile,
+      :short => '-b',
+      :long => 'berksfile',
+      :description => 'Path to a Berksfile to operate off of',
+      :default => nil,
+      :proc => lambda { |o| o || File.join(Dir.pwd, ::Berkshelf::DEFAULT_FILENAME) }
+
+    option :skip_dependencies,
+      :short => '-s',
+      :long => '--skip-dependencies',
+      :description => 'Berksfile skips resolving source cookbook dependencies',
+      :default => true
 
     def run
       self.class.send(:include, KnifeSpork::Runner)
@@ -54,7 +53,7 @@ module KnifeSpork
 
       #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
@@ -152,7 +151,7 @@ module KnifeSpork
         rest.get_rest(api_endpoint).to_hash['frozen?']
       end
     end
-    
+
     def fail_and_exit(message, options={})
      	ui.fatal message
      	show_usage if options[:show_usage]

data/lib/chef/knife/spork-databag-create.rb

@@ -31,11 +31,12 @@ module KnifeSpork
       end
 
       @object_name = @name_args.first
+      @object_secondary_name = @name_args.last
 
       run_plugins(:before_databagcreate)
       pre_databag = {}
       databag_create
-      post_databag = load_databag(@object_name)
+      post_databag = load_databag_item(@object_name, @object_secondary_name)
       @object_difference = json_diff(pre_databag,post_databag).to_s
       run_plugins(:after_databagcreate)
     end

data/lib/chef/knife/spork-environment-create.rb

@@ -27,9 +27,26 @@ module KnifeSpork
       @object_name = @name_args.first
 
       run_plugins(:before_environmentcreate)
+
+      # Check if environment already exists
+      begin
+        check_environment = load_environment(@object_name)
+        if check_environment
+          ui.confirm("It looks like the environment #{@object_name} already exists. Are you sure you want to overwrite it")
+        end
+      rescue Net::HTTPServerException
+      end
+
+
       pre_environment = {}
       environment_create
       post_environment = load_environment(@object_name)
+
+      if spork_config[:save_environment_locally_on_create]
+        ui.msg "Saving environment changes to #{@object_name}.json"
+        save_environment_changes(@object_name, pretty_print_json(post_environment))
+      end
+
       @object_difference = json_diff(pre_environment,post_environment).to_s
       run_plugins(:after_environmentcreate)
     end

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

@@ -1,13 +1,13 @@
 require 'chef/knife'
-begin
-  require 'berkshelf'
-rescue LoadError; end
 
 module KnifeSpork
   class SporkOmni < Chef::Knife
 
     deps do
       require 'knife-spork/runner'
+      begin
+        require 'berkshelf'
+      rescue LoadError; end
     end
 
     banner 'knife spork omni COOKBOOK (options)'
@@ -40,13 +40,12 @@ module KnifeSpork
            :description => 'Make omni finish with promote --remote instead of a local promote',
            :default => nil
 
-    if defined?(::Berkshelf)
-      option :berksfile,
-             :short => '-b',
-             :long => '--berksfile BERKSFILE',
-             :description => 'Path to a Berksfile to operate from',
-             :default => File.join(Dir.pwd, ::Berkshelf::DEFAULT_FILENAME)
-    end
+    option :berksfile,
+           :short => '-b',
+           :long => '--berksfile BERKSFILE',
+           :description => 'Path to a Berksfile to operate from',
+           :default => nil,
+           :proc => lambda { |o| o || File.join(Dir.pwd, ::Berkshelf::DEFAULT_FILENAME) }
 
     def run
       self.class.send(:include, KnifeSpork::Runner)

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

@@ -1,7 +1,4 @@
 require 'chef/knife'
-begin
-  require 'berkshelf'
-rescue LoadError; end
 
 module KnifeSpork
   class SporkPromote < Chef::Knife
@@ -9,6 +6,9 @@ module KnifeSpork
     deps do
       require 'chef/exceptions'
       require 'knife-spork/runner'
+      begin
+        require 'berkshelf'
+      rescue LoadError; end
     end
 
     banner 'knife spork promote ENVIRONMENT COOKBOOK (options)'
@@ -24,6 +24,12 @@ module KnifeSpork
       :description => 'Save the environment to the chef server in addition to the local JSON file',
       :default => nil
 
+    option :cookbook_path,
+         :short => '-o PATH:PATH',
+         :long => '--cookbook-path PATH:PATH',
+         :description => 'A colon-separated path to look for cookbooks in',
+         :proc => lambda { |o| o.split(':') }
+
     if defined?(::Berkshelf)
       option :berksfile,
         :short => '-b',
@@ -151,19 +157,6 @@ module KnifeSpork
       local_environment.save
     end
 
-    def save_environment_changes(environment, json)
-      if spork_config[:environment_path]
-        environments_path = spork_config[:environment_path]
-      else
-        split_cb_path = cookbook_path.split("/")
-        environments_path = (split_cb_path[0..-2] << split_cb_path[-1].gsub("cookbooks","environments")).join("/")
-      end
-
-      environment_path = File.expand_path( File.join(environments_path, "#{environment}.json") )
-
-      File.open(environment_path, 'w'){ |f| f.puts(json) }
-    end
-
     def promote(environment, cookbook_names)
       cookbook_names = [cookbook_names].flatten
 

data/lib/chef/knife/spork-role-fromfile.rb

@@ -11,6 +11,13 @@ module KnifeSpork
 
     banner 'knife spork role from file FILENAME (options)'
 
+    option :match_filename,
+        :long => '--match-filename',
+        :short => '-f',
+        :description => 'Ensure that the filename matches the name specified in the role (true|false).',
+        :boolean => true,
+        :default => false
+
     def run
       self.class.send(:include, KnifeSpork::Runner)
       self.config = Chef::Config.merge!(config)
@@ -40,6 +47,18 @@ module KnifeSpork
     def role_from_file
       rff = Chef::Knife::RoleFromFile.new
       rff.name_args = @name_args
+      if (config[:match_filename] || spork_config[:role_match_file_name])
+        ## Check if file names match role names 
+        @name_args.each do |arg|
+            file_name = arg.split("/").last
+            role = rff.loader.load_from("roles", file_name)
+            file_name = file_name.gsub(".json","").gsub(".rb", "")
+            if file_name != role.name
+                ui.error("Role name in file #{role.name} does not match file name #{file_name}")
+                exit 1
+            end
+        end
+      end
       rff.run
     end
   end

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

@@ -32,13 +32,12 @@ module KnifeSpork
       :long => '--include-dependencies',
       :description => 'Also upload cookbook dependencies'
 
-    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
+    option :berksfile,
+      :short => '-b',
+      :long => 'berksfile',
+      :description => 'Path to a Berksfile to operate off of',
+      :default => nil,
+      :proc => lambda { |o| o || File.join(Dir.pwd, ::Berkshelf::DEFAULT_FILENAME) }
 
     def run
       self.class.send(:include, KnifeSpork::Runner)

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

@@ -12,87 +12,109 @@ module KnifeSpork
       end
 
       def after_promote_remote
-        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(", ")}"
+        diff = environment_diffs[environment.name]
+        env_gist = env_gist(environment, diff) if config.gist
+        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(", ")} #{env_gist}"
       end
 
       def after_environmentfromfile
-        hipchat "#{organization}#{current_user} uploaded environment #{object_name}"
+        environment_gist = object_gist("environment", object_name, object_difference) if config.gist  and !object_difference.empty?
+        hipchat "#{organization}#{current_user} uploaded environment #{object_name} #{environment_gist}"
       end
 
       def after_environmentedit
-        hipchat "#{organization}#{current_user} edited environment #{object_name}"
+        environment_gist = object_gist("environment", object_name, object_difference) if config.gist  and !object_difference.empty?
+        hipchat "#{organization}#{current_user} edited environment #{object_name} #{environment_gist}"
       end
 
       def after_environmentcreate
-        hipchat "#{organization}#{current_user} created environment #{object_name}"
+        environment_gist = object_gist("environment", object_name, object_difference) if config.gist  and !object_difference.empty?
+        hipchat "#{organization}#{current_user} created environment #{object_name} #{environment_gist}"
       end
 
       def after_environmentdelete
-        hipchat "#{organization}#{current_user} deleted environment #{object_name}"
+        environment_gist = object_gist("environment", object_name, object_difference) if config.gist  and !object_difference.empty?
+        hipchat "#{organization}#{current_user} deleted environment #{object_name} #{environment_gist}"
       end
 
       def after_rolefromfile
-        hipchat "#{organization}#{current_user} uploaded role #{object_name}"
+        role_gist = object_gist("role", object_name, object_difference) if config.gist  and !object_difference.empty?
+        hipchat "#{organization}#{current_user} uploaded role #{object_name} #{role_gist}"
       end
 
       def after_roleedit
-        hipchat "#{organization}#{current_user} edited role #{object_name}"
+        role_gist = object_gist("role", object_name, object_difference) if config.gist  and !object_difference.empty?
+        hipchat "#{organization}#{current_user} edited role #{object_name} #{role_gist}"
       end
 
       def after_rolecreate
-        hipchat "#{organization}#{current_user} created role #{object_name}"
+        role_gist = object_gist("role", object_name, object_difference) if config.gist  and !object_difference.empty?
+        hipchat "#{organization}#{current_user} created role #{object_name} #{role_gist}"
       end
 
       def after_roledelete
-        hipchat "#{organization}#{current_user} deleted role #{object_name}"
+        role_gist = object_gist("role", object_name, object_difference) if config.gist  and !object_difference.empty?
+        hipchat "#{organization}#{current_user} deleted role #{object_name} #{role_gist}"
       end
 
       def after_databagedit
-        hipchat "#{organization}#{current_user} edited data bag item #{object_name}:#{object_secondary_name}"
+        databag_gist = object_gist("databag item", "#{object_name}:#{object_secondary_name}", object_difference) if config.gist  and !object_difference.empty?
+        hipchat "#{organization}#{current_user} edited data bag item #{object_name}:#{object_secondary_name} #{databag_gist}"
       end
 
       def after_databagcreate
-        hipchat "#{organization}#{current_user} created data bag #{object_name}"
+        databag_gist = object_gist("databag item", "#{object_name}:#{object_secondary_name}", object_difference) if config.gist  and !object_difference.empty?
+        hipchat "#{organization}#{current_user} created data bag #{object_name} #{databag_gist}"
       end
 
       def after_databagdelete
-        hipchat "#{organization}#{current_user} deleted data bag item #{object_name}"
+        databag_gist = object_gist("databag item", "#{object_name}:#{object_secondary_name}", object_difference) if config.gist  and !object_difference.empty?
+        hipchat "#{organization}#{current_user} deleted data bag item #{object_name} #{databag_gist}"
       end
 
       def after_databagitemdelete
-        hipchat "#{organization}#{current_user} deleted data bag item #{object_name}:#{object_secondary_name}"
+        databag_gist = object_gist("databag item", "#{object_name}:#{object_secondary_name}", object_difference) if config.gist  and !object_difference.empty?
+        hipchat "#{organization}#{current_user} deleted data bag item #{object_name}:#{object_secondary_name} #{databag_gist}"
       end
 
       def after_databagfromfile
-        hipchat "#{organization}#{current_user} uploaded data bag item #{object_name}:#{object_secondary_name}"
+        databag_gist = object_gist("databag item", "#{object_name}:#{object_secondary_name}", object_difference) if config.gist  and !object_difference.empty?
+        hipchat "#{organization}#{current_user} uploaded data bag item #{object_name}:#{object_secondary_name} #{databag_gist}"
       end
 
       def after_nodeedit
-        hipchat "#{organization}#{current_user} edited node #{object_name}"
+        node_gist = object_gist("node", "#{object_name}", object_difference) if config.gist  and !object_difference.empty?
+        hipchat "#{organization}#{current_user} edited node #{object_name} #{node_gist}"
       end
 
       def after_nodedelete
-        hipchat "#{organization}#{current_user} deleted node #{object_name}"
+        node_gist = object_gist("node", "#{object_name}", object_difference) if config.gist  and !object_difference.empty?
+        hipchat "#{organization}#{current_user} deleted node #{object_name} #{node_gist}"
       end
 
       def after_nodecreate
-        hipchat "#{organization}#{current_user} created node #{object_name}"
+        node_gist = object_gist("node", "#{object_name}", object_difference) if config.gist  and !object_difference.empty?
+        hipchat "#{organization}#{current_user} created node #{object_name} #{node_gist}"
       end
 
       def after_nodefromfile
-        hipchat "#{organization}#{current_user} uploaded node #{object_name}"
+        node_gist = object_gist("node", "#{object_name}", object_difference) if config.gist  and !object_difference.empty?
+        hipchat "#{organization}#{current_user} uploaded node #{object_name} #{node_gist}"
       end
 
       def after_noderunlistadd
-        hipchat "#{organization}#{current_user} added run_list items to #{object_name}: #{object_secondary_name}"
+        node_gist = object_gist("node", "#{object_name}", object_difference) if config.gist  and !object_difference.empty?
+        hipchat "#{organization}#{current_user} added run_list items to #{object_name}: #{object_secondary_name} #{node_gist}"
       end
 
       def after_noderunlistremove
-        hipchat "#{organization}#{current_user} removed run_list items from #{object_name}: #{object_secondary_name}"
+        node_gist = object_gist("node", "#{object_name}", object_difference) if config.gist  and !object_difference.empty?
+        hipchat "#{organization}#{current_user} removed run_list items from #{object_name}: #{object_secondary_name} #{node_gist}"
       end
 
       def after_noderunlistset
-        hipchat "#{organization}#{current_user} set the run_list for #{object_name} to #{object_secondary_name}"
+        node_gist = object_gist("node", "#{object_name}", object_difference) if config.gist  and !object_difference.empty?
+        hipchat "#{organization}#{current_user} set the run_list for #{object_name} to #{object_secondary_name} #{node_gist}"
       end
 
 
@@ -111,6 +133,18 @@ module KnifeSpork
         end
       end
 
+      def env_gist(environment, diff)
+        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}"
+        link = %x[ echo "#{msg}" | #{config.gist}]
+        return "<a href=\"#{link}\">Diff</a>" if !link.nil? || !link.empty?
+      end
+
+      def object_gist(object_type, object_name, object_diff)
+        msg = "#{object_type.capitalize} #{object_name} changed at #{Time.now.getutc} by #{current_user}\n\nDiff is as follows:\n\n#{object_diff}"
+        link = %x[ echo "#{msg}" | #{config.gist}]
+        return "<a href=\"#{link}\">Diff</a>" if !link.nil? || !link.empty?
+      end
+
       def rooms
         [ config.room || config.rooms ].flatten
       end

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

@@ -0,0 +1,28 @@
+require 'knife-spork/plugins/plugin'
+
+module KnifeSpork
+  module Plugins
+    class Influxdb < Plugin
+      name :influxdb
+      hooks :after_upload
+
+      def perform
+        safe_require 'influxdb'
+        conn = InfluxDB::Client.new(config.database, host: config.host, port: config.port, username: config.username, password: config.password, use_ssl: config.ssl)
+        environments.each do |environment|
+          begin
+            data = {
+              user: current_user,
+              cookbook: cookbook.name,
+              version: cookbook.version
+            }
+            conn.write_point(config.series, data)
+          rescue Exception => e
+            ui.error 'Could not write data to influxdb'
+            ui.error e.to_s
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -100,7 +100,7 @@ module KnifeSpork
       def slack(message)
         safe_require 'slack-notifier'
         begin
-          notifier = ::Slack::Notifier.new( config.teamname, config.api_token, channel: channel, username: username, icon_url: config.icon_url)
+          notifier = ::Slack::Notifier.new( config.webhook_url, channel: channel, username: username, icon_url: config.icon_url)
           notifier.ping message 
         rescue Exception => e
           ui.error 'Something went wrong sending to Slack.'

data/lib/knife-spork/runner.rb

@@ -3,6 +3,8 @@ require 'diffy'
 require 'json'
 
 require 'chef/cookbook_loader'
+require 'chef/environment'
+require 'chef/data_bag_item'
 require 'chef/knife/core/object_loader'
 require 'knife-spork/plugins'
 
@@ -106,6 +108,19 @@ module KnifeSpork
         JSON.pretty_generate(json, options.to_hash)
       end
 
+      def save_environment_changes(environment, json)
+        if spork_config[:environment_path]
+          environments_path = spork_config[:environment_path]
+        else
+          split_cb_path = cookbook_path.split("/")
+          environments_path = (split_cb_path[0..-2] << split_cb_path[-1].gsub("cookbooks","environments")).join("/")
+        end
+
+        environment_path = File.expand_path( File.join(environments_path, "#{environment}.json") )
+
+        File.open(environment_path, 'w'){ |f| f.puts(json) }
+      end
+
       def valid_version?(version)
         version_keys = version.split('.')
         return false unless version_keys.size == 3 && version_keys.any?{ |k| begin Float(k); rescue false; else true; end }
@@ -231,7 +246,7 @@ module KnifeSpork
       def load_environment_from_file(environment_name)
         begin
           environment_loader.object_from_file("#{environment_path}/#{environment_name}.json")
-        rescue Yajl::ParseError => e
+        rescue FFI_Yajl::ParseError => e
           raise "#{environment_name} environment file has syntactically incorrect json.\n #{e.to_s}" 
         end
       end
@@ -300,7 +315,7 @@ module KnifeSpork
         # to be bypassed until #85 has been completed and Berkshelf 3 support added
         if spork_config.skip_berkshelf
           ui.warn "Unloading Berkshelf as skip_berkshelf option found in config"
-          Object.send(:remove_const, :Berkshelf)
+          Object.send(:remove_const, :Berkshelf) if defined?(::Berkshelf)
         end
       end
     end

data/plugins/HipChat.md

@@ -28,6 +28,7 @@ plugins:
       - Web Operations
     notify: true
     color: yellow
+    gist: /usr/bin/gist
 ```
 
 #### server_url
@@ -60,3 +61,9 @@ The color of the message.
 
 - Type: `String`
 - Acceptable Values: `[yellow, red, green, purple, random]`
+
+#### gist
+Optional path to gist binary installed by https://rubygems.org/gems/gist
+
+- Type: `String`
+

data/plugins/Influxdb.md

@@ -0,0 +1,25 @@
+Influxdb
+========
+
+Annouce influxdb about your chef deployments
+
+Gem Requirements
+----------------
+`gem influxdb`
+
+Hooks
+-----
+- `after_upload`
+
+Configuration
+-------------
+```yaml
+plugins:
+  influxdb:
+    database: deployments
+    username: deploy
+    password: deploy
+    series: deployments
+    host: influx.example.com
+    port: 8086
+```

data/plugins/Slack.md

@@ -20,14 +20,14 @@ Configuration
 ```yaml
 plugins:
   slack:
-    api_token: ABC123
+    webhook_url: https://hooks.slack.com/services/AABBCC
     channel: "#operations"
     teamname: myteam
     username: knife
 ```
 
 #### api_token
-Your Slack API token.
+Your Slack Webhook URL.
 
 - Type: `String`
 
@@ -36,10 +36,6 @@ The channel to post to.
 
 - Type: `String`
 
-#### teamname
-The teamname of the slack account. ex. https://TEAMNAME.slack.com
-
-- Type: `String`
 
 #### username
 The username to post as.

data/spec/unit/fixtures/cookbooks/example/metadata.rb

@@ -1,7 +1,8 @@
+name             "example"
 maintainer       "Jon Cowie"
 maintainer_email "jonlives@gmail.com"
 license          "All rights reserved"
 description      "Test cookbook for knife-spork"
-long_description      "Test cookbook for knife-spork"
+long_description "Test cookbook for knife-spork"
 version "0.0.1"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-spork
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - Jon Cowie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-03 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -162,6 +162,7 @@ files:
 - lib/knife-spork/plugins/graphite.rb
 - lib/knife-spork/plugins/grove.rb
 - lib/knife-spork/plugins/hipchat.rb
+- lib/knife-spork/plugins/influxdb.rb
 - lib/knife-spork/plugins/irccat.rb
 - lib/knife-spork/plugins/jabber.rb
 - lib/knife-spork/plugins/plugin.rb
@@ -176,6 +177,7 @@ files:
 - plugins/Graphite.md
 - plugins/Grove.md
 - plugins/HipChat.md
+- plugins/Influxdb.md
 - plugins/Irccat.md
 - plugins/Jabber.md
 - plugins/README.md
@@ -230,3 +232,4 @@ test_files:
 - spec/unit/spork_info_spec.rb
 - spec/unit/spork_promote_spec.rb
 - spec/unit/spork_upload_spec.rb
+has_rdoc: