ridley 0.9.1 → 0.10.0.rc1

data/lib/ridley/resource.rb

@@ -184,7 +184,7 @@ module Ridley
     end
 
     def to_s
-      "#{self.chef_id}: #{self._attributes_}"
+      "#<#{self.class} chef_id:#{self.chef_id}, attributes:#{self._attributes_}>"
     end
 
     # @param [Object] other

data/lib/ridley/resources/client_resource.rb

@@ -1,5 +1,12 @@
 module Ridley
   # @author Jamie Winsor <reset@riotgames.com>
+  #
+  # @example listing all clients
+  #   conn = Ridley.new(...)
+  #   conn.client.all #=> [
+  #     #<Ridley::ClientResource chef_id:'reset'>,
+  #     #<Ridley::ClientResource chef_id:'reset-validator'>
+  #   ]
   class ClientResource < Ridley::Resource
     class << self
       # Retrieves a client from the remote connection matching the given chef_id

data/lib/ridley/resources/node_resource.rb

@@ -10,6 +10,10 @@ module Ridley
       #     * :password (String) the password for the shell user that will perform the bootstrap
       #     * :keys (Array, String) an array of keys (or a single key) to authenticate the ssh user with instead of a password
       #     * :timeout (Float) [5.0] timeout value for SSH bootstrap
+      #   @option options [Hash] :winrm
+      #     * :user (String) a user that will login to each node and perform the bootstrap command on (required)
+      #     * :password (String) the password for the user that will perform the bootstrap
+      #     * :port (Fixnum) the winrm port to connect on the node the bootstrap will be performed on (5985)
       #   @option options [String] :validator_client
       #   @option options [String] :validator_path
       #     filepath to the validator used to bootstrap the node (required)
@@ -24,7 +28,7 @@ module Ridley
       #   @option options [Array] :run_list
       #     an initial run list to bootstrap with (default: Array.new)
       #   @option options [String] :chef_version
-      #     version of Chef to install on the node (default: {Ridley::CHEF_VERSION})
+      #     version of Chef to install on the node (default: nil)
       #   @option options [String] :environment
       #     environment to join the node to (default: '_default')
       #   @option options [Boolean] :sudo
@@ -41,12 +45,13 @@ module Ridley
           validator_path: client.validator_path,
           validator_client: client.validator_client,
           encrypted_data_bag_secret_path: client.encrypted_data_bag_secret_path,
-          ssh: client.ssh
+          ssh: client.ssh,
+          winrm: client.winrm,
+          chef_version: client.chef_version
         }
 
         options = default_options.merge(options)
-
-        Bootstrapper.new(*args, options).run
+        Bootstrapper.new(args, options).run
       end
 
       # Merges the given data with the the data of the target node on the remote

data/lib/ridley/sandbox_uploader.rb

@@ -94,7 +94,7 @@ module Ridley
     # @return [Hash, nil]
     def upload(chk_id, path)
       checksum = self.checksum(chk_id)
-
+      
       unless checksum[:needs_upload]
         return nil
       end
@@ -109,12 +109,6 @@ module Ridley
       upload_path = url.path
       url.path    = ""
 
-      # versions prior to OSS Chef 11 will strip the port to upload the file to in the checksum
-      # url returned. This will ensure we are uploading to the proper location.
-      if client.connection.foss?
-        url.port = URI(client.connection.server_url).port
-      end
-
       begin
         Faraday.new(url, client.options.slice(*Connection::VALID_OPTIONS)) do |c|
           c.response :chef_response

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "0.9.1"
+  VERSION = "0.10.0.rc1"
 end

data/ridley.gemspec

@@ -33,4 +33,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'erubis'
   s.add_runtime_dependency 'net-http-persistent', '>= 2.8'
   s.add_runtime_dependency 'retryable'
+  s.add_runtime_dependency 'winrm', '~> 1.1.0'
 end

data/spec/unit/ridley/bootstrap_bindings/unix_template_binding_spec.rb

@@ -0,0 +1,102 @@
+require 'spec_helper'
+
+describe Ridley::UnixTemplateBinding do
+
+  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
+    }
+  end
+  
+  describe "ClassMethods" do
+    subject { described_class }
+    
+    describe "::new" do
+      context "when no sudo option is passed through" do
+        it "sets a default value of 'true' to 'sudo'" do
+          options.delete(:sudo)
+          obj = subject.new(options)
+
+          obj.send(:sudo).should be_true
+        end
+      end
+
+      context "when the sudo option is passed through as false" do
+        it "sets the value of sudo to 'false' if provided" do
+          options.merge!(sudo: false)
+          obj = subject.new(options)
+
+          obj.send(:sudo).should be_false
+        end
+      end
+    end
+  end
+
+  subject { Ridley::UnixTemplateBinding.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 "#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
+end

data/spec/unit/ridley/bootstrap_bindings/windows_template_binding_spec.rb

@@ -0,0 +1,118 @@
+require 'spec_helper'
+
+describe Ridley::WindowsTemplateBinding do
+  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 { 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 { Ridley::WindowsTemplateBinding.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 "#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_vb" do
+    it "returns a string" do
+      subject.windows_wget_vb.should be_a(String)
+    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/bootstrapper/context_spec.rb

@@ -15,118 +15,31 @@ describe Ridley::Bootstrapper::Context do
   describe "ClassMethods" do
     subject { Ridley::Bootstrapper::Context }
 
-    describe "::new" do
-      it "sets a default value of 'true' to 'sudo'" do
-        options.delete(:sudo)
-        obj = subject.new(host, options)
-
-        obj.send(:sudo).should be_true
-      end
-
-      it "sets the value of sudo to 'false' if provided" do
-        options.merge!(sudo: false)
-        obj = subject.new(host, options)
-
-        obj.send(:sudo).should be_false
-      end
-
-      context "when validator_path is not specified" do
-        let(:options) { Hash.new }
-
-        it "raises an ArgumentError" do
-          lambda {
-            subject.new(host, options)
-          }.should raise_error(Ridley::Errors::ArgumentError)
+    describe "::create" do
+      
+      context "when the best connection is SSH" do
+        it "sets template_binding to a Ridley::UnixTemplateBinding" do
+          Ridley::HostConnector.stub(:best_connector_for).and_return(Ridley::HostConnector::SSH)
+          context = subject.create(host, options)
+          context.template_binding.should be_a(Ridley::UnixTemplateBinding)
         end
       end
 
-      context "when a validator_path is specified" do
-        let(:options) do
-          {
-            server_url: "https://api.opscode.com/organizations/vialstudios",
-            validator_path: fixtures_path.join("reset.pem").to_s
-          }
-        end
-
-        it "sets a value for validation_key" do
-          subject.new(host, options).validation_key.should_not be_nil
+      context "when the best connection is WinRM" do
+        it "sets template_binding to a Ridley::WindowsTemplateBinding" do
+          Ridley::HostConnector.stub(:best_connector_for).and_return(Ridley::HostConnector::WinRM)
+          context = subject.create(host, options)
+          context.template_binding.should be_a(Ridley::WindowsTemplateBinding)          
         end
       end
-    end
-  end
-
-  subject { Ridley::Bootstrapper::Context.new(host, options) }
-
-  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 "#first_boot" do
-    it "returns a string" do
-      subject.first_boot.should be_a(String)
-    end
-  end
-
-  describe "#validation_key" do
-    it "returns a string" do
-      subject.validation_key.should be_a(String)
-    end
-
-    it "returns the chomped contents of the file found at validator_path" do
-      subject.validation_key.should eql(File.read(options[:validator_path]).chomp)
-    end
-
-    context "when a validator file is not found at validator_path" do
-      before(:each) do
-        subject.stub(:validator_path) { fixtures_path.join("not.txt").to_s }
-      end
-
-      it "raises a ValidatorNotFound error" do
-        lambda {
-          subject.validation_key
-        }.should raise_error(Ridley::Errors::ValidatorNotFound)
-      end
-    end
-  end
-
-  describe "#encrypted_data_bag_secret" do
-    it "returns a string" do
-      subject.encrypted_data_bag_secret.should be_a(String)
-    end
-
-    context "when a encrypted_data_bag_secret_path is not provided" do
-      before(:each) do
-        subject.stub(:encrypted_data_bag_secret_path) { nil }
-      end
 
-      it "returns nil" do
-        subject.encrypted_data_bag_secret.should be_nil
-      end
-    end
-
-    context "when the file is not found at the given encrypted_data_bag_secret_path" do
-      before(:each) do
-        subject.stub(:encrypted_data_bag_secret_path) { fixtures_path.join("not.txt").to_s }
-      end
-
-      it "raises an EncryptedDataBagSecretNotFound erorr" do
-        lambda {
-          subject.encrypted_data_bag_secret
-        }.should raise_error(Ridley::Errors::EncryptedDataBagSecretNotFound)
+      context "when there is no good connection option" do
+        it "raises an error" do
+          Ridley::HostConnector.stub(:best_connector_for).and_return(nil)
+          expect {
+            context = subject.create(host, options)
+          }.to raise_error(Ridley::Errors::HostConnectionError)
+        end
       end
     end
   end