ridley-connectors 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 301f0d55380eefdcc12152a5e943643c67af77aa
-  data.tar.gz: 5e1f3ac6e959b50a8f62d0ff7e76c0c20ce55c9a
+  metadata.gz: 83951fdd4b407da750f1650dda96da6092dc5d87
+  data.tar.gz: 6781793e33583fb2a2a0c66803daaa93a3bd6a5b
 SHA512:
-  metadata.gz: 4780c2b719f082bc9e4cda5bf8b2154c0f670ce6a78d6c8d27246643e7c8b469642b6e9cdab54f91c8779c6e2073fa84a2fd51705d97a052690259a8a353cd51
-  data.tar.gz: c732f970be05ea14f0a396e165c5ffad48a81bb6df3914995474064d62e372d639d490e83942fc315efeecfc4130ec220d522efea0ed36eef9e368185ed94214
+  metadata.gz: 0e948a143d321f8036a4ca2bdb1c03551082a90f7de15622df2e5cfc70c5937399eb619855a04c43bfbee639ad20f5d62f0781f0479ba7c255e4d97d04e38e85
+  data.tar.gz: 80e8ebdc8e53faf8096eb541d291a89813db4914fdb0cfac5b47d12bde0d2ebda245a9d4d9e91a6dcf12facaa81141b62020775f6ddd2e4f1b42078989fb311b

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v.2.1.2
+
+* [#25](https://github.com/RiotGames/ridley-connectors/pull/25) Fix an edge case in the connector_for logic from #22
+
 ## v.2.1.1
 
 * [#24](https://github.com/RiotGames/ridley-connectors/pull/24) Fix a bug with Timeout.rb unable to interrupt Socket connections (mostly JRuby)

data/lib/ridley-connectors/host_commander.rb

@@ -29,6 +29,8 @@ module Ridley
     DEFAULT_WINDOWS_CONNECTOR = "winrm"
     DEFAULT_LINUX_CONNECTOR = "ssh"
 
+    VALID_CONNECTORS = [ DEFAULT_WINDOWS_CONNECTOR, DEFAULT_LINUX_CONNECTOR ]
+
     CONNECTOR_PORT_ERRORS = [
       Errno::ETIMEDOUT, Timeout::Error, SocketError, 
       Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::EADDRNOTAVAIL,
@@ -216,6 +218,11 @@ module Ridley
 
       connector = options[:connector]
 
+      if !VALID_CONNECTORS.include?(connector)
+        log.warn { "Received connector '#{connector}' is not one of #{VALID_CONNECTORS}. Checking default connectors..." }
+        connector = nil
+      end
+
       if (connector == DEFAULT_WINDOWS_CONNECTOR || connector.nil?) && connector_port_open?(host, options[:winrm][:port], options[:winrm][:timeout], options[:retries])
         options.delete(:ssh)
         winrm

data/lib/ridley-connectors/version.rb

@@ -1,5 +1,5 @@
 module Ridley
   module Connectors
-    VERSION = "2.1.1"
+    VERSION = "2.1.2"
   end
 end

data/spec/unit/ridley-connectors/host_commander_spec.rb

@@ -167,6 +167,9 @@ describe Ridley::HostCommander do
   end
 
   describe "#connector_for" do
+    let(:options) do
+      { ssh: { port: 22, timeout: 3 }, winrm: { port: 5985, timeout: 3 }, retries: 3 }
+    end
 
     context "when connector_port_open? experiences an error" do
       let(:socket) { double(close: true) }
@@ -206,40 +209,45 @@ describe Ridley::HostCommander do
     end
 
     context "when a connector of winrm is given" do
-      let(:options) do
-        { ssh: { port: 22, timeout: 3 }, winrm: { port: 5985, timeout: 3 }, retries: 3, connector: "winrm" }
-      end
+      let(:connector_options) { options.merge(connector: "winrm") }
       let(:winrm) { double }
 
       it "should return winrm if winrm is open" do
         subject.stub(:connector_port_open?).with(host, Ridley::HostConnector::WinRM::DEFAULT_PORT, anything, anything).and_return(true)
         subject.stub(:winrm).and_return(winrm)
-        expect(subject.connector_for(host, options)).to eql(winrm)
+        expect(subject.connector_for(host, connector_options)).to eql(winrm)
       end
 
       it "should return nil if winrm is closed" do
         subject.stub(:connector_port_open?).with(host, Ridley::HostConnector::WinRM::DEFAULT_PORT, anything, anything).and_return(false)
-        expect(subject.connector_for(host, options)).to be_nil
+        expect(subject.connector_for(host, connector_options)).to be_nil
       end
     end
 
     context "when a connector of ssh is given" do
-      let(:options) do
-        { ssh: { port: 22, timeout: 3 }, winrm: { port: 5985, timeout: 3 }, retries: 3, connector: "ssh" }
-      end
+      let(:connector_options) { options.merge(connector: "ssh") }
       let(:ssh) { double }
 
       it "should return ssh if ssh is open" do
         subject.stub(:connector_port_open?).with(host, Ridley::HostConnector::SSH::DEFAULT_PORT, anything, anything).and_return(true)
         subject.stub(:ssh).and_return(ssh)
         subject.should_not_receive(:connector_port_open?).with(host, Ridley::HostConnector::WinRM::DEFAULT_PORT, anything, anything)
-        expect(subject.connector_for(host, options)).to eql(ssh)
+        expect(subject.connector_for(host, connector_options)).to eql(ssh)
       end
 
       it "should return nil if ssh is closed" do
         subject.stub(:connector_port_open?).with(host, Ridley::HostConnector::SSH::DEFAULT_PORT, anything, anything).and_return(false)
         subject.should_not_receive(:connector_port_open?).with(host, Ridley::HostConnector::WinRM::DEFAULT_PORT, anything, anything)
-        expect(subject.connector_for(host, options)).to be_nil
+        expect(subject.connector_for(host, connector_options)).to be_nil
+      end
+    end
+
+    context "when an unknown connector is given" do
+      let(:connector_options) { options.merge(connector: "foo") }
+
+      it "should try both connectors" do
+        subject.should_receive(:connector_port_open?).twice
+        subject.connector_for(host, connector_options)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley-connectors
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-29 00:00:00.000000000 Z
+date: 2014-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid