ridley 0.11.2 → 0.12.0.rc1

data/Gemfile

@@ -46,5 +46,4 @@ group :test do
   gem 'json_spec'
   gem 'webmock'
   gem 'chef-zero'
-  gem 'json', '>= 1.4.4', '<= 1.7.7'
 end

data/README.md

@@ -40,30 +40,10 @@ Ridley exposes a number of functions that return resources which you can use to
 
 For more information scroll down to the Manipulating Chef Resources section of this README.
 
-### Synchronous execution
+If you don't want to instantiate and manage a connection object you can use `Ridley.open` to open a connection, do some work, and it will be closed for you after the block executes.
 
-An alternative syntax is provided if you want to perform multiple requests, in order, on a connection.
-
-    ridley = Ridley.new(...)
-    ridley.sync do
-      role.all
-      role.find("reset")
-      role.create(name: "ridley-test")
-      role.delete("reset")
-    end
-
-The `sync` function on the connection object takes a block with no arguments and allows you to access the DSL within the block. You can address any one of the resources within the sync block:
-
-    ridley.sync do
-      environment.all
-      node.all
-      ...
-    end
-
-For one-liner requests you can create a new instance of Ridley and dispose of it with `Ridley.open`
-
-    Ridley.open(server_url: "https://api.opscode.com", ...) do
-      role.all
+    Ridley.open(server_url: "https://api.opscode.com", ...) do |r|
+      r.node.all
     end
 
 ## Manipulating Chef Resources

data/lib/ridley/bootstrap_bindings/windows_template_binding.rb

@@ -79,7 +79,7 @@ CONFIG
       end
 
       if encrypted_data_bag_secret.present?
-        body << %Q{encrypted_data_bag_secret "#{bootstrap_directory}\\encrypted_data_bag_secret"\n}
+        body << %Q{encrypted_data_bag_secret '#{bootstrap_directory}\\encrypted_data_bag_secret'\n}
       end
 
       escape_and_echo(body)

data/lib/ridley/client.rb

@@ -54,8 +54,10 @@ module Ridley
 
     class << self
       def open(options = {}, &block)
-        cli = new(options)
-        cli.evaluate(&block)
+        client = new(options)
+        yield client
+      ensure
+        client.terminate if client && client.alive?
       end
 
       # @raise [ArgumentError]
@@ -266,32 +268,10 @@ module Ridley
       self.url_prefix.to_s
     end
 
-    def evaluate(&block)
-      unless block_given?
-        raise LocalJumpError, "no block given (yield)"
-      end
-
-      @self_before_instance_eval = eval("self", block.binding)
-      instance_eval(&block)
-    end
-    alias_method :sync, :evaluate
-
     private
 
       def connection
         @connection_registry[:connection_pool]
       end
-
-      def method_missing(method, *args, &block)
-        if block_given?
-          @self_before_instance_eval ||= eval("self", block.binding)
-        end
-
-        if @self_before_instance_eval.nil?
-          super
-        end
-
-        @self_before_instance_eval.send(method, *args, &block)
-      end
   end
 end

data/lib/ridley/host_connector.rb

@@ -53,10 +53,10 @@ module Ridley
         ssh_port, winrm_port = parse_port_options(options)
         timeout = options[:ssh] && options[:ssh][:timeout]
 
-        if connector_port_open?(host, winrm_port)
-          host_connector = Ridley::HostConnector::WinRM
-        elsif connector_port_open?(host, ssh_port, timeout)
+        if connector_port_open?(host, ssh_port, timeout)
           host_connector = Ridley::HostConnector::SSH
+        elsif connector_port_open?(host, winrm_port)
+          host_connector = Ridley::HostConnector::WinRM
         else
           raise Ridley::Errors::HostConnectionError, "No available connection method available on #{host}."
         end

data/lib/ridley/resources/environment_resource.rb

@@ -4,6 +4,25 @@ module Ridley
     set_resource_path "environments"
     represented_by Ridley::EnvironmentObject
 
+    # Used to return a hash of the cookbooks and cookbook versions (including all dependencies)
+    # that are required by the run_list array.
+    #
+    # @param [String] environment
+    #   name of the environment to run against
+    # @param [Array] run_list
+    #   an array of cookbooks to satisfy
+    #
+    # @raise [Errors::ResourceNotFound] if the given environment is not found
+    #
+    # @return [Hash]
+    def cookbook_versions(environment, run_list = [])
+      run_list = Array(run_list).flatten
+      chef_id  = environment.respond_to?(:chef_id) ? environment.chef_id : environment
+      request(:post, "#{self.class.resource_path}/#{chef_id}/cookbook_versions", MultiJson.encode(run_list: run_list))
+    rescue Errors::HTTPNotFound => ex
+      abort Errors::ResourceNotFound.new(ex)
+    end
+
     # Delete all of the environments on the client. The '_default' environment
     # will never be deleted.
     #

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "0.11.2"
+  VERSION = "0.12.0.rc1"
 end

data/ridley.gemspec

@@ -27,8 +27,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'addressable'
   s.add_runtime_dependency 'faraday', '>= 0.8.4'
   s.add_runtime_dependency 'activesupport', '>= 3.2.0'
-  s.add_runtime_dependency 'solve', '>= 0.4.3'
-  s.add_runtime_dependency 'celluloid', '~> 0.13.0'
+  s.add_runtime_dependency 'solve', '>= 0.4.4'
+  s.add_runtime_dependency 'celluloid', '~> 0.14.0'
   s.add_runtime_dependency 'net-ssh'
   s.add_runtime_dependency 'erubis'
   s.add_runtime_dependency 'net-http-persistent', '>= 2.8'

data/spec/acceptance/environment_resource_spec.rb

@@ -90,12 +90,9 @@ describe "Environment API operations", type: "acceptance" do
         }
       }
 
-      connection.sync do
-        environment.update(target)
-        obj = environment.find(target)
-
-        obj.default_attributes.should eql(default_attributes)
-      end
+      connection.environment.update(target)
+      obj = connection.environment.find(target)
+      obj.default_attributes.should eql(default_attributes)
     end
 
     it "saves a new set of 'override_attributes'" do
@@ -106,12 +103,9 @@ describe "Environment API operations", type: "acceptance" do
         }
       }
 
-      connection.sync do
-        environment.update(target)
-        obj = environment.find(target)
-
-        obj.override_attributes.should eql(override_attributes)
-      end
+      connection.environment.update(target)
+      obj = connection.environment.find(target)
+      obj.override_attributes.should eql(override_attributes)
     end
 
     it "saves a new set of 'cookbook_versions'" do
@@ -120,12 +114,9 @@ describe "Environment API operations", type: "acceptance" do
         "tomcat" => "1.3.0"
       }
 
-      connection.sync do
-        environment.update(target)
-        obj = environment.find(target)
-
-        obj.cookbook_versions.should eql(cookbook_versions)
-      end
+      connection.environment.update(target)
+      obj = connection.environment.find(target)
+      obj.cookbook_versions.should eql(cookbook_versions)
     end
   end
 end

data/spec/acceptance/node_resource_spec.rb

@@ -23,11 +23,9 @@ describe "Node API operations", type: "acceptance" do
     end
 
     it "adds a new node to the server" do
-      connection.sync do
-        node.create(name: node_name)
+      connection.node.create(name: node_name)
 
-        node.all.should have(1).node
-      end
+      connection.node.all.should have(1).node
     end
   end
 
@@ -40,11 +38,9 @@ describe "Node API operations", type: "acceptance" do
     end
 
     it "removes the node from the server" do
-      connection.sync do
-        node.delete(node_name)
+      connection.node.delete(node_name)
 
-        node.find(node_name).should be_nil
-      end
+      connection.node.find(node_name).should be_nil
     end
   end
 
@@ -55,11 +51,9 @@ describe "Node API operations", type: "acceptance" do
     end
 
     it "deletes all nodes from the remote server" do
-      connection.sync do
-        node.delete_all
+      connection.node.delete_all
 
-        node.all.should have(0).nodes
-      end
+      connection.node.all.should have(0).nodes
     end
   end
 
@@ -70,12 +64,10 @@ describe "Node API operations", type: "acceptance" do
     end
 
     it "returns an array of Ridley::NodeObject" do
-      connection.sync do
-        obj = node.all
+      obj = connection.node.all
 
-        obj.should each be_a(Ridley::NodeObject)
-        obj.should have(2).nodes
-      end
+      obj.should each be_a(Ridley::NodeObject)
+      obj.should have(2).nodes
     end
   end
 
@@ -96,12 +88,10 @@ describe "Node API operations", type: "acceptance" do
         }
       }
 
-      connection.sync do
-        node.update(target)
-        obj = node.find(target)
+      connection.node.update(target)
+      obj = connection.node.find(target)
 
-        obj.normal.should eql(normal)
-      end
+      obj.normal.should eql(normal)
     end
 
     it "saves a new set of 'default' attributes" do
@@ -112,12 +102,10 @@ describe "Node API operations", type: "acceptance" do
         }
       }
 
-      connection.sync do
-        node.update(target)
-        obj = node.find(target)
+      connection.node.update(target)
+      obj = connection.node.find(target)
 
-        obj.default.should eql(defaults)
-      end
+      obj.default.should eql(defaults)
     end
 
     it "saves a new set of 'automatic' attributes" do
@@ -128,12 +116,10 @@ describe "Node API operations", type: "acceptance" do
         }
       }
 
-      connection.sync do
-        node.update(target)
-        obj = node.find(target)
+      connection.node.update(target)
+      obj = connection.node.find(target)
 
-        obj.automatic.should eql(automatics)
-      end
+      obj.automatic.should eql(automatics)
     end
 
     it "saves a new set of 'override' attributes" do
@@ -144,34 +130,28 @@ describe "Node API operations", type: "acceptance" do
         }
       }
 
-      connection.sync do
-        node.update(target)
-        obj = node.find(target)
+      connection.node.update(target)
+      obj = connection.node.find(target)
 
-        obj.override.should eql(overrides)
-      end
+      obj.override.should eql(overrides)
     end
 
     it "places a node in a new 'chef_environment'" do
       target.chef_environment = environment = "ridley"
 
-      connection.sync do
-        node.update(target)
-        obj = node.find(target)
+      connection.node.update(target)
+      obj = connection.node.find(target)
 
-        obj.chef_environment.should eql(environment)
-      end
+      obj.chef_environment.should eql(environment)
     end
 
     it "saves a new 'run_list' for the node" do
       target.run_list = run_list = ["recipe[one]", "recipe[two]"]
 
-      connection.sync do
-        node.update(target)
-        obj = node.find(target)
+      connection.node.update(target)
+      obj = connection.node.find(target)
 
-        obj.run_list.should eql(run_list)
-      end
+      obj.run_list.should eql(run_list)
     end
   end
 end

data/spec/acceptance/role_resource_spec.rb

@@ -23,11 +23,8 @@ describe "Role API operations", type: "acceptance" do
     end
 
     it "adds a new role to the server" do
-      connection.sync do
-        role.create(name: role_name)
-
-        role.all.should have(1).role
-      end
+      connection.role.create(name: role_name)
+      connection.role.all.should have(1).role
     end
   end
 
@@ -40,11 +37,9 @@ describe "Role API operations", type: "acceptance" do
     end
 
     it "removes the role from the server" do
-      connection.sync do
-        role.delete(role_name)
+      connection.role.delete(role_name)
 
-        role.find(role_name).should be_nil
-      end
+      connection.role.find(role_name).should be_nil
     end
   end
 
@@ -55,11 +50,9 @@ describe "Role API operations", type: "acceptance" do
     end
 
     it "deletes all nodes from the remote server" do
-      connection.sync do
-        role.delete_all
+      connection.role.delete_all
 
-        role.all.should have(0).roles
-      end
+      connection.role.all.should have(0).roles
     end
   end
 
@@ -70,12 +63,10 @@ describe "Role API operations", type: "acceptance" do
     end
 
     it "should return an array of Ridley::RoleObject" do
-      connection.sync do
-        obj = role.all
+      obj = connection.role.all
 
-        obj.should have(2).roles
-        obj.should each be_a(Ridley::RoleObject)
-      end
+      obj.should have(2).roles
+      obj.should each be_a(Ridley::RoleObject)
     end
   end
 
@@ -91,12 +82,10 @@ describe "Role API operations", type: "acceptance" do
     it "saves a new run_list" do
       target.run_list = run_list = ["recipe[one]", "recipe[two]"]
 
-      connection.sync do
-        role.update(target)
-        obj = role.find(target)
+      connection.role.update(target)
+      obj = connection.role.find(target)
 
-        obj.run_list.should eql(run_list)
-      end
+      obj.run_list.should eql(run_list)
     end
 
     it "saves a new env_run_lists" do
@@ -105,23 +94,19 @@ describe "Role API operations", type: "acceptance" do
         "development" => ["recipe[two]"]
       }
 
-      connection.sync do
-        role.update(target)
-        obj = role.find(target)
+      connection.role.update(target)
+      obj = connection.role.find(target)
 
-        obj.env_run_lists.should eql(env_run_lists)
-      end
+      obj.env_run_lists.should eql(env_run_lists)
     end
 
     it "saves a new description" do
       target.description = description = "a new description!"
 
-      connection.sync do
-        role.update(target)
-        obj = role.find(target)
+      connection.role.update(target)
+      obj = connection.role.find(target)
 
-        obj.description.should eql(description)
-      end
+      obj.description.should eql(description)
     end
 
     it "saves a new default_attributes" do
@@ -132,12 +117,10 @@ describe "Role API operations", type: "acceptance" do
         }
       }
 
-      connection.sync do
-        role.update(target)
-        obj = role.find(target)
+      connection.role.update(target)
+      obj = connection.role.find(target)
 
-        obj.default_attributes.should eql(defaults)
-      end
+      obj.default_attributes.should eql(defaults)
     end
 
     it "saves a new override_attributes" do
@@ -148,12 +131,10 @@ describe "Role API operations", type: "acceptance" do
         }
       }
 
-      connection.sync do
-        role.update(target)
-        obj = role.find(target)
+      connection.role.update(target)
+      obj = connection.role.find(target)
 
-        obj.override_attributes.should eql(overrides)
-      end
+      obj.override_attributes.should eql(overrides)
     end
   end
 end

data/spec/unit/ridley/client_spec.rb

@@ -115,56 +115,53 @@ describe Ridley::Client do
     end
 
     describe "::open" do
-      it "raises a LocalJumpError if no block is given" do
-        lambda {
-          described_class.open(config)
-        }.should raise_error(LocalJumpError)
+      it "instantiates a new connection, yields to it, and terminates it" do
+        new_instance = double(alive?: true)
+        described_class.should_receive(:new).and_return(new_instance)
+        new_instance.should_receive(:hello)
+        new_instance.should_receive(:terminate)
+
+        described_class.open do |f|
+          f.hello
+        end
       end
     end
   end
 
   let(:instance) { described_class.new(config) }
 
-  describe "#node" do
-    subject { instance.node }
-
-    it { should be_a(Ridley::NodeResource) }
+  subject { instance }
 
-    its(:server_url) { should eql(config[:server_url]) }
-    its(:validator_path) { should eql(config[:validator_path]) }
-    its(:validator_client) { should eql(config[:validator_client]) }
-    its(:encrypted_data_bag_secret) { should eql(instance.encrypted_data_bag_secret) }
-    its(:ssh) { should eql(config[:ssh]) }
-    its(:winrm) { should eql(config[:winrm]) }
-    its(:chef_version) { should eql(config[:chef_version]) }
-  end
+  its(:client) { should be_a(Ridley::ClientResource) }
+  its(:cookbook) { should be_a(Ridley::CookbookResource) }
+  its(:data_bag) { should be_a(Ridley::DataBagResource) }
+  its(:environment) { should be_a(Ridley::EnvironmentResource) }
+  its(:node) { should be_a(Ridley::NodeResource) }
+  its(:role) { should be_a(Ridley::RoleResource) }
+  its(:sandbox) { should be_a(Ridley::SandboxResource) }
 
   describe "#encrypted_data_bag_secret" do
-    subject { instance }
+    subject { instance.encrypted_data_bag_secret }
 
-    it "returns a string" do
-      subject.encrypted_data_bag_secret.should be_a(String)
-    end
+    it { should be_a(String) }
 
     context "when a encrypted_data_bag_secret_path is not provided" do
       before(:each) do
-        subject.stub(:encrypted_data_bag_secret_path) { nil }
+        instance.stub(encrypted_data_bag_secret_path: nil)
       end
 
       it "returns nil" do
-        subject.encrypted_data_bag_secret.should be_nil
+        expect(subject).to 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 }
+        instance.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)
+        expect { subject }.to raise_error(Ridley::Errors::EncryptedDataBagSecretNotFound)
       end
     end
   end

data/spec/unit/ridley/host_connector_spec.rb

@@ -96,15 +96,15 @@ describe Ridley::HostConnector do
 
     context "when an SSH port is open" do
       it "returns Ridley::HostConnector::SSH" do
-        subject.stub(:connector_port_open?).and_return(false, true)
-        expect(subject.best_connector_for(host)).to eq(Ridley::HostConnector::SSH)
+        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(true, false)
-        expect(subject.best_connector_for(host)).to eq(Ridley::HostConnector::WinRM)
+        subject.stub(:connector_port_open?).and_return(false, true)
+        subject.best_connector_for(host).should eq(Ridley::HostConnector::WinRM)
       end
     end
 
@@ -119,9 +119,9 @@ describe Ridley::HostConnector do
 
     context "when a block is provided" do
       it "yields the best HostConnector to the block" do
-        subject.stub(:connector_port_open?).and_return(false, true)
+        subject.stub(:connector_port_open?).and_return(true)
         subject.best_connector_for(host) do |yielded|
-          expect(yielded).to eq(Ridley::HostConnector::SSH)
+          yielded.should eq(Ridley::HostConnector::SSH)
         end
       end
     end

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

@@ -1,7 +1,60 @@
 require 'spec_helper'
 
 describe Ridley::EnvironmentResource do
-  subject { described_class.new(double('registry')) }
+  let(:server_url)  { Ridley::RSpec::ChefServer.server_url }
+  let(:client_name) { "reset" }
+  let(:client_key)  { fixtures_path.join('reset.pem').to_s }
+  let(:connection)  { Ridley::Connection.new(server_url, client_name, client_key) }
+
+  let(:resource) do
+    resource = described_class.new(double('registry'))
+    resource.stub(connection: connection)
+    resource
+  end
+
+  subject { resource }
+
+  describe "#cookbook_versions" do
+    let(:name) { "rspec-test" }
+    let(:run_list) { ["hello", "there"] }
+
+    subject { resource.cookbook_versions(name, run_list) }
+
+    context "when the chef server has the given cookbooks" do
+      before do
+        chef_environment("rspec-test")
+        chef_cookbook("hello", "1.2.3")
+        chef_cookbook("there", "1.0.0")
+      end
+
+      it "returns a Hash" do
+        should be_a(Hash)
+      end
+
+      it "contains a key for each cookbook" do
+        subject.keys.should have(2).items
+        subject.should have_key("hello")
+        subject.should have_key("there")
+      end
+    end
+
+    context "when the chef server does not have the environment" do
+      before do
+        chef_cookbook("hello", "1.2.3")
+        chef_cookbook("there", "1.0.0")
+      end
+
+      it "raises a ResourceNotFound error" do
+        expect { subject }.to raise_error(Ridley::Errors::ResourceNotFound)
+      end
+    end
+
+    context "when the chef server does not have one or more of the cookbooks" do
+      it "raises a precondition failed error" do
+        expect { subject }.to raise_error(Ridley::Errors::HTTPPreconditionFailed)
+      end
+    end
+  end
 
   describe "#delete_all" do
     let(:default_env) { double(name: "_default") }

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 0.11.2
-  prerelease: 
+  version: 0.12.0.rc1
+  prerelease: 7
 platform: ruby
 authors:
 - Jamie Winsor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -178,7 +178,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -186,7 +186,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +194,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -202,7 +202,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -451,12 +451,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: 4471568292874425542
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23