knife-zero 1.10.2 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06a7110f13cc319dbdfa486c76fd6d36c4b02a03
-  data.tar.gz: 78a63c938cf105802a63a1d134fa6985c36d72b3
+  metadata.gz: afd0f61fa28cf5503c87d00457cdbd3f0ca61fc2
+  data.tar.gz: e5c765743125b15b55e529df1cfda77dc4a4f855
 SHA512:
-  metadata.gz: 467b5875ee53e14272dfd9e39c2c6514f741185707bc23040a462e2bc55afbdf65ef06ce417d9f0e1c92dd7d1fe701b4447755207b08699eaf685698b8fa13c5
-  data.tar.gz: 73ca397b8343ace527d50460038a4b951df9d570955e5a8c987cf55b25356848ea19f4ee4b42048eea97622dae72794cd75b964167d178e4bd3a072a38fe132d
+  metadata.gz: 62e4ffbb9964256340c3bb1c8e9eddfdbc093cd020fa3725d5ad9192dc7e44997195c4598fb0a03c258c1fdc2b28f171f3c55e66983253129c63ddadcf17cbb0
+  data.tar.gz: e2fff31c58c0e232396e76ad6a7f7937d777707f540b3b9ba634ca5f6f75975175ad9f9ee063f382ff36dbf33df8aff43334604f0920150554ef196c5eddae73

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## v1.11.0
+
+- Add dependency chef "~> 12.6.0"
+- Feature: Allow USER@FQDN format for bootstrap commands #37
+- Remove: Option first_boot_attributes compatibility before 12.6.
+
 ## v1.10.2
 
 - Bugfix: `--json-attribute` was broken. #73

data/knife-zero.gemspec

@@ -28,5 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "simplecov-rcov"
 
-  spec.add_runtime_dependency "chef"
+  spec.add_runtime_dependency "chef", "~> 12.6.0"
 end

data/lib/chef/knife/zero_bootstrap.rb

@@ -12,14 +12,14 @@ class Chef
         Chef::Knife::BootstrapSsh.load_deps
       end
 
-      banner "knife zero bootstrap FQDN (options)"
+      banner "knife zero bootstrap [SSH_USER@]FQDN (options)"
 
       ## Import from knife bootstrap except exclusions
       self.options = Bootstrap.options.merge(self.options)
       self.options.delete :node_ssl_verify_mode
       self.options.delete :node_verify_api_cert
 
-      ## Override to use nil by default
+      ## Override to use nil by default. It should be create PR
       option :ssh_user,
         :short => "-x USERNAME",
         :long => "--ssh-user USERNAME"
@@ -31,41 +31,7 @@ class Chef
         :default => true,
         :proc => lambda { |v| Chef::Config[:knife][:bootstrap_converge] = v }
 
-      ## 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 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
-      end
-
       def run
-      ## 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(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
@@ -84,7 +50,7 @@ class Chef
         ssh.ui = ui
         ssh.name_args = [ server_name, ssh_command ]
         ssh.config = Net::SSH.configuration_for(server_name)
-        ssh.config[:ssh_user] = config[:ssh_user] || Chef::Config[:knife][:ssh_user]
+        ssh.config[:ssh_user] = user_name || config[:ssh_user] || Chef::Config[:knife][:ssh_user]
         ssh.config[:ssh_password] = config[:ssh_password]
         ssh.config[:ssh_port] = config[:ssh_port] || Chef::Config[:knife][:ssh_port]
         ssh.config[:ssh_gateway] = config[:ssh_gateway] || Chef::Config[:knife][:ssh_gateway]

data/lib/knife-zero/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Zero
-    VERSION = "1.10.2"
+    VERSION = "1.11.0"
     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.10.2
+  version: 1.11.0
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2015-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,16 +140,16 @@ dependencies:
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.6.0
 description: Run chef-client at remote node with chef-zero(local-mode) via HTTP over
   SSH port fowarding.
 email:
@@ -197,4 +197,3 @@ specification_version: 4
 summary: Run chef-client at remote node with chef-zero(local-mode) via HTTP over SSH
   port fowarding.
 test_files: []
-has_rdoc: