knife-zero 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e39c13ccfb06700b75faf777b099918ce95faacd
-  data.tar.gz: a944aa77a0e4642586f929510ce70c59b765a1a4
+  metadata.gz: d3c54264c03d55412eecd072c0b7383b12f8bead
+  data.tar.gz: f392fdc368ee1035a433e59a2166e586523c6630
 SHA512:
-  metadata.gz: db8c52fa6822403387d8cd0c4529eb0977a908b4c691ca8c41a62c35f567d5237e938b0407721cc9a4dadcf04230a106912ccf73aa6ec9bc25191abbc432ba8f
-  data.tar.gz: 6ede3e035a21562fe1b3730053f6e18397628ebf52f647896ef107cc687e7c46d3c822b8fd321db8c188a57fa035dda05f589a37f8efe02c7d2ff937d8b767ae
+  metadata.gz: f96d14bcb72c719a9cf1f0dea34784b828424779425568902edda23e724dd680abad35226c858443d17e34372bc5c45d5397d4e72882c755934d10d4282ca8ec
+  data.tar.gz: 28cf727c4bf98d683f3661cec5e3e5df92b75c8001b16d746b341d0ea708c1f3af618a5349494bf0d1964222a889be9bfa41fa03e4deae01575e338fbe1402a6

data/lib/chef/knife/zero_chef_client.rb

@@ -1,55 +1,19 @@
 require 'chef/knife'
-require 'chef/knife/zero_base'
-require 'knife-zero/bootstrap_ssh'
+require 'chef/knife/zero_converge'
 
 class Chef
   class Knife
-    class ZeroChefClient < Chef::Knife::BootstrapSsh
-      include Chef::Knife::ZeroBase
+    class ZeroChefClient < Chef::Knife::ZeroConverge
       deps do
-        require 'chef/run_list/run_list_item'
-        Chef::Knife::BootstrapSsh.load_deps
-        require "knife-zero/helper"
+        Chef::Knife::ZeroConverge.load_deps
       end
 
       banner "knife zero chef_client QUERY (options) | It's same as converge"
+      self.options = ZeroConverge.options
 
-      self.options = Ssh.options.merge(self.options)
-      self.options[:use_sudo_password] = Bootstrap.options[:use_sudo_password]
-
-
-      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 }
-
-
-      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 }
-
-
-      def initialize(argv=[])
+      def run
+        Chef::Log.warn "`zero chef_client` was renamed. use `zero converge`."
         super
-        self.configure_chef
-        @name_args = [@name_args[0], start_chef_client]
-      end
-
-      def start_chef_client
-        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 = "#{client_path}"
-        s << ' -l debug' if @config[:verbosity] and @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 << " -W" if @config[:why_run]
-        Chef::Log.info "Remote command: " + s
-        s
       end
     end
   end

data/lib/chef/knife/zero_converge.rb

@@ -1,15 +1,56 @@
 require 'chef/knife'
-require 'chef/knife/zero_chef_client'
+require 'chef/knife/zero_base'
+require 'knife-zero/bootstrap_ssh'
 
 class Chef
   class Knife
-    class ZeroConverge < Chef::Knife::ZeroChefClient
+    class ZeroConverge < Chef::Knife::BootstrapSsh
+      include Chef::Knife::ZeroBase
       deps do
-        Chef::Knife::ZeroChefClient.load_deps
+        require 'chef/run_list/run_list_item'
+        Chef::Knife::BootstrapSsh.load_deps
+        require "knife-zero/helper"
       end
 
       banner "knife zero converge QUERY (options)"
-      self.options = ZeroChefClient.options
+
+      self.options = Ssh.options.merge(self.options)
+      self.options[:use_sudo_password] = Bootstrap.options[:use_sudo_password]
+
+
+      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 }
+
+
+      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 }
+
+
+      def initialize(argv=[])
+        super
+        self.configure_chef
+        @name_args = [@name_args[0], start_chef_client]
+      end
+
+      def start_chef_client
+        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 = "#{client_path}"
+        s << ' -l debug' if @config[:verbosity] and @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 << " -W" if @config[:why_run]
+        Chef::Log.info "Remote command: " + s
+        s
+      end
     end
   end
 end

data/lib/knife-zero/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Zero
-    VERSION = "1.8.1"
+    VERSION = "1.8.2"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

data/test/knife-zero/test_versioin.rb

@@ -2,6 +2,6 @@ require "knife-zero/version"
 
 class TC_Version < Test::Unit::TestCase
   test "returns version correctly" do
-    assert_equal("1.8.0", Knife::Zero::VERSION)
+    assert_equal("1.8.2", Knife::Zero::VERSION)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-zero
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler