ridley 0.9.1 → 0.10.0.rc1

data/spec/unit/ridley/bootstrapper_spec.rb

@@ -18,6 +18,8 @@ describe Ridley::Bootstrapper do
     }
   end
 
+  before(:each) { Ridley::HostConnector.stub(:best_connector_for).and_return(Ridley::HostConnector::SSH) }
+
   describe "ClassMethods" do
     subject { Ridley::Bootstrapper }
 
@@ -50,18 +52,6 @@ describe Ridley::Bootstrapper do
         end
       end
     end
-
-    describe "::templates_path" do
-      it "returns a pathname" do
-        subject.templates_path.should be_a(Pathname)
-      end
-    end
-
-    describe "::default_template" do
-      it "returns a string" do
-        subject.default_template.should be_a(String)
-      end
-    end
   end
 
   subject { Ridley::Bootstrapper.new(nodes, options) }

data/spec/unit/ridley/client_spec.rb

@@ -6,6 +6,9 @@ describe Ridley::Client do
   let(:client_key) { fixtures_path.join("reset.pem").to_s }
   let(:organization) { "vialstudios" }
   let(:encrypted_data_bag_secret_path) { fixtures_path.join("reset.pem").to_s }
+  let(:ssh) { {user: "reset", password: "password1", port: "222"} }
+  let(:winrm) { {user: "reset", password: "password2", port: "5986"} }
+  let(:chef_version) { "10.24.0-01" }
 
   let(:config) do
     {
@@ -13,7 +16,10 @@ describe Ridley::Client do
       client_name: client_name,
       client_key: client_key,
       organization: organization,
-      encrypted_data_bag_secret_path: encrypted_data_bag_secret_path
+      encrypted_data_bag_secret_path: encrypted_data_bag_secret_path,
+      ssh: ssh,
+      winrm: winrm,
+      chef_version: chef_version
     }
   end
 
@@ -28,7 +34,7 @@ describe Ridley::Client do
           @conn = subject.new(
             server_url: server_url,
             client_name: client_name,
-            client_key: client_key
+            client_key: client_key,
           )
         end
 
@@ -108,6 +114,18 @@ describe Ridley::Client do
 
         subject.new(config).client_key.should_not == "~/"
       end
+
+      it "assigns a 'ssh' attribute from the given 'ssh' option" do
+        subject.new(config).ssh.should eql({user: "reset", password: "password1", port: "222"})
+      end
+
+      it "assigns a 'winrm' attribute from the given 'winrm' option" do
+        subject.new(config).winrm.should eql({user: "reset", password: "password2", port: "5986"})
+      end
+
+      it "assigns a 'chef_version' attribute from the given 'chef_version' option" do
+        subject.new(config).chef_version.should eql("10.24.0-01")
+      end
     end
 
     describe "::open" do

data/spec/unit/ridley/{ssh → host_connector}/response_set_spec.rb

@@ -1,15 +1,15 @@
 require 'spec_helper'
 
-describe Ridley::SSH::ResponseSet do
+describe Ridley::HostConnector::ResponseSet do
   describe "ClassMethods" do
     subject { described_class }
 
     describe "::merge!" do
-      let(:target) { Ridley::SSH::ResponseSet.new }
-      let(:other) { Ridley::SSH::ResponseSet.new }
+      let(:target) { Ridley::HostConnector::ResponseSet.new }
+      let(:other) { Ridley::HostConnector::ResponseSet.new }
 
       before(:each) do
-        other.add_response(Ridley::SSH::Response.new('host.local'))
+        other.add_response(Ridley::HostConnector::Response.new('host.local'))
       end
 
       it "returns the mutated target" do
@@ -26,8 +26,8 @@ describe Ridley::SSH::ResponseSet do
   describe "#add_response" do
     it "accepts an array of responses" do
       responses = [
-        Ridley::SSH::Response.new("one.riotgames.com"),
-        Ridley::SSH::Response.new("two.riotgames.com")
+        Ridley::HostConnector::Response.new("one.riotgames.com"),
+        Ridley::HostConnector::Response.new("two.riotgames.com")
       ]
       subject.add_response(responses)
 
@@ -35,7 +35,7 @@ describe Ridley::SSH::ResponseSet do
     end
 
     it "accepts a single response" do
-      response = Ridley::SSH::Response.new("one.riotgames.com")
+      response = Ridley::HostConnector::Response.new("one.riotgames.com")
       subject.add_response(response)
 
       subject.responses.should have(1).item
@@ -43,7 +43,7 @@ describe Ridley::SSH::ResponseSet do
   end
 
   describe "#responses" do
-    it "returns an array of Ridley::SSH::Response objects including both failures and successes" do
+    it "returns an array of Ridley::HostConnector::Response objects including both failures and successes" do
       responses = [
         double('success', error?: false),
         double('failure', error?: true)
@@ -55,7 +55,7 @@ describe Ridley::SSH::ResponseSet do
   end
 
   describe "#successes" do
-    it "returns an array of Ridley::SSH::Response objects only including the successes" do
+    it "returns an array of Ridley::HostConnector::Response objects only including the successes" do
       responses = [
         double('success', error?: false),
         double('failure', error?: true)
@@ -67,7 +67,7 @@ describe Ridley::SSH::ResponseSet do
   end
 
   describe "#failures" do
-    it "returns an array of Ridley::SSH::Response objects only including the failures" do
+    it "returns an array of Ridley::HostConnector::Response objects only including the failures" do
       responses = [
         double('success', error?: false),
         double('failure', error?: true)
@@ -79,14 +79,14 @@ describe Ridley::SSH::ResponseSet do
   end
 
   describe "#merge" do
-    let(:target) { Ridley::SSH::ResponseSet.new }
-    let(:other) { Ridley::SSH::ResponseSet.new }
+    let(:target) { Ridley::HostConnector::ResponseSet.new }
+    let(:other) { Ridley::HostConnector::ResponseSet.new }
 
     before(:each) do
-      other.add_response(Ridley::SSH::Response.new('host.local'))
+      other.add_response(Ridley::HostConnector::Response.new('host.local'))
     end
 
-    it "returns a new Ridley::SSH::ResponseSet object" do
+    it "returns a new Ridley::HostConnector::ResponseSet object" do
       result = target.merge(other)
 
       result.should have(1).item
@@ -95,11 +95,11 @@ describe Ridley::SSH::ResponseSet do
   end
 
   describe "#merge!" do
-    let(:target) { Ridley::SSH::ResponseSet.new }
-    let(:other) { Ridley::SSH::ResponseSet.new }
+    let(:target) { Ridley::HostConnector::ResponseSet.new }
+    let(:other) { Ridley::HostConnector::ResponseSet.new }
 
     before(:each) do
-      other.add_response(Ridley::SSH::Response.new('host.local'))
+      other.add_response(Ridley::HostConnector::Response.new('host.local'))
     end
 
     it "returns the mutated target" do

data/spec/unit/ridley/host_connector/ssh/worker_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Ridley::HostConnector::SSH::Worker do
+  describe "ClassMethods" do
+    let(:host) { 'reset.riotgames.com' }
+    
+    subject { described_class }
+
+    describe "::new" do
+      it { subject.new(host, ssh: {sudo: true}).sudo.should be_true }
+      it { subject.new(host, ssh: {sudo: false}).sudo.should be_false }
+      it { subject.new(host).sudo.should be_false }
+    end
+  end
+end

data/spec/unit/ridley/{ssh_spec.rb → host_connector/ssh_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Ridley::SSH do
+describe Ridley::HostConnector::SSH do
   let(:connection) { double('conn', ssh: { user: "vagrant", password: "vagrant" }) }
 
   let(:node_one) do
@@ -12,7 +12,7 @@ describe Ridley::SSH do
   end
 
   describe "ClassMethods" do
-    subject { Ridley::SSH }
+    subject { Ridley::HostConnector::SSH }
     
     describe "::start" do
       let(:options) do
@@ -27,7 +27,7 @@ describe Ridley::SSH do
           ssh.run("ls")
         end
 
-        result.should be_a(Ridley::SSH::ResponseSet)
+        result.should be_a(Ridley::HostConnector::ResponseSet)
       end
 
       it "raises a LocalJumpError if a block is not provided" do        
@@ -38,11 +38,11 @@ describe Ridley::SSH do
     end
   end
 
-  subject { Ridley::SSH.new([node_one, node_two], user: "vagrant", password: "vagrant") }
+  subject { Ridley::HostConnector::SSH.new([node_one, node_two], user: "vagrant", password: "vagrant") }
 
   describe "#run" do
     it "returns an SSH::ResponseSet" do
-      subject.run("ls").should be_a(Ridley::SSH::ResponseSet)
+      subject.run("ls").should be_a(Ridley::HostConnector::ResponseSet)
     end
   end
 end

data/spec/unit/ridley/host_connector/winrm/worker_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe Ridley::HostConnector::WinRM::Worker do
+  let(:host) { 'reset.riotgames.com' }  
+  
+  let(:options) do
+    {
+      winrm: {
+        port: 1234
+      }
+    }
+  end
+
+  subject { Ridley::HostConnector::WinRM::Worker.new(host, options) }
+
+  describe "#winrm_port" do
+    it "can be overridden if options contains :winrm_port" do
+      subject.winrm_port.should eq(1234)
+    end
+
+    it "defaults to Ridley::HostConnector::DEFAULT_WINRM_PORT when not overridden" do
+      options.delete(:winrm)
+      subject.winrm_port.should eq(Ridley::HostConnector::DEFAULT_WINRM_PORT)
+    end
+  end
+
+  describe "#winrm" do
+    it "returns a WinRM::WinRMWebService" do
+      subject.winrm.should be_a(WinRM::WinRMWebService)
+    end
+  end
+
+  describe "#get_command" do
+    let(:command) { "echo %TEMP%" }
+    context "when a command is less than 2047 characters" do
+      it "returns the command" do
+        subject.get_command(command).should eq(command)
+      end
+    end
+  end
+end

data/spec/unit/ridley/host_connector/winrm_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe Ridley::HostConnector::WinRM do
+  let(:connection) { double('conn', ssh: { user: "vagrant", password: "vagrant" }) }
+
+  let(:node_one) do
+    Ridley::NodeResource.new(connection, automatic: { cloud: { public_hostname: "33.33.33.10" } })
+  end
+
+  let(:node_two) do
+    Ridley::NodeResource.new(connection, automatic: { cloud: { public_hostname: "33.33.33.11" } })
+  end
+
+  describe "ClassMethods" do
+    subject { Ridley::HostConnector::WinRM }
+    
+    describe "::start" do
+      let(:options) do
+        {
+          user: "Administrator",
+          password: "password1"
+        }
+      end
+
+      it "evaluates within the context of a new WinRM and returns the last item in the block" do
+        result = subject.start([node_one, node_two], options) do |winrm|
+          winrm.run("dir")
+        end
+        result.should be_a(Ridley::HostConnector::ResponseSet)
+      end
+
+      it "raises a LocalJumpError if a block is not provided" do
+        expect {
+          subject.start([node_one, node_two], options)
+        }.to raise_error(LocalJumpError)
+      end
+    end
+  end
+
+  subject { Ridley::HostConnector::WinRM.new([node_one, node_two], user: 'Administrator', password: 'password1') }
+
+  describe "#run" do
+    it "returns a ResponseSet" do
+      subject.run("dir").should be_a(Ridley::HostConnector::ResponseSet)
+    end
+  end
+end

data/spec/unit/ridley/host_connector_spec.rb

@@ -0,0 +1,102 @@
+require 'spec_helper'
+
+describe Ridley::HostConnector do
+  
+  subject do
+    described_class
+  end
+
+  it "returns 22 as the default SSH port" do
+    described_class::DEFAULT_SSH_PORT.should eq(22)
+  end
+
+  it "returns 5985 as the default WinRM port" do
+    described_class::DEFAULT_WINRM_PORT.should eq(5985)
+  end
+
+  describe "#connector_port_open" do
+    let(:host) {"127.0.0.1"}
+    let(:port) {22}
+    let(:socket) {double(:new => true, :close => nil)}
+
+    context "when a port is open" do
+      it "returns true" do
+        TCPSocket.stub(:new).and_return(socket)
+        subject.connector_port_open?(host, port).should eq(true)
+      end
+    end
+
+    context "when a port is closed" do
+      it "returns false" do
+        TCPSocket.stub(:new).and_raise(Errno::ECONNREFUSED)
+        subject.connector_port_open?(host, port).should eq(false)
+      end
+    end
+  end
+
+  describe "#best_connector_for" do
+    let(:host) {"127.0.0.1"}
+    
+    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)
+      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)
+      end
+    end
+
+    context "when no useable ports are open" do
+      it "raises an exception" do
+        subject.stub(:connector_port_open?).and_return(false, false)
+        expect {
+          subject.best_connector_for(host)
+        }.to raise_error(Ridley::Errors::HostConnectionError)
+      end
+    end
+  end
+
+  describe "#parse_port_options" do
+    let(:options) do
+      {
+        ssh: {
+          port: 1234
+        },
+        winrm: {
+          port: 5678
+        }
+      }
+    end
+    
+    context "when :ssh has a key for :port" do
+      it "returns the value of port instead of the default" do
+        subject.parse_port_options(options).should include(1234)
+      end
+    end
+
+    context "when there is no :ssh key" do
+      it "returns the default value for port" do
+        options.delete(:ssh)
+        subject.parse_port_options(options).should include(22)
+      end
+    end
+
+    context "when :winrm has a key for :port" do
+      it "returns the value of port instead of the default" do
+        subject.parse_port_options(options).should include(5678)
+      end
+    end
+
+    context "when there is no :ssh key" do
+      it "returns the default value for port" do
+        options.delete(:winrm)
+        subject.parse_port_options(options).should include(5985)
+      end
+    end
+  end
+end

data/spec/unit/ridley/mixin/bootstrap_binding_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+describe Ridley::BootstrapBinding do
+  let(:host) { "reset.riotgames.com" }
+  let(:options) do
+    {
+      server_url: "https://api.opscode.com/organizations/vialstudios",
+      validator_client: "chef-validator",
+      validator_path: fixtures_path.join("reset.pem").to_s,
+      encrypted_data_bag_secret_path: fixtures_path.join("reset.pem").to_s,
+      chef_version: "11.4.0"
+    }
+  end
+
+  describe "ClassMethods" do
+    subject do
+      Class.new do
+        include Ridley::BootstrapBinding
+      end
+    end
+
+    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)
+        end
+      end
+    end
+
+    describe ":validate_options" do
+      context "when server_url is not specified" do
+        let(:options) { Hash.new }
+
+        it "raises an ArgumentError" do
+          expect {
+            subject.validate_options(options)
+          }.to raise_error(Ridley::Errors::ArgumentError)
+        end
+      end
+    end
+
+    context "when validator_path is not specified" do
+      let(:options) do
+        {
+          server_url: "https://api.opscode.com/organizations/vialstudios"
+        }
+      end
+
+      it "raises an ArgumentError" do
+        expect {
+          subject.validate_options(options)
+        }.to raise_error(Ridley::Errors::ArgumentError)
+      end
+    end
+  end
+end