ridley 1.2.3 → 1.2.4

data/.travis.yml

@@ -1,11 +1,13 @@
-script: "bundle exec thor spec:all"
+script: "bundle exec thor spec:$TEST_SUITE"
 language: ruby
+env:
+  - TEST_SUITE=unit
+  - TEST_SUITE=acceptance
 rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
   - jruby-19mode
-
 matrix:
   allow_failures:
-    - rvm: jruby-19mode # Allow failure for now: https://github.com/RiotGames/ridley/issues/143
+    - rvm: jruby-19mode

data/lib/ridley/errors.rb

@@ -50,6 +50,18 @@ module Ridley
 
     class RemoteCommandError < RidleyError; end
     class RemoteScriptError < RemoteCommandError; end
+    class CommandNotProvided < RemoteCommandError
+      attr_reader :connector_type
+
+      # @params [Symbol] connector_type
+      def initialize(connector_type)
+        @connector_type = connector_type
+      end
+
+      def to_s
+        "No command provided in #{connector_type.inspect}, however the #{connector_type.inspect} connector was selected."
+      end
+    end
 
     # Exception thrown when the maximum amount of requests is exceeded.
     class RedirectLimitReached < RidleyError

data/lib/ridley/host_commander.rb

@@ -156,6 +156,36 @@ module Ridley
       execute(__method__, host, options)
     end
 
+    # Finds and returns the best HostConnector for a given host
+    #
+    # @param [String] host
+    #   the host to attempt to connect to
+    # @option options [Hash] :ssh
+    #   * :port (Fixnum) the ssh port to connect on the node the bootstrap will be performed on (22)
+    #   * :timeout (Float) [5.0] timeout value for testing SSH connection
+    # @option options [Hash] :winrm
+    #   * :port (Fixnum) the winrm port to connect on the node the bootstrap will be performed on (5985)
+    # @param block [Proc]
+    #   an optional block that is yielded the best HostConnector
+    #
+    # @return [HostConnector::SSH, HostConnector::WinRM]
+    def connector_for(host, options = {})
+      options = options.reverse_merge(ssh: Hash.new, winrm: Hash.new)
+      options[:ssh][:port]   ||= HostConnector::SSH::DEFAULT_PORT
+      options[:winrm][:port] ||= HostConnector::WinRM::DEFAULT_PORT
+
+      if connector_port_open?(host, options[:winrm][:port])
+        options.delete(:ssh)
+        winrm
+      elsif connector_port_open?(host, options[:ssh][:port], options[:ssh][:timeout])
+        options.delete(:winrm)
+        ssh
+      else
+        raise Errors::HostConnectionError, "No connector ports open on '#{host}'"
+      end
+    end
+
+
     private
 
       def execute(method, host, *args)
@@ -166,35 +196,6 @@ module Ridley
         abort(ex)
       end
 
-      # Finds and returns the best HostConnector for a given host
-      #
-      # @param [String] host
-      #   the host to attempt to connect to
-      # @option options [Hash] :ssh
-      #   * :port (Fixnum) the ssh port to connect on the node the bootstrap will be performed on (22)
-      #   * :timeout (Float) [5.0] timeout value for testing SSH connection
-      # @option options [Hash] :winrm
-      #   * :port (Fixnum) the winrm port to connect on the node the bootstrap will be performed on (5985)
-      # @param block [Proc]
-      #   an optional block that is yielded the best HostConnector
-      #
-      # @return [HostConnector::SSH, HostConnector::WinRM]
-      def connector_for(host, options = {})
-        options = options.reverse_merge(ssh: Hash.new, winrm: Hash.new)
-        options[:ssh][:port]   ||= HostConnector::SSH::DEFAULT_PORT
-        options[:winrm][:port] ||= HostConnector::WinRM::DEFAULT_PORT
-
-        if connector_port_open?(host, options[:winrm][:port])
-          options.delete(:ssh)
-          winrm
-        elsif connector_port_open?(host, options[:ssh][:port], options[:ssh][:timeout])
-          options.delete(:winrm)
-          ssh
-        else
-          raise Errors::HostConnectionError, "No connector ports open on '#{host}'"
-        end
-      end
-
       # Checks to see if the given port is open for TCP connections
       # on the given host.
       #

data/lib/ridley/host_connector/winrm.rb

@@ -80,7 +80,11 @@ module Ridley
           end
         end
       ensure
-        command_uploaders.map(&:cleanup)
+        begin
+          command_uploaders.map(&:cleanup)
+        rescue ::WinRM::WinRMHTTPTransportError => ex
+          log.info "Error cleaning up leftover Powershell scripts on some hosts"
+        end
       end
 
       # Returns the command if it does not break the WinRM command length

data/lib/ridley/resources/node_resource.rb

@@ -132,12 +132,36 @@ module Ridley
     # @param [String] host
     # @param [String] command
     #
-    # @return [Array<Symbol, HostConnector::Response>]
+    # @return [HostConnector::Response]
     def run(host, command)
       host_commander.run(host, command, ssh: ssh, winrm: winrm)
     end
     alias_method :execute_command, :run
 
+    # Executes the given command on a node using a platform specific
+    # command.
+    #
+    # @param [String] host
+    # @param [Hash] commands
+    #
+    # @example
+    #   platform_specific_run("host.example.com", linux: "hostname -f", windows: "echo %COMPUTERNAME%")
+    #
+    # @return [HostConnector::Response]
+    def platform_specific_run(host, commands)
+      case (type = host_commander.connector_for(host, ssh: ssh, winrm: winrm))
+      when HostConnector::SSH
+        raise Errors::CommandNotProvided.new(:ssh) unless commands[:ssh] and !commands[:ssh].empty?
+        run(host, commands[:ssh])
+      when HostConnector::WinRM
+        raise Errors::CommandNotProvided.new(:winrm) unless commands[:winrm] and !commands[:winrm].empty?
+        run(host, commands[:winrm])
+      else
+        raise RuntimeError, "#{type.class.to_s} is not a supported connector for #{self.class}##{__method__}"
+      end
+    end
+    alias_method :execute_platform_specific_command, :platform_specific_run
+
     # Merges the given data with the the data of the target node on the remote
     #
     # @param [Ridley::NodeResource, String] target

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end

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

@@ -67,6 +67,77 @@ describe Ridley::NodeResource do
     end
   end
 
+  describe "#platform_specific_run" do
+    let(:ssh_command) { "hostname -f" }
+    let(:winrm_command) { "echo %COMPUTERNAME%" }
+    let(:ssh_connector) { Ridley::HostConnector::SSH.new }
+    let(:winrm_connector) { Ridley::HostConnector::WinRM.new }
+    let(:unsupported_connector) { Object.new }
+
+    describe "expecting the ssh connector" do
+      before do
+        host_commander.stub(:connector_for).and_return ssh_connector
+      end
+      it "sends the ssh command" do
+        instance.should_receive(:run).with(host, ssh_command)
+        instance.platform_specific_run(host, ssh: ssh_command, winrm: winrm_command)
+      end
+
+      it "raises an error if no command is provided for the ssh connector when the ssh connector is used" do
+        expect {
+          instance.platform_specific_run(host, winrm: winrm_command)
+        }.to raise_error(Ridley::Errors::CommandNotProvided)
+      end
+
+      it "raises an error if an empty command is provided for the ssh connector when the ssh connector is used" do
+        expect {
+          instance.platform_specific_run(host, ssh: "", winrm: winrm_command)
+        }.to raise_error(Ridley::Errors::CommandNotProvided)
+      end
+
+      it "raises an error if a nil command is provided for the ssh connector when the ssh connector is used" do
+        expect {
+          instance.platform_specific_run(host, ssh: nil, winrm: winrm_command)
+        }.to raise_error(Ridley::Errors::CommandNotProvided)
+      end
+    end
+
+    describe "expecting the winrm connector" do
+      before do
+        host_commander.stub(:connector_for).and_return winrm_connector
+      end
+      it "sends the ssh command if the connector is winrm" do
+        instance.should_receive(:run).with(host, winrm_command)
+        instance.platform_specific_run(host, ssh: ssh_command, winrm: winrm_command)
+      end
+
+      it "raises an error if no command is provided for the winrm connector when the winrm connector is used" do
+        expect {
+          instance.platform_specific_run(host, ssh: ssh_command)
+        }.to raise_error(Ridley::Errors::CommandNotProvided)
+      end
+
+      it "raises an error if an empty is provided for the winrm connector when the winrm connector is used" do
+        expect {
+          instance.platform_specific_run(host, ssh: ssh_command, winrm: "")
+        }.to raise_error(Ridley::Errors::CommandNotProvided)
+      end
+
+      it "raises a nil command is provided for the winrm connector when the winrm connector is used" do
+        expect {
+          instance.platform_specific_run(host, ssh: ssh_command, winrm: nil)
+        }.to raise_error(Ridley::Errors::CommandNotProvided)
+      end
+    end
+
+    it "raises a RuntimeError if an unsupported connector is used" do
+      host_commander.stub(:connector_for).and_return unsupported_connector
+      expect {
+        instance.platform_specific_run(host, ssh: ssh_command, winrm: winrm_command)
+      }.to raise_error(RuntimeError)
+    end
+  end
+
   describe "#merge_data" do
     let(:node_name) { "rspec-test" }
     let(:run_list) { [ "recipe[one]", "recipe[two]" ] }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-20 00:00:00.000000000 Z
+date: 2013-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -454,7 +454,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2669705474346805003
+      hash: -3781892320161055859
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23