sshkit 0.0.26 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbb3f36f6373d515b4313fc92514655ba7ca36e0
-  data.tar.gz: 484fd64e12a264d5bdaffe1e0a680194739930c5
+  metadata.gz: fa55cb451f47225ec73ee08039769db6d0b94042
+  data.tar.gz: 1a518438483ce60cab579ed6e4324048a8026d74
 SHA512:
-  metadata.gz: e2d81fb0548c2a2d66763cb9a3ca7afa71753955264da34a8d5c9c6b83cefbaa2a073970f3a4059d87597f3c6998d57c687cdedbf596dbcd6a7efb099725e675
-  data.tar.gz: 3c2e49e6cff7cc951097ece2084824ea7350a3d36bb34008a82ce3b14af31b420d9019c5e71c6b9a5cae0217f30f0a70cc70264ea437b994345bd3609391798f
+  metadata.gz: 02de05f408918db9ce6ea869948200abd85bf732ea87fa92a2ccd12d8a2c96d3f113a3f92b36935050ab949dabca6cd1380f9d7bc262bfdc95c126dc555c7057
+  data.tar.gz: 3ccffca30784f05d5fc4cef3db7bb42b2111b1935c178a93e6c95819d275c2fc681731f3d47677056069ce0562dc291fc16c5744beca478a4711034b1cf384e5

data/CHANGELOG.md

@@ -3,6 +3,12 @@
 This file is written in reverse chronological order, newer releases will
 appear at the top.
 
+## 0.0.27
+
+  * Don't clobber SSH options with empty values. This allows Net::SSH to
+    do the right thing most of the time, and look into the SSH configuration
+    files.
+
 ## 0.0.26
 
   * Pretty output no longer prints white text. ("Command.....")

data/lib/sshkit/host.rb

@@ -1,4 +1,3 @@
-require 'etc'
 require 'ostruct'
 
 module SSHKit
@@ -67,21 +66,17 @@ module SSHKit
     alias :== :eql?
     alias :equal? :eql?
 
-    def to_key
-      to_s.to_sym
-    end
-
     def to_s
-      sprintf("%s@%s:%d", username, hostname, port)
+      hostname
     end
 
     def netssh_options
-      {
-        keys:     keys,
-        port:     port,
-        user:     user,
-        password: password
-      }
+      {}.tap do |sho|
+        sho[:keys]     = keys     if keys.any?
+        sho[:port]     = port     if port
+        sho[:user]     = user     if user
+        sho[:password] = password if password
+      end
     end
 
     def properties
@@ -103,11 +98,11 @@ module SSHKit
     end
 
     def username
-      Etc.getlogin
+
     end
 
     def port
-      22
+
     end
 
     def hostname

data/lib/sshkit/version.rb

@@ -1,3 +1,3 @@
 module SSHKit
-  VERSION = "0.0.26"
+  VERSION = "0.0.27"
 end

data/test/unit/test_coordinator.rb

@@ -32,11 +32,6 @@ module SSHKit
       Coordinator.new %w{1.example.com 2.example.com 3.example.com}
     end
 
-    def test_connection_manager_removes_duplicates_after_resolving_hosts
-      cm = Coordinator.new %w{user@1.example.com:22 user@1.example.com}
-      assert_equal ['user@1.example.com:22'], cm.hosts.map(&:to_s)
-    end
-
     def test_the_connection_manager_yields_the_host_to_each_connection_instance
       spy = lambda do |host|
         execute "echo #{host.hostname}"

data/test/unit/test_host.rb

@@ -12,8 +12,6 @@ module SSHKit
 
     def test_regular_hosts
       h = Host.new 'example.com'
-      assert_equal 22,             h.port
-      assert_equal `whoami`.chomp, h.username
       assert_equal 'example.com',  h.hostname
     end
 
@@ -49,12 +47,8 @@ module SSHKit
       assert_equal '1fff:0:a88:85a3::ac1f', h.hostname
     end
 
-    def testing_host_casting_to_a_key
-      assert_equal :"user@example.com:1234", Host.new('user@example.com:1234').to_key
-    end
-
     def testing_host_casting_to_a_string
-      assert_equal "user@example.com:1234", Host.new('user@example.com:1234').to_s
+      assert_equal "example.com", Host.new('user@example.com:1234').to_s
     end
 
     def test_assert_hosts_hash_equally
@@ -99,6 +93,17 @@ module SSHKit
       end
     end
 
+    def test_host_ssh_options_are_simply_missing_when_they_have_no_value
+      Host.new('my_config_is_in_the_ssh_config_file').tap do |host|
+        host.netssh_options.tap do |sho|
+          refute sho.has_key?(:port)
+          refute sho.has_key?(:password)
+          refute sho.has_key?(:keys)
+          refute sho.has_key?(:user)
+        end
+      end
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sshkit
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
 platform: ruby
 authors:
 - Lee Hambley