ridley 0.11.1 → 0.11.2

data/Gemfile

@@ -46,4 +46,5 @@ group :test do
   gem 'json_spec'
   gem 'webmock'
   gem 'chef-zero'
+  gem 'json', '>= 1.4.4', '<= 1.7.7'
 end

data/lib/ridley/host_connector.rb

@@ -53,10 +53,10 @@ module Ridley
         ssh_port, winrm_port = parse_port_options(options)
         timeout = options[:ssh] && options[:ssh][:timeout]
 
-        if connector_port_open?(host, ssh_port, timeout)
-          host_connector = Ridley::HostConnector::SSH
-        elsif connector_port_open?(host, winrm_port)
+        if connector_port_open?(host, winrm_port)
           host_connector = Ridley::HostConnector::WinRM
+        elsif connector_port_open?(host, ssh_port, timeout)
+          host_connector = Ridley::HostConnector::SSH
         else
           raise Ridley::Errors::HostConnectionError, "No available connection method available on #{host}."
         end

data/lib/ridley/host_connector/winrm/worker.rb

@@ -86,7 +86,12 @@ module Ridley
 
         # @return [WinRM::WinRMWebService]
         def winrm
-          ::WinRM::WinRMWebService.new(winrm_endpoint, :plaintext, user: user, pass: password, disable_sspi: true, basic_auth_only: true)
+          @winrm_client ||= begin
+            client = ::WinRM::WinRMWebService.new(winrm_endpoint, :plaintext,
+              user: user, pass: password, disable_sspi: true, basic_auth_only: true)
+            client.set_timeout(6000)
+            client
+          end
         end
 
         # @return [Fixnum]

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "0.11.1"
+  VERSION = "0.11.2"
 end

data/spec/unit/ridley/chef/cookbook_spec.rb

@@ -40,7 +40,7 @@ describe Ridley::Chef::Cookbook do
         end
       end
 
-      context "when a metadata.rb is missing but metadata.json is present", focus: true do
+      context "when a metadata.rb is missing but metadata.json is present" do
         let(:cookbook_path) { tmp_path.join("temp_cookbook").to_s }
 
         before do

data/spec/unit/ridley/host_connector_spec.rb

@@ -96,15 +96,15 @@ describe Ridley::HostConnector do
 
     context "when an SSH port is open" do
       it "returns Ridley::HostConnector::SSH" do
-        subject.stub(:connector_port_open?).and_return(true)
-        subject.best_connector_for(host).should eq(Ridley::HostConnector::SSH)
+        subject.stub(:connector_port_open?).and_return(false, true)
+        expect(subject.best_connector_for(host)).to eq(Ridley::HostConnector::SSH)
       end
     end
 
     context "when an SSH port isnt open and a WinRM port is open" do
       it "retrns Ridley::HostConnector::WinRM" do
-        subject.stub(:connector_port_open?).and_return(false, true)
-        subject.best_connector_for(host).should eq(Ridley::HostConnector::WinRM)
+        subject.stub(:connector_port_open?).and_return(true, false)
+        expect(subject.best_connector_for(host)).to eq(Ridley::HostConnector::WinRM)
       end
     end
 
@@ -119,9 +119,9 @@ describe Ridley::HostConnector do
 
     context "when a block is provided" do
       it "yields the best HostConnector to the block" do
-        subject.stub(:connector_port_open?).and_return(true)
+        subject.stub(:connector_port_open?).and_return(false, true)
         subject.best_connector_for(host) do |yielded|
-          yielded.should eq(Ridley::HostConnector::SSH)
+          expect(yielded).to eq(Ridley::HostConnector::SSH)
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -456,7 +456,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2982737321566508752
+      hash: 4471568292874425542
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23