knife-zero 1.19.6 → 2.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 545bcbb3dda41e338e20d5398a675b4e10844ff80fca063da7e9dfdbfbaaf847
-  data.tar.gz: 24e2261cb0fe6fc30840abce18d07f8b099a7618d4b709b9c3a728afd31ef6ec
+  metadata.gz: 7e95f3c1de4d14fab19d32c3b3654efeaa17565815efe0a54c21db5db118e1e6
+  data.tar.gz: a84cc6bbc4ec236c8d043d4ebeb95f4cab208d3b0b42108c51f58683a38eb674
 SHA512:
-  metadata.gz: 6f360145c52b46d0749a814d4655a55e60fa28dd0148d85dbdaa5925bd205e6db79a871b806d3bb2d517a4edcef5b22d6afc74e80e859b58b407ce055424bc12
-  data.tar.gz: acbe3b4862f3d36fbb050f7bb3976100ab65e62550612ecd96a09e5fac3d4d55ff9d4c90a738158fd6f66007b9784155205860b892e45fb75fcfe0a01fa35497
+  metadata.gz: 895dfe7c70f06142c67300659e7ae563494833c68aad69f2f18dc5021967958fc3bbca1834e95206827a28b250a7aa0bf604e95cf98793d71c24a23ff9e20d5b
+  data.tar.gz: 5aeaf0628f3878a490dfb624223673f44b16edabcfb0c4b8e9caee5ace7b99090fa920ddb5e4877948c3aa777ad83c0eaa8a3f8f928f7a1f1c30a157acda8cd1

data/CHANGELOG.md

@@ -2,15 +2,12 @@
 
 ## Unreleased
 
-## v1.19.6
 
-- Properly quoted policy name [#129](https://github.com/higanworks/knife-zero/pull/129) HT: [@etki](https://github.com/etki)
+## v2.0.0
 
-## v1.19.5(yanked)
-
-## v1.19.4
-
-- set `chef < 15.0` for 1.x
+- Support bootstrap changes on Chef Infra Client 15.x
+  - without Windows
+- drop support chef-client < 15
 
 ## v1.19.3
 

data/README.md

@@ -6,8 +6,6 @@
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/higanworks/knife-zero?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 [![Gem Version](https://badge.fury.io/rb/knife-zero.svg)](http://badge.fury.io/rb/knife-zero)
-[![Stories in Ready](https://badge.waffle.io/higanworks/knife-zero.svg?label=ready&title=Ready)](http://waffle.io/higanworks/knife-zero) 
-[![Stories in Progress](https://badge.waffle.io/higanworks/knife-zero.svg?label=In%20Progress&title=In%20Progress)](http://waffle.io/higanworks/knife-zero) 
 
 Run chef-client at remote node with chef-zero(local-mode) via HTTP over SSH port forwarding.
 
@@ -23,7 +21,8 @@ Run chef-client at remote node with chef-zero(local-mode) via HTTP over SSH port
 
 ## Requirements
 
-- Must support AllowTcpForward 
+- Ruby 2.5 or later
+- Must support AllowTcpForward
 
 ## Installation
 

data/knife-zero.gemspec

@@ -1,32 +1,32 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'knife-zero/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "knife-zero"
+  spec.name          = 'knife-zero'
   spec.version       = Knife::Zero::VERSION
-  spec.authors       = ["sawanoboly"]
-  spec.email         = ["sawanoboriyu@higanworks.com"]
-  spec.summary       = %q{Run chef-client at remote node with chef-zero(local-mode) via HTTP over SSH port fowarding.}
-  spec.description   = %q{Run chef-client at remote node with chef-zero(local-mode) via HTTP over SSH port fowarding.}
-  spec.homepage      = "http://knife-zero.github.io"
-  spec.license       = "Apache-2.0"
+  spec.authors       = ['sawanoboly']
+  spec.email         = ['sawanoboriyu@higanworks.com']
+  spec.summary       = 'Run chef-client at remote node with chef-zero(local-mode) via HTTP over SSH port fowarding.'
+  spec.description   = 'Run chef-client at remote node with chef-zero(local-mode) via HTTP over SSH port fowarding.'
+  spec.homepage      = 'http://knife-zero.github.io'
+  spec.license       = 'Apache-2.0'
+  spec.required_ruby_version = '>= 2.5.0'
 
-  spec.files         = Dir['README.md','CHANGELOG.md','knife-zero.gemspec','lib/**/*']
+  spec.files         = Dir['README.md', 'CHANGELOG.md', 'knife-zero.gemspec', 'lib/**/*']
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", ">= 1.6"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "test-unit"
-  spec.add_development_dependency "test-unit-rr"
-  spec.add_development_dependency "test-unit-notify"
-  spec.add_development_dependency "guard"
-  spec.add_development_dependency "guard-shell"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "simplecov-rcov"
+  spec.add_development_dependency 'bundler', '>= 1.6'
+  spec.add_development_dependency 'guard'
+  spec.add_development_dependency 'guard-shell'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'simplecov-rcov'
+  spec.add_development_dependency 'test-unit'
+  spec.add_development_dependency 'test-unit-notify'
+  spec.add_development_dependency 'test-unit-rr'
 
-  spec.add_runtime_dependency "chef", ">= 12.6", "< 15.0"
+  spec.add_runtime_dependency 'chef', '>= 15.0'
 end

data/lib/chef/knife/zero_apply.rb

@@ -13,10 +13,10 @@ class Chef
       deps do
         Chef::Knife::BootstrapSsh.load_deps
         Chef::Knife::ZeroConverge.load_deps
-        require "knife-zero/helper"
+        require 'knife-zero/helper'
       end
 
-      banner "knife zero apply QUERY (options)"
+      banner 'knife zero apply QUERY (options)'
 
       self.options = Ssh.options.merge(self.options)
       self.options = ZeroConverge.options.merge(self.options)
@@ -24,42 +24,41 @@ class Chef
       self.options.delete(:override_runlist)
 
       option :recipe,
-        :short        => "-r Recipe String or @filename",
-        :long         => "--recipe Recipe String or @filename",
-        :description  => "Recipe for execute by chef-apply",
-        :default => "",
-        :proc => lambda { |o| o.start_with?('@') ? File.read(o[1..-1]).shellescape : (o.to_s).shellescape }
+             short: '-r Recipe String or @filename',
+             long: '--recipe Recipe String or @filename',
+             description: 'Recipe for execute by chef-apply',
+             default: '',
+             proc: lambda { |o| o.start_with?('@') ? File.read(o[1..-1]).shellescape : o.to_s.shellescape }
 
       ## Import from Chef-Apply
       self.options[:minimal_ohai] = Chef::Application::Apply.options[:minimal_ohai]
       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)"
+      self.options[:json_attribs][:description] = 'Load attributes from a JSON file or URL (retrieves from the remote node)'
 
-
-      def initialize(argv=[])
+      def initialize(argv = [])
         super
         self.configure_chef
 
         @name_args = [@name_args[0], start_chef_apply]
       end
 
-      def start_chef_apply
-        if @config[:verbosity] and @config[:verbosity] >= 2
-          log_level = 'debug'
-        else
-          log_level = 'info'
-        end
+      def start_chef_apply # rubocop:disable Metrics/PerceivedComplexity, Metrics/AbcSize, Metrics/CyclomaticComplexity
+        log_level = if @config[:verbosity] && @config[:verbosity] >= 2
+                      'debug'
+                    else
+                      'info'
+                    end
 
         client_path = @config[:use_sudo] || Chef::Config[:knife][:use_sudo] ? 'sudo ' : ''
         client_path = @config[:chef_client_path] ? "#{client_path}#{@config[:chef_client_path]}" : "#{client_path}chef-apply"
         s = String.new("echo #{@config[:recipe]} | #{client_path}")
         s << " -l #{log_level}"
-        s << " -s"
-        s << " --minimal-ohai" if @config[:minimal_ohai]
+        s << ' -s'
+        s << ' --minimal-ohai' if @config[:minimal_ohai]
         s << " -j #{@config[:json_attribs]}" if @config[:json_attribs]
-        s << " --no-color" unless @config[:color]
-        s << " -W" if @config[:why_run]
-        Chef::Log.info "Remote command: " + s
+        s << ' --no-color' unless @config[:color]
+        s << ' -W' if @config[:why_run]
+        Chef::Log.info 'Remote command: ' + s
         s
       end
     end

data/lib/chef/knife/zero_base.rb

@@ -12,23 +12,22 @@ class Chef
             ## deprecated CHEF-18.
             ## TODO: should implement unix domain socket forwarding (~< net-ssh 4.1.0) before will be removed.
             Chef::Config[:listen]     = true
-            Chef::Config[:knife_zero] = Hash.new
+            Chef::Config[:knife_zero] = {}
             Chef::Knife::Ssh.load_deps
           end
 
           ## Added by Knife-Zero
           option :why_run,
-            :short        => '-W',
-            :long         => '--why-run',
-            :description  => 'Enable whyrun mode on chef-client run at remote node.',
-            :boolean      => true
+                 short: '-W',
+                 long: '--why-run',
+                 description: 'Enable whyrun mode on chef-client run at remote node.',
+                 boolean: true
 
           option :remote_chef_zero_port,
-            :long => "--remote-chef-zero-port PORT",
-            :description => "Listen port on remote",
-            :default => nil,
-            :proc => Proc.new { |key| Chef::Config[:remote_chef_zero_port] = key.to_i }
-
+                 long: '--remote-chef-zero-port PORT',
+                 description: 'Listen port on remote',
+                 default: nil,
+                 proc: proc { |key| Chef::Config[:remote_chef_zero_port] = key.to_i }
         end
       end
 

data/lib/chef/knife/zero_bootstrap.rb

@@ -7,55 +7,52 @@ class Chef
     class ZeroBootstrap < Chef::Knife::Bootstrap
       include Chef::Knife::ZeroBase
       deps do
+        require 'erubis' unless defined?(Erubis)
+
+        require 'chef/knife/bootstrap/chef_vault_handler'
+        require 'chef/knife/bootstrap/client_builder'
+        require 'chef/knife/bootstrap/train_connector'
         require 'knife-zero/core/bootstrap_context'
-        require 'knife-zero/bootstrap_ssh'
-        Chef::Knife::BootstrapSsh.load_deps
+        require 'knife-zero/devpatch/train_connector'
+        require 'knife-zero/helper'
 
         self.options.delete :node_ssl_verify_mode
         self.options.delete :node_verify_api_cert
-
-        ## Override to use nil by default. It should be create PR
-        option :ssh_user,
-        :short => "-x USERNAME",
-        :long => "--ssh-user USERNAME"
-
-        ## For support policy_document_databag(old style)
-        self.options[:policy_name][:description] = "Policy name to use (F.Y.I: Default policy_group=local)"
-
-        ## Set `local` to default policy_group
-        self.options[:policy_group][:description] = "Policy group name to use (--policy-name must also be given). use 'local' "
-        self.options[:policy_group][:default] = "local"
       end
 
-      banner "knife zero bootstrap [SSH_USER@]FQDN (options)"
+      banner 'knife zero bootstrap [SSH_USER@]FQDN (options)'
 
       ## Import from knife bootstrap except exclusions
       self.options = Bootstrap.options.merge(self.options)
 
       option :bootstrap_converge,
-             :long => "--[no-]converge",
-             :description => "Bootstrap without Chef-Client Run.(for only update client.rb)",
-             :boolean => true,
-             :default => true,
-             :proc => lambda { |v| Chef::Config[:knife][:bootstrap_converge] = v }
+             long: '--[no-]converge',
+             description: 'Bootstrap without Chef-Client Run.(for only update client.rb)',
+             boolean: true,
+             default: true,
+             proc: lambda { |v| Chef::Config[:knife][:bootstrap_converge] = v }
 
       option :overwrite_node_object,
-             :long => "--[no-]overwrite",
-             :description => "Overwrite local node object if node already exist. false by default",
-             :boolean => true,
-             :default => false,
-             :proc => lambda { |v| Chef::Config[:knife][:overwrite_node_object] = v }
+             long: '--[no-]overwrite',
+             description: 'Overwrite local node object if node already exist. false by default',
+             boolean: true,
+             default: false,
+             proc: lambda { |v| Chef::Config[:knife][:overwrite_node_object] = v }
 
       option :appendix_config,
-             :long => "--appendix-config PATH",
-             :description => "Append lines to end of client.rb on remote node from file.",
-             :proc => lambda { |o| File.read(o) },
-             :default => nil
+             long: '--appendix-config PATH',
+             description: 'Append lines to end of client.rb on remote node from file.',
+             proc: lambda { |o| File.read(o) },
+             default: nil
 
-      def run
+      def run # rubocop:disable Metrics/MethodLength, Metrics/PerceivedComplexity, Metrics/AbcSize, Metrics/CyclomaticComplexity
         ## Command hook before_bootstrap (After launched Chef-Zero)
         if Chef::Config[:knife][:before_bootstrap]
-          ::Knife::Zero::Helper.hook_shell_out!("before_bootstrap", ui, Chef::Config[:knife][:before_bootstrap])
+          ::Knife::Zero::Helper.hook_shell_out!(
+            'before_bootstrap',
+            ui,
+            Chef::Config[:knife][:before_bootstrap]
+          )
         end
 
         if @config[:bootstrap_converge]
@@ -64,81 +61,61 @@ class Chef
             node_name = resolve_node_name
             result = q.search(:node, "name:#{node_name} OR knife_zero_host:#{node_name}")
             if result.last > 0
-              ui.warn(%Q{Node "#{node_name}" already exist. [Found #{result.last} Node(s) in local search.] (You can skip asking with --overwrite option.)})
+              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(%Q{Overwrite it }, true, false)
+                ui.confirm(%{Overwrite it }, true, false)
               else
-                ui.confirm(%Q{Overwrite one of them }, true, false)
+                ui.confirm(%{Overwrite one of them }, true, false)
               end
             end
           end
         end
 
-
         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
-          if @config[:first_boot_attributes]
-            @config[:first_boot_attributes] = @config[:first_boot_attributes].merge(build_knifezero_attributes_for_node)
-          else
-            @config[:first_boot_attributes] = build_knifezero_attributes_for_node
-          end
+          @config[:first_boot_attributes] = if @config[:first_boot_attributes]
+                                              @config[:first_boot_attributes].merge(build_knifezero_attributes_for_node)
+                                            else
+                                              @config[:first_boot_attributes] = build_knifezero_attributes_for_node
+                                            end
         end
-        super
-      end
 
-      def knife_ssh
-        begin
-        ssh = Chef::Knife::BootstrapSsh.new
-        ssh.ui = ui
-        ssh.name_args = [ server_name, ssh_command ]
-        ssh.config = Net::SSH.configuration_for(server_name, true)
-        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]
-        ssh.config[:forward_agent] = config[:forward_agent] || Chef::Config[:knife][:forward_agent]
-        ssh.config[:identity_file] = config[:identity_file] || Chef::Config[:knife][:identity_file] # DEPRECATED
-        ssh.config[:ssh_identity_file] = config[:ssh_identity_file] || Chef::Config[:knife][:ssh_identity_file]
-        ssh.config[:manual] = true
-        ssh.config[:host_key_verify] = config[:host_key_verify] || Chef::Config[:knife][:host_key_verify]
-        ssh.config[:on_error] = :raise
-        ssh
-        rescue => e
-          ui.error(e.class.to_s + e.message)
-          ui.error e.backtrace.join("\n")
-          exit 1
+        File.open(client_builder.client_path, 'w') do |f|
+          f.puts OpenSSL::PKey::RSA.new(2048).to_s
         end
+        super
       end
 
       ## For support policy_document_databag(old style)
       def validate_options!
         if policyfile_and_run_list_given?
-          ui.error("Policyfile options and --run-list are exclusive")
+          ui.error('Policyfile options and --run-list are exclusive')
           exit 1
         end
         true
       end
 
       def build_knifezero_attributes_for_node
-## Return to Pending.
-#         ssh_url = String.new("ssh://")
-#         ssh_url << config[:ssh_user] || Chef::Config[:knife][:ssh_user]
-#         ssh_url << "@"
-#         ssh_url << server_name
-#         ssh_url << ":"
-#         port =  config[:ssh_port] || Chef::Config[:knife][:ssh_port] || 22
-#         ssh_url << port.to_s
+        ## Return to Pending.
+        # ssh_url = String.new("ssh://")
+        # ssh_url << config[:ssh_user] || Chef::Config[:knife][:ssh_user]
+        # ssh_url << "@"
+        # ssh_url << server_name
+        # ssh_url << ":"
+        # port =  config[:ssh_port] || Chef::Config[:knife][:ssh_port] || 22
+        # ssh_url << port.to_s
         attr = Mash.new
         attr[:knife_zero] = {
           host: server_name
-#           ssh_url: ssh_url
+          # ssh_url: ssh_url
         }
         attr
       end
 
       def resolve_node_name
         return @config[:chef_node_name] if @config[:chef_node_name]
+
         @cli_arguments.first.split('@').last
       end
     end

data/lib/chef/knife/zero_chef_client.rb

@@ -12,7 +12,7 @@ class Chef
       self.options = ZeroConverge.options
 
       def run
-        Chef::Log.warn "`zero chef_client` was renamed. use `zero converge`."
+        Chef::Log.warn '`zero chef_client` was renamed. use `zero converge`.'
         super
       end
     end

data/lib/chef/knife/zero_converge.rb

@@ -12,10 +12,10 @@ class Chef
       deps do
         require 'chef/run_list/run_list_item'
         Chef::Knife::BootstrapSsh.load_deps
-        require "knife-zero/helper"
+        require 'knife-zero/helper'
       end
 
-      banner "knife zero converge QUERY (options)"
+      banner 'knife zero converge QUERY (options)'
 
       self.options = Ssh.options.merge(self.options)
       self.options[:use_sudo_password] = Bootstrap.options[:use_sudo_password]
@@ -37,50 +37,49 @@ class Chef
       end
 
       option :node_config_file,
-        :short => "-N PATH_TO_CONFIG",
-        :long  => "--node-config PATH_TO_CONFIG",
-        :description => "The configuration file to use on remote node"
+             short: '-N PATH_TO_CONFIG',
+             long: '--node-config PATH_TO_CONFIG',
+             description: 'The configuration file to use on remote node'
 
       option :splay,
-        :long => "--splay SECONDS",
-        :description => "The splay time for running at intervals, in seconds",
-        :proc => lambda { |s| s.to_i }
+             long: '--splay SECONDS',
+             description: 'The splay time for running at intervals, in seconds',
+             proc: lambda { |s| s.to_i }
 
       option :use_sudo,
-        :long => "--[no-]sudo",
-        :description => "Execute the chef-client via sudo (true by default)",
-        :boolean => true,
-        :default => true,
-        :proc => lambda { |v| Chef::Config[:knife][:use_sudo] = v }
-
+             long: '--[no-]sudo',
+             description: 'Execute the chef-client via sudo (true by default)',
+             boolean: true,
+             default: true,
+             proc: lambda { |v| Chef::Config[:knife][:use_sudo] = v }
 
       option :override_runlist,
-        :short        => "-o RunlistItem,RunlistItem...",
-        :long         => "--override-runlist RunlistItem,RunlistItem...",
-        :description  => "Replace current run list with specified items for a single run. It skips save node.json on local",
-        :default => nil,
-        :proc => lambda { |o| o.to_s }
+             short: '-o RunlistItem,RunlistItem...',
+             long: '--override-runlist RunlistItem,RunlistItem...',
+             description: 'Replace current run list with specified items for a single run. It skips save node.json on local',
+             default: nil,
+             proc: lambda { |o| o.to_s }
 
       option :client_version,
-        :long         => "--client-version [latest|VERSION]",
-        :description  => "Up or downgrade omnibus chef-client before converge.",
-        :default => nil,
-        :proc => lambda { |o|
-          if ::Knife::Zero::Helper.chef_version_available?(o)
-            o.to_s
-          else
-            ui.error "Client version #{o} is not found."
-            exit 1
-          end
-        }
-
-      def initialize(argv=[])
+             long: '--client-version [latest|VERSION]',
+             description: 'Up or downgrade omnibus chef-client before converge.',
+             default: nil,
+             proc: lambda { |o|
+               if ::Knife::Zero::Helper.chef_version_available?(o)
+                 o.to_s
+               else
+                 ui.error "Client version #{o} is not found."
+                 exit 1
+               end
+             }
+
+      def initialize(argv = [])
         super
         self.configure_chef
 
         ## Command hook before_converge (Before launched Chef-Zero)
         if Chef::Config[:knife][:before_converge]
-          ::Knife::Zero::Helper.hook_shell_out!("before_converge", ui, Chef::Config[:knife][:before_converge])
+          ::Knife::Zero::Helper.hook_shell_out!('before_converge', ui, Chef::Config[:knife][:before_converge])
         end
 
         validate_options!
@@ -91,29 +90,29 @@ class Chef
         @name_args = [@name_args[0], start_chef_client]
       end
 
-      def start_chef_client
+      def start_chef_client # rubocop:disable Metrics/PerceivedComplexity, Metrics/AbcSize, Metrics/CyclomaticComplexity
         client_path = @config[:use_sudo] || Chef::Config[:knife][:use_sudo] ? 'sudo ' : ''
         client_path = @config[:chef_client_path] ? "#{client_path}#{@config[:chef_client_path]}" : "#{client_path}chef-client"
-        s = String.new("#{client_path}")
-        s << ' -l debug' if @config[:verbosity] and @config[:verbosity] >= 2
+        s = String.new(client_path)
+        s << ' -l debug' if @config[:verbosity] && @config[:verbosity] >= 2
         s << " -S http://127.0.0.1:#{::Knife::Zero::Helper.zero_remote_port}"
         s << " -o #{@config[:override_runlist]}" if @config[:override_runlist]
         s << ' -j /etc/chef/chef_client_json.json' if @config[:json_attribs]
         s << " --splay #{@config[:splay]}" if @config[:splay]
         s << " -n #{@config[:named_run_list]}" if @config[:named_run_list]
         s << " --config #{@config[:node_config_file]}" if @config[:node_config_file]
-        s << " --skip-cookbook-sync" if @config[:skip_cookbook_sync]
-        s << " --no-color" unless @config[:color]
+        s << ' --skip-cookbook-sync' if @config[:skip_cookbook_sync]
+        s << ' --no-color' unless @config[:color]
         s << " -E #{@config[:environment]}" if @config[:environment]
-        s << " -W" if @config[:why_run]
-        Chef::Log.info "Remote command: " + s
+        s << ' -W' if @config[:why_run]
+        Chef::Log.info 'Remote command: ' + s
         s
       end
 
       ## For support policy_document_databag(old style)
       def validate_options!
         if override_and_named_given?
-          ui.error("--override_runlist and --named_run_list are exclusive")
+          ui.error('--override_runlist and --named_run_list are exclusive')
           exit 1
         end
         if json_attribs_without_override_given?
@@ -125,6 +124,7 @@ class Chef
         end
         true
       end
+
       # True if policy_name and run_list are both given
       def override_and_named_given?
         override_runlist_given? && named_run_list_given?

data/lib/chef/knife/zero_diagnose.rb

@@ -15,7 +15,7 @@ class Chef
         Chef::Knife::ZeroChefClient.load_deps
       end
 
-      banner "knife zero diagnose # show configuration from file"
+      banner 'knife zero diagnose # show configuration from file'
 
       def initialize(argv = [])
         super
@@ -23,26 +23,26 @@ class Chef
         @converge = Chef::Knife::ZeroConverge.new
       end
 
-      def run
-        ui.msg "Chef::Config"
-        ui.msg "===================="
+      def run # rubocop:disable Metrics/AbcSize
+        ui.msg 'Chef::Config'
+        ui.msg '===================='
         ui.msg Chef::Config.configuration.to_yaml
-        ui.msg ""
+        ui.msg ''
 
-        ui.msg "Knife::Config"
-        ui.msg "===================="
+        ui.msg 'Knife::Config'
+        ui.msg '===================='
         ui.msg config.to_yaml
-        ui.msg ""
+        ui.msg ''
 
-        ui.msg "Zero Bootstrap Config"
-        ui.msg "===================="
-        bootstrap = Chef::Knife::ZeroBootstrap.new
+        ui.msg 'Zero Bootstrap Config'
+        ui.msg '===================='
+        @bootstrap = Chef::Knife::ZeroBootstrap.new
         @bootstrap.merge_configs
         ui.msg @bootstrap.config.to_yaml
-        ui.msg ""
+        ui.msg ''
 
-        ui.msg "Zero Converge Config"
-        ui.msg "===================="
+        ui.msg 'Zero Converge Config'
+        ui.msg '===================='
         @converge.merge_configs
         ui.msg @converge.config.to_yaml
       end

data/lib/knife-zero/bootstrap_ssh.rb

@@ -5,15 +5,13 @@ class Chef
     class BootstrapSsh < Chef::Knife::Ssh
       deps do
         Chef::Knife::Ssh.load_deps
-        require "knife-zero/net-ssh-multi-patch"
-        require "knife-zero/helper"
+        require 'knife-zero/net_ssh_multi_patch'
+        require 'knife-zero/helper'
       end
 
-      def ssh_command(command, subsession=nil)
-        begin
-
+      def ssh_command(command, subsession = nil) # rubocop:disable Metrics/PerceivedComplexity, Metrics/AbcSize, Metrics/CyclomaticComplexity
         if config[:client_version]
-          super(%Q{/opt/chef/embedded/bin/ruby -ropen-uri -e 'puts open("https://omnitruck.chef.io/install.sh").read' | sudo sh -s -- -v #{config[:client_version]}})
+          super(%{/opt/chef/embedded/bin/ruby -ropen-uri -e 'puts open("https://omnitruck.chef.io/install.sh").read' | sudo sh -s -- -v #{config[:client_version]}})
         end
 
         if config[:json_attribs]
@@ -26,25 +24,24 @@ class Chef
                          URI.parse(Chef::Config.chef_server_url).port
         chef_zero_host = config[:chef_zero_host] ||
                          Chef::Config[:knife][:chef_zero_host] ||
-                        '127.0.0.1'
+                         '127.0.0.1'
         (subsession || session).servers.each do |server|
           session = server.session(true)
           session.forward.remote(chef_zero_port, chef_zero_host, ::Knife::Zero::Helper.zero_remote_port)
         end
         super
-        rescue => e
-          ui.error(e.class.to_s + e.message)
-          ui.error e.backtrace.join("\n")
-          exit 1
-        end
+      rescue => e # rubocop:disable Style/RescueStandardError
+        ui.error(e.class.to_s + e.message)
+        ui.error e.backtrace.join("\n")
+        exit 1
       end
 
       def build_client_json
-        <<-EOH
+        <<-SCRIPT
         sudo sh -c 'cat <<"EOP" > /etc/chef/chef_client_json.json
         #{config[:chef_client_json].to_json}
         '
-        EOH
+        SCRIPT
       end
     end
   end

data/lib/knife-zero/core/bootstrap_context.rb

@@ -1,80 +1,80 @@
 require 'chef/knife/core/bootstrap_context'
-require "knife-zero/helper"
+require 'knife-zero/helper'
 
 class Chef
   class Knife
     module Core
       class BootstrapContext
-         class_eval do
-           alias :orig_validation_key validation_key
-           def validation_key
-             if @chef_config[:knife_zero]
-               OpenSSL::PKey::RSA.new(2048).to_s
-             else
-               orig_validation_key
-             end
-           end
+        class_eval do # rubocop:disable Metrics/BlockLength
+          alias_method :orig_validation_key, :validation_key
+          def validation_key
+            if @chef_config[:knife_zero]
+              OpenSSL::PKey::RSA.new(2048).to_s
+            else
+              orig_validation_key
+            end
+          end
 
-           alias :orig_config_content config_content
-           def config_content
-             client_rb = orig_config_content
-             white_lists = []
-             %w{ automatic_attribute_whitelist default_attribute_whitelist normal_attribute_whitelist override_attribute_whitelist }.each do |white_list|
-               if Chef::Config[:knife][white_list.to_sym] && Chef::Config[:knife][white_list.to_sym].is_a?(Array)
-                 white_lists.push([
-                   white_list,
-                   Chef::Config[:knife][white_list.to_sym].to_s
-                 ].join(" "))
-               end
-             end
-             client_rb << white_lists.join("\n")
+          alias_method :orig_config_content, :config_content
+          def config_content # rubocop:disable Metrics/AbcSize
+            client_rb = orig_config_content
+            white_lists = []
+            %w{automatic_attribute_whitelist default_attribute_whitelist normal_attribute_whitelist override_attribute_whitelist}.each do |white_list|
+              next unless Chef::Config[:knife][white_list.to_sym]&.is_a?(Array)
 
-             ## For support policy_document_native_api
-             if @config[:policy_name]
-               client_rb << ["\n", "use_policyfile true",
-                             "versioned_cookbooks true",
-                             "policy_document_native_api true",
-                             "policy_name \"#{@config[:policy_name]}\"",
-                             "policy_group \"#{@config[:policy_group]}\""].join("\n")
-             end
+              white_lists.push([
+                white_list,
+                Chef::Config[:knife][white_list.to_sym].to_s
+              ].join(' '))
+            end
+            client_rb << white_lists.join("\n")
 
-             if @config[:appendix_config]
-               client_rb << ["\n## --appendix-config", @config[:appendix_config]].join("\n")
-             end
+            ## For support policy_document_native_api
+            if @config[:policy_name]
+              client_rb << ["\n", 'use_policyfile true',
+                            'versioned_cookbooks true',
+                            'policy_document_native_api true',
+                            "policy_name '#{@config[:policy_name]}'",
+                            "policy_group '#{@config[:policy_group]}'"].join("\n")
+            end
 
-             client_rb
-           end
+            if @config[:appendix_config]
+              client_rb << ["\n## --appendix-config", @config[:appendix_config]].join("\n")
+            end
 
-           alias :orig_start_chef start_chef
-           def start_chef
-             if @chef_config[:knife_zero]
-               if @config[:bootstrap_converge]
-               client_path = @chef_config[:chef_client_path] || 'chef-client'
-               s = String.new("#{client_path} -j /etc/chef/first-boot.json")
-               s << ' -l debug' if @config[:verbosity] and @config[:verbosity] >= 2
-               s << " -E #{bootstrap_environment}" unless bootstrap_environment.nil?
-               s << " -S http://127.0.0.1:#{::Knife::Zero::Helper.zero_remote_port}"
-               s << " -W" if @config[:why_run]
-               Chef::Log.info "Remote command: " + s
-               s
-               else
-                 "echo Execution of Chef-Client has been canceled due to bootstrap_converge is false."
-               end
-             else
-               orig_start_chef
-             end
-           end
+            client_rb
+          end
 
-           ## For support policy_document_databag(old style)
-           alias :orig_first_boot first_boot
-           def first_boot
-             attributes = orig_first_boot
-             if @config[:policy_name]
-               attributes.delete(:run_list)
-             end
-             attributes
-           end
-         end
+          alias_method :orig_start_chef, :start_chef
+          def start_chef # rubocop:disable Metrics/PerceivedComplexity, Metrics/AbcSize, Metrics/CyclomaticComplexity
+            if @chef_config[:knife_zero]
+              if @config[:bootstrap_converge]
+                client_path = @chef_config[:chef_client_path] || 'chef-client'
+                s = String.new("#{client_path} -j /etc/chef/first-boot.json")
+                s << ' -l debug' if @config[:verbosity] && @config[:verbosity] >= 2
+                s << " -E #{bootstrap_environment}" unless bootstrap_environment.nil?
+                s << " -S http://127.0.0.1:#{::Knife::Zero::Helper.zero_remote_port}"
+                s << ' -W' if @config[:why_run]
+                Chef::Log.info 'Remote command: ' + s
+                s
+              else
+                'echo Execution of Chef-Client has been canceled due to bootstrap_converge is false.'
+              end
+            else
+              orig_start_chef
+            end
+          end
+
+          ## For support policy_document_databag(old style)
+          alias_method :orig_first_boot, :first_boot
+          def first_boot
+            attributes = orig_first_boot
+            if @config[:policy_name]
+              attributes.delete(:run_list)
+            end
+            attributes
+          end
+        end
       end
     end
   end

data/lib/knife-zero/devpatch/train_connector.rb

@@ -0,0 +1,26 @@
+require 'chef/knife/bootstrap/train_connector'
+require 'knife-zero/helper'
+
+class Chef
+  class Knife
+    class Bootstrap < Knife
+      class TrainConnector
+        class_eval do
+          def connect!
+            # Force connection to establish
+            connection.wait_until_ready
+            if connection.is_a? Train::Transports::SSH::Connection
+              connection
+                .instance_variable_get(:@session)
+                .forward.remote(
+                  URI.parse(Chef::Config.chef_server_url).port,
+                  '127.0.0.1', ::Knife::Zero::Helper.zero_remote_port
+                )
+            end
+            true
+          end
+        end
+      end
+    end
+  end
+end

data/lib/knife-zero/helper.rb

@@ -3,24 +3,25 @@ require 'open-uri'
 module Knife
   module Zero
     module Helper
-
       extend Chef::Mixin::ShellOut
 
       def self.zero_remote_port
         return ::Chef::Config[:remote_chef_zero_port] if ::Chef::Config[:remote_chef_zero_port]
+
         chef_zero_port = ::Chef::Config[:chef_zero_port] ||
                          ::Chef::Config[:knife][:chef_zero_port] ||
                          8889
-        chef_zero_port + 10000
+        chef_zero_port + 10_000
       end
 
       def self.chef_version_available?(version)
         return true if version == 'latest'
+
         chefgem_metaurl = 'https://rubygems.org/api/v1/versions/chef.json'
         begin
-          c_versions = JSON.parse(open(chefgem_metaurl).read).map {|v| v['number']}
+          c_versions = JSON.parse(URI.parse(chefgem_metaurl).open.read).map { |v| v['number'] }
           c_versions.include?(version)
-        rescue => e
+        rescue => e # rubocop:disable Style/RescueStandardError
           puts e.inspect
           puts "Some Error occurerd while fetching versions from #{chefgem_metaurl}. Please try again later."
           exit
@@ -31,7 +32,7 @@ module Knife
         ui.info ui.color("Execute command hook in #{event}.", :green)
         begin
           ui.info shell_out!(*command_args).stdout
-        rescue => e
+        rescue => e # rubocop:disable Style/RescueStandardError
           ui.error e.inspect
           raise e
         end

data/lib/knife-zero/{net-ssh-multi-patch.rb → net_ssh_multi_patch.rb}

@@ -1,7 +1,9 @@
 require 'net/ssh/multi/version'
 
+# rubocop:disable all
+
 ## 1.3.0~ includes this patch.
-if Gem::Version.new(Net::SSH::Multi::Version::STRING) < Gem::Version.new("1.3.0.rc1")
+if Gem::Version.new(Net::SSH::Multi::Version::STRING) < Gem::Version.new('1.3.0.rc1')
   require 'net/ssh/multi'
 
   module Net::SSH::Multi
@@ -122,3 +124,5 @@ module Net::SSH::Multi
     end
   end
 end
+
+# rubocop:enable all

data/lib/knife-zero/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Zero
-    VERSION = '1.19.6'
+    VERSION = '2.0.0.rc1'.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: 1.19.6
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-01 00:00:00.000000000 Z
+date: 2019-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: guard-shell
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit-rr
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit-notify
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard
+  name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-shell
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: test-unit-notify
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov-rcov
+  name: test-unit-rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -141,9 +141,6 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '12.6'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '15.0'
   type: :runtime
@@ -151,9 +148,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '12.6'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '15.0'
 description: Run chef-client at remote node with chef-zero(local-mode) via HTTP over
@@ -175,8 +169,9 @@ files:
 - lib/chef/knife/zero_diagnose.rb
 - lib/knife-zero/bootstrap_ssh.rb
 - lib/knife-zero/core/bootstrap_context.rb
+- lib/knife-zero/devpatch/train_connector.rb
 - lib/knife-zero/helper.rb
-- lib/knife-zero/net-ssh-multi-patch.rb
+- lib/knife-zero/net_ssh_multi_patch.rb
 - lib/knife-zero/version.rb
 homepage: http://knife-zero.github.io
 licenses:
@@ -190,12 +185,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6