knife-spork 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 34cd399094e7ae6b16b29d67d900cd6511a77ac0
-  data.tar.gz: 4c75d7ee4393852c00e22eb024f335a48c5e9cc9
+SHA256:
+  metadata.gz: e8d36ad90f20dbe5a5b2a473862a010b842ccbc8038d8437094b10f4c2107b09
+  data.tar.gz: 34ad1ffb10bbc77b02b9a3cd20235baf73d3a09d5e97244ac547a036da2d279c
 SHA512:
-  metadata.gz: 00141fddecab5cd117ac3f90a72b889ed1adc51df2de9f471aea0f04d8672cc1e455b014f7bf8d5fd25b97b8a51ceb39de60019afe6ae324bc47a5365088ae55
-  data.tar.gz: 676e232430b8e6bfe682b62247c5f1115d02e139af107b578fac4b5eb7b6e0858736c4d30ff7b907eb63e1cb6aa54098ef6403f9de2eed19978f43a697295eff
+  metadata.gz: 50630ebcc3d3183b04430cdfde3e01d30e76de268080b1dd62ff4cbd372569a91b71f59ae7a18cf3d7ae279e59dd4a569e893d0fd0c08f4dea865dcbfc863f33
+  data.tar.gz: 8520fc4d6359f811446fbc3d6112ef0ff26e9526c87651b7f1e6ac50afbdc6651c3252114d134822850c5673326fc56d05667c6e61590ebb4590a86f60b27adc

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.7.2 (3rd August 2018)
+    
+Bugfixes:
+
+    - Fix issues handling an array of environment paths. (Thanks to miroswan https://github.com/jonlives/knife-spork/pull/223)
+
+
 ## 1.7.1 (17th November 2017)
     
 Bugfixes:

data/lib/knife-spork/runner.rb

@@ -38,7 +38,7 @@ module KnifeSpork
 
         environments = [ @environments || @environment ].flatten.compact.collect{|environment| environment.is_a?(::Chef::Environment) ? environment : load_environment_from_file(environment)}.sort{|a,b| a.name.to_s <=> b.name.to_s}
         environment_diffs = @environment_diffs
-        
+
         KnifeSpork::Plugins.run(
           :config => spork_config,
           :hook => hook.to_sym,
@@ -57,7 +57,7 @@ module KnifeSpork
 
       def load_environments_and_cookbook
         ensure_environment_and_cookbook_provided!
-       
+
         if @name_args.size == 2
           environments = @name_args[0].split(",").map{ |env| load_specified_environment_group(env) }
           [ environments.flatten, @name_args[1] ]
@@ -110,10 +110,16 @@ module KnifeSpork
       end
 
       def save_environment_changes(environment, json)
-        if @config[:environment_path]
-          environments_path = @config[:environment_path]
-        elsif spork_config[:environment_path]
+        if spork_config[:environment_path]
           environments_path = spork_config[:environment_path]
+        elsif @config[:environment_path]
+          # environment_path can be an Array or String. If Array, let's just
+          # take the first value as we have done in other similar circumstances
+          environments_path = if @config[:environment_path].is_a? Array
+                                @config[:environment_path].first
+                              else
+                                @config[:environment_path]
+                              end
         else
           split_cb_path = cookbook_path.split("/")
           environments_path = (split_cb_path[0..-2] << split_cb_path[-1].gsub("cookbooks","environments")).join("/")
@@ -250,7 +256,7 @@ module KnifeSpork
         begin
           environment_loader.object_from_file("#{environment_path}/#{environment_name}.json")
         rescue FFI_Yajl::ParseError => e
-          raise "#{environment_name} environment file has syntactically incorrect json.\n #{e.to_s}" 
+          raise "#{environment_name} environment file has syntactically incorrect json.\n #{e.to_s}"
         end
       end
 

data/lib/knife-spork/version.rb

@@ -1,5 +1,5 @@
 module KnifeSpork
   module Version
-    VERSION = "1.7.1"
+    VERSION = "1.7.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-spork
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Jon Cowie
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-17 00:00:00.000000000 Z
+date: 2018-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A workflow plugin to help many devs work with the same chef repo/server