ridley-connectors 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 762f12e6c4e0916c5d00458a76b433770fe3d8ac
-  data.tar.gz: a4f104fb5eb97c9c9bb16bc3204e65575938956b
+  metadata.gz: 7af7fa7d2548244502ecb8c58068e8942e53e050
+  data.tar.gz: 47f076edd626e03d1703891822e0299f5eb91ea4
 SHA512:
-  metadata.gz: 6b7d0f5c3ae3054ea68907876e81b5de8816b8a0f691bdefbd2e59b32aed185a253a9b870149ec14d9957d015c1b29c485e6bb6ae62cd1997b423929dc467220
-  data.tar.gz: 67aac46a68059c709d2519f69ff11391ee28ae98428c435b12ad9c00423286c24f9ac0a82916857bbb10d11df2fa962c21fd31d17e8379cd692b7ef4ce914ae3
+  metadata.gz: 89b29b05d062eaf1935561e31c4b07434bf2509bb9ad8a00c67247fcbf54047b25aea68d4303fa1e7e8d82fd552203e91750a6c2b6bacc591d863362f3f1d9ad
+  data.tar.gz: 287594f56bf8892051b1f47c79051f2cb95f760d4af28ab66a5879d59d7a7799e99ddf46b1f000ef4c2bfe2bc586e042010c04ba704f366680f9ce81175868c0

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2.4.0
+
+* Fix race condition with choosing and starting the appropriate connector
+* Bump required Celluloid/Celluloid-IO versions
+* Silence noisy warning output into debug output
+
 ## 2.3.1
 
 * Fix installation problem on some Windows machines

data/Gemfile

@@ -5,14 +5,13 @@ gemspec
 group :development do
   gem 'yard'
   gem 'spork'
-  gem 'guard', '~> 1.8'
+  gem 'guard', '~> 2.0'
   gem 'guard-rspec'
-  gem 'guard-spork', platforms: :ruby
-  gem 'fuubar'
 end
 
 group :test do
   gem 'rspec'
   gem 'webmock'
   gem 'thor'
+  gem 'rake'
 end

data/Guardfile

@@ -1,12 +1,6 @@
 notification :off
 
-guard 'spork' do
-  watch('Gemfile')
-  watch('spec/spec_helper.rb')     { :rspec }
-  watch(%r{^spec/support/.+\.rb$}) { :rspec }
-end
-
-guard 'rspec', cli: "--color --drb --format Fuubar", all_on_start: false, all_after_pass: false do
+guard 'rspec', cmd: "bundle exec rspec --color", all_on_start: false, all_after_pass: false do
   watch(%r{^spec/unit/.+_spec\.rb$})
   watch(%r{^spec/acceptance/.+_spec\.rb$})
 

data/Rakefile

@@ -0,0 +1 @@
+require "bundler/gem_tasks"

data/lib/ridley-connectors/host_commander.rb

@@ -225,20 +225,16 @@ module Ridley
     #
     # @return [HostConnector::SSH, HostConnector::WinRM, NilClass]
     def connector_for(host, options = {})
-      connector = options[:connector]
+      connector = options[:connector].to_s
 
       if !VALID_CONNECTORS.include?(connector)
-        log.warn { "Received connector '#{connector}' is not one of #{VALID_CONNECTORS}. Checking default connectors..." }
+        log.debug { "Connector '#{connector}' is not one of #{VALID_CONNECTORS}. Determining connector..." }
         connector = nil
       end
 
-      if (connector == DEFAULT_WINDOWS_CONNECTOR || connector.nil?) && 
-          winrm.connector_port_open?(host, options)
-        options.delete(:ssh)
+      if (connector == DEFAULT_WINDOWS_CONNECTOR || connector.nil?) && winrm.connector_port_open?(host, options)
         winrm
-      elsif (connector == DEFAULT_LINUX_CONNECTOR || connector.nil?) && 
-          ssh.connector_port_open?(host, options)
-        options.delete(:winrm)
+      elsif (connector == DEFAULT_LINUX_CONNECTOR || connector.nil?) && ssh.connector_port_open?(host, options)
         ssh
       else
         nil
@@ -265,7 +261,11 @@ module Ridley
         if connector.nil?
           log.warn { "No connector ports open on '#{host}'" }
           HostConnector::Response.new(host, stderr: "No connector ports open on '#{host}'")
-        else
+        elsif connector.is_a?(winrm.class)
+          options.delete(:ssh)
+          connector.send(method, host, *args, options)
+        elsif connector.is_a?(ssh.class)
+          options.delete(:winrm)
           connector.send(method, host, *args, options)
         end
       end

data/lib/ridley-connectors/host_connector.rb

@@ -8,7 +8,7 @@ module Ridley
       RETRY_COUNT = 3
       CONNECTOR_PORT_ERRORS = [Errno::ETIMEDOUT,
                                Timeout::Error,
-                               SocketError, 
+                               SocketError,
                                Errno::ECONNREFUSED,
                                Errno::EHOSTUNREACH,
                                Errno::EADDRNOTAVAIL,
@@ -129,12 +129,12 @@ module Ridley
       # @param [Fixnum] port
       #   the port to attempt to connect on
       # @param [Fixnum] timeout ({PORT_CHECK_TIMEOUT})
-      # 
+      #
       # @return [Boolean]
       def connectable?(host, port, timeout = PORT_CHECK_TIMEOUT)
-        addr = Socket.getaddrinfo(host, nil)
+        addr     = Socket.getaddrinfo(host, nil)
         sockaddr = Socket.pack_sockaddr_in(port, addr[0][3])
-        socket = Socket.new(Socket.const_get(addr[0][0]), Socket::SOCK_STREAM, 0)
+        socket   = Socket.new(Socket.const_get(addr[0][0]), Socket::SOCK_STREAM, 0)
         socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
 
         success = false

data/lib/ridley-connectors/resources/node_resource.rb

@@ -1,6 +1,5 @@
 module Ridley
   class NodeResource
-
     attr_reader :server_url
     attr_reader :validator_path
     attr_reader :validator_client
@@ -123,7 +122,7 @@ module Ridley
     # @param [String] host
     # @param [Array<String>] command_lines
     # @option options [String] :connector
-    #   a connectory type to prefer    
+    #   a connectory type to prefer
     #
     # @return [HostConnector::Response]
     def ruby_script(host, command_lines, options = {})
@@ -135,6 +134,8 @@ module Ridley
     #
     # @param [String] host
     # @param [String] command
+    # @option options [String] :connector
+    #   a connectory type to prefer
     #
     # @return [HostConnector::Response]
     def run(host, command, options = {})
@@ -192,7 +193,6 @@ module Ridley
       host_commander.uninstall_chef(host, options)
     end
 
-
     # Update a node's Omnibus installation of Chef
     #
     # @param [String] host

data/lib/ridley-connectors/version.rb

@@ -1,5 +1,5 @@
 module Ridley
   module Connectors
-    VERSION = "2.3.1"
+    VERSION = "2.4.0"
   end
 end

data/ridley-connectors.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |s|
   s.version       = Ridley::Connectors::VERSION
   s.required_ruby_version = ">= 1.9.1"
 
-  s.add_dependency 'celluloid',    '~> 0.16.0.pre'
-  s.add_dependency 'celluloid-io', '~> 0.16.0.pre'
+  s.add_dependency 'celluloid',    '~> 0.16.0'
+  s.add_dependency 'celluloid-io', '~> 0.16.1'
   s.add_dependency 'erubis'
   s.add_dependency 'net-ssh'
   s.add_dependency 'net-ssh-gateway'

data/spec/unit/ridley-connectors/bootstrap_context/unix_spec.rb

@@ -19,7 +19,7 @@ describe Ridley::BootstrapContext::Unix do
           options.delete(:sudo)
           obj = subject.new(options)
 
-          obj.send(:sudo).should be_true
+          expect(obj.send(:sudo)).to be true
         end
       end
 
@@ -28,7 +28,7 @@ describe Ridley::BootstrapContext::Unix do
           options.merge!(sudo: false)
           obj = subject.new(options)
 
-          obj.send(:sudo).should be_false
+          expect(obj.send(:sudo)).to be false
         end
       end
     end
@@ -40,62 +40,62 @@ describe Ridley::BootstrapContext::Unix do
 
     describe "#templates_path" do
       it "returns a pathname" do
-        subject.templates_path.should be_a(Pathname)
+        expect(subject.templates_path).to be_a(Pathname)
       end
     end
 
     describe "#first_boot" do
       it "returns a string" do
-        subject.first_boot.should be_a(String)
+        expect(subject.first_boot).to be_a(String)
       end
     end
 
     describe "#encrypted_data_bag_secret" do
       it "returns a string" do
-        subject.encrypted_data_bag_secret.should be_a(String)
+        expect(subject.encrypted_data_bag_secret).to be_a(String)
       end
     end
 
     describe "#validation_key" do
       it "returns a string" do
-        subject.validation_key.should be_a(String)
+        expect(subject.validation_key).to be_a(String)
       end
     end
 
     describe "template" do
       it "returns a string" do
-        subject.template.should be_a(Erubis::Eruby)
+        expect(subject.template).to be_a(Erubis::Eruby)
       end
     end
   end
 
   describe "#boot_command" do
     it "returns a string" do
-      subject.boot_command.should be_a(String)
+      expect(subject.boot_command).to be_a(String)
     end
   end
 
   describe "#chef_run" do
     it "returns a string" do
-      subject.chef_run.should be_a(String)
+      expect(subject.chef_run).to be_a(String)
     end
   end
 
   describe "#chef_config" do
     it "returns a string" do
-      subject.chef_config.should be_a(String)
+      expect(subject.chef_config).to be_a(String)
     end
   end
 
   describe "#default_template" do
     it "returns a string" do
-      subject.default_template.should be_a(String)
+      expect(subject.default_template).to be_a(String)
     end
   end
 
   describe "#bootstrap_directory" do
     it "returns a string" do
-      subject.bootstrap_directory.should be_a(String)
+      expect(subject.bootstrap_directory).to be_a(String)
     end
   end
 end

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

@@ -18,7 +18,7 @@ describe Ridley::BootstrapContext::Base do
     describe ":included" do
       context "when a class includes Ridley::BootstrapBinding" do
         it "should have a validate_options class method`" do
-          subject.methods.should include(:validate_options)
+          expect(subject.methods).to include(:validate_options)
         end
       end
     end

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

@@ -21,11 +21,11 @@ describe Ridley::Client do
       subject { described_class.new(options) }
 
       it "assigns a 'ssh' attribute from the given 'ssh' option" do
-        described_class.new(config).ssh.should eql({user: "fake", password: "password1", port: "222"})
+        expect(described_class.new(config).ssh).to eql({user: "fake", password: "password1", port: "222"})
       end
 
       it "assigns a 'winrm' attribute from the given 'winrm' option" do
-        described_class.new(config).winrm.should eql({user: "fake", password: "password2", port: "5986"})
+        expect(described_class.new(config).winrm).to eql({user: "fake", password: "password2", port: "5986"})
       end
     end
   end

data/spec/unit/ridley-connectors/command_context/unix_uninstall_spec.rb

@@ -6,7 +6,7 @@ describe Ridley::CommandContext::UnixUninstall do
   describe "::new" do
     context "when skip_chef is not provided" do
       it "sets skip_chef to false" do
-        expect(unix_uninstall.skip_chef).to be_false
+        expect(unix_uninstall.skip_chef).to be false
       end
     end
   end

data/spec/unit/ridley-connectors/command_context/unix_update_omnibus_spec.rb

@@ -12,7 +12,7 @@ describe Ridley::CommandContext::UnixUpdateOmnibus do
 
     context "when prerelease is not given" do
       it "prerelease is set to false" do
-        expect(unix_update_omnibus.prerelease).to be_false
+        expect(unix_update_omnibus.prerelease).to be false
       end
     end
 
@@ -31,7 +31,7 @@ describe Ridley::CommandContext::UnixUpdateOmnibus do
       end
 
       it "sets prerelease" do
-        expect(unix_update_omnibus.prerelease).to be_true
+        expect(unix_update_omnibus.prerelease).to be true
       end
 
       it "sets direct_url" do

data/spec/unit/ridley-connectors/command_context/windows_update_omnibus_spec.rb

@@ -12,7 +12,7 @@ describe Ridley::CommandContext::WindowsUpdateOmnibus do
 
     context "when prerelease is not given" do
       it "prerelease is set to false" do
-        expect(windows_update_omnibus.prerelease).to be_false
+        expect(windows_update_omnibus.prerelease).to be false
       end
     end
 
@@ -31,7 +31,7 @@ describe Ridley::CommandContext::WindowsUpdateOmnibus do
       end
 
       it "sets prerelease" do
-        expect(windows_update_omnibus.prerelease).to be_true
+        expect(windows_update_omnibus.prerelease).to be true
       end
 
       it "sets direct_url" do

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

@@ -12,25 +12,24 @@ describe Ridley::HostCommander do
 
     context "when communicating to a unix node" do
       before do
-        subject.send(:winrm).stub(:port_open?).and_return(false)
-        subject.send(:ssh).stub(:port_open?).and_return(true)
+        allow(subject.send(:winrm)).to receive(:connector_port_open?) { false }
+        allow(subject.send(:ssh)).to receive(:connector_port_open?) { true }
       end
 
       it "sends a #run message to the ssh host connector" do
-        subject.send(:ssh).should_receive(:run).with(host, command, options)
+        expect(subject.send(:ssh)).to receive(:send).with(:run, host, command, options)
         subject.run(host, command, options)
       end
     end
 
     context "when communicating to a windows node" do
       before do
-        subject.send(:winrm).stub(:port_open?).and_return(true)
-        subject.send(:ssh).stub(:port_open?).and_return(false)
+        allow(subject.send(:winrm)).to receive(:connector_port_open?) { true }
+        allow(subject.send(:ssh)).to receive(:connector_port_open?) { false }
       end
 
       it "sends a #run message to the ssh host connector" do
-        subject.send(:winrm).should_receive(:run).with(host, command, options)
-
+        expect(subject.send(:winrm)).to receive(:send).with(:run, host, command, options)
         subject.run(host, command, options)
       end
     end
@@ -43,12 +42,12 @@ describe Ridley::HostCommander do
 
     context "when communicating to a unix node" do
       before do
-        subject.send(:winrm).stub(:port_open?).and_return(false)
-        subject.send(:ssh).stub(:port_open?).and_return(true)
+        allow(subject.send(:winrm)).to receive(:connector_port_open?) { false }
+        allow(subject.send(:ssh)).to receive(:connector_port_open?) { true }
       end
 
       it "sends a #bootstrap message to the ssh host connector" do
-        subject.send(:ssh).should_receive(:bootstrap).with(host, options)
+        expect(subject.send(:ssh)).to receive(:bootstrap).with(host, options)
 
         subject.bootstrap(host, options)
       end
@@ -56,12 +55,12 @@ describe Ridley::HostCommander do
 
     context "when communicating to a windows node" do
       before do
-        subject.send(:winrm).stub(:port_open?).and_return(true)
-        subject.send(:ssh).stub(:port_open?).and_return(false)
+        allow(subject.send(:winrm)).to receive(:connector_port_open?) { true }
+        allow(subject.send(:ssh)).to receive(:connector_port_open?) { false }
       end
 
       it "sends a #bootstrap message to the winrm host connector" do
-        subject.send(:winrm).should_receive(:bootstrap).with(host, options)
+        expect(subject.send(:winrm)).to receive(:bootstrap).with(host, options)
 
         subject.bootstrap(host, options)
       end
@@ -75,12 +74,12 @@ describe Ridley::HostCommander do
 
     context "when communicating to a unix node" do
       before do
-        subject.send(:winrm).stub(:port_open?).and_return(false)
-        subject.send(:ssh).stub(:port_open?).and_return(true)
+        allow(subject.send(:winrm)).to receive(:connector_port_open?) { false }
+        allow(subject.send(:ssh)).to receive(:connector_port_open?) { true }
       end
 
       it "sends a #chef_client message to the ssh host connector" do
-        subject.send(:ssh).should_receive(:chef_client).with(host, options)
+        expect(subject.send(:ssh)).to receive(:chef_client).with(host, options)
 
         subject.chef_client(host, options)
       end
@@ -88,12 +87,12 @@ describe Ridley::HostCommander do
 
     context "when communicating to a windows node" do
       before do
-        subject.send(:winrm).stub(:port_open?).and_return(true)
-        subject.send(:ssh).stub(:port_open?).and_return(false)
+        allow(subject.send(:winrm)).to receive(:connector_port_open?) { true }
+        allow(subject.send(:ssh)).to receive(:connector_port_open?) { false }
       end
 
       it "sends a #chef_client message to the ssh host connector" do
-        subject.send(:winrm).should_receive(:chef_client).with(host, options)
+        expect(subject.send(:winrm)).to receive(:chef_client).with(host, options)
 
         subject.chef_client(host, options)
       end
@@ -108,12 +107,12 @@ describe Ridley::HostCommander do
 
     context "when communicating to a unix node" do
       before do
-        subject.send(:winrm).stub(:port_open?).and_return(false)
-        subject.send(:ssh).stub(:port_open?).and_return(true)
+        allow(subject.send(:winrm)).to receive(:connector_port_open?) { false }
+        allow(subject.send(:ssh)).to receive(:connector_port_open?) { true }
       end
 
       it "sends a #put_secret message to the ssh host connector" do
-        subject.send(:ssh).should_receive(:put_secret).with(host, secret, options)
+        expect(subject.send(:ssh)).to receive(:put_secret).with(host, secret, options)
 
         subject.put_secret(host, secret, options)
       end
@@ -121,12 +120,12 @@ describe Ridley::HostCommander do
 
     context "when communicating to a windows node" do
       before do
-        subject.send(:winrm).stub(:port_open?).and_return(true)
-        subject.send(:ssh).stub(:port_open?).and_return(false)
+        allow(subject.send(:winrm)).to receive(:connector_port_open?) { true }
+        allow(subject.send(:ssh)).to receive(:connector_port_open?) { false }
       end
 
       it "sends a #put_secret message to the ssh host connector" do
-        subject.send(:winrm).should_receive(:put_secret).with(host, secret, options)
+        expect(subject.send(:winrm)).to receive(:put_secret).with(host, secret, options)
 
         subject.put_secret(host, secret, options)
       end
@@ -141,12 +140,12 @@ describe Ridley::HostCommander do
 
     context "when communicating to a unix node" do
       before do
-        subject.send(:winrm).stub(:port_open?).and_return(false)
-        subject.send(:ssh).stub(:port_open?).and_return(true)
+        allow(subject.send(:winrm)).to receive(:connector_port_open?) { false }
+        allow(subject.send(:ssh)).to receive(:connector_port_open?) { true }
       end
 
       it "sends a #ruby_script message to the ssh host connector" do
-        subject.send(:ssh).should_receive(:ruby_script).with(host, command_lines, options)
+        expect(subject.send(:ssh)).to receive(:ruby_script).with(host, command_lines, options)
 
         subject.ruby_script(host, command_lines, options)
       end
@@ -154,12 +153,12 @@ describe Ridley::HostCommander do
 
     context "when communicating to a windows node" do
       before do
-        subject.send(:winrm).stub(:port_open?).and_return(true)
-        subject.send(:ssh).stub(:port_open?).and_return(false)
+        allow(subject.send(:winrm)).to receive(:connector_port_open?) { true }
+        allow(subject.send(:ssh)).to receive(:connector_port_open?) { false }
       end
 
       it "sends a #ruby_script message to the ssh host connector" do
-        subject.send(:winrm).should_receive(:ruby_script).with(host, command_lines, options)
+        expect(subject.send(:winrm)).to receive(:ruby_script).with(host, command_lines, options)
 
         subject.ruby_script(host, command_lines, options)
       end
@@ -176,7 +175,7 @@ describe Ridley::HostCommander do
 
       it "executes retry logic" do
         @times_called = 0
-        subject.send(:winrm).should_receive(:connectable?).twice.and_return do
+        expect(subject.send(:winrm)).to receive(:connectable?).twice do
           @times_called += 1
           if @times_called == 1
             raise Errno::ETIMEDOUT
@@ -189,14 +188,14 @@ describe Ridley::HostCommander do
       end
     end
 
-    it "should return winrm if winrm is open" do
-      subject.send(:winrm).stub(:port_open?).and_return(true)
+    it "returns winrm if winrm is open" do
+      allow(subject.send(:winrm)).to receive(:connector_port_open?) { true }
       expect(subject.connector_for(host).class).to eq(Ridley::HostConnector::WinRM)
     end
-    
-    it "should return ssh if winrm is closed" do
-      subject.send(:winrm).stub(:port_open?).and_return(false)
-      subject.send(:ssh).stub(:port_open?).and_return(true)
+
+    it "returns ssh if winrm is closed" do
+      allow(subject.send(:winrm)).to receive(:connector_port_open?) { false }
+      allow(subject.send(:ssh)).to receive(:connector_port_open?) { true }
       expect(subject.connector_for(host).class).to eq(Ridley::HostConnector::SSH)
     end
 
@@ -204,13 +203,13 @@ describe Ridley::HostCommander do
       let(:connector_options) { options.merge(connector: "winrm") }
       let(:winrm) { double }
 
-      it "should return winrm if winrm is open" do
-        subject.send(:winrm).stub(:port_open?).and_return(true)
+      it "returns winrm if winrm is open" do
+        allow(subject.send(:winrm)).to receive(:connector_port_open?) { true }
         expect(subject.connector_for(host, options).class).to eql(Ridley::HostConnector::WinRM)
       end
 
-      it "should return nil if winrm is closed" do
-        subject.stub(:port_open?).and_return(false)
+      it "returns nil if winrm is closed" do
+        allow(subject).to receive(:connector_port_open?) { false }
         expect(subject.connector_for(host, connector_options)).to be_nil
       end
     end
@@ -218,15 +217,15 @@ describe Ridley::HostCommander do
     context "when a connector of ssh is given" do
       let(:connector_options) { options.merge(connector: "ssh") }
 
-      it "should return ssh if ssh is open" do
-        subject.send(:ssh).stub(:port_open?).and_return(true)
-        subject.send(:winrm).should_not_receive(:port_open?)
+      it "returns ssh if ssh is open" do
+        allow(subject.send(:ssh)).to receive(:connector_port_open?) { true }
+        expect(subject.send(:winrm)).not_to receive(:connector_port_open?)
         expect(subject.connector_for(host, connector_options).class).to eql(Ridley::HostConnector::SSH)
       end
 
-      it "should return nil if ssh is closed" do
-        subject.send(:ssh).stub(:port_open?).and_return(false)
-        subject.send(:winrm).should_not_receive(:port_open?)
+      it "returns nil if ssh is closed" do
+        allow(subject.send(:ssh)).to receive(:connector_port_open?) { false }
+        expect(subject.send(:winrm)).not_to receive(:connector_port_open?)
         expect(subject.connector_for(host, connector_options)).to be_nil
       end
     end
@@ -234,8 +233,8 @@ describe Ridley::HostCommander do
     context "when an unknown connector is given" do
       let(:connector_options) { options.merge(connector: "foo") }
 
-      it "should try both connectors" do
-        [:winrm, :ssh].each { |c| subject.send(c).should_receive(:port_open?) }
+      it "tries both connectors" do
+        [:winrm, :ssh].each { |c| expect(subject.send(c)).to receive(:connector_port_open?) }
         subject.connector_for(host, connector_options)
       end
     end

data/spec/unit/ridley-connectors/host_connector/winrm/command_uploader_spec.rb

@@ -15,22 +15,26 @@ describe Ridley::HostConnector::WinRM::CommandUploader do
   let(:run_cmd_data) { { data: [{ stdout: "abc123" }] } }
   let(:command_file_name) { "my_command.bat" }
 
-  its(:winrm) { should eq(winrm_stub) }
+  describe "#winrm" do
+    it "is equal to the given winrm web service object" do
+      expect(subject.winrm).to eq(winrm_stub)
+    end
+  end
 
   before do
-    command_uploader.stub(:get_file_path).and_return("")
+    allow(command_uploader).to receive(:get_file_path) { "" }
   end
 
   describe "#upload" do
     let(:upload) { command_uploader.upload(command_string) }
 
     it "calls winrm to upload and convert the command" do
-      winrm_stub.should_receive(:run_cmd).and_return(
+      expect(winrm_stub).to receive(:run_cmd).and_return(
         run_cmd_data,
         nil,
         run_cmd_data
       )
-      winrm_stub.should_receive(:powershell)
+      expect(winrm_stub).to receive(:powershell)
 
       upload
     end
@@ -41,7 +45,7 @@ describe Ridley::HostConnector::WinRM::CommandUploader do
     let(:command) { command_uploader.command }
 
     before do
-      command_uploader.stub command_file_name: command_file_name
+      allow(command_uploader).to receive(:command_file_name) { command_file_name }
     end
 
     it { should eq("cmd.exe /C #{command_file_name}") }
@@ -54,13 +58,13 @@ describe Ridley::HostConnector::WinRM::CommandUploader do
     let(:base64_file_name) { "my_base64_file" }
 
     before do
-      command_uploader.stub command_file_name: command_file_name
-      command_uploader.stub base64_file_name: base64_file_name
+      allow(command_uploader).to receive(:command_file_name) { command_file_name }
+      allow(command_uploader).to receive(:base64_file_name) { base64_file_name }
     end
 
     it "cleans up the windows temp dir" do
-      winrm_stub.should_receive(:run_cmd).with("del #{base64_file_name} /F /Q")
-      winrm_stub.should_receive(:run_cmd).with("del #{command_file_name} /F /Q")
+      expect(winrm_stub).to receive(:run_cmd).with("del #{base64_file_name} /F /Q")
+      expect(winrm_stub).to receive(:run_cmd).with("del #{command_file_name} /F /Q")
       cleanup
     end
   end

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

@@ -55,7 +55,7 @@ describe Ridley::HostConnector::Base do
       Socket
         .stub(:getaddrinfo)
         .with(host, nil)
-        .and_return [["AF_INET", 0, "33.33.33.10", "33.33.33.10", 2, 2, 17], 
+        .and_return [["AF_INET", 0, "33.33.33.10", "33.33.33.10", 2, 2, 17],
                      ["AF_INET", 0, "33.33.33.10", "33.33.33.10", 2, 1,  6]]
     end
 
@@ -73,26 +73,26 @@ describe Ridley::HostConnector::Base do
 
       it "should return true when a connection is initiated" do
         ::IO.stub(:select).and_return ["an array!"]
-        
-        expect(subject.send(:connectable?, host, port)).to be_true
+
+        expect(subject.send(:connectable?, host, port)).to be true
       end
 
       it "should return true when a connection is initiated and an explicit nil is passed as the timeout" do
         ::IO.stub(:select).with(anything, anything, anything, Ridley::HostConnector::Base::PORT_CHECK_TIMEOUT).and_return ["an array!"]
-        
-        expect(subject.send(:connectable?, host, port, nil)).to be_true
+
+        expect(subject.send(:connectable?, host, port, nil)).to be true
       end
 
       it "should return false when select times out" do
         ::IO.stub(:select).and_return nil
 
-        expect(subject.send(:connectable?, host, port)).to be_false
+        expect(subject.send(:connectable?, host, port)).to be false
       end
 
       it "should return true when the connection does not have to wait" do
         Socket.any_instance.stub(:connect_nonblock).and_return 0
-        
-        expect(subject.send(:connectable?, host, port)).to be_true
+
+        expect(subject.send(:connectable?, host, port)).to be true
       end
     end
 
@@ -113,13 +113,13 @@ describe Ridley::HostConnector::Base do
 
         context "should return false" do
           it "" do
-            expect(subject.send(:connectable?, host, port)).to be_false
+            expect(subject.send(:connectable?, host, port)).to be false
           end
 
           it "when the socket close throws EBAFD" do
             Socket.any_instance.stub(:close).and_return { raise Errno::EBADF.new }
 
-            expect(subject.send(:connectable?, host, port)).to be_false
+            expect(subject.send(:connectable?, host, port)).to be false
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley-connectors
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0.pre
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0.pre
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0.pre
+        version: 0.16.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0.pre
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
@@ -132,13 +132,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE
 - README.md
+- Rakefile
 - Thorfile
 - bootstrappers/unix_omnibus.erb
 - bootstrappers/windows_omnibus.erb

data/.ruby-version

@@ -1 +0,0 @@
-2.1.1