knife-zero 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7615a63a5eff793078740317f3ca12fdb607821e
-  data.tar.gz: 0d73adc8804b0bd7795cdf3c7bfa4f37b73ed7ca
+  metadata.gz: 44cf84092314004ad94e89203f75d0b6ea6288f4
+  data.tar.gz: db9b5e072c8fa7c72b8c7e45f430bf03d0886e56
 SHA512:
-  metadata.gz: abec6340cc40f8df2457bb2d11323c4f83d12a4a2cedd6f8178fe98e6803a70e9a3ec3732d3a38e196da9d8b1a1678ac404c1ccdf1430484e5127199b50eb5ef
-  data.tar.gz: ec85f918f363ac842b3e65c1391ba9093e2ba6322763fa55249be4fa7bc01af698167116c81a8540cb7b5aa3595bb84c032c36f9b7c81c4ceb224460b29d5514
+  metadata.gz: 0a85dc16d988db80196031105baaed5f2d1c5eee572bcbd4129b4d952f0d4f6a00b595bebbde82ecd184e80c7a41879bec241e085565ba24fd12eceacd492c2b
+  data.tar.gz: 5a48efd0493b912277410c57654b42e8b26f99d8971d66739691615124f41661847a1011afb9025e88ee910f7559ed7a1e21f849ea6fb6a7e43695d73de57708

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## v1.5.1
+
+- Bug: `--ssh-user` arg doesn't override `knife[:ssh_user]`.
+    - PR #35 HT: @patcon
+
 ## v1.5.0
 
 - Feature: Support bootstrap as vault client(chef-vault).

data/lib/chef/knife/zero_bootstrap.rb

@@ -138,14 +138,14 @@ class Chef
         ssh.ui = ui
         ssh.name_args = [ server_name, ssh_command ]
         ssh.config = Net::SSH.configuration_for(server_name)
-        ssh.config[:ssh_user] = Chef::Config[:knife][:ssh_user] || config[:ssh_user]
+        ssh.config[:ssh_user] = config[:ssh_user] || Chef::Config[:knife][: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[: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]
         ssh.config[:manual] = true
-        ssh.config[:host_key_verify] = Chef::Config[:knife][:host_key_verify] || config[:host_key_verify]
+        ssh.config[:host_key_verify] = config[:host_key_verify] || Chef::Config[:knife][:host_key_verify]
         ssh.config[:on_error] = :raise
         ssh
         rescue => e

data/lib/knife-zero/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Zero
-    VERSION = "1.5.0"
+    VERSION = "1.5.1"
     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.5.0", Knife::Zero::VERSION)
+    assert_equal("1.5.1", Knife::Zero::VERSION)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-zero
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2015-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -220,3 +220,4 @@ test_files:
 - test/knife-zero/test_bootstrap_ssh.rb
 - test/knife-zero/test_versioin.rb
 - test/run_test.rb
+has_rdoc: