knife-zero 0.3.0.pre → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78eea0a45dc96971a8ca19c4ad4adca6c958d749
-  data.tar.gz: 2ca8b1ddc35e0030c18f28944759027030622e5b
+  metadata.gz: 5b49630ab7f49b0d6124a0a36f17b15c486832c0
+  data.tar.gz: 0062f6d3d584a135c438865e71df980a18986604
 SHA512:
-  metadata.gz: a6de703db7970fb788c970886555256d2c8b9ade52f1754b7d43e31c7dc0dcdd8364f8f05324c158e737cdd6615314b2014d8cab1834f8fe9185bfdd1ac1b0de
-  data.tar.gz: be6bcb9912982792b319a31169be2713c64006173f25ffaf84f8413f309f436ec5137d08ceb1f6a4b76851981038e71e8655f4a4ae4afe2b92b0572bdcac6c44
+  metadata.gz: 3b57450d3140a1d518e4908bf8d8419956cd41cc6bbf5b6cad62450cc2bfef2af1c3824e5ae6a871557a53e221da3e82e0367044223e7b98ebf1c5a7bdb7b9b9
+  data.tar.gz: ab553ebadbc9e3c9608d0916e9e36c90e2b92b222c490bb3182e6855a68ebd4b9ce2282659e21cf473c1397a6313fa08724968228f05931932d1293c5b427c90

data/CHANGELOG.md

@@ -1,8 +1,9 @@
 # Changelog of knife-zero
 
-## v0.3.0.pre
+## v1.0.0
 
-- Feature: chef_client run parallel.
+- Code cleanup: use Chef::Knife::SSH framework. HT: @Yasushi
+- Patch: Support forwarding in Net::SSH::Multi::PendingConnection. HT: @Yasushi
 
 ## v0.2.0
 

data/README.md

@@ -44,12 +44,7 @@ knife zero chef_client QUERY (options)
 Install Chef to remote node and run chef-client under chef-zero via tcp-forward.
 
 Supported options are mostly the same as `knife bootstrap`.
-
-#### Specific options(s)
-
-```
--W, --why-run                    Enable whyrun mode on chef-client run at remote node.
-```
+And it supports why-run(`-W, --why-run`).
 
 #### Example
 
@@ -120,13 +115,7 @@ xxx.xxx.xxx.xxx  08:41:37 up 143 days,  2:32,  4 users,  load average: 0.00, 0.0
 Search nodes from local chef-repo directory, and run command at remote node.
 
 Supported options are mostly the same as `knife ssh`.
-
-#### Specific options(s)
-
-```
--W, --why-run                    Enable whyrun mode on chef-client run at remote node.
--C, --concurrency NUMBER         (0.3.0 or later) Number of concurrency. (default: 1) ; not avaiable on some platforms like Windows and NetBSD 4.
-```
+And it supports why-run(`-W, --why-run`).
 
 #### Example
 

data/lib/chef/knife/chef_client.rb

@@ -1,24 +1,24 @@
 require 'chef/knife'
 require 'chef/knife/zero_base'
-require 'knife-zero/helper'
+require 'knife-zero/bootstrap_ssh'
 
 class Chef
   class Knife
-    class ZeroChefClient < Chef::Knife::Ssh
+    class ZeroChefClient < Chef::Knife::BootstrapSsh
       include Chef::Knife::ZeroBase
-      include ::Knife::Zero::Helper
-
       deps do
-        require 'chef/node'
-        require 'chef/environment'
-        require 'chef/api_client'
-        require 'chef/search/query'
-        require 'knife-zero/bootstrap_ssh'
         Chef::Knife::BootstrapSsh.load_deps
       end
 
       banner "knife zero chef_client QUERY (options)"
 
+      option :concurrency,
+        :short => "-C NUM",
+        :long => "--concurrency NUM",
+        :description => "The number of concurrent connections",
+        :default => nil,
+        :proc => lambda { |o| o.to_i }
+
       option :attribute,
         :short => "-a ATTR",
         :long => "--attribute ATTR",
@@ -30,48 +30,14 @@ class Chef
         :description => "execute the chef-client via sudo",
         :boolean => true
 
-      option :concurrency,
-        :short => "-C NUMBER",
-        :long => "--concurrency NUMBER",
-        :description => "Number of concurrency. (default: 1) ; not avaiable on some platforms like Windows and NetBSD 4.",
-        :proc => lambda { |s| s.to_i },
-        :default => 1
-
-      def run
-        configure_attribute
-        configure_user
-        configure_password
-        configure_identity_file
-        list = search_nodes
-
-        pids = []
-        list.each do |n|
-          # Note: fork(2) is not avaiable on some platforms like Windows and NetBSD 4. 
-          if (Process.respond_to?(:fork) && !Chef::Platform.windows?)
-            pids << Process.fork {
-              Chef::Log.debug("Start session for #{n}")
-              session = knife_ssh
-              session.configure_session(n)
-              session.ssh_command(start_chef_client)
-            }
-            until count_alive_pids(pids) < @config[:concurrency]
-              sleep 1
-            end
-          else
-            Chef::Log.debug("Start session for #{n}")
-            session = knife_ssh
-            session.configure_session(n)
-            session.ssh_command(start_chef_client)
-          end
-        end
-
-        result = Process.waitall
-        ## NOTE: should report if includes fail...?
+      def initialize(argv=[])
+        super
+        @name_args = [@name_args[0], start_chef_client]
       end
 
       def start_chef_client
         client_path = @config[:use_sudo] ? 'sudo ' : ''
-        client_path = @config[:chef_client_path] ? "#{client_path}#{@config[:chef_client_path]}" : "#{client_path}chef-client" 
+        client_path = @config[:chef_client_path] ? "#{client_path}#{@config[:chef_client_path]}" : "#{client_path}chef-client"
         s = "#{client_path}"
         s << ' -l debug' if @config[:verbosity] and @config[:verbosity] >= 2
         s << " -S http://127.0.0.1:8889"

data/lib/chef/knife/zero_base.rb

@@ -7,11 +7,6 @@ class Chef
         includer.class_eval do
           deps do
             Chef::Config[:local_mode] = true
-            require 'knife-zero/core/bootstrap_context'
-            require 'chef/json_compat'
-            require 'tempfile'
-            require 'highline'
-            require 'net/ssh'
             Chef::Knife::Ssh.load_deps
           end
 
@@ -64,22 +59,6 @@ class Chef
         end
       end
 
-      def knife_ssh
-        ssh = Chef::Knife::BootstrapSsh.new
-        ssh.ui = ui
-        ssh.name_args = [ server_name, ssh_command ] unless ssh.name_args.empty?
-        ssh.config[:ssh_user] = Chef::Config[:knife][:ssh_user] || config[:ssh_user]
-        ssh.config[:ssh_password] = config[:ssh_password]
-        ssh.config[:ssh_port] = Chef::Config[:knife][:ssh_port] || config[:ssh_port]
-        ssh.config[:ssh_gateway] = Chef::Config[:knife][:ssh_gateway] || config[:ssh_gateway]
-        ssh.config[:forward_agent] = Chef::Config[:knife][:forward_agent] || config[:forward_agent]
-        ssh.config[:identity_file] = Chef::Config[:knife][:identity_file] || config[:identity_file]
-        ssh.config[:manual] = true
-        ssh.config[:host_key_verify] = Chef::Config[:knife][:host_key_verify] || config[:host_key_verify]
-        ssh.config[:on_error] = :raise
-        ssh
-      end
-
       private
 
       def locate_config_value(key)

data/lib/chef/knife/zero_bootstrap.rb

@@ -7,6 +7,7 @@ class Chef
     class ZeroBootstrap < Chef::Knife::Bootstrap
       include Chef::Knife::ZeroBase
       deps do
+        require 'knife-zero/core/bootstrap_context'
         require 'knife-zero/bootstrap_ssh'
         Chef::Knife::BootstrapSsh.load_deps
       end
@@ -127,11 +128,6 @@ class Chef
         ssh.config[:on_error] = :raise
         ssh
       end
-
-      alias :default_run :run
-      def run
-        default_run
-      end
     end
   end
 end

data/lib/knife-zero/bootstrap_ssh.rb

@@ -3,38 +3,11 @@ require 'chef/knife/ssh'
 class Chef
   class Knife
     class BootstrapSsh < Chef::Knife::Ssh
-      def configure_session(args = @name_args)
-        host, ssh_port = args[0].split(" ")
-        @longest = host.length
-
-        Chef::Log.debug("Configration for #{host}")
-        session_opts = {}
-
-        ssh_config = Net::SSH.configuration_for(host)
-
-        # Chef::Config[:knife][:ssh_user] is parsed in #configure_user and written to config[:ssh_user]
-        user = config[:ssh_user] || ssh_config[:user]
-        hostspec = user ? "#{user}@#{host}" : host
-        session_opts[:keys] = File.expand_path(config[:identity_file]) if config[:identity_file]
-        session_opts[:keys_only] = true if config[:identity_file]
-        session_opts[:password] = config[:ssh_password] if config[:ssh_password]
-        session_opts[:forward_agent] = config[:forward_agent]
-        session_opts[:port] = config[:ssh_port] ||
-          ssh_port || # Use cloud port if available
-          Chef::Config[:knife][:ssh_port] ||
-          ssh_config[:port]
-        session_opts[:logger] = Chef::Log.logger if Chef::Log.level == :debug
-
-        if !config[:host_key_verify]
-          session_opts[:paranoid] = false
-          session_opts[:user_known_hosts_file] = "/dev/null"
-        end
-
-        ## use nomal Net::SSH instead of Net::SSH::Multi for simply tcpforward.
-        @session ||= Net::SSH.start(host, user, session_opts)
+      deps do
+        Chef::Knife::Ssh.load_deps
+        require "knife-zero/net-ssh-multi-patch"
       end
 
-
       def ssh_command(command, subsession=nil)
         chef_zero_port = config[:chef_zero_port] ||
                          Chef::Config[:knife][:chef_zero_port] ||
@@ -42,35 +15,12 @@ class Chef
         chef_zero_host = config[:chef_zero_host] ||
                          Chef::Config[:knife][:chef_zero_host] ||
                         '127.0.0.1'
-
-        exit_status = 0
-        subsession ||= session
-        command = fixup_sudo(command)
-        command.force_encoding('binary') if command.respond_to?(:force_encoding)
-
-        Chef::Log.debug("Creating tcp-foward channel to #{chef_zero_host}:#{chef_zero_port}")
-        session.forward.remote(8889, chef_zero_host, chef_zero_port)
-        subsession.open_channel do |ch|
-          ch.request_pty
-          ch.exec command do |ch, success|
-            raise ArgumentError, "Cannot execute #{command}" unless success
-            ch.on_data do |ichannel, data|
-              ## Patched
-              print_data(ichannel.connection.host, data)
-              if data =~ /^knife sudo password: /
-                print_data(ichannel.connection.host, "\n")
-                ichannel.send_data("#{get_password}\n")
-              end
-            end
-            ch.on_request "exit-status" do |ichannel, data|
-              exit_status = [exit_status, data.read_long].max
-            end
-          end
+        (subsession || session).servers.each do |server|
+          session = server.session(true)
+          session.forward.remote(8889, chef_zero_host, chef_zero_port)
         end
-        session.loop
-        exit_status
+        super
       end
     end
   end
 end
-

data/lib/knife-zero/common.rb

@@ -0,0 +1,7 @@
+module Knife
+  module Zero
+    module Helper
+      ## Some Helper..
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+require 'net/ssh/multi/version'
+
+if Net::SSH::Multi::Version::STRING == "1.1.0" || Net::SSH::Multi::Version::STRING == "1.2.0"
+
+  require 'net/ssh/multi'
+
+  module Net::SSH::Multi
+    class PendingConnection
+      class ForwardRecording
+        def initialize
+          @recordings = []
+        end
+
+        def remote(port, host, remote_port, remote_host="127.0.0.1")
+          @recordings << [:remote, port, host, remote_port, remote_host]
+        end
+
+        def replay_on(session)
+          forward = session.forward
+          @recordings.each {|args| forward.send *args}
+        end
+      end
+
+      def forward
+        forward = ForwardRecording.new
+        @recordings << forward
+        forward
+      end
+    end
+  end
+end

data/lib/knife-zero/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Zero
-    VERSION = "0.3.0.pre"
+    VERSION = "1.0.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: 0.3.0.pre
+  version: 1.0.0
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,8 +72,9 @@ files:
 - lib/chef/knife/zero_base.rb
 - lib/chef/knife/zero_bootstrap.rb
 - lib/knife-zero/bootstrap_ssh.rb
+- lib/knife-zero/common.rb
 - lib/knife-zero/core/bootstrap_context.rb
-- lib/knife-zero/helper.rb
+- lib/knife-zero/net-ssh-multi-patch.rb
 - lib/knife-zero/version.rb
 homepage: ''
 licenses:
@@ -90,9 +91,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '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.2.2

data/lib/knife-zero/helper.rb

@@ -1,18 +0,0 @@
-module Knife
-  module Zero
-    module Helper
-      def count_alive_pids(pids)
-        alive = 0
-        pids.each do |pid|
-          begin
-            Process.getpgid pid
-            alive +=1
-          rescue
-            next
-          end
-        end
-        alive
-      end
-    end
-  end
-end