knife-setup 1.0.5 → 1.0.6

data/lib/chef/knife/knife-setup.rb

@@ -142,9 +142,9 @@ class Chef
       end
 
       def get_node
-        node = Chef::Node.load(@node_name)
+        node = Chef::Node.load(server_name)
         if node.nil?
-          ui.error("Could not find a node named #{@node_name}")
+          ui.error("Could not find a node named #{@server_name}")
           exit 1
         end
         return node
@@ -199,13 +199,17 @@ class Chef
       end
 
       def server_name
-        Array(@name_args).first
+        if config[:chef_node_name].empty?
+          Array(@name_args).first
+        else
+          config[:chef_node_name]
+        end
       end
 
       def knife_ssh(command)
         ssh = Chef::Knife::Ssh.new
         ssh.ui = ui
-        ssh.name_args = [ server_name, command]
+        ssh.name_args = [ @node_name, command]
         ssh.config[:ssh_user] = config[:ssh_user]
         ssh.config[:ssh_password] = config[:ssh_password]
         ssh.config[:ssh_port] = Chef::Config[:knife][:ssh_port] || config[:ssh_port]

data/lib/knife-setup/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module Setup
-    VERSION = "1.0.5"
+    VERSION = "1.0.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-setup
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -66,3 +66,4 @@ signing_key:
 specification_version: 3
 summary: Setup chef on machine.
 test_files: []
+has_rdoc: