knife-zero 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44cf84092314004ad94e89203f75d0b6ea6288f4
-  data.tar.gz: db9b5e072c8fa7c72b8c7e45f430bf03d0886e56
+  metadata.gz: d4383c976a2e1f917aaec4d23f7684e13bc72fb2
+  data.tar.gz: 43698c8ac6150af68f0744215d8a66fbcd54d8da
 SHA512:
-  metadata.gz: 0a85dc16d988db80196031105baaed5f2d1c5eee572bcbd4129b4d952f0d4f6a00b595bebbde82ecd184e80c7a41879bec241e085565ba24fd12eceacd492c2b
-  data.tar.gz: 5a48efd0493b912277410c57654b42e8b26f99d8971d66739691615124f41661847a1011afb9025e88ee910f7559ed7a1e21f849ea6fb6a7e43695d73de57708
+  metadata.gz: eacd35b62835fd3879179b19060f1d8682962c08fddd84e3a0f80b9d01164298c58f62ee1bb1818c0351f775c4c3ab586d32d239125b68b1e850f4e4496ef29d
+  data.tar.gz: bf56cd573120019588155d0302139cc990fca572707702809087d41db75daa460d9ed86208a9dccd473359c23131a360cc459c6447c61a30e0bd600ee50b998a

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## v1.6.0
+
+- Feature: #32 create alias converge to chef_client, and recommended it by README.
+- Refactor: almostoptions are derived from core.
+    - PR #38 HT: @patcon
+
 ## v1.5.1
 
 - Bug: `--ssh-user` arg doesn't override `knife[:ssh_user]`.

data/README.md

@@ -47,7 +47,8 @@ $ chef gem install knife-zero
 ```
 ** ZERO COMMANDS **
 knife zero bootstrap FQDN (options)
-knife zero chef_client QUERY (options)
+knife zero chef_client QUERY (options) | It's same as converge
+knife zero converge QUERY (options)
 knife zero diagnose # show configuration from file
 ```
 
@@ -121,11 +122,12 @@ $ parallel -j 5 ./bin/knife zero bootstrap ::: nodeA nodeB nodeC...
 ```
 
 
-### knife zero chef_client (for update)
+### knife zero converge/chef_client (for update)
 
-`knife zero chef_client QUERY (options)`
+`knife zero converge QUERY (options)`
+`knife zero chef_client QUERY (options) | It's same as converge`
 
-Search nodes from local chef-repo directory, and run command at remote node.
+Search nodes from local chef-repo directory, and run chef-client at remote node.
 
 Supported options are mostly the same as `knife ssh`.
 And it supports below.
@@ -147,7 +149,7 @@ host.example.com:
   run_list: recipe[hogehoge::default]
 
 
-$ knife zero chef_client 'name:*' --attribute ipaddress 
+$ knife zero converge 'name:*' --attribute ipaddress 
 
 ## host.example.com was converged by run_list.
 host.example.com Starting Chef Client, version 11.14.6
@@ -249,14 +251,14 @@ Connecting to 192.168.33.10
 ...
 ```
 
-Run zero chef_client with `-a name` option.
+Run zero converge with `-a name` option.
 
 > Caution: `-a(--attribute) name` option doesn't work since chef 12.1.0.
 > Please use specific attribute until fix it.
 > I've already create PR for fix. Please wait for merge to use name attribute. https://github.com/chef/chef/pull/3195
 
 ```
-$ knife zero chef_client "name:*" -x vagrant -i ./.vagrant/machines/default/virtualbox/private_key --sudo -a name
+$ knife zero converge "name:*" -x vagrant -i ./.vagrant/machines/default/virtualbox/private_key --sudo -a name
 WARN: No cookbooks directory found at or above current directory.  Assuming /Users/sawanoboriyu/worktemp/knife-zero-vagrant.
 192.168.33.10 Starting Chef Client, version 12.0.3
 192.168.33.10 resolving cookbooks for run list: []
@@ -320,10 +322,10 @@ $ knife node edit vagrant.vm
 }
 ```
 
-Run zero chef_client with `-a chef_ip` option. 
+Run zero converge with `-a chef_ip` option. 
 
 ```
-$ ./bin/knife zero chef_client "name:vagrant.vm" -x vagrant -i ./.vagrant/machines/default/virtualbox/private_key --sudo -a chef_ip 
+$ ./bin/knife zero converge "name:vagrant.vm" -x vagrant -i ./.vagrant/machines/default/virtualbox/private_key --sudo -a chef_ip 
 
 192.168.33.10 Starting Chef Client, version 12.0.3
 192.168.33.10 resolving cookbooks for run list: []
@@ -342,7 +344,7 @@ $ ./bin/knife zero chef_client "name:vagrant.vm" -x vagrant -i ./.vagrant/machin
 For example, you can use ipv4 of eth1(or others) like below.
 
 ```
-$ knife zero chef_client "name:*" -x vagrant -i ./.vagrant/machines/default/virtualbox/private_key --sudo -a network.interfaces.eth1.addresses.keys.rotate.first
+$ knife zero converge "name:*" -x vagrant -i ./.vagrant/machines/default/virtualbox/private_key --sudo -a network.interfaces.eth1.addresses.keys.rotate.first
 
 192.168.33.10 Starting Chef Client, version 12.0.3
 192.168.33.10 resolving cookbooks for run list: []

data/lib/chef/knife/zero_base.rb

@@ -11,57 +11,6 @@ class Chef
             Chef::Knife::Ssh.load_deps
           end
 
-          ## Just ported from chef
-          option :ssh_user,
-            :short => "-x USERNAME",
-            :long => "--ssh-user USERNAME",
-            :description => "The ssh username",
-            :default => "root"
-
-          option :ssh_password,
-            :short => "-P PASSWORD",
-            :long => "--ssh-password PASSWORD",
-            :description => "The ssh password"
-
-          option :identity_file,
-            :short => "-i IDENTITY_FILE",
-            :long => "--identity-file IDENTITY_FILE",
-            :description => "The SSH identity file used for authentication"
-
-          option :ssh_port,
-            :short => "-p PORT",
-            :long => "--ssh-port PORT",
-            :description => "The ssh port",
-            :proc => Proc.new { |key| Chef::Config[:knife][:ssh_port] = key }
-
-          option :ssh_gateway,
-            :short => "-G GATEWAY",
-            :long => "--ssh-gateway GATEWAY",
-            :description => "The ssh gateway",
-            :proc => Proc.new { |key| Chef::Config[:knife][:ssh_gateway] = key }
-
-          option :forward_agent,
-            :short => "-A",
-            :long => "--forward-agent",
-            :description => "Enable SSH agent forwarding",
-            :boolean => true
-
-          option :host_key_verify,
-            :long => "--[no-]host-key-verify",
-            :description => "Verify host key, enabled by default.",
-            :boolean => true,
-            :default => true
-
-          option :use_sudo,
-            :long => "--sudo",
-            :description => "execute the chef-client via sudo",
-            :boolean => true
-
-          option :use_sudo_password,
-            :long => "--use-sudo-password",
-            :description => "Execute the bootstrap via sudo with password",
-            :boolean => false
-
           ## Added by Knife-Zero
           option :why_run,
             :short        => '-W',

data/lib/chef/knife/zero_bootstrap.rb

@@ -14,123 +14,10 @@ class Chef
 
       banner "knife zero bootstrap FQDN (options)"
 
-      ## Just ported from chef bootstrap
-      option :chef_node_name,
-        :short => "-N NAME",
-        :long => "--node-name NAME",
-        :description => "The Chef node name for your new node"
-
-      option :prerelease,
-        :long => "--prerelease",
-        :description => "Install the pre-release chef gems"
-
-      option :bootstrap_version,
-        :long => "--bootstrap-version VERSION",
-        :description => "The version of Chef to install",
-        :proc => lambda { |v| Chef::Config[:knife][:bootstrap_version] = v }
-
-      option :bootstrap_proxy,
-        :long => "--bootstrap-proxy PROXY_URL",
-        :description => "The proxy server for the node being bootstrapped",
-        :proc => Proc.new { |p| Chef::Config[:knife][:bootstrap_proxy] = p }
-
-      option :bootstrap_no_proxy,
-        :long => "--bootstrap-no-proxy [NO_PROXY_URL|NO_PROXY_IP]",
-        :description => "Do not proxy locations for the node being bootstrapped; this option is used internally by Opscode",
-        :proc => Proc.new { |np| Chef::Config[:knife][:bootstrap_no_proxy] = np }
-
-      # DEPR: Remove this option in Chef 13
-      option :distro,
-        :short => "-d DISTRO",
-        :long => "--distro DISTRO",
-        :description => "Bootstrap a distro using a template",
-        :default => "chef-full"
-
-      option :bootstrap_template,
-        :short => "-t TEMPLATE",
-        :long => "--bootstrap-template TEMPLATE",
-        :description => "Bootstrap Chef using a built-in or custom template. Set to the full path of an erb template or use one of the built-in templates."
-
-      # DEPR: Remove this option in Chef 13
-      option :template_file,
-        :long => "--template-file TEMPLATE",
-        :description => "Full path to location of template to use",
-        :default => false
-
-      option :run_list,
-        :short => "-r RUN_LIST",
-        :long => "--run-list RUN_LIST",
-        :description => "Comma separated list of roles/recipes to apply",
-        :proc => lambda { |o| o.split(/[\s,]+/) },
-        :default => []
-
-      option :first_boot_attributes,
-        :short => "-j JSON_ATTRIBS",
-        :long => "--json-attributes",
-        :description => "A JSON string to be added to the first run of chef-client",
-        :proc => lambda { |o| Chef::JSONCompat.parse(o) },
-        :default => {}
-
-      option :hint,
-        :long => "--hint HINT_NAME[=HINT_FILE]",
-        :description => "Specify Ohai Hint to be set on the bootstrap target.  Use multiple --hint options to specify multiple hints.",
-        :proc => Proc.new { |h|
-          Chef::Config[:knife][:hints] ||= Hash.new
-          name, path = h.split("=")
-          Chef::Config[:knife][:hints][name] = path ? Chef::JSONCompat.parse(::File.read(path)) : Hash.new  }
-
-      option :secret,
-        :short => "-s SECRET",
-        :long  => "--secret ",
-        :description => "The secret key to use to encrypt data bag item values",
-        :proc => Proc.new { |s| Chef::Config[:knife][:secret] = s }
-
-      option :secret_file,
-        :long => "--secret-file SECRET_FILE",
-        :description => "A file containing the secret key to use to encrypt data bag item values",
-        :proc => Proc.new { |sf| Chef::Config[:knife][:secret_file] = sf }
-
-      option :bootstrap_url,
-        :long        => "--bootstrap-url URL",
-        :description => "URL to a custom installation script",
-        :proc        => Proc.new { |u| Chef::Config[:knife][:bootstrap_url] = u }
-
-      option :bootstrap_install_command,
-        :long        => "--bootstrap-install-command COMMANDS",
-        :description => "Custom command to install chef-client",
-        :proc        => Proc.new { |ic| Chef::Config[:knife][:bootstrap_install_command] = ic }
-
-      option :bootstrap_wget_options,
-        :long        => "--bootstrap-wget-options OPTIONS",
-        :description => "Add options to wget when installing chef-client",
-        :proc        => Proc.new { |wo| Chef::Config[:knife][:bootstrap_wget_options] = wo }
-
-      option :bootstrap_curl_options,
-        :long        => "--bootstrap-curl-options OPTIONS",
-        :description => "Add options to curl when install chef-client",
-        :proc        => Proc.new { |co| Chef::Config[:knife][:bootstrap_curl_options] = co }
-
-
-      ## experimental: vault support
-      option :bootstrap_vault_file,
-        :long        => '--bootstrap-vault-file VAULT_FILE',
-        :description => 'A JSON file with a list of vault(s) and item(s) to be updated'
-
-      option :bootstrap_vault_json,
-        :long        => '--bootstrap-vault-json VAULT_JSON',
-        :description => 'A JSON string with the vault(s) and item(s) to be updated'
-
-      option :bootstrap_vault_item,
-        :long        => '--bootstrap-vault-item VAULT_ITEM',
-        :description => 'A single vault and item to update as "vault:item"',
-        :proc        => Proc.new { |i|
-          (vault, item) = i.split(/:/)
-          Chef::Config[:knife][:bootstrap_vault_item] ||= {}
-          Chef::Config[:knife][:bootstrap_vault_item][vault] ||= []
-          Chef::Config[:knife][:bootstrap_vault_item][vault].push(item)
-          Chef::Config[:knife][:bootstrap_vault_item]
-        }
-
+      ## Import from knife bootstrap except exclusions
+      self.options = Bootstrap.options.merge(self.options)
+      self.options.delete :node_ssl_verify_mode
+      self.options.delete :node_verify_api_cert
 
       def knife_ssh
         begin

data/lib/chef/knife/zero_chef_client.rb

@@ -12,20 +12,11 @@ class Chef
         require "knife-zero/helper"
       end
 
-      banner "knife zero chef_client QUERY (options)"
+      banner "knife zero chef_client QUERY (options) | It's same as converge"
 
-      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",
-        :description => "The attribute to use for opening the connection - default depends on the context",
-        :proc => Proc.new { |key| Chef::Config[:knife][:ssh_attribute] = key.strip }
+      self.options = Ssh.options.merge(self.options)
+      self.options[:use_sudo] = Bootstrap.options[:use_sudo]
+      self.options[:use_sudo_password] = Bootstrap.options[:use_sudo_password]
 
       option :override_runlist,
         :short        => "-o RunlistItem,RunlistItem...",

data/lib/chef/knife/zero_converge.rb

@@ -0,0 +1,15 @@
+require 'chef/knife'
+require 'chef/knife/zero_chef_client'
+
+class Chef
+  class Knife
+    class ZeroConverge < Chef::Knife::ZeroChefClient
+      deps do
+        Chef::Knife::ZeroChefClient.load_deps
+      end
+
+      banner "knife zero converge QUERY (options)"
+      self.options = ZeroChefClient.options
+    end
+  end
+end

data/lib/knife-zero/version.rb

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

data/test/chef/knife/test_zero_bootstrap.rb

@@ -13,8 +13,8 @@ class TC_ZeroBootstrap < Test::Unit::TestCase
       assert_true(Chef::Config[:knife_zero])
     end
 
-    test "returns changed value from core" do
-      assert_equal("chef-full", @app.config[:distro])
+    test "returns expected bootstrap template(for notice changes of core to me)" do
+      assert_equal("chef-full", @app.default_bootstrap_template)
     end
 
     test "returns BootstrapSsh via knife_ssh" do

data/test/knife-zero/test_bootstrap_ssh.rb

@@ -5,14 +5,4 @@ class TC_BootstrapSsh < Test::Unit::TestCase
     @app = Chef::Knife::BootstrapSsh.new
     @app.merge_configs
   end
-
-  test "RR" do
-    assert_rr do
-      subject = Hash.new
-      mock(subject).to_json("hoge") {
-        "mogemoge"
-      }
-      assert_equal("mogemoge", subject.to_json("hoge"))
-    end
-  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.5.1", Knife::Zero::VERSION)
+    assert_equal("1.6.0", Knife::Zero::VERSION)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-zero
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - sawanoboly
@@ -174,6 +174,7 @@ files:
 - lib/chef/knife/zero_base.rb
 - lib/chef/knife/zero_bootstrap.rb
 - lib/chef/knife/zero_chef_client.rb
+- lib/chef/knife/zero_converge.rb
 - lib/chef/knife/zero_diagnose.rb
 - lib/knife-zero/bootstrap_ssh.rb
 - lib/knife-zero/core/bootstrap_context.rb