knife-zero 1.9.0 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb08a77c75ed412f73232982758664c56edcc320
-  data.tar.gz: 972d0b53f360020d722945ff15d98c567b5bb0f1
+  metadata.gz: 22e6e86fa94daaa9c448d457064d019fce563dd6
+  data.tar.gz: 3c5b8f78180ce1cf06fd1376f45c5a4bc0e06a7f
 SHA512:
-  metadata.gz: c279163703ea39020514a90ee8ea9d961ea149030fa81a2b9c8208ea189e49967c7c3f9dc2edc989f13b4c369d3df6a978fd50f2900416777d8e0056b126903e
-  data.tar.gz: 26dc030e5c3829d6d67d0a17505dd269e0c6a4c0e42864dd42e5e690bb6bf9936ecb3ebcb70ee7e5619bb0171984fe8b2fbbaaa57d7150cd5c58acb8a7f565dc
+  metadata.gz: 5e0dc596b82124a4a478ec81f45a4a24e79cffe04422ce0b1f2e1c2a23c4c3b6c91cd28c9296b53c0f52795655333fc2d338b43fabb5534b660c190e5b663977
+  data.tar.gz: 51ddf8d0e3e4b33104f7593f9b1dcefba73481f84e691238c4c2fbf16e5feae1151c72af48b800399d7694f55aa367afdc6e5355c34b471a413fa692db8afd49

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## Unreleased
 
+## v1.9.2
+
+- Monkey: include Fixed host parsing to work with ipv6 addresses net-ssh/net-ssh-multi#9
+    - https://github.com/net-ssh/net-ssh-multi/pull/9
+
+## v1.9.1
+
+- Compatibility: Keep same behavior of --json-attribute-file option.
+    - use patche only before 12.5.2
+
 ## v1.9.0
 
 - Change: use nil to ssh_user on bootstraping by default.

data/lib/chef/knife/zero_bootstrap.rb

@@ -31,32 +31,45 @@ 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
+      ## monkey for #3900(included 12.5.2) >>
+      if Gem::Version.new(Chef::VERSION) < Gem::Version.new('12.5.2')
+        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
+          def first_boot_attributes
+            @config[:first_boot_attributes] || @config[:first_boot_attributes_from_file] || {}
+          end
+
+          def render_template
+            @config[:first_boot_attributes] = first_boot_attributes
+            template_file = find_template
+            template = IO.read(template_file).chomp
+            Erubis::Eruby.new(template).evaluate(bootstrap_context)
+          end
+
+          ## monkey for #3900(included 12.5.2) <<
         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."
+      ## monkey for #3900(included 12.5.2) >>
+        if Gem::Version.new(Chef::VERSION) < Gem::Version.new('12.5.2')
+          if @config[:first_boot_attributes] # Check for edge master
+            if @config[:first_boot_attributes].any? && @config[:first_boot_attributes_from_file]
+              raise "You cannot pass both --json-attributes and --json-attribute-file."
+            end
+          end
         end
-      ## monkey for #3900 <<
+      ## monkey for #3900(included 12.5.2) <<
 
         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
-          @config[:first_boot_attributes] = @config[:first_boot_attributes].merge(build_knifezero_attributes_for_node)
+          @config[:first_boot_attributes] = build_knifezero_attributes_for_node
         end
         super
       end

data/lib/knife-zero/net-ssh-multi-patch.rb

@@ -28,4 +28,30 @@ if Net::SSH::Multi::Version::STRING == "1.1.0" || Net::SSH::Multi::Version::STRI
       end
     end
   end
+
+  # https://github.com/net-ssh/net-ssh-multi/pull/9
+  require 'net/ssh/multi/server'
+  module Net::SSH::Multi
+    class Server
+      class_eval do
+        def initialize(master, host, options={})
+          @master = master
+          @options = options.dup
+
+          ## Patched line here
+          @user, @host, port = host.match(/^(?:([^;,:=]+)@|)\[?(.*?)\]?(?::(\d+)|)$/)[1,3]
+
+          user_opt, port_opt = @options.delete(:user), @options.delete(:port)
+
+          @user = @user || user_opt || master.default_user
+          port ||= port_opt
+
+          @options[:port] = port.to_i if port
+
+          @gateway = @options.delete(:via)
+          @failed = false
+        end
+      end
+    end
+  end
 end

data/lib/knife-zero/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Zero
-    VERSION = "1.9.0"
+    VERSION = "1.9.2"
     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: 1.9.0
+  version: 1.9.2
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2015-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler