knife-zero 2.0.0.rc1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e95f3c1de4d14fab19d32c3b3654efeaa17565815efe0a54c21db5db118e1e6
-  data.tar.gz: a84cc6bbc4ec236c8d043d4ebeb95f4cab208d3b0b42108c51f58683a38eb674
+  metadata.gz: 28702dd9c432d13e8dbd122ab8e4fe98451181d28f814f166ca863e8679d9a0e
+  data.tar.gz: e8f3fe9460bde789dd575e382d2369d5df15ede8ce848045efa29f4a76216e9b
 SHA512:
-  metadata.gz: 895dfe7c70f06142c67300659e7ae563494833c68aad69f2f18dc5021967958fc3bbca1834e95206827a28b250a7aa0bf604e95cf98793d71c24a23ff9e20d5b
-  data.tar.gz: 5aeaf0628f3878a490dfb624223673f44b16edabcfb0c4b8e9caee5ace7b99090fa920ddb5e4877948c3aa777ad83c0eaa8a3f8f928f7a1f1c30a157acda8cd1
+  metadata.gz: b07d56e44c7eee303904307d7631e66dde820a98d04b05a5898a3de051d0e336a0f42aa0ea11c6a1d480e55cb17de5be641cb7dbbc1427c565398d3aba02aff3
+  data.tar.gz: c235442c8f1268305091a90dc59eec2c8b80930e6a0bc0da890a03796c7c2378855df272a4a8e462ed32ee09e014fcc279b80467ffda4e3cf1ed8be46a338dcf

data/CHANGELOG.md

@@ -8,6 +8,7 @@
 - Support bootstrap changes on Chef Infra Client 15.x
   - without Windows
 - drop support chef-client < 15
+- add `--connection-user`, `--connection-password`, `--connection-port` options for converge, apply subcommand as wrapper.
 
 ## v1.19.3
 

data/README.md

@@ -24,6 +24,14 @@ Run chef-client at remote node with chef-zero(local-mode) via HTTP over SSH port
 - Ruby 2.5 or later
 - Must support AllowTcpForward
 
+### 2.0.0 or later
+
+- Chef Infra Client 15.x for bootstraping.
+
+### 1.x
+
+- Chef < 15.0
+
 ## Installation
 
 Relocated: [Installation | Knife-Zero Document](http://knife-zero.github.io/10_install/)

data/lib/chef/knife/zero_apply.rb

@@ -35,6 +35,23 @@ class Chef
       self.options[:json_attribs] = Chef::Application::Apply.options[:json_attribs]
       self.options[:json_attribs][:description] = 'Load attributes from a JSON file or URL (retrieves from the remote node)'
 
+      # Common connectivity options for compatibility
+      option :connection_user,
+             short: '-U USERNAME',
+             long: '--connection-user USERNAME',
+             description: 'Authenticate to the target host with this user account. (same as --ssh-user)',
+             proc: lambda { |v| Chef::Config[:knife][:ssh_user] = v }
+
+      option :connection_password,
+             long: '--connection-password PASSWORD',
+             description: 'Authenticate to the target host with this password. (same as --ssh-password)',
+             proc: lambda { |v| Chef::Config[:knife][:ssh_password_ng] = v }
+
+      option :connection_port,
+             long: '--connection-port PORT',
+             description: 'The port on the target node to connect to. (same as --ssh-port)',
+             proc: lambda { |v| Chef::Config[:knife][:ssh_port] = v }
+
       def initialize(argv = [])
         super
         self.configure_chef

data/lib/chef/knife/zero_base.rb

@@ -1,6 +1,6 @@
 require 'chef'
 require 'chef/knife/ssh'
-require 'chef/knife/bootstrap'
+require 'chef/knife/bootstrap' unless Chef::Knife.const_defined?(:Bootstrap)
 
 class Chef
   class Knife

data/lib/chef/knife/zero_bootstrap.rb

@@ -1,5 +1,4 @@
 require 'chef/knife'
-require 'chef/knife/bootstrap'
 require 'chef/knife/zero_base'
 
 class Chef
@@ -60,7 +59,7 @@ class Chef
             q = Chef::Search::Query.new
             node_name = resolve_node_name
             result = q.search(:node, "name:#{node_name} OR knife_zero_host:#{node_name}")
-            if result.last > 0
+            if result.last.positive?
               ui.warn(%{Node "#{node_name}" already exist. [Found #{result.last} Node(s) in local search.] (You can skip asking with --overwrite option.)})
               if result.last == 1
                 ui.confirm(%{Overwrite it }, true, false)

data/lib/chef/knife/zero_converge.rb

@@ -73,6 +73,23 @@ class Chef
                end
              }
 
+      # Common connectivity options for compatibility
+      option :connection_user,
+             short: '-U USERNAME',
+             long: '--connection-user USERNAME',
+             description: 'Authenticate to the target host with this user account. (same as --ssh-user)',
+             proc: lambda { |v| Chef::Config[:knife][:ssh_user] = v }
+
+      option :connection_password,
+             long: '--connection-password PASSWORD',
+             description: 'Authenticate to the target host with this password. (same as --ssh-password)',
+             proc: lambda { |v| Chef::Config[:knife][:ssh_password_ng] = v }
+
+      option :connection_port,
+             long: '--connection-port PORT',
+             description: 'The port on the target node to connect to. (same as --ssh-port)',
+             proc: lambda { |v| Chef::Config[:knife][:ssh_port] = v }
+
       def initialize(argv = [])
         super
         self.configure_chef

data/lib/chef/knife/zero_diagnose.rb

@@ -1,5 +1,4 @@
 require 'chef/knife'
-require 'chef/knife/bootstrap'
 require 'chef/knife/zero_base'
 
 class Chef

data/lib/knife-zero/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Zero
-    VERSION = '2.0.0.rc1'.freeze
+    VERSION = '2.0.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.0.rc1
+  version: 2.0.0
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-05 00:00:00.000000000 Z
+date: 2019-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -188,9 +188,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6