ridley 0.12.4 → 1.0.0.rc1

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

@@ -3,163 +3,103 @@ require 'spec_helper'
 describe Ridley::NodeResource do
   let(:host) { "33.33.33.10" }
   let(:worker) { double('worker', alive?: true, terminate: nil) }
+  let(:host_commander) { double('host-commander') }
   let(:options) do
     {
-      server_url: "https://api.opscode.com/organizations/vialstudios",
-      validator_path: "/some/path",
-      validator_client: "chef-validator",
-      encrypted_data_bag_secret: "hellokitty",
-      ssh: {
-        user: "reset",
-        password: "lol"
-      },
-      winrm: {
-        user: "Administrator",
-        password: "secret"
-      },
-      chef_version: "11.4.0"
+      server_url: double('server_url'),
+      validator_path: double('validator_path'),
+      validator_client: double('validator_client'),
+      encrypted_data_bag_secret: double('encrypted_data_bag_secret'),
+      ssh: double('ssh'),
+      winrm: double('winrm'),
+      chef_version: double('chef_version')
     }
   end
-  let(:instance) { described_class.new(double, options) }
+  let(:instance) do
+    inst = described_class.new(double, options)
+    inst.stub(connection: chef_zero_connection, host_commander: host_commander)
+    inst
+  end
 
   describe "#bootstrap" do
-    let(:hosts) { [ "192.168.1.2" ] }
-    let(:options) do
-      {
-        validator_path: fixtures_path.join("reset.pem").to_s,
-        encrypted_data_bag_secret: File.read(fixtures_path.join("reset.pem"))
-      }
+    it "sends the message #bootstrap to the instance's host_commander" do
+      host_commander.should_receive(:bootstrap).with(host, options)
+      instance.bootstrap(host)
     end
-    let(:bootstrapper) { double('bootstrapper', run: nil) }
-    subject { instance }
-    before { Ridley::Bootstrapper.should_receive(:new).with(hosts, anything).and_return(bootstrapper) }
-
-    it "runs the Bootstrapper" do
-      bootstrapper.should_receive(:run)
 
-      subject.bootstrap("192.168.1.2", options)
+    it "passes pre-configured options to #bootstrap" do
+      host_commander.should_receive(:bootstrap).with(host, options)
+      instance.bootstrap(host)
     end
   end
 
   describe "#chef_run" do
-    let(:chef_run) { instance.chef_run(host) }
-    let(:response) { [:ok, double('response', stdout: 'success_message')] }
-    subject { chef_run }
-
-    before do
-      Ridley::HostConnector.stub(:new).and_return(worker)
-      worker.stub(:chef_client).and_return(response)
-    end
-
-    it { should eql(response) }
-
-    context "when it executes unsuccessfully" do
-      let(:response) { [ :error, double('response', stderr: 'failure_message') ] }
-
-      it { should eql(response) }
-    end
-
-    it "terminates the worker" do
-      worker.should_receive(:terminate)
-      chef_run
+    it "sends the message #chef_client to the instance's host_commander" do
+      host_commander.should_receive(:chef_client).with(host, ssh: instance.ssh, winrm: instance.winrm)
+      instance.chef_run(host)
     end
   end
 
   describe "#put_secret" do
-    let(:put_secret) { instance.put_secret(host) }
-    let(:response) { [ :ok, double('response', stdout: 'success_message') ] }
-    subject { put_secret }
-
-    before do
-      Ridley::HostConnector.stub(:new).and_return(worker)
-      worker.stub(:put_secret).and_return(response)
-    end
-
-    it { should eql(response) }
-
-    context "when it executes unsuccessfully" do
-      let(:response) { [ :error, double('response', stderr: 'failure_message') ] }
-
-      it { should eql(response) }
-    end
+    let(:secret) { options[:encrypted_data_bag_secret] }
 
-    it "terminates the worker" do
-      worker.should_receive(:terminate)
-      put_secret
+    it "sends the message #put_secret to the instance's host_commander" do
+      host_commander.should_receive(:put_secret).with(host, secret, options.slice(:ssh, :winrm))
+      instance.put_secret(host)
     end
   end
 
   describe "#ruby_script" do
-    let(:ruby_script) { instance.ruby_script(host, command_lines) }
-    let(:response) { [:ok, double('response', stdout: 'success_message')] }
     let(:command_lines) { ["puts 'hello'", "puts 'there'"] }
-    subject { ruby_script }
 
-    before do
-      Ridley::HostConnector.stub(:new).and_return(worker)
-      worker.stub(:ruby_script).and_return(response)
-    end
-
-    it { should eq(response) }
-
-    context "when it executes unsuccessfully" do
-      let(:response) { [:error, double('response', stderr: 'failure_message')] }
-
-      it { should eq(response) }
-    end
-
-    it "terminates the worker" do
-      worker.should_receive(:terminate)
-      ruby_script
+    it "sends the message #ruby_script to the instance's host_commander" do
+      host_commander.should_receive(:ruby_script).with(host, command_lines, ssh: instance.ssh, winrm: instance.winrm)
+      instance.ruby_script(host, command_lines)
     end
   end
 
   describe "#execute_command" do
-    let(:execute_command) { instance.execute_command(host, command) }
-    let(:response) { [:ok, double('response', stdout: 'success_message')] }
     let(:command) { "echo 'hello world'" }
-    subject { execute_command }
-
-    before do
-      Ridley::HostConnector.stub(:new).and_return(worker)
-      worker.stub(:run).and_return(response)
-    end
-
-    it { should eq(response) }
 
-    context "when it executes unsuccessfully" do
-      let(:response) { [:error, double('response', stderr: 'failure_message')] }
-
-      it { should eq(response) }
+    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)
     end
   end
 
   describe "#merge_data" do
-    subject { instance }
-    let(:node) { double('node') }
-    let(:data) { double('data') }
-
-    before { subject.stub(find: nil) }
+    let(:node_name) { "rspec-test" }
+    let(:run_list) { [ "recipe[one]", "recipe[two]" ] }
+    let(:attributes) { { deep: { two: "val" } } }
+
+    subject(:result) { instance.merge_data(node_name, run_list: run_list, attributes: attributes) }
+
+    context "when a node of the given name exists" do
+      before do
+        chef_node(node_name,
+          run_list: [ "recipe[one]", "recipe[three]" ],
+          normal: { deep: { one: "val" } }
+        )
+      end
 
-    context "when a node with the given name exists" do
-      before { subject.should_receive(:find).and_return(node) }
+      it "returns a Ridley::NodeObject" do
+        expect(result).to be_a(Ridley::NodeObject)
+      end
 
-      it "finds the target node, sends it the merge_data message, and updates it" do
-        updated = double('updated')
-        node.should_receive(:merge_data).with(data).and_return(updated)
-        subject.should_receive(:update).with(updated)
+      it "has a union between the run list of the original node and the new run list" do
+        expect(result.run_list).to eql(["recipe[one]","recipe[three]","recipe[two]"])
+      end
 
-        subject.merge_data(node, data)
+      it "has a deep merge between the attributes of the original node and the new attributes" do
+        expect(result.normal.to_hash).to eql(deep: { one: "val", two: "val" })
       end
     end
 
     context "when a node with the given name does not exist" do
-      before { subject.should_receive(:find).with(node).and_return(nil) }
+      let(:node_name) { "does_not_exist" }
 
       it "raises a ResourceNotFound error" do
-        expect {
-          subject.merge_data(node, data)
-        }.to raise_error(Ridley::Errors::ResourceNotFound)
+        expect { result }.to raise_error(Ridley::Errors::ResourceNotFound)
       end
     end
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 0.12.4
-  prerelease: 
+  version: 1.0.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Jamie Winsor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-28 00:00:00.000000000 Z
+date: 2013-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -107,22 +107,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.2
-- !ruby/object:Gem::Dependency
-  name: mixlib-log
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
@@ -139,22 +123,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: mixlib-config
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: mixlib-authentication
   requirement: !ruby/object:Gem::Requirement
@@ -269,11 +237,9 @@ files:
 - bootstrappers/unix_omnibus.erb
 - bootstrappers/windows_omnibus.erb
 - lib/ridley.rb
-- lib/ridley/bootstrap_bindings.rb
-- lib/ridley/bootstrap_bindings/unix_template_binding.rb
-- lib/ridley/bootstrap_bindings/windows_template_binding.rb
-- lib/ridley/bootstrapper.rb
-- lib/ridley/bootstrapper/context.rb
+- lib/ridley/bootstrap_context.rb
+- lib/ridley/bootstrap_context/unix.rb
+- lib/ridley/bootstrap_context/windows.rb
 - lib/ridley/chef.rb
 - lib/ridley/chef/chefignore.rb
 - lib/ridley/chef/cookbook.rb
@@ -293,15 +259,12 @@ files:
 - lib/ridley/client.rb
 - lib/ridley/connection.rb
 - lib/ridley/errors.rb
+- lib/ridley/host_commander.rb
 - lib/ridley/host_connector.rb
 - lib/ridley/host_connector/response.rb
-- lib/ridley/host_connector/response_set.rb
 - lib/ridley/host_connector/ssh.rb
-- lib/ridley/host_connector/ssh/worker.rb
 - lib/ridley/host_connector/winrm.rb
 - lib/ridley/host_connector/winrm/command_uploader.rb
-- lib/ridley/host_connector/winrm/worker.rb
-- lib/ridley/log.rb
 - lib/ridley/logging.rb
 - lib/ridley/middleware.rb
 - lib/ridley/middleware/chef_auth.rb
@@ -311,7 +274,6 @@ files:
 - lib/ridley/middleware/parse_json.rb
 - lib/ridley/middleware/retry.rb
 - lib/ridley/mixin.rb
-- lib/ridley/mixin/bootstrap_binding.rb
 - lib/ridley/mixin/checksum.rb
 - lib/ridley/mixin/shell_out.rb
 - lib/ridley/resource.rb
@@ -361,10 +323,9 @@ files:
 - spec/support/filepath_matchers.rb
 - spec/support/shared_examples/ridley_resource.rb
 - spec/support/spec_helpers.rb
-- spec/unit/ridley/bootstrap_bindings/unix_template_binding_spec.rb
-- spec/unit/ridley/bootstrap_bindings/windows_template_binding_spec.rb
-- spec/unit/ridley/bootstrapper/context_spec.rb
-- spec/unit/ridley/bootstrapper_spec.rb
+- spec/unit/ridley/bootstrap_context/unix_spec.rb
+- spec/unit/ridley/bootstrap_context/windows_spec.rb
+- spec/unit/ridley/bootstrap_context_spec.rb
 - spec/unit/ridley/chef/chefignore_spec.rb
 - spec/unit/ridley/chef/cookbook_spec.rb
 - spec/unit/ridley/chef/digester_spec.rb
@@ -380,18 +341,15 @@ files:
 - spec/unit/ridley/client_spec.rb
 - spec/unit/ridley/connection_spec.rb
 - spec/unit/ridley/errors_spec.rb
-- spec/unit/ridley/host_connector/response_set_spec.rb
-- spec/unit/ridley/host_connector/ssh/worker_spec.rb
+- spec/unit/ridley/host_commander_spec.rb
 - spec/unit/ridley/host_connector/ssh_spec.rb
 - spec/unit/ridley/host_connector/winrm/command_uploader_spec.rb
-- spec/unit/ridley/host_connector/winrm/worker_spec.rb
 - spec/unit/ridley/host_connector/winrm_spec.rb
 - spec/unit/ridley/host_connector_spec.rb
 - spec/unit/ridley/middleware/chef_auth_spec.rb
 - spec/unit/ridley/middleware/chef_response_spec.rb
 - spec/unit/ridley/middleware/gzip_spec.rb
 - spec/unit/ridley/middleware/parse_json_spec.rb
-- spec/unit/ridley/mixin/bootstrap_binding_spec.rb
 - spec/unit/ridley/resource_spec.rb
 - spec/unit/ridley/resources/client_resource_spec.rb
 - spec/unit/ridley/resources/cookbook_resource_spec.rb
@@ -420,12 +378,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 744717169722095875
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -466,10 +421,9 @@ test_files:
 - spec/support/filepath_matchers.rb
 - spec/support/shared_examples/ridley_resource.rb
 - spec/support/spec_helpers.rb
-- spec/unit/ridley/bootstrap_bindings/unix_template_binding_spec.rb
-- spec/unit/ridley/bootstrap_bindings/windows_template_binding_spec.rb
-- spec/unit/ridley/bootstrapper/context_spec.rb
-- spec/unit/ridley/bootstrapper_spec.rb
+- spec/unit/ridley/bootstrap_context/unix_spec.rb
+- spec/unit/ridley/bootstrap_context/windows_spec.rb
+- spec/unit/ridley/bootstrap_context_spec.rb
 - spec/unit/ridley/chef/chefignore_spec.rb
 - spec/unit/ridley/chef/cookbook_spec.rb
 - spec/unit/ridley/chef/digester_spec.rb
@@ -485,18 +439,15 @@ test_files:
 - spec/unit/ridley/client_spec.rb
 - spec/unit/ridley/connection_spec.rb
 - spec/unit/ridley/errors_spec.rb
-- spec/unit/ridley/host_connector/response_set_spec.rb
-- spec/unit/ridley/host_connector/ssh/worker_spec.rb
+- spec/unit/ridley/host_commander_spec.rb
 - spec/unit/ridley/host_connector/ssh_spec.rb
 - spec/unit/ridley/host_connector/winrm/command_uploader_spec.rb
-- spec/unit/ridley/host_connector/winrm/worker_spec.rb
 - spec/unit/ridley/host_connector/winrm_spec.rb
 - spec/unit/ridley/host_connector_spec.rb
 - spec/unit/ridley/middleware/chef_auth_spec.rb
 - spec/unit/ridley/middleware/chef_response_spec.rb
 - spec/unit/ridley/middleware/gzip_spec.rb
 - spec/unit/ridley/middleware/parse_json_spec.rb
-- spec/unit/ridley/mixin/bootstrap_binding_spec.rb
 - spec/unit/ridley/resource_spec.rb
 - spec/unit/ridley/resources/client_resource_spec.rb
 - spec/unit/ridley/resources/cookbook_resource_spec.rb

data/lib/ridley/bootstrap_bindings.rb

@@ -1,3 +0,0 @@
-Dir["#{File.dirname(__FILE__)}/bootstrap_bindings/*.rb"].sort.each do |path|
-  require_relative "bootstrap_bindings/#{File.basename(path, '.rb')}"
-end

data/lib/ridley/bootstrap_bindings/unix_template_binding.rb

@@ -1,108 +0,0 @@
-module Ridley
-  # Represents a binding that will be evaluated as an ERB template. When bootstrapping
-  # nodes, an instance of this class represents the customizable and necessary configurations
-  # needed by the Host in order to install and connect to Chef. By default, this class will be used
-  # when SSH is the best way to connect to the node.
-  #
-  # @author Kyle Allan <kallan@riotgames.com>
-  class UnixTemplateBinding
-    include Ridley::BootstrapBinding
-
-    attr_reader :sudo
-    attr_reader :hints
-
-    # @option options [String] :validator_client
-    # @option options [String] :validator_path
-    #   filepath to the validator used to bootstrap the node (required)
-    # @option options [String] :bootstrap_proxy (nil)
-    #   URL to a proxy server to bootstrap through
-    # @option options [String] :encrypted_data_bag_secret
-    #   your organizations encrypted data bag secret
-    # @option options [Hash] :hints (Hash.new)
-    #   a hash of Ohai hints to place on the bootstrapped node
-    # @option options [Hash] :attributes (Hash.new)
-    #   a hash of attributes to use in the first Chef run
-    # @option options [Array] :run_list (Array.new)
-    #   an initial run list to bootstrap with
-    # @option options [String] :chef_version (nil)
-    #   version of Chef to install on the node
-    # @option options [String] :environment ('_default')
-    #   environment to join the node to
-    # @option options [Boolean] :sudo (true)
-    #   bootstrap with sudo (default: true)
-    # @option options [String] :template ('unix_omnibus')
-    #   bootstrap template to use
-    def initialize(options = {})
-      options = self.class.default_options.merge(options)
-      options[:template] ||= default_template
-      self.class.validate_options(options)
-
-      @template_file             = options[:template]
-      @bootstrap_proxy           = options[:bootstrap_proxy]
-      @chef_version              = options[:chef_version]
-      @sudo                      = options[:sudo]
-      @validator_path            = options[:validator_path]
-      @encrypted_data_bag_secret = options[:encrypted_data_bag_secret]
-      @hints                     = options[:hints]
-      @server_url                = options[:server_url]
-      @validator_client          = options[:validator_client]
-      @node_name                 = options[:node_name]
-      @attributes                = options[:attributes]
-      @run_list                  = options[:run_list]
-      @environment               = options[:environment]
-    end
-
-    # @return [String]
-    def boot_command
-      cmd = template.evaluate(self)
-
-      if sudo
-        cmd = "sudo #{cmd}"
-      end
-
-      cmd
-    end
-
-    # @return [String]
-    def chef_config
-      body = <<-CONFIG
-log_level        :info
-log_location     STDOUT
-chef_server_url  "#{server_url}"
-validation_client_name "#{validator_client}"
-CONFIG
-
-      if node_name.present?
-        body << %Q{node_name "#{node_name}"\n}
-      else
-        body << "# Using default node name (fqdn)\n"
-      end
-
-      if bootstrap_proxy.present?
-        body << %Q{http_proxy        "#{bootstrap_proxy}"\n}
-        body << %Q{https_proxy       "#{bootstrap_proxy}"\n}
-      end
-
-      if encrypted_data_bag_secret.present?
-        body << %Q{encrypted_data_bag_secret "#{bootstrap_directory}/encrypted_data_bag_secret"\n}
-      end
-
-      body
-    end
-
-    # @return [String]
-    def bootstrap_directory
-      "/etc/chef"
-    end
-
-    # @return [String]
-    def chef_run
-      "chef-client -j #{bootstrap_directory}/first-boot.json -E #{environment}"
-    end
-
-    # @return [String]
-    def default_template
-      templates_path.join('unix_omnibus.erb').to_s
-    end
-  end
-end