knife-spork 1.3.0 → 1.3.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YzVhYmQyOTBlMDQzMWNkNWY0ZDUwNTk4Njg3YjYyNDJjZDA0NjU1NA==
+  data.tar.gz: !binary |-
+    OWM2M2VjYzg2MTUwNzM0YTkxN2M1ZGUzYjlmNTI4N2VlODk4N2Y0Nw==
+SHA512:
+  metadata.gz: !binary |-
+    MmNmYTkwODJhYmRkZjJiOTM0MmZkNmJhNzI1OWY4YTUwMGNkZDQxM2NjM2Y4
+    ZjVjNGYwMjliZjFkMjdmYjZiNWI0NjhhY2M5ZjllZTIzNjNjNDYzZTJmODNj
+    ZDYwMzQ1OGEzZTc1MWQ1N2YyZjhmZWY3MTA5NDg1MGI1ZjMwZjM=
+  data.tar.gz: !binary |-
+    NTYzZWJiYjBjYmM0M2JmYzA3OGYxNmE5MTcxMGI3NDZhYzE4NDZkMjNmM2Ri
+    NDg1MzE4NWY1NGM1OWZlZjRhODhjNzEwOTQ5ZTAxNjlmOWYxNmNmODk5MjNj
+    ZTAzNTM1NWIzM2NjZGU3OGRjZWZjMjU1MDEzYzcxN2RkMDVjNmY=

data/.ruby-gemset

@@ -0,0 +1 @@
+knife-spork

data/.ruby-version

@@ -0,0 +1 @@
+ruby-1.9.3-p448

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 1.3.1 (31st Dec, 2013)
+
+Features:
+
+    - Add a cookbook_path option to spork bump (https://github.com/jonlives/knife-spork/issues/92)
+    - Add config option to promote --remote by default (https://github.com/jonlives/knife-spork/issues/95)
+
+Bugfixes:
+
+    - Fix issue with gist generation in the irccat plugin breaking when json diffs were incorrectly escaped ((https://github.com/jonlives/knife-spork/issues/97)
+    - Fix issue with data bag upload when file path is specified (https://github.com/jonlives/knife-spork/issues/98)
+
 ## 1.3.0 (23rd October, 2013)
 
 Features:

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source "https://rubygems.org"
 
 gemspec

data/README.md

@@ -2,6 +2,8 @@ KnifeSpork
 ===========
 KnifeSpork is a workflow plugin for `Chef::Knife` which helps multiple developers work on the same Chef Server and repository without treading on each other's toes. This plugin was designed around the workflow we have here at Etsy, where several people are working on the Chef repository and Chef Server simultaneously. It contains several functions, documented below:
 
+[![Gem Version](https://badge.fury.io/rb/knife-spork.png)](http://badge.fury.io/rb/knife-spork)
+
 Installation
 ------------
 
@@ -48,6 +50,7 @@ version_change_threshold: 2
 environment_path: "/home/me/environments"
 role_path: "/home/me/roles"
 custom_plugin_path: "/home/me/spork-plugins"
+always_promote_remote: true
 plugins:
   campfire:
     account: myaccount
@@ -93,6 +96,10 @@ The `environment_groups` directive allows you to specify a list of environments
 #### Version Change Threshold
 The `version_change_threshold` directive allows you to customise the threshold used by a safety check in spork promote which will prompt for confirmation if you're promoting a cookbook by more than version_change_threshold versions. This defaults to 2 if not set, ie promoting a cookbook from v1.0.1 to v 1.0.2 will not trip this check, wheras promoting from v1.0.1 to v1.0.3 will.
 
+#### Always Promote Remote
+The `always_promote_remote` directive allows you to tell spork promote to always act as if the --remote option had been specified. This will also have the same effect on spork omni. This option should only be used if you're sure you want all changes to be uploaded to the server as soon as you run promote.
+
+
 #### 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"
 

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

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

@@ -7,10 +7,17 @@ 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(':') }
+
     banner 'knife spork bump COOKBOOK [major|minor|patch|manual]'
 
     def run
       self.config = Chef::Config.merge!(config)
+      config[:cookbook_path] ||= Chef::Config[:cookbook_path]
 
       if @name_args.empty?
         show_usage

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

@@ -54,7 +54,7 @@ module KnifeSpork
 
       else
         @name_args[1..-1].each do |arg|
-            @object_secondary_name = arg
+            @object_secondary_name = arg.split("/").last
             run_plugins(:before_databagfromfile)
             begin
               pre_databag = load_databag_item(@object_name, @object_secondary_name.gsub(".json",""))

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

@@ -61,7 +61,7 @@ module KnifeSpork
         new_environment_json = pretty_print_json(environment.to_hash)
         save_environment_changes(e, new_environment_json)
 
-        if config[:remote]
+        if config[:remote] || spork_config.always_promote_remote
           ui.msg "Uploading #{environment.name}.json to Chef Server"
           save_environment_changes_remote(e)
           ui.info "Promotion complete at #{Time.now}!"
@@ -70,7 +70,7 @@ module KnifeSpork
         end
       end
       run_plugins(:after_promote_local)
-      if config[:remote]
+      if config[:remote] || spork_config.always_promote_remote
         run_plugins(:after_promote_remote)
       end
     end

data/lib/knife-spork/runner.rb

@@ -211,7 +211,7 @@ 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")
+        Diffy::Diff.new(JSON.pretty_generate(pre_json), JSON.pretty_generate(post_json), :diff=>"-U 3").to_s.gsub(/[()]/, '\\\\\0')
       end
 
       def hash_diff(hash, other)

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: knife-spork
 version: !ruby/object:Gem::Version
-  version: 1.3.0
-  prerelease: 
+  version: 1.3.1
 platform: ruby
 authors:
 - Jon Cowie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-23 00:00:00.000000000 Z
+date: 2013-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: app_conf
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -82,7 +73,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rvmrc
+- .ruby-gemset
+- .ruby-version
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -138,26 +130,25 @@ files:
 - plugins/Template.md
 homepage: https://github.com/jonlives/knife-spork
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A workflow plugin to help many devs work with the same chef repo/server
 test_files: []

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 1.9.3@knife-spork --create