knife-zero 1.8.2 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3c54264c03d55412eecd072c0b7383b12f8bead
-  data.tar.gz: f392fdc368ee1035a433e59a2166e586523c6630
+  metadata.gz: ebc675803ccbf5f586711666bfee3b4a9ec46687
+  data.tar.gz: f00a5d34ae9b64a051c62f97b45b09e2b7312a33
 SHA512:
-  metadata.gz: f96d14bcb72c719a9cf1f0dea34784b828424779425568902edda23e724dd680abad35226c858443d17e34372bc5c45d5397d4e72882c755934d10d4282ca8ec
-  data.tar.gz: 28cf727c4bf98d683f3661cec5e3e5df92b75c8001b16d746b341d0ea708c1f3af618a5349494bf0d1964222a889be9bfa41fa03e4deae01575e338fbe1402a6
+  metadata.gz: 54bac746bf8b408d0eec0d669c25527c8e8ade834f35534340931cc807219786740e804e42ed796d8a482f3d28b374b93fb5b950b11a811be4a3ace07eab0efc
+  data.tar.gz: dc710abf2017e12553ed1ae187e6fe4358f1d899b8ba55b862269bf90c36de9a23756eefa11e1a9800d372770dccff82d699fa0044749715f30314a86418d495

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## Unreleased
 
+## v1.8.3
+
+- include Chef#3900 until merge.
+    - add option --json-attribute-file FILE
+
+## v1.8.2
+
+- Cleanup: Swap chef_client and converge.
+
 ## v1.8.1
 
 - Follow Chef: check first_boot_attribute_from_file flag for knife_zero.host attribute(normal).

data/lib/chef/knife/zero_bootstrap.rb

@@ -26,7 +26,28 @@ class Chef
         :default => true,
         :proc => lambda { |v| Chef::Config[:knife][:bootstrap_converge] = v }
 
+      ## monkey for #3900 >>
+      unless options.has_key?(:first_boot_attributes_from_file)
+        option :first_boot_attributes_from_file,
+          :long => "--json-attribute-file FILE",
+          :description => "A JSON file to be used to the first run of chef-client",
+          :proc => lambda { |o| Chef::JSONCompat.parse(File.read(o)) },
+          :default => nil
+
+        def render_template
+          @config[:first_boot_attributes].merge!(@config[:first_boot_attributes_from_file]) if @config[:first_boot_attributes_from_file]
+          super
+        end
+      ## monkey for #3900 <<
+      end
+
       def run
+      ## monkey for #3900 >>
+        if @config[:first_boot_attributes].any? && @config[:first_boot_attributes_from_file]
+          raise "You cannot pass both --json-attributes and --json-attribute-file."
+        end
+      ## monkey for #3900 <<
+
         if @config[:first_boot_attributes_from_file]
           @config[:first_boot_attributes_from_file] = @config[:first_boot_attributes_from_file].merge(build_knifezero_attributes_for_node)
         else
@@ -65,6 +86,7 @@ class Chef
         }
         attr
       end
+
     end
   end
 end

data/lib/chef/knife/zero_diagnose.rb

@@ -20,7 +20,7 @@ class Chef
       def initialize(argv = [])
         super
         @bootstrap = Chef::Knife::ZeroBootstrap.new
-        @chef_client = Chef::Knife::ZeroChefClient.new
+        @converge = Chef::Knife::ZeroConverge.new
       end
 
       def run
@@ -41,10 +41,10 @@ class Chef
         ui.msg @bootstrap.config.to_yaml
         ui.msg ""
 
-        ui.msg "Zero ChefClient Config"
+        ui.msg "Zero Converge Config"
         ui.msg "===================="
-        @chef_client.merge_configs
-        ui.msg @chef_client.config.to_yaml
+        @converge.merge_configs
+        ui.msg @converge.config.to_yaml
       end
     end
   end

data/lib/knife-zero/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Zero
-    VERSION = "1.8.2"
+    VERSION = "1.8.3"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

data/test/knife-zero/test_versioin.rb

@@ -2,6 +2,6 @@ require "knife-zero/version"
 
 class TC_Version < Test::Unit::TestCase
   test "returns version correctly" do
-    assert_equal("1.8.2", Knife::Zero::VERSION)
+    assert_equal("1.8.3", Knife::Zero::VERSION)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-zero
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.3
 platform: ruby
 authors:
 - sawanoboly