ridley-connectors 2.0.0 → 2.0.1

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

@@ -0,0 +1,116 @@
+require 'spec_helper'
+
+describe Ridley::BootstrapContext::Windows do
+  let(:options) do
+    {
+      server_url: "https://api.opscode.com/organizations/vialstudios",
+      validator_client: "chef-validator",
+      validator_path: fixtures_path.join("my-fake.pem").to_s,
+      encrypted_data_bag_secret: File.read(fixtures_path.join("my-fake.pem")),
+      chef_version: "11.4.0"
+    }
+  end
+
+  describe "ClassMethods" do
+    subject { described_class }
+
+    describe "::new" do
+      context "when a chef_version is passed through" do
+        it "sets the chef_version attribute to the same value" do
+          subject.new(options).chef_version.should eq("11.4.0")
+        end
+      end
+
+      context "when the chef_version is not passed through" do
+        it "sets the chef_version to 'latest'" do
+          options.delete(:chef_version)
+          subject.new(options).chef_version.should eq("latest")
+        end
+      end
+    end
+  end
+
+  subject { described_class.new(options) }
+
+  describe "MixinMethods" do
+    describe "#templates_path" do
+      it "returns a pathname" do
+        subject.templates_path.should be_a(Pathname)
+      end
+    end
+
+    describe "#first_boot" do
+      it "returns a string" do
+        subject.first_boot.should 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)
+      end
+    end
+
+    describe "#validation_key" do
+      it "returns a string" do
+        subject.validation_key.should be_a(String)
+      end
+    end
+
+    describe "template" do
+      it "returns a string" do
+        subject.template.should be_a(Erubis::Eruby)
+      end
+    end
+  end
+
+  describe "#boot_command" do
+    it "returns a string" do
+      subject.boot_command.should be_a(String)
+    end
+  end
+
+  describe "#chef_run" do
+    it "returns a string" do
+      subject.chef_run.should be_a(String)
+    end
+  end
+
+  describe "#chef_config" do
+    it "returns a string" do
+      subject.chef_config.should be_a(String)
+    end
+  end
+
+  describe "#env_path" do
+    it "returns a string" do
+      expect(subject.env_path).to be_a(String)
+    end
+  end
+
+  describe "#default_template" do
+    it "returns a string" do
+      subject.default_template.should be_a(String)
+    end
+  end
+
+  describe "#bootstrap_directory" do
+    it "returns a string" do
+      subject.bootstrap_directory.should be_a(String)
+    end
+  end
+
+  describe "#escape_and_echo" do
+    let(:output) { "foo()" }
+
+    it "adds 'echo.' to the beginning of each line and escapes special batch characters" do
+      subject.escape_and_echo(output).should eq("echo.foo^(^)")
+    end
+  end
+
+  describe "#windows_wget_powershell" do
+    it "returns a string" do
+      subject.windows_wget_powershell.should be_a(String)
+    end
+  end
+end

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

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe Ridley::BootstrapContext::Base 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("my-fake.pem").to_s,
+      encrypted_data_bag_secret: File.read(fixtures_path.join("my-fake.pem")),
+      chef_version: "11.4.0"
+    }
+  end
+
+  describe "ClassMethods" do
+    subject { described_class }
+
+    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

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

@@ -26,7 +26,7 @@ describe Ridley::Client do
 
       it "assigns a 'winrm' attribute from the given 'winrm' option" do
         described_class.new(config).winrm.should eql({user: "fake", password: "password2", port: "5986"})
-      end      
+      end
     end
   end
 end

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

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+describe Ridley::CommandContext::Base do
+  let(:command_context) { described_class.new }
+
+  describe "ClassMethods" do
+    describe "::template_file" do
+      let(:template_file) { described_class.template_file(filename) }
+      let(:filename) { "test" }
+
+      context "when a filename is provided" do
+        it "sets and returns a class variable" do
+          expect(template_file).to be_a(Pathname)
+          expect(template_file.to_path).to end_with("scripts/test.erb")
+        end
+      end
+    end
+  end
+
+  describe "#command" do
+    let(:command) { command_context.command }
+    let(:template) { double(:evaluate => nil) }
+
+    before do
+      command_context.stub(:template).and_return(template)
+    end
+
+    it "attempts to evaluate the template" do
+      command
+      expect(template).to have_received(:evaluate)
+    end
+  end
+end
+
+describe Ridley::CommandContext::Unix do
+  let(:unix) { described_class.new(options) }
+
+  describe "#command" do
+    context "when sudo is true" do
+      let(:command) { unix.command }
+      let(:template) { double(:evaluate => command_string) }
+      let(:options) do
+        {sudo: true}
+      end
+      let(:command_string) { "echo 'hi'" }
+
+      before do
+        unix.stub(:template).and_return(template)
+      end
+
+      it "prepends sudo to the command" do
+        expect(command).to eql("sudo echo 'hi'")
+      end
+    end
+  end
+end

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

@@ -167,6 +167,29 @@ describe Ridley::HostCommander do
   end
 
   describe "#connector_for" do
+
+    context "when connector_port_open? experiences an error" do
+      let(:socket) { double(close: true) }
+
+
+      before do
+        @times_called = 0
+        Celluloid::IO::TCPSocket.stub(:new).and_return do
+          @times_called += 1
+          if @times_called == 1
+            raise Errno::ETIMEDOUT
+          else
+            socket
+          end
+        end
+      end
+
+      it "executes retry logic" do
+        expect(Celluloid::IO::TCPSocket).to receive(:new).twice
+        subject.connector_for(host)
+      end
+    end
+
     it "should return winrm if winrm is open" do
       subject.stub(:connector_port_open?).with(host, Ridley::HostConnector::WinRM::DEFAULT_PORT, anything, anything).and_return(true)
       subject.should_receive(:winrm)

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

@@ -21,29 +21,6 @@ describe Ridley::HostConnector::WinRM do
     ::WinRM::WinRMWebService.stub(:new).and_return(double(:set_timeout => nil, :run_cmd => {exitcode: 0}))
   end
 
-  describe "#get_command" do
-    subject(:get_command) { connector.get_command(command, command_uploader_stub) }
-
-    let(:command) { "echo %TEMP%" }
-    let(:command_uploader_stub) { double('CommandUploader') }
-
-    it { should eq(command) }
-
-    context "when a command is more than 2047 characters" do
-      let(:command) { "a" * 2048 }
-
-      it "uploads and returns a command" do
-        described_class::CommandUploader.stub(new: command_uploader_stub)
-
-        command_uploader_stub.should_receive :upload
-        command_uploader_stub.stub command: "my command"
-        command_uploader_stub.stub(:cleanup)
-
-        get_command.should eq("my command")
-      end
-    end
-  end
-
   describe "#run" do
     subject(:result) { connector.run(host, command, options) }
     let(:command) { "dir" }
@@ -58,6 +35,37 @@ describe Ridley::HostConnector::WinRM do
       winrm_stub.stub(:run_cmd).and_yield(stdout, stderr).and_return(exitcode: 0)
     end
 
+    context "when the command is forced" do
+      let(:command_uploader) { double(upload: nil, command: command, cleanup: true) }
+      let(:command) { "a forced-to-upload command" }
+      let(:options) do
+        { force_batch_file: true }
+      end
+
+      before do
+        Ridley::HostConnector::WinRM::CommandUploader.stub(:new).and_return(command_uploader)
+      end
+
+      it "uploads the command" do
+        expect(winrm_stub).to receive(:run_cmd).with("a forced-to-upload command")
+        result
+      end
+    end
+
+    context "when the command is too long" do
+      let(:command_uploader) { double(upload: nil, command: command, cleanup: true) }
+      let(:command) { "a" * 2048 }
+
+      before do
+        Ridley::HostConnector::WinRM::CommandUploader.stub(:new).and_return(command_uploader)
+      end
+
+      it "uploads the command" do
+        expect(winrm_stub).to receive(:run_cmd).with("a" * 2048)
+        result
+      end
+    end
+
     context "when the exit_code is 0" do
       it "returns a non-error HostConnector::Response" do
         expect(result).to be_a(Ridley::HostConnector::Response)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley-connectors
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2014-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -39,6 +39,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.16.0.pre
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -112,9 +126,18 @@ files:
 - LICENSE
 - README.md
 - Thorfile
+- bootstrappers/unix_omnibus.erb
+- bootstrappers/windows_omnibus.erb
 - lib/ridley-connectors.rb
+- lib/ridley-connectors/bootstrap_context.rb
+- lib/ridley-connectors/bootstrap_context/unix.rb
+- lib/ridley-connectors/bootstrap_context/windows.rb
 - lib/ridley-connectors/chef_objects/node_object.rb
 - lib/ridley-connectors/client.rb
+- lib/ridley-connectors/command_context.rb
+- lib/ridley-connectors/command_context/unix_uninstall.rb
+- lib/ridley-connectors/command_context/windows_uninstall.rb
+- lib/ridley-connectors/errors.rb
 - lib/ridley-connectors/host_commander.rb
 - lib/ridley-connectors/host_connector.rb
 - lib/ridley-connectors/host_connector/response.rb
@@ -124,13 +147,19 @@ files:
 - lib/ridley-connectors/resources/node_resource.rb
 - lib/ridley-connectors/version.rb
 - ridley-connectors.gemspec
+- scripts/unix_uninstall_omnibus.erb
+- scripts/windows_uninstall_omnibus.erb
 - spec/fixtures/encrypted_data_bag_secret
 - spec/fixtures/my-fake.pem
 - spec/spec_helper.rb
 - spec/support/actor_mocking.rb
 - spec/support/spec_helpers.rb
+- spec/unit/ridley-connectors/bootstrap_context/unix_spec.rb
+- spec/unit/ridley-connectors/bootstrap_context/windows_spec.rb
+- spec/unit/ridley-connectors/bootstrap_context_spec.rb
 - spec/unit/ridley-connectors/chef_objects/node_object_spec.rb
 - spec/unit/ridley-connectors/client_spec.rb
+- spec/unit/ridley-connectors/command_context_spec.rb
 - spec/unit/ridley-connectors/host_commander_spec.rb
 - spec/unit/ridley-connectors/host_connector/ssh_spec.rb
 - spec/unit/ridley-connectors/host_connector/winrm/command_uploader_spec.rb
@@ -157,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A Connector API for talking to nodes managed by Chef
@@ -167,8 +196,12 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/actor_mocking.rb
 - spec/support/spec_helpers.rb
+- spec/unit/ridley-connectors/bootstrap_context/unix_spec.rb
+- spec/unit/ridley-connectors/bootstrap_context/windows_spec.rb
+- spec/unit/ridley-connectors/bootstrap_context_spec.rb
 - spec/unit/ridley-connectors/chef_objects/node_object_spec.rb
 - spec/unit/ridley-connectors/client_spec.rb
+- spec/unit/ridley-connectors/command_context_spec.rb
 - spec/unit/ridley-connectors/host_commander_spec.rb
 - spec/unit/ridley-connectors/host_connector/ssh_spec.rb
 - spec/unit/ridley-connectors/host_connector/winrm/command_uploader_spec.rb