ridley 1.0.0.rc3 → 1.0.0

data/lib/ridley.rb

@@ -1,6 +1,7 @@
 require 'active_support/inflector'
 require 'addressable/uri'
 require 'celluloid'
+require 'celluloid/io'
 require 'chozo'
 require 'faraday'
 require 'forwardable'

data/lib/ridley/connection.rb

@@ -6,6 +6,7 @@ require 'zlib'
 module Ridley
   class Connection < Faraday::Connection
     include Celluloid
+    task_class TaskThread
 
     VALID_OPTIONS = [
       :retries,
@@ -100,7 +101,7 @@ module Ridley
     # Override Faraday::Connection#run_request to catch exceptions from {Ridley::Middleware} that
     # we expect. Caught exceptions are re-raised with Celluloid#abort so we don't crash the connection.
     def run_request(*args)
-      defer { super }
+      super
     rescue Errors::HTTPError => ex
       abort ex
     rescue Faraday::Error::ConnectionFailed => ex
@@ -140,22 +141,20 @@ module Ridley
       local = Tempfile.new('ridley-stream')
       local.binmode
 
-      defer {
-        retryable(tries: retries, on: OpenURI::HTTPError, sleep: retry_interval) do
-          open(target, 'rb', headers) do |remote|
-            body = remote.read
-            case remote.content_encoding
-            when ['gzip']
-              body = Zlib::GzipReader.new(StringIO.new(body), encoding: 'ASCII-8BIT').read
-            when ['deflate']
-              body = Zlib::Inflate.inflate(body)
-            end
-            local.write(body)
+      retryable(tries: retries, on: OpenURI::HTTPError, sleep: retry_interval) do
+        open(target, 'rb', headers) do |remote|
+          body = remote.read
+          case remote.content_encoding
+          when ['gzip']
+            body = Zlib::GzipReader.new(StringIO.new(body), encoding: 'ASCII-8BIT').read
+          when ['deflate']
+            body = Zlib::Inflate.inflate(body)
           end
+          local.write(body)
         end
+      end
 
-        local.flush
-      }
+      local.flush
 
       FileUtils.mv(local.path, destination)
     rescue OpenURI::HTTPError => ex

data/lib/ridley/host_commander.rb

@@ -1,6 +1,3 @@
-require 'socket'
-require 'timeout'
-
 module Ridley
   class ConnectorSupervisor < ::Celluloid::SupervisionGroup
     # @param [Celluloid::Registry] registry
@@ -12,25 +9,6 @@ module Ridley
   end
 
   class HostCommander
-    class << self
-      # Checks to see if the given port is open for TCP connections
-      # on the given host.
-      #
-      # @param [String] host
-      #   the host to attempt to connect to
-      # @param [Fixnum] port
-      #   the port to attempt to connect on
-      # @param [Float] timeout
-      #   the number of seconds to wait (default: {PORT_CHECK_TIMEOUT})
-      #
-      # @return [Boolean]
-      def connector_port_open?(host, port, timeout = nil)
-        Timeout.timeout(timeout || PORT_CHECK_TIMEOUT) { TCPSocket.new(host, port).close; true }
-      rescue Timeout::Error, SocketError, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::EADDRNOTAVAIL => ex
-        false
-      end
-    end
-
     include Celluloid
     include Ridley::Logging
 
@@ -183,7 +161,7 @@ module Ridley
       def execute(method, host, *args)
         options = args.last.is_a?(Hash) ? args.pop : Hash.new
 
-        connector_for(host, options).send(method, host, *args, options)
+        defer { connector_for(host, options).send(method, host, *args, options) }
       rescue Errors::HostConnectionError => ex
         abort(ex)
       end
@@ -206,10 +184,10 @@ module Ridley
         options[:ssh][:port]   ||= HostConnector::SSH::DEFAULT_PORT
         options[:winrm][:port] ||= HostConnector::WinRM::DEFAULT_PORT
 
-        if self.class.connector_port_open?(host, options[:winrm][:port])
+        if connector_port_open?(host, options[:winrm][:port])
           options.delete(:ssh)
           winrm
-        elsif self.class.connector_port_open?(host, options[:ssh][:port], options[:ssh][:timeout])
+        elsif connector_port_open?(host, options[:ssh][:port], options[:ssh][:timeout])
           options.delete(:winrm)
           ssh
         else
@@ -217,6 +195,23 @@ module Ridley
         end
       end
 
+      # Checks to see if the given port is open for TCP connections
+      # on the given host.
+      #
+      # @param [String] host
+      #   the host to attempt to connect to
+      # @param [Fixnum] port
+      #   the port to attempt to connect on
+      # @param [Float] wait_time ({PORT_CHECK_TIMEOUT})
+      #   the number of seconds to wait
+      #
+      # @return [Boolean]
+      def connector_port_open?(host, port, wait_time = nil)
+        timeout(wait_time || PORT_CHECK_TIMEOUT) { Celluloid::IO::TCPSocket.new(host, port).close; true }
+      rescue Timeout::Error, SocketError, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::EADDRNOTAVAIL => ex
+        false
+      end
+
       def finalize_callback
         @connector_supervisor.terminate if @connector_supervisor && @connector_supervisor.alive?
       end

data/lib/ridley/resource.rb

@@ -109,7 +109,7 @@ module Ridley
           raise Errors::HTTPUnknownMethod, "unknown http method: #{method}"
         end
 
-        defer { connection.send(method, *args) }
+        connection.send(method, *args)
       rescue Errors::HTTPError, Errors::ClientError => ex
         abort(ex)
       end

data/lib/ridley/resources/node_resource.rb

@@ -133,9 +133,10 @@ module Ridley
     # @param [String] command
     #
     # @return [Array<Symbol, HostConnector::Response>]
-    def execute_command(host, command)
+    def run(host, command)
       host_commander.run(host, command, ssh: ssh, winrm: winrm)
     end
+    alias_method :execute_command, :run
 
     # Merges the given data with the the data of the target node on the remote
     #

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "1.0.0.rc3"
+  VERSION = "1.0.0"
 end

data/ridley.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'addressable'
   s.add_runtime_dependency 'chozo',                   '>= 0.6.0'
   s.add_runtime_dependency 'celluloid',               '~> 0.14.0'
+  s.add_runtime_dependency 'celluloid-io',            '~> 0.14.0'
   s.add_runtime_dependency 'erubis'
   s.add_runtime_dependency 'faraday',                 '>= 0.8.4'
   s.add_runtime_dependency 'hashie',                  '>= 2.0.2'

data/spec/unit/ridley/host_commander_spec.rb

@@ -1,41 +1,6 @@
 require 'spec_helper'
 
 describe Ridley::HostCommander do
-  describe "ClassMethods" do
-    subject { described_class }
-
-    describe "::connector_port_open?" do
-      let(:host) { "127.0.0.1" }
-      let(:port) { 22 }
-      let(:socket) { double(close: nil) }
-
-      before { TCPSocket.stub(:new).and_return(socket) }
-
-      subject(:result) { described_class.connector_port_open?(host, port) }
-
-      context "when a port is open" do
-        it { should be_true }
-
-        it "closes the opened socket" do
-          socket.should_receive(:close)
-          result
-        end
-      end
-
-      context "when a port is closed" do
-        before { TCPSocket.stub(:new).and_raise(Errno::ECONNREFUSED) }
-
-        it { should be_false }
-      end
-
-      context "when host is unreachable" do
-        before { TCPSocket.stub(:new).and_raise(SocketError) }
-
-        it { should be_false }
-      end
-    end
-  end
-
   subject { described_class.new }
 
   describe "#run" do
@@ -47,8 +12,8 @@ describe Ridley::HostCommander do
 
     context "when communicating to a unix node" do
       before do
-        described_class.stub(:connector_port_open?).with(host, options[:winrm][:port]).and_return(false)
-        described_class.stub(:connector_port_open?).with(host, options[:ssh][:port], anything).and_return(true)
+        subject.stub(:connector_port_open?).with(host, options[:winrm][:port]).and_return(false)
+        subject.stub(:connector_port_open?).with(host, options[:ssh][:port], anything).and_return(true)
       end
 
       it "sends a #run message to the ssh host connector" do
@@ -60,8 +25,8 @@ describe Ridley::HostCommander do
 
     context "when communicating to a windows node" do
       before do
-        described_class.stub(:connector_port_open?).with(host, options[:winrm][:port]).and_return(true)
-        described_class.stub(:connector_port_open?).with(host, options[:ssh][:port], anything).and_return(false)
+        subject.stub(:connector_port_open?).with(host, options[:winrm][:port]).and_return(true)
+        subject.stub(:connector_port_open?).with(host, options[:ssh][:port], anything).and_return(false)
       end
 
       it "sends a #run message to the ssh host connector" do
@@ -80,8 +45,8 @@ describe Ridley::HostCommander do
 
     context "when communicating to a unix node" do
       before do
-        described_class.stub(:connector_port_open?).with(host, options[:winrm][:port]).and_return(false)
-        described_class.stub(:connector_port_open?).with(host, options[:ssh][:port], anything).and_return(true)
+        subject.stub(:connector_port_open?).with(host, options[:winrm][:port]).and_return(false)
+        subject.stub(:connector_port_open?).with(host, options[:ssh][:port], anything).and_return(true)
       end
 
       it "sends a #bootstrap message to the ssh host connector" do
@@ -93,8 +58,8 @@ describe Ridley::HostCommander do
 
     context "when communicating to a windows node" do
       before do
-        described_class.stub(:connector_port_open?).with(host, options[:winrm][:port]).and_return(true)
-        described_class.stub(:connector_port_open?).with(host, options[:ssh][:port], anything).and_return(false)
+        subject.stub(:connector_port_open?).with(host, options[:winrm][:port]).and_return(true)
+        subject.stub(:connector_port_open?).with(host, options[:ssh][:port], anything).and_return(false)
       end
 
       it "sends a #bootstrap message to the ssh host connector" do
@@ -113,8 +78,8 @@ describe Ridley::HostCommander do
 
     context "when communicating to a unix node" do
       before do
-        described_class.stub(:connector_port_open?).with(host, options[:winrm][:port]).and_return(false)
-        described_class.stub(:connector_port_open?).with(host, options[:ssh][:port], anything).and_return(true)
+        subject.stub(:connector_port_open?).with(host, options[:winrm][:port]).and_return(false)
+        subject.stub(:connector_port_open?).with(host, options[:ssh][:port], anything).and_return(true)
       end
 
       it "sends a #chef_client message to the ssh host connector" do
@@ -126,8 +91,8 @@ describe Ridley::HostCommander do
 
     context "when communicating to a windows node" do
       before do
-        described_class.stub(:connector_port_open?).with(host, options[:winrm][:port]).and_return(true)
-        described_class.stub(:connector_port_open?).with(host, options[:ssh][:port], anything).and_return(false)
+        subject.stub(:connector_port_open?).with(host, options[:winrm][:port]).and_return(true)
+        subject.stub(:connector_port_open?).with(host, options[:ssh][:port], anything).and_return(false)
       end
 
       it "sends a #chef_client message to the ssh host connector" do
@@ -147,8 +112,8 @@ describe Ridley::HostCommander do
 
     context "when communicating to a unix node" do
       before do
-        described_class.stub(:connector_port_open?).with(host, options[:winrm][:port]).and_return(false)
-        described_class.stub(:connector_port_open?).with(host, options[:ssh][:port], anything).and_return(true)
+        subject.stub(:connector_port_open?).with(host, options[:winrm][:port]).and_return(false)
+        subject.stub(:connector_port_open?).with(host, options[:ssh][:port], anything).and_return(true)
       end
 
       it "sends a #put_secret message to the ssh host connector" do
@@ -160,8 +125,8 @@ describe Ridley::HostCommander do
 
     context "when communicating to a windows node" do
       before do
-        described_class.stub(:connector_port_open?).with(host, options[:winrm][:port]).and_return(true)
-        described_class.stub(:connector_port_open?).with(host, options[:ssh][:port], anything).and_return(false)
+        subject.stub(:connector_port_open?).with(host, options[:winrm][:port]).and_return(true)
+        subject.stub(:connector_port_open?).with(host, options[:ssh][:port], anything).and_return(false)
       end
 
       it "sends a #put_secret message to the ssh host connector" do
@@ -181,8 +146,8 @@ describe Ridley::HostCommander do
 
     context "when communicating to a unix node" do
       before do
-        described_class.stub(:connector_port_open?).with(host, options[:winrm][:port]).and_return(false)
-        described_class.stub(:connector_port_open?).with(host, options[:ssh][:port], anything).and_return(true)
+        subject.stub(:connector_port_open?).with(host, options[:winrm][:port]).and_return(false)
+        subject.stub(:connector_port_open?).with(host, options[:ssh][:port], anything).and_return(true)
       end
 
       it "sends a #ruby_script message to the ssh host connector" do
@@ -194,8 +159,8 @@ describe Ridley::HostCommander do
 
     context "when communicating to a windows node" do
       before do
-        described_class.stub(:connector_port_open?).with(host, options[:winrm][:port]).and_return(true)
-        described_class.stub(:connector_port_open?).with(host, options[:ssh][:port], anything).and_return(false)
+        subject.stub(:connector_port_open?).with(host, options[:winrm][:port]).and_return(true)
+        subject.stub(:connector_port_open?).with(host, options[:ssh][:port], anything).and_return(false)
       end
 
       it "sends a #ruby_script message to the ssh host connector" do

data/spec/unit/ridley/resources/node_resource_spec.rb

@@ -58,12 +58,12 @@ describe Ridley::NodeResource do
     end
   end
 
-  describe "#execute_command" do
+  describe "#run" do
     let(:command) { "echo 'hello world'" }
 
     it "sends the message #run to the instance's host_commander" do
       host_commander.should_receive(:run).with(host, command, ssh: instance.ssh, winrm: instance.winrm)
-      instance.execute_command(host, command)
+      instance.run(host, command)
     end
   end
 

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc3
-  prerelease: 6
+  version: 1.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Jamie Winsor
@@ -60,6 +60,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.14.0
+- !ruby/object:Gem::Dependency
+  name: celluloid-io
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
@@ -369,9 +385,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 422593322150565092
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23