knife-spork 1.5.1 → 1.6.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NGY3MTU1NmJmZDY0MGYxMDBjODBhZTQyNGZhMTYyMmE5NzU0ZWUwOA==
-  data.tar.gz: !binary |-
-    MTU0NTkzMThmMTBlMTdhZGM3ZDc0YTI2M2JkNDM3YWVhMzM4ZjM2YQ==
+SHA1:
+  metadata.gz: 9ff8c79e614ce12d680d5aeb4f2f4880db47fef8
+  data.tar.gz: ee66678d1171a4403f5a9c7b1ae853b085dfbd99
 SHA512:
-  metadata.gz: !binary |-
-    MGY0ODhkNjllY2E2Y2JlYjJkMmI2OGViNDdlMWI0ZjE5ZjZjN2U2NmJjODk0
-    YTRkYTllMDJkY2E5YTIyNzNhNmRmYzU1NDViYTU0NjAxNmMzM2EwYjRjNTY3
-    YmJhNmRlMWYzNGZjOTdmMDM3N2ZjNDA0YjdkOWJhZDhiYWQ2YmU=
-  data.tar.gz: !binary |-
-    ZjUxODgyMTVhZjc4MmNlM2YyMDcwMjljYmVjODA2OTAxYTQwMmI5ZjQ0YjZh
-    NjZlZTE0NjE4MTRiOTMwN2Q0ZjM4MWEwNGU0MTJhM2VmYmQzOGNlNmE2OWVh
-    MTlmNTc2MjhjOTcyMWY2N2Q1Y2I4MzRjMjViNzQwYjFjMmU3N2E=
+  metadata.gz: 32dd1355f125d3945976867a55e627045a748b793469c9db25a432a204cac61a2d13fba771023e9957e762e22d2390ac42ce718d9a31f5f4ed0fe63a84ef8afb
+  data.tar.gz: 767fc04c9b0efd98add867321d3cee37256c7382bca5ba581924be8dd624e419956fdbcc8c96c02e248b7bc2483fced576e22504c0e356a0d6da594c0a71cf8d

data/.gitignore

@@ -18,3 +18,4 @@ test/version_tmp
 tmp
 .idea
 checksums
+*.swp

data/.ruby-version

@@ -1 +1 @@
-ruby-1.9.3-p484
+ruby-2.1.1

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 1.6.0(18th August, 2015)
+
+Features:
+
+    - Optionally print a link to a gist of change diffs on the command line in addition to in plugin notifications (https://github.com/jonlives/knife-spork/issues/183
+    - Display a warning when deleting a role currently in use by nodes on the Chef server (https://github.com/jonlives/knife-spork/issues/184)
+    - Spork bump will now bump in the current directory if no cookbook name is specified and metadata.rb is found (https://github.com/jonlives/knife-spork/issues/186)
+    - Spork promote now prompts for confirmation if a newer version of a cookbook exists on the server than the one being promoted (Thanks to @chazzle https://github.com/jonlives/knife-spork/pull/188)
+    - Significantly refactored git plugin, now supporting optional automatic commit & push (Thanks to @jeunito https://github.com/jonlives/knife-spork/pull/187)
+    
+
+Bugfixes:
+
+    - Correct parameter errors in Slack plugin README.md (Thanks to BarthV https://github.com/jonlives/knife-spork/pull/185)
+    - Spork data bag from file now shows an error if data bag name is missed off (Thanks to @kdaniels https://github.com/jonlives/knife-spork/pull/190)
+    
 ## 1.5.1(26th February, 2015)
 
 Bugfixes:

data/README.md

@@ -21,7 +21,9 @@ or install the gem manually:
 gem install knife-spork
 ```
 
-**Please note**: As of version 1.3.0, knife-spork depends on version 11.0.0 or greater of the chef gem. If you're still using Chef 10, please continue to use knife-spork 1.2.x
+knife-spork is also included in the [Chef Devlopment Kit](https://downloads.chef.io/chef-dk/).
+
+**Please note**: As of version 1.6.0, knife-spork requires Ruby 2.1.1 or greater and Chef version 11.0.0 or greater. If you're still using < Ruby 2.0 or Chef 11, please continue to use knife-spork 1.5.x
 Spork Configuration
 -------------------
 Out of the box, knife spork will work with no configuration. However, you can optionally enable several features to enhance its functionality.
@@ -56,6 +58,8 @@ custom_plugin_path: "/home/me/spork-plugins"
 always_promote_remote: true
 skip_berkshelf: false
 role_match_file_name: true
+role_safe_delete: true
+stdout_diffs
 json_options:
   indent: "    "
 plugins:
@@ -102,9 +106,8 @@ plugins:
   eventinator:
     url: http://eventinator.mydomain.com/events/oneshot
   slack:
-    api_token: abc123
+    webhook_url: https://hooks.slack.com/services/ABCD/efgh
     channel: "#sysops"
-    teamname: myteam
     username: knife
     icon_url: http://example.com/image.jpg
   rubocop:
@@ -147,9 +150,16 @@ The `save_environment_on_create` directive allows you to have the ```knife spork
 #### 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 Safe Delete
+The `role_safe_delete` flag will, when you use the spork ```knife spork role delete``` command, check to see if any nodes currently have that role in their runlist and exit with an error message if any are found.
+
 #### 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.
 
+#### Stdout Diffs
+The `stdout_diffs` flag will cause any diffs generated by knife-spork (for example on events such as data bag uploads, role edits etc) to be displayed on stdout in addition to any notifications generated by plugins.
+
+
 #### 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)
 
@@ -502,3 +512,13 @@ knife spork environment delete
 knife spork environment edit
 knife spork environment from file
 ```
+
+Troubleshooting
+---------------
+If you get an error when running `knife spork <command>` and the message shown when running with the `-VV` flag contains:
+```ruby
+undefined method `gsub' for #<Pathname:0x00000002d3a6b0> (NoMethodError)
+```
+...then you are probably using `Librarian::Chef.install_path()` in your `knife.rb` file.
+
+To fix this you need to call `.to_s` on the install path, i.e. ``Librarian::Chef.install_path().to_s`.

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.5.1'
+  gem.version       = '1.6.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

@@ -35,10 +35,17 @@ module KnifeSpork
       self.config = Chef::Config.merge!(config)
       config[:cookbook_path] ||= Chef::Config[:cookbook_path]
 
-      if @name_args.empty?
+      cookbook_name = ""
+
+      if @name_args.empty? && File.exists?("#{Dir.pwd}/metadata.rb")
+        cookbook_name = File.read("#{Dir.pwd}/metadata.rb").split("\n").select{|l|l.start_with?("name")}.first.split.last.gsub("\"","")
+        ui.info "Cookbook name omitted, but metadata.rb for cookbook #{cookbook_name} found - bumping that."
+      elsif @name_args.empty?
         show_usage
         ui.error("You must specify at least a cookbook name")
         exit 1
+      else
+        cookbook_name = name_args.first
       end
 
       # Temporary fix for #138 to allow Berkshelf functionality
@@ -46,12 +53,12 @@ module KnifeSpork
       unload_berkshelf_if_specified
 
       #First load so plugins etc know what to work with
-      @cookbook = load_cookbook(name_args.first)
+      @cookbook = load_cookbook(cookbook_name)
 
       run_plugins(:before_bump)
 
       #Reload cookbook in case a VCS plugin found updates
-      @cookbook = load_cookbook(name_args.first)
+      @cookbook = load_cookbook(cookbook_name)
       bump
       run_plugins(:after_bump)
     end

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

@@ -30,6 +30,12 @@ module KnifeSpork
       self.config = Chef::Config.merge!(config)
 
       @object_name = @name_args.first
+      # This should be the data bag name. If it isn't, some poor soul forgot the data bag name.
+      # Check to see if there are any more arguments, and if not, warn about usage.
+      if @name_args.drop(1).size == 0
+        print "USAGE: #{banner}"
+        exit(1)
+      end
 
       if config[:all] == true
         test = Chef::Knife::DataBagFromFile.new

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

@@ -61,6 +61,7 @@ module KnifeSpork
       @environments, @cookbook = load_environments_and_cookbook
 
       check_cookbook_uploaded(@cookbook)
+      check_cookbook_latest(@cookbook)
 
       @environments.each do |e|
         environment = load_environment_from_file(e)
@@ -182,5 +183,15 @@ module KnifeSpork
         exit(1)
       end
     end
+
+    def check_cookbook_latest(cookbook_name)
+      validate_version!(config[:version])
+      version = config[:version] || load_cookbook(cookbook_name).version
+      cb_latest = Chef::CookbookVersion.load(cookbook_name).metadata.version
+      # ui.msg "server: #{cb_latest} -- local: #{version}"
+      if cb_latest > version
+        ui.confirm "There is a later verison of #{cookbook_name} on the chef server.  Would you still like to promote version #{version}?"
+      end
+    end
   end
 end

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

@@ -5,6 +5,7 @@ module KnifeSpork
 
     deps do
       require 'knife-spork/runner'
+      require 'chef/search/query'
     end
 
     banner 'knife spork role delete ROLENAME (options)'
@@ -22,6 +23,16 @@ module KnifeSpork
       @object_name = @name_args.first
 
       run_plugins(:before_roledelete)
+
+      if spork_config.role_safe_delete
+        query = Chef::Search::Query.new
+        nodes = query.search('node', "roles:#{@object_name}").first
+        if nodes.size > 0
+          ui.fatal("#{nodes.size} nodes have been found which still contain the role #{@object_name} in their runlists. Please remove this role from all runlists before deleting it.")
+          exit(1)
+        end
+      end
+
       pre_role = load_role(@object_name)
       role_delete
       post_role = {}

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

@@ -7,6 +7,138 @@ module KnifeSpork
 
       def perform; end
 
+      # Role Git wrappers
+      def before_rolecreate
+        if config.auto_push
+          if !File.directory?(role_path)
+            ui.error "Role path #{role_path} does not exist"
+            exit 1
+          end
+          git_pull(role_path)
+          if File.exist?(File.join(role_path, object_name + '.json'))
+            ui.error 'Role already exists in local git, aborting creation'
+            exit 1
+          end
+        end
+      end
+      def after_rolecreate
+        if config.auto_push
+          if !File.directory?(role_path)
+            ui.error "Role path #{role_path} does not exist"
+            exit 1
+          end
+          save_role(object_name) unless object_difference == ''
+        end
+      end
+      def before_roleedit
+        if config.auto_push
+          git_pull(role_path)
+          if !File.exist?(File.join(role_path, object_name + '.json'))
+            ui.error 'Role does not exist in git, please create it first with spork'
+            exit 1
+          end
+        end
+      end
+      def after_roleedit
+        if config.auto_push
+          save_role(object_name) unless object_difference == ''
+        end
+      end
+      def before_roledelete
+        if config.auto_push
+          git_pull(role_path)
+        end
+      end
+      def after_roledelete
+        if config.auto_push
+          delete_role(object_name)
+        end
+      end
+
+      # Environmental Git wrappers
+      def before_environmentcreate
+        if config.auto_push
+          if !File.directory?(environment_path)
+            ui.error "Environment path #{environment_path} does not exist"
+            exit 1
+          end
+          git_pull(environment_path)
+          if File.exist?(File.join(environment_path, object_name + '.json'))
+            ui.error 'Environment already exists in local git, aborting creation'
+            exit 1
+          end
+        end
+      end
+      def after_environmentcreate
+        if config.auto_push
+          save_environment(object_name) unless object_difference == ''
+        end
+      end
+      def before_environmentedit
+        if config.auto_push
+          git_pull(environment_path)
+          if !File.exist?(File.join(environment_path, object_name + '.json'))
+            ui.error 'Environment does not exist in git, please create it first with spork'
+            exit 1
+          end
+        end
+      end
+      def after_environmentedit
+        if config.auto_push
+          save_environment(object_name) unless object_difference == ''
+        end
+      end
+      def before_environmentdelete
+        if config.auto_push
+          git_pull(environment_path)
+        end
+      end
+      def after_environmentdelete
+        if config.auto_push
+          delete_environment(object_name)
+        end
+      end
+
+      # Node Git wrappers
+      def before_nodecreate
+        if config.auto_push
+          git_pull(node_path)
+          if File.exist?(File.join(node_path, object_name + '.json'))
+            ui.error 'Node already exists in local git, aborting creation'
+            exit 1
+          end
+        end
+      end
+      def after_nodecreate
+        if config.auto_push
+          save_node(object_name) unless object_difference == ''
+        end
+      end
+      def before_nodeedit
+        if config.auto_push
+          git_pull(node_path)
+          if !File.exist?(File.join(node_path, object_name + '.json'))
+            ui.error 'Node does not exist in git, please bootstrap one first'
+            exit 1
+          end
+        end
+      end
+      def after_nodeedit
+        if config.auto_push
+          save_node(object_name) unless object_difference == ''
+        end
+      end
+      def before_nodedelete
+        if config.auto_push
+          git_pull(node_path)
+        end
+      end
+      def after_nodedelete
+        if config.auto_push
+          delete_node(object_name)
+        end
+      end
+ 
       def before_bump
         git_pull(environment_path) unless cookbook_path.include?(environment_path.gsub"/environments","")
         git_pull_submodules(environment_path) unless cookbook_path.include?(environment_path.gsub"/environments","")
@@ -55,6 +187,50 @@ module KnifeSpork
           git_push(branch)
         end
       end
+    
+      def save_node(node)
+        json = JSON.pretty_generate(Chef::Node.load(node))
+        node_file = File.expand_path( File.join(node_path, "#{node}.json") )
+        File.open(node_file, 'w'){ |f| f.puts(json) }
+        git_add(node_path, "#{node}.json")
+        git_commit(node_path, "[NODE] Updated #{node}")
+        git_push(branch) if config.auto_push
+      end
+      def delete_node(node)
+        git_rm(node_path, "#{node}.json")
+        git_commit(node_path, "[NODE] Deleted #{node}")
+        git_push(branch) if config.auto_push
+      end
+
+      def save_role(role)
+        json = JSON.pretty_generate(Chef::Role.load(role))
+        role_file = File.expand_path( File.join(role_path, "#{role}.json") )
+        File.open(role_file, 'w'){ |f| f.puts(json) }
+        git_add(role_path, "#{role}.json")
+        git_commit(role_path, "[ROLE] Updated #{role}")
+        git_push(branch)
+      end
+      def delete_role(role)
+        git_rm(role_path, "#{role}.json")
+        if config.auto_push
+          git_commit(role_path, "[ROLE] Deleted #{role}")
+          git_push(branch)
+        end
+      end
+
+      def save_environment(environment)
+        json = JSON.pretty_generate(Chef::Environment.load(environment))
+        environment_file = File.expand_path( File.join(environment_path, "#{environment}.json") )
+        File.open(environment_file, 'w'){ |f| f.puts(json) }
+        git_add(environment_path, "#{environment}.json")
+        git_commit(environment_path, "[ENV] Updated #{environment}")
+        git_push(branch) if config.auto_push
+      end
+      def delete_environment(environment)
+        git_rm(environment_path, "#{environment}.json")
+        git_commit(environment_path, "[ENV] Deleted #{environment}")
+        git_push(branch) if config.auto_push
+      end
 
       private
       def git
@@ -77,7 +253,7 @@ module KnifeSpork
       def git_pull(path)
         if is_repo?(path)
           ui.msg "Git: Pulling latest changes from #{path}"
-          output = IO.popen("git pull 2>&1")
+          output = IO.popen("cd #{path} && git pull 2>&1")
           Process.wait
           exit_code = $?
           if !exit_code.exitstatus ==  0
@@ -136,6 +312,19 @@ module KnifeSpork
         end
       end
 
+      def git_rm(filepath, filename)
+        if is_repo?(filepath)
+          ui.msg "Git rm'ing #{filepath}/#{filename}"
+          output = IO.popen("cd #{filepath} && git rm #{filename}")
+          Process.wait
+          exit_code = $?
+          if !exit_code.exitstatus ==  0
+            ui.error "#{output.read()}\n"
+            exit 1
+          end
+        end
+      end
+
       def git_tag(tag)
         begin
           git.add_tag(tag)

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

@@ -44,6 +44,7 @@ module KnifeSpork
         environments.each do |environment|
           diff = environment_diffs[environment.name]
           env_gist = env_gist(environment, diff) if config.gist
+          display_gist(env_gist) if env_gist
           irccat(template(:promote) % {
             :organization => organization,
             :current_user => current_user,
@@ -56,6 +57,7 @@ module KnifeSpork
 
       def after_environmentfromfile
         environment_gist = object_gist("environment", object_name, object_difference) if config.gist  and !object_difference.empty?
+        display_gist(environment_gist) if environment_gist
         irccat(template(:environmentfromfile) % {
             :organization => organization,
             :current_user => current_user,
@@ -66,6 +68,7 @@ module KnifeSpork
 
       def after_environmentedit
         environment_gist = object_gist("environment", object_name, object_difference) if config.gist  and !object_difference.empty?
+        display_gist(environment_gist) if environment_gist
         irccat(template(:environmentedit) % {
             :organization => organization,
             :current_user => current_user,
@@ -76,6 +79,7 @@ module KnifeSpork
 
       def after_environmentcreate
         environment_gist = object_gist("environment", object_name, object_difference) if config.gist  and !object_difference.empty?
+        display_gist(environment_gist) if environment_gist
         irccat(template(:environmentcreate) % {
             :organization => organization,
             :current_user => current_user,
@@ -86,6 +90,7 @@ module KnifeSpork
 
       def after_environmentdelete
         environment_gist = object_gist("environment", object_name, object_difference) if config.gist  and !object_difference.empty?
+        display_gist(environment_gist) if environment_gist
         irccat(template(:environmentdelete) % {
             :organization => organization,
             :current_user => current_user,
@@ -96,6 +101,7 @@ module KnifeSpork
 
       def after_rolefromfile
         role_gist = object_gist("role", object_name, object_difference) if config.gist  and !object_difference.empty?
+        display_gist(role_gist) if role_gist
         irccat(template(:rolefromfile) % {
             :organization => organization,
             :current_user => current_user,
@@ -106,6 +112,7 @@ module KnifeSpork
 
       def after_roleedit
         role_gist = object_gist("role", object_name, object_difference) if config.gist  and !object_difference.empty?
+        display_gist(role_gist) if role_gist
         irccat(template(:roleedit) % {
             :organization => organization,
             :current_user => current_user,
@@ -116,6 +123,7 @@ module KnifeSpork
 
       def after_rolecreate
         role_gist = object_gist("role", object_name, object_difference) if config.gist  and !object_difference.empty?
+        display_gist(role_gist) if role_gist
         irccat(template(:rolecreate) % {
             :organization => organization,
             :current_user => current_user,
@@ -126,6 +134,7 @@ module KnifeSpork
 
       def after_roledelete
         role_gist = object_gist("role", object_name, object_difference) if config.gist  and !object_difference.empty?
+        display_gist(role_gist) if role_gist
         irccat(template(:roledelete) % {
             :organization => organization,
             :current_user => current_user,
@@ -136,6 +145,7 @@ module KnifeSpork
 
       def after_databagedit
         databag_gist = object_gist("databag item", "#{object_name}:#{object_secondary_name}", object_difference) if config.gist  and !object_difference.empty?
+        display_gist(databag_gist) if databag_gist
         irccat(template(:databagedit) % {
             :organization => organization,
             :current_user => current_user,
@@ -147,6 +157,7 @@ module KnifeSpork
 
       def after_databagdelete
         databag_gist = object_gist("databag item", "#{object_name}", object_difference) if config.gist  and !object_difference.empty?
+        display_gist(databag_gist) if databag_gist
         irccat(template(:databagdelete) % {
             :organization => organization,
             :current_user => current_user,
@@ -157,6 +168,7 @@ module KnifeSpork
 
       def after_databagitemdelete
         databag_gist = object_gist("databag item", "#{object_name}:#{object_secondary_name}", object_difference) if config.gist  and !object_difference.empty?
+        display_gist(databag_gist) if databag_gist
         irccat(template(:databagitemdelete) % {
             :organization => organization,
             :current_user => current_user,
@@ -168,6 +180,7 @@ module KnifeSpork
 
       def after_databagcreate
         databag_gist = object_gist("databag", "#{object_name}", object_difference) if config.gist  and !object_difference.empty?
+        display_gist(databag_gist) if databag_gist
         irccat(template(:databagcreate) % {
             :organization => organization,
             :current_user => current_user,
@@ -178,6 +191,7 @@ module KnifeSpork
 
       def after_databagfromfile
         databag_gist = object_gist("databag", "#{object_name}", object_difference) if config.gist  and !object_difference.empty?
+        display_gist(databag_gist) if databag_gist
         irccat(template(:databagfromfile) % {
             :organization => organization,
             :current_user => current_user,
@@ -189,6 +203,7 @@ module KnifeSpork
 
       def after_nodeedit
         node_gist = object_gist("node", "#{object_name}", object_difference) if config.gist  and !object_difference.empty?
+        display_gist(node_gist) if node_gist
         irccat(template(:nodeedit) % {
             :organization => organization,
             :current_user => current_user,
@@ -199,6 +214,7 @@ module KnifeSpork
 
       def after_nodedelete
         node_gist = object_gist("node", "#{object_name}", object_difference) if config.gist  and !object_difference.empty?
+        display_gist(node_gist) if node_gist
         irccat(template(:nodedelete) % {
             :organization => organization,
             :current_user => current_user,
@@ -209,6 +225,7 @@ module KnifeSpork
 
       def after_nodecreate
         node_gist = object_gist("node", "#{object_name}", object_difference) if config.gist  and !object_difference.empty?
+        display_gist(node_gist) if node_gist
         irccat(template(:nodecreate) % {
             :organization => organization,
             :current_user => current_user,
@@ -219,6 +236,7 @@ module KnifeSpork
 
       def after_nodefromfile
         node_gist = object_gist("node", "#{object_name}", object_difference) if config.gist  and !object_difference.empty?
+        display_gist(node_gist) if node_gist
         irccat(template(:nodefromfile) % {
             :organization => organization,
             :current_user => current_user,
@@ -229,6 +247,7 @@ module KnifeSpork
 
       def after_noderunlistadd
         node_gist = object_gist("node", "#{object_name}", object_difference) if config.gist  and !object_difference.empty?
+        display_gist(node_gist) if node_gist
         irccat(template(:noderunlistadd) % {
             :organization => organization,
             :current_user => current_user,
@@ -240,6 +259,7 @@ module KnifeSpork
 
       def after_noderunlistremove
         node_gist = object_gist("node", "#{object_name}", object_difference) if config.gist  and !object_difference.empty?
+        display_gist(node_gist) if node_gist
         irccat(template(:noderunlistremove) % {
             :organization => organization,
             :current_user => current_user,
@@ -251,6 +271,7 @@ module KnifeSpork
 
       def after_noderunlistset
         node_gist = object_gist("node", "#{object_name}", object_difference) if config.gist  and !object_difference.empty?
+        display_gist(node_gist) if node_gist
         irccat(template(:noderunlistset) % {
             :organization => organization,
             :current_user => current_user,
@@ -281,6 +302,10 @@ module KnifeSpork
         %x[ echo "#{msg}" | #{config.gist}]
       end
 
+      def display_gist(gist)
+        ui.info "Gist generated at #{gist}"
+      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}"
         %x[ echo "#{msg}" | #{config.gist}]

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

@@ -71,6 +71,14 @@ module KnifeSpork
         @options[:cookbook_path]
       end
 
+      def role_path
+        File.expand_path(config.role_path.nil? ? "#{cookbook_path}/../roles" : config[:role_path])
+      end
+
+      def node_path
+        File.expand_path(config.role_path.nil? ? "#{cookbook_path}/../nodes" : config[:role_path])
+      end
+
       def object_name
         @options[:object_name]
       end

data/lib/knife-spork/runner.rb

@@ -269,7 +269,12 @@ module KnifeSpork
       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").to_s.gsub(/[()]/, '\\\\\0')
+        diff = Diffy::Diff.new(JSON.pretty_generate(pre_json), JSON.pretty_generate(post_json), :diff=>"-U 3")
+        if spork_config.stdout_diffs
+          ui.info "Diff:"
+          ui.info diff.to_s(:color)
+        end
+        return diff.to_s.gsub(/[()]/, '\\\\\0')
       end
 
       def hash_diff(hash, other)

data/plugins/Git.md

@@ -47,7 +47,7 @@ The git branch to push/pull to/from.
 - Default: `master`
 
 #### auto_push
-An optional true / false parameter indicating whether or not changes should be automatically comitted and pushed to Git
+An optional true / false parameter indicating whether or not subcommands manipulating environment, role, node, databag files should be automatically comitted and pushed to Git
 
 - Type: `Boolean`
-- Default: `false`
+- Default: `false`

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: knife-spork
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Jon Cowie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: chef-zero
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 11.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 11.0.0
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.5
 - !ruby/object:Gem::Dependency
   name: app_conf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.1
 description: KnifeSpork is a workflow plugin for Chef::Knife which helps multiple
@@ -206,17 +206,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A workflow plugin to help many devs work with the same chef repo/server
@@ -232,4 +232,3 @@ test_files:
 - spec/unit/spork_info_spec.rb
 - spec/unit/spork_promote_spec.rb
 - spec/unit/spork_upload_spec.rb
-has_rdoc: