knife-spork 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93e752d2fef0d00b90070917a9cacf6c8a76b7ef
-  data.tar.gz: de4e76be38ac6164362b384f6c84a63949caa525
+  metadata.gz: 26313008b7f03c5acecc0d2b2970fb06a77065b8
+  data.tar.gz: ca8484028045757341ce88915ede0fd19369f795
 SHA512:
-  metadata.gz: 2bbc27290cb40cc10b110f01df391530076f7c470ed7706c78782f038bbdfbe2af658296dc030972e23c42a68da0a52db38170f9bc619d4d68e4c95366626286
-  data.tar.gz: f423f662b3dec1c37efd56718345b3aacb8f62ced62f2aeb68971fcbebe0b6661a42841f836c0333dcf4c0935f13e36485c6145040e1b5b34ba3b48f6caaea50
+  metadata.gz: fb63fa4406cbaa4528de24fe0f7b348f307583e364bda31ff8bd65360018b20d5a168ecbf73cebe577132f8fc89be40edbb8cdc5ffb86e4b83a1cad24e08d94c
+  data.tar.gz: 8da3b9ff746dffb31df03926a3f5e288c7b0b6c92cc5db4a9c55a28980d598995d6a3e7710a7682b279abd222844f974fd1406198791c7766522829ac34f2e98

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1.1
+ruby-2.1.4

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.6.2(13th June, 2016)
+
+Features:
+
+    - Search for spork config file in .chef directory under current working dir (Thansk to jgoulah https://github.com/jonlives/knife-spork/pull/203)
+
+Bugfixes:
+
+    - Typo fix in documentation (Thanks to @gregkare https://github.com/jonlives/knife-spork/pull/199)
+
 ## 1.6.1(18th August, 2015)
 
 Bugfixes:

data/README.md

@@ -33,6 +33,7 @@ KnifeSpork will look for a configuration file in the following locations, in asc
 - `config/spork-config.yml`
 - `/etc/spork-config.yml`
 - `~/.chef/spork-config.yml`
+- `.chef/spork-config.yml`
 
 Anything set in the configuration file in your home directory for example, will override options set in your Chef repository or `/etc`.
 

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

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

@@ -190,7 +190,7 @@ module KnifeSpork
       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}?"
+        ui.confirm "There is a later version of #{cookbook_name} on the chef server.  Would you still like to promote version #{version}"
       end
     end
   end

data/lib/knife-spork/runner.rb

@@ -17,7 +17,7 @@ module KnifeSpork
         return @spork_config unless @spork_config.nil?
 
         @spork_config = AppConf.new
-        load_paths = [ File.expand_path("#{cookbook_path.gsub('cookbooks','')}/config/spork-config.yml"), File.expand_path('config/spork-config.yml'), '/etc/spork-config.yml', File.expand_path('~/.chef/spork-config.yml') ]
+        load_paths = [ File.expand_path("#{cookbook_path.gsub('cookbooks','')}/config/spork-config.yml"), File.expand_path('config/spork-config.yml'), '/etc/spork-config.yml', File.expand_path('~/.chef/spork-config.yml'), File.expand_path("#{cookbook_path.gsub('cookbooks','')}/.chef/spork-config.yml") ]
         load_paths.each do |load_path|
           if File.exists?(load_path)
             @spork_config.load(load_path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-spork
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Jon Cowie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2016-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -216,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 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: