capistrano-knife-solo 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa436950ca64377469516aefa8892d7476172753
-  data.tar.gz: 2ef2588082cae643c199a6535ea69c00be99435e
+  metadata.gz: 9b7706e2a1b662db3c19af21aa208914e8783ec3
+  data.tar.gz: 7b07c6e46d53ce2550ebae4daae0b570a0f886e4
 SHA512:
-  metadata.gz: f3d12285d01a2a16331826b30e6d6d12c251d96a795dbe8e9ccb219585a645a6b38cf27ac511349d4595b0fc18b8a9eaa5d6dff18a05ca9de86d18b6ae07288f
-  data.tar.gz: 1ff221d22db6dbfb802338c4e92037200ee9dfded9488132331a5fff4bca7fe8ae0bf5360a77e29c6fde1451c9a4d68e6fc44fe99ef6b4524561dad31f86cf6c
+  metadata.gz: 95f28befa60aacf0e387ccb95741d0137b332439eb0dbfd3e2ae7a20f6ff8a44a905b2064e63b601172c29d0bcf0b79cc919612a2d9c9dc8f4f06bc3fd829731
+  data.tar.gz: a31a1933b8c462b3c3d95869373a4ae5ff007450f868ee46925b41c1505474461076bc830738867203e13810363b69cab2f6466cb2f5f09663b1c26436a6795c

data/capistrano-knife-solo.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'capistrano-knife-solo'
-  spec.version       = '0.1.0'
+  spec.version       = '0.2.0'
   spec.authors       = 'Robert Coleman'
   spec.email         = 'github@robert.net.nz'
   spec.summary       = %q{Use knife solo with Capistrano.}

data/lib/capistrano-knife-solo.rb

@@ -17,12 +17,12 @@ module CapistranoKnifeSolo
     end
 
     def self.knife_config(host)
-      ssh_options = fetch(:ssh_options)
+      ssh_options = fetch(:ssh_options, {})
       options = {}
       options[:ssh_user] = ssh_options[:user] if ssh_options[:user]
       options[:ssh_password] = ssh_options[:password] if ssh_options[:password]
       options[:ssh_port] = ssh_options[:port] if ssh_options[:port]
-      options[:identity_file] = ssh_options[:keys][0] if ssh_options[:keys][0]
+      options[:identity_file] = ssh_options[:keys][0] if ssh_options.fetch(:keys, [])[0]
       options[:forward_agent] = ssh_options[:forward_agent] if ssh_options[:forward_agent]
       options[:startup_script] = fetch(:knife_startup_script) if fetch(:knife_startup_script)
       options[:sudo_command] = fetch(:knife_sudo_command) if fetch(:knife_sudo_command)
@@ -33,7 +33,11 @@ module CapistranoKnifeSolo
 
     def self.knife_args(host)
       args = []
-      args << host.hostname
+      if host.user
+        args << "#{ host.user }@#{ host.hostname }"
+      else
+        args << host.hostname
+      end
       args << "#{fetch(:knife_args)}" if fetch(:knife_args)
       return args
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-knife-solo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Robert Coleman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-18 00:00:00.000000000 Z
+date: 2015-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Use knife solo with Capistrano.