knife-zero 2.0.4 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06a73972f23a35d8577fb7da3b2b52d90ace87d5fe527897d1fed330c0d645cc
-  data.tar.gz: 802065a908c3446706f6d8d0f5ffd4c03d6af2ad0b8fc396eb7217d77c9d8324
+  metadata.gz: 7f1cd2562eb42faa227a762c0fae1ab59bb7f5c0c357e6c53b75d4c35546fc3b
+  data.tar.gz: be6e7409ad03494cb2fd204f788221331bb7cef7e3054fe7e910c4da1b45773e
 SHA512:
-  metadata.gz: 2aca5ed0865e7060a8c8c95aea81437bc9812f8014747bbd48dac762fdda542eccbf4a66938eabf462a943d181cdfacb664957465d1c7be023d7a57e10d840fe
-  data.tar.gz: fd93251cfe928a56f3ee86d133b15ef5fbb568e57d24413ef7f365a59aa07cbff0d1f8e40b2d7d42e490cc12711d6134fb3a4a16943369ca879974e9eeca6936
+  metadata.gz: 34644654c493967891415dceb6f88ec0bb437b4abebbb540121969aa2e992d81877270d3a372cff002d8e8556666c24cbf4c5405e8822167d47d7142d0779cc2
+  data.tar.gz: 7453c885179051ad941aad30c214f1d5b0bf2b50b42276b92a251560ca63f831fe7b16c568e2787f475908a689144e092a73dbec01cc1538ab6ae4376817df61

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Unreleased
 
+none.
+
+## v2.1.0
+
+- Allow pass run-list and environments from json-attributes.
+  - Related:Split run list and attributes from nodes [#132](https://github.com/higanworks/knife-zero/issues/132)
+
 ## v2.0.4
 
 - bugfix: Crash around the end of a concurrent connection [#131](https://github.com/higanworks/knife-zero/pull/131)

data/lib/chef/knife/zero_converge.rb

@@ -105,11 +105,12 @@ class Chef
           ::Knife::Zero::Helper.hook_shell_out!('before_converge', ui, Chef::Config[:knife][:before_converge])
         end
 
-        validate_options!
         if @config[:json_attribs]
           @config[:chef_client_json] = fetch_json_from_url
         end
 
+        validate_options!
+
         @name_args = [@name_args[0], start_chef_client]
       end
 
@@ -142,7 +143,8 @@ class Chef
         if json_attribs_without_override_given?
           ui.error(
             '--json-attributes must be used with --override-runlist ' \
-            'to avoid updating local node object.'
+            'or passed json should includes key `run-list` ' \
+            'to avoid unexpected updating local node object.'
           )
           exit 1
         end
@@ -155,7 +157,7 @@ class Chef
       end
 
       def override_runlist_given?
-        !config[:override_runlist].nil? && !config[:override_runlist].empty?
+        !config[:override_runlist].nil? && !config[:override_runlist].empty? || @config[:chef_client_json]&.key?('run_list')
       end
 
       def named_run_list_given?

data/lib/knife-zero/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Zero
-    VERSION = '2.0.4'.freeze
+    VERSION = '2.1.0'.freeze
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-zero
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.0
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-23 00:00:00.000000000 Z
+date: 2019-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler