knife-zero 1.18.2 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3482b27b06c57e695fffe467a3dc5fe813c5c108
-  data.tar.gz: a31005457dbeacb0552fcde7927efa49457f865f
+  metadata.gz: 52199e9e746924c3c79500a9e400efc65106ecc3
+  data.tar.gz: 36e1acc1c01787057359d74e905d4cda5ca09dc3
 SHA512:
-  metadata.gz: 49261c9d9dc2132d2e2404801399ba06ea66d3c577cb2e494ebe16a159c186eb32578dc8dd8dac0cfe39e3adc68010df96f9bc1cafc277226aa505626d40ff6f
-  data.tar.gz: d4ce400adca4cc8b25bad7d8ae7b694210e4d4fd55c9b2e32e6b77e587c3cec59876f1d17f97bc8b705c2c610385902eb9198f96a88e98960249e3b43c4d3f83
+  metadata.gz: 97e2d77e4489f0918a66b6d964cda2278d1de4c9e17e521c12f5087bba224764af129727e4c9e0533e62ba519825eec9503da031c298d206d1d4823ad2b1687c
+  data.tar.gz: 2a09dff1d7181f5b3e5b570c2fb0add8a6431f6c37fd4b005d46440e14223f37e5c62cfde00bad5c2562842c487b1c2d05bd68f93405c3c3022a0bda51bf47f3

data/CHANGELOG.md

@@ -2,11 +2,16 @@
 
 ## Unreleased
 
-Empty.
+
+## v1.19.0
+
+- enable keepalive on Net::SSH::Multi [#116](https://github.com/higanworks/knife-zero/pull/116)
+- add option node_config_file to zero converge [#114](https://github.com/higanworks/knife-zero/pull/114)
+  - `-N, --node-config PATH_TO_CONFIG`
 
 ## v1.18.2
 
-- add -E option support for converge #112 HT: @yusukegoto
+- add -E option support for converge [#112](https://github.com/higanworks/knife-zero/pull/112) HT: [@yusukegoto](https://github.com/yusukegoto)
 
 ## v1.18.1
 
@@ -19,11 +24,11 @@ Empty.
 
 ## v1.17.3
 
-- apply no-color to remote side #109 HT: @yusukegoto
+- apply no-color to remote side [#109](https://github.com/higanworks/knife-zero/pull/109) HT: [@yusukegoto](https://github.com/yusukegoto)
 
 ## v1.17.2
 
-- pass true as 2nd args for Net::SSH.configuration_for by default. #106
+- pass true as 2nd args for Net::SSH.configuration_for by default. [#106](https://github.com/higanworks/knife-zero/pull/106)
 
 ## v1.17.1
 
@@ -31,17 +36,17 @@ Empty.
 
 ## v1.17.0(Yanked)
 
-- Change: Ask overwrite node object at bootstrap #101
+- Change: Ask overwrite node object at bootstrap [#101](https://github.com/higanworks/knife-zero/pull/101)
     - New option `--[no-]overwrite`
 
 ## v1.16.0
 
-- [Feature] converge with `--json-attributes` #98
+- [Feature] converge with `--json-attributes` [#98](https://github.com/higanworks/knife-zero/pull/98)
 
 ## v1.15.3
 
 - [Bugfix] move overridden options of bootstrap into deps.
-    - The new change about policy_group breaks knife bootstrap when policies aren't used #92
+    - The new change about policy_group breaks knife bootstrap when policies aren't used [#92](https://github.com/higanworks/knife-zero/pull/92)
 
 ## v1.15.2
 

data/lib/chef/knife/zero_converge.rb

@@ -30,6 +30,11 @@ class Chef
         self.options[:skip_cookbook_sync] = Chef::Application::Client.options[:skip_cookbook_sync]
       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"
+
       option :splay,
         :long => "--splay SECONDS",
         :description => "The splay time for running at intervals, in seconds",
@@ -90,6 +95,7 @@ class Chef
         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 << " -E #{@config[:environment]}" if @config[:environment]

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

@@ -55,3 +55,70 @@ if Gem::Version.new(Net::SSH::Multi::Version::STRING) < Gem::Version.new("1.3.0.
     end
   end
 end
+
+## monkey patch for ssh keepalive
+# Ref: http://qiita.com/kackytw/items/49e2d10512b197089502
+require 'net/ssh/multi/server'
+module Net::SSH::Multi
+  class Server
+    class_eval do
+      require 'net/ssh/connection/keepalive'
+      def new_session #:nodoc:
+        session = if gateway
+          gateway.ssh(host, user, options)
+        else
+          Net::SSH.start(host, user, options)
+        end
+
+        ## >> Patch
+        @keepalive = Net::SSH::Connection::Keepalive.new(session)
+        ## << Patch
+
+        session[:server] = self
+        session
+      rescue ::Timeout::Error => error
+        raise Net::SSH::ConnectionTimeout.new("#{error.message} for #{host}")
+      rescue Net::SSH::AuthenticationFailed => error
+        raise Net::SSH::AuthenticationFailed.new("#{error.message}@#{host}")
+      end
+
+      ## >> Patch
+      def keepalive_if_needed(readers, writers)
+        listeners = session.listeners.keys
+        readers = readers || []
+        writers = writers || []
+        @keepalive.send_as_needed(!(listeners & readers).empty? || !(listeners & writers).empty?)
+      end
+      ## << Patch
+    end
+  end
+end
+
+require 'net/ssh/multi/session'
+module Net::SSH::Multi
+  class Session
+    class_eval do
+      def process(wait=nil, &block)
+        realize_pending_connections!
+        wait = @connect_threads.any? ? 0 : wait
+
+        return false unless preprocess(&block)
+
+        readers = server_list.map { |s| s.readers }.flatten
+        writers = server_list.map { |s| s.writers }.flatten
+
+        readers, writers, = IO.select(readers, writers, nil, wait)
+
+        ## >> Patch
+        server_list.each { |server| server.keepalive_if_needed(readers, writers) }
+        ## << Patch
+
+        if readers
+          return postprocess(readers, writers)
+        else
+          return true
+        end
+      end
+    end
+  end
+end

data/lib/knife-zero/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Zero
-    VERSION = "1.18.2"
+    VERSION = "1.19.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.18.2
+  version: 1.19.0
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-06 00:00:00.000000000 Z
+date: 2017-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler