ridley 0.12.0.rc1 → 0.12.0

data/lib/ridley.rb

@@ -34,7 +34,6 @@ module Ridley
   autoload :Bootstrapper, 'ridley/bootstrapper'
   autoload :Client, 'ridley/client'
   autoload :Connection, 'ridley/connection'
-  autoload :ChainLink, 'ridley/chain_link'
   autoload :Chef, 'ridley/chef'
   autoload :ChefObject, 'ridley/chef_object'
   autoload :DSL, 'ridley/dsl'

data/lib/ridley/chef/cookbook/syntax_check.rb

@@ -1,3 +1,5 @@
+require 'shellwords'
+
 module Ridley::Chef
   class Cookbook
     # @author Jamie Winsor <reset@riotgames.com>
@@ -125,7 +127,7 @@ module Ridley::Chef
       end
 
       def validate_template(erb_file)
-        result = quietly { shell_out("erubis -x #{erb_file} | ruby -c") }
+        result = quietly { shell_out("erubis -x #{erb_file.shellescape} | ruby -c") }
         result.error!
         true
       rescue Mixlib::ShellOut::ShellCommandFailed
@@ -136,7 +138,7 @@ module Ridley::Chef
       end
 
       def validate_ruby_file(ruby_file)
-        result = quietly { shell_out("ruby -c #{ruby_file}") }
+        result = quietly { shell_out("ruby -c #{ruby_file.shellescape}") }
         result.error!
         true
       rescue Mixlib::ShellOut::ShellCommandFailed

data/lib/ridley/errors.rb

@@ -110,6 +110,15 @@ module Ridley
       end
     end
 
+    class HTTPUnknownMethod < HTTPError
+      attr_reader :method
+
+      def initialize(method)
+        @method  = method
+        @message = "unknown http method: #{method}"
+      end
+    end
+
     class HTTP3XXError < HTTPError; end
     class HTTP4XXError < HTTPError; end
     class HTTP5XXError < HTTPError; 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, ssh_port, timeout)
-          host_connector = Ridley::HostConnector::SSH
-        elsif connector_port_open?(host, winrm_port)
+        if connector_port_open?(host, winrm_port)
           host_connector = Ridley::HostConnector::WinRM
+        elsif connector_port_open?(host, ssh_port, timeout)
+          host_connector = Ridley::HostConnector::SSH
         else
           raise Ridley::Errors::HostConnectionError, "No available connection method available on #{host}."
         end

data/lib/ridley/host_connector/winrm/worker.rb

@@ -47,10 +47,10 @@ module Ridley
         end
 
         def run(command)
+          response = Ridley::HostConnector::Response.new(host)
           command_uploaders << command_uploader = CommandUploader.new(winrm)
           command = get_command(command, command_uploader)
 
-          response = Ridley::HostConnector::Response.new(host)
           debug "Running WinRM Command: '#{command}' on: '#{host}' as: '#{user}'"
 
           output = winrm.run_cmd(command) do |stdout, stderr|

data/lib/ridley/resource.rb

@@ -25,8 +25,6 @@ module Ridley
     end
 
     include Celluloid
-    include Chozo::VariaModel
-    include Comparable
 
     # @param [Celluloid::Registry] connection_registry
     def initialize(connection_registry)
@@ -37,6 +35,7 @@ module Ridley
       self.class.representation.new(Actor.current, *args)
     end
 
+    # @return [Ridley::Connection]
     def connection
       @connection_registry[:connection_pool]
     end
@@ -52,12 +51,13 @@ module Ridley
 
     # @param [String, #chef_id] object
     #
-    # @return [nil, Object]
+    # @return [Object, nil]
     def find(object)
       chef_id = object.respond_to?(:chef_id) ? object.chef_id : object
       new(request(:get, "#{self.class.resource_path}/#{chef_id}"))
-    rescue Errors::HTTPNotFound => ex
-      nil
+    rescue AbortError => ex
+      return nil if ex.cause.is_a?(Errors::HTTPNotFound)
+      abort(ex.cause)
     end
 
     # @param [#to_hash] object
@@ -68,33 +68,33 @@ module Ridley
       new_attributes = request(:post, self.class.resource_path, resource.to_json)
       resource.mass_assign(resource._attributes_.deep_merge(new_attributes))
       resource
-    rescue Errors::HTTPConflict => ex
-      abort(ex)
     end
 
     # @param [String, #chef_id] object
     #
-    # @return [Object]
+    # @return [Object, nil]
     def delete(object)
       chef_id = object.respond_to?(:chef_id) ? object.chef_id : object
       new(request(:delete, "#{self.class.resource_path}/#{chef_id}"))
+    rescue AbortError => ex
+      return nil if ex.cause.is_a?(Errors::HTTPNotFound)
+      abort(ex.cause)
     end
 
     # @return [Array<Object>]
     def delete_all
-      all.collect do |resource|
-        future(:delete, resource)
-      end.map(&:value)
+      all.collect { |resource| future(:delete, resource) }.map(&:value)
     end
 
     # @param [#to_hash] object
     #
-    # @return [Object]
+    # @return [Object, nil]
     def update(object)
       resource = new(object.to_hash)
       new(request(:put, "#{self.class.resource_path}/#{resource.chef_id}", resource.to_json))
-    rescue Errors::HTTPConflict => ex
-      abort(ex)
+    rescue AbortError => ex
+      return nil if ex.cause.is_a?(Errors::HTTPConflict)
+      abort(ex.cause)
     end
 
     private
@@ -107,10 +107,12 @@ module Ridley
       # @param [Symbol] method
       def raw_request(method, *args)
         unless Connection::METHODS.include?(method)
-          raise
+          raise Errors::HTTPUnknownMethod, "unknown http method: #{method}"
         end
 
         defer { connection.send(method, *args) }
+      rescue Errors::HTTPError => ex
+        abort(ex)
       end
   end
 end

data/lib/ridley/resources/cookbook_resource.rb

@@ -49,8 +49,9 @@ module Ridley
 
       request(:delete, url)
       true
-    rescue Errors::HTTPNotFound
-      true
+    rescue AbortError => ex
+      return nil if ex.cause.is_a?(Errors::HTTPNotFound)
+      abort(ex.cause)
     end
 
     # Delete all of the versions of a given cookbook on the remote Chef server
@@ -60,9 +61,7 @@ module Ridley
     #
     # @option options [Boolean] purge (false)
     def delete_all(name, options = {})
-      versions(name).each do |version|
-        future(:delete, name, version, options)
-      end.map(&:value)
+      versions(name).collect { |version| future(:delete, name, version, options) }.map(&:value)
     end
 
     # Download the entire cookbook
@@ -92,8 +91,9 @@ module Ridley
     def find(object, version)
       chef_id = object.respond_to?(:chef_id) ? object.chef_id : object
       new(request(:get, "#{self.class.resource_path}/#{chef_id}/#{version}"))
-    rescue Errors::HTTPNotFound
-      nil
+    rescue AbortError => ex
+      return nil if ex.cause.is_a?(Errors::HTTPNotFound)
+      abort(ex.cause)
     end
 
     # Return the latest version of the given cookbook found on the remote Chef server
@@ -157,8 +157,11 @@ module Ridley
       url << "?force=true" if options[:force]
 
       request(:put, url, cookbook.to_json)
-    rescue Ridley::Errors::HTTPConflict => ex
-      abort Ridley::Errors::FrozenCookbook.new(ex)
+    rescue AbortError => ex
+      if ex.cause.is_a?(Errors::HTTPConflict)
+        abort Ridley::Errors::FrozenCookbook.new(ex)
+      end
+      abort(ex.cause)
     end
     alias_method :create, :update
 
@@ -221,8 +224,11 @@ module Ridley
       response[name]["versions"].collect do |cb_ver|
         cb_ver["version"]
       end
-    rescue Errors::HTTPNotFound => ex
-      abort(Errors::ResourceNotFound.new(ex))
+    rescue AbortError => ex
+      if ex.cause.is_a?(Errors::HTTPNotFound)
+        abort Errors::ResourceNotFound.new(ex)
+      end
+      abort(ex.cause)
     end
 
     private

data/lib/ridley/resources/data_bag_item_resource.rb

@@ -16,7 +16,7 @@ module Ridley
     #
     # @return [Array<Object>]
     def all(data_bag)
-      connection.get("#{DataBagResource.resource_path}/#{data_bag.name}").body.collect do |id, location|
+      request(:get, "#{DataBagResource.resource_path}/#{data_bag.name}").collect do |id, location|
         new(data_bag, id: id)
       end
     end
@@ -24,63 +24,61 @@ module Ridley
     # @param [Ridley::DataBagObject] data_bag
     # @param [String, #chef_id] object
     #
-    # @return [Ridley::DataBagItemObject]
+    # @return [Ridley::DataBagItemObject, nil]
     def find(data_bag, object)
       chef_id = object.respond_to?(:chef_id) ? object.chef_id : object
-      new(data_bag).from_hash(connection.get("#{DataBagResource.resource_path}/#{data_bag.name}/#{chef_id}").body)
-    rescue Errors::HTTPNotFound
-      nil
+      new(data_bag).from_hash(request(:get, "#{DataBagResource.resource_path}/#{data_bag.name}/#{chef_id}"))
+    rescue AbortError => ex
+      return nil if ex.cause.is_a?(Errors::HTTPNotFound)
+      abort(ex.cause)
     end
 
     # @param [Ridley::DataBagObject] data_bag
     # @param [#to_hash] object
     #
-    # @return [Ridley::DataBagItemObject]
+    # @return [Ridley::DataBagItemObject, nil]
     def create(data_bag, object)
       resource = new(data_bag, object.to_hash)
       unless resource.valid?
         abort Errors::InvalidResource.new(resource.errors)
       end
 
-      new_attributes = connection.post("#{DataBagResource.resource_path}/#{data_bag.name}", resource.to_json).body
+      new_attributes = request(:post, "#{DataBagResource.resource_path}/#{data_bag.name}", resource.to_json)
       resource.mass_assign(new_attributes)
       resource
-    rescue Errors::HTTPConflict => ex
-      abort(ex)
     end
 
     # @param [Ridley::DataBagObject] data_bag
     # @param [String, #chef_id] object
     #
-    # @return [Ridley::DataBagItemObject]
+    # @return [Ridley::DataBagItemObject, nil]
     def delete(data_bag, object)
       chef_id = object.respond_to?(:chef_id) ? object.chef_id : object
-      new(data_bag).from_hash(connection.delete("#{DataBagResource.resource_path}/#{data_bag.name}/#{chef_id}").body)
+      new(data_bag).from_hash(request(:delete, "#{DataBagResource.resource_path}/#{data_bag.name}/#{chef_id}"))
+    rescue AbortError => ex
+      return nil if ex.cause.is_a?(Errors::HTTPNotFound)
+      abort(ex.cause)
     end
 
     # @param [Ridley::DataBagObject] data_bag
     #
     # @return [Array<Ridley::DataBagItemObject>]
     def delete_all(data_bag)
-      mutex = Mutex.new
-      deleted = []
-
-      all(data_bag).collect do |resource|
-        future(:delete, data_bag, resource)
-      end.map(&:value)
+      all(data_bag).collect { |resource| future(:delete, data_bag, resource) }.map(&:value)
     end
 
     # @param [Ridley::DataBagObject] data_bag
     # @param [#to_hash] object
     #
-    # @return [Ridley::DataBagItemObject]
+    # @return [Ridley::DataBagItemObject, nil]
     def update(data_bag, object)
       resource = new(data_bag, object.to_hash)
       new(data_bag).from_hash(
-        connection.put("#{DataBagResource.resource_path}/#{data_bag.name}/#{resource.chef_id}", resource.to_json).body
+        request(:put, "#{DataBagResource.resource_path}/#{data_bag.name}/#{resource.chef_id}", resource.to_json)
       )
-    rescue Errors::HTTPConflict => ex
-      abort(ex)
+    rescue AbortError => ex
+      return nil if ex.cause.is_a?(Errors::HTTPConflict)
+      abort(ex.cause)
     end
   end
 end

data/lib/ridley/resources/data_bag_resource.rb

@@ -24,10 +24,11 @@ module Ridley
     # @return [nil, Ridley::DataBagResource]
     def find(object)
       chef_id = object.respond_to?(:chef_id) ? object.chef_id : object
-      connection.get("#{self.class.resource_path}/#{chef_id}")
+      request(:get, "#{self.class.resource_path}/#{chef_id}")
       new(name: chef_id)
-    rescue Errors::HTTPNotFound
-      nil
+    rescue AbortError => ex
+      return nil if ex.cause.is_a?(Errors::HTTPNotFound)
+      abort(ex.cause)
     end
   end
 end

data/lib/ridley/resources/environment_resource.rb

@@ -19,8 +19,11 @@ module Ridley
       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)
+    rescue AbortError => ex
+      if ex.cause.is_a?(Errors::HTTPNotFound)
+        abort Errors::ResourceNotFound.new(ex)
+      end
+      abort(ex.cause)
     end
 
     # Delete all of the environments on the client. The '_default' environment
@@ -29,9 +32,7 @@ module Ridley
     # @return [Array<Ridley::EnvironmentObject>]
     def delete_all
       envs = all.reject { |env| env.name.to_s == '_default' }
-      envs.collect do |resource|
-        future(:delete, resource)
-      end.map(&:value)
+      envs.collect { |resource| future(:delete, resource) }.map(&:value)
     end
   end
 end

data/lib/ridley/resources/sandbox_resource.rb

@@ -34,7 +34,7 @@ module Ridley
       sumhash = { checksums: Hash.new }.tap do |chks|
         Array(checksums).each { |chk| chks[:checksums][chk] = nil }
       end
-      new(connection.post(self.class.resource_path, MultiJson.encode(sumhash)).body)
+      new(request(:post, self.class.resource_path, MultiJson.encode(sumhash)))
     end
 
     # @param [#chef_id] object
@@ -46,13 +46,15 @@ module Ridley
     # @return [Hash]
     def commit(object)
       chef_id = object.respond_to?(:chef_id) ? object.chef_id : object
-      connection.put("#{self.class.resource_path}/#{chef_id}", MultiJson.encode(is_completed: true)).body
-    rescue Ridley::Errors::HTTPBadRequest => ex
-      abort Ridley::Errors::SandboxCommitError.new(ex.message)
-    rescue Ridley::Errors::HTTPNotFound => ex
-      abort Ridley::Errors::ResourceNotFound.new(ex.message)
-    rescue Ridley::Errors::HTTPUnauthorized, Ridley::Errors::HTTPForbidden => ex
-      abort Ridley::Errors::PermissionDenied.new(ex.message)
+      request(:put, "#{self.class.resource_path}/#{chef_id}", MultiJson.encode(is_completed: true))
+    rescue AbortError => ex
+      case ex.cause
+      when Ridley::Errors::HTTPBadRequest; abort Ridley::Errors::SandboxCommitError.new(ex.message)
+      when Ridley::Errors::HTTPNotFound; abort Ridley::Errors::ResourceNotFound.new(ex.message)
+      when Ridley::Errors::HTTPUnauthorized, Ridley::Errors::HTTPForbidden
+        abort Ridley::Errors::PermissionDenied.new(ex.message)
+      else; abort(ex.cause)
+      end
     end
 
     # Concurrently upload all of the files in the given sandbox
@@ -75,23 +77,23 @@ module Ridley
     end
 
     def update(*args)
-      raise RuntimeError, "action not supported"
+      abort RuntimeError.new("action not supported")
     end
 
     def all(*args)
-      raise RuntimeError, "action not supported"
+      abort RuntimeError.new("action not supported")
     end
 
     def find(*args)
-      raise RuntimeError, "action not supported"
+      abort RuntimeError.new("action not supported")
     end
 
     def delete(*args)
-      raise RuntimeError, "action not supported"
+      abort RuntimeError.new("action not supported")
     end
 
     def delete_all(*args)
-      raise RuntimeError, "action not supported"
+      abort RuntimeError.new("action not supported")
     end
 
     private

data/lib/ridley/resources/search_resource.rb

@@ -41,7 +41,7 @@ module Ridley
     #
     # @return [Array<String, Symbol>]
     def indexes
-      connection.get(self.class.resource_path).body.collect { |name, _| name }
+      request(:get, self.class.resource_path).collect { |name, _| name }
     end
 
     # Executes the built up query on the search's client
@@ -80,7 +80,7 @@ module Ridley
     def run(index, query_string, resources_registry, options = {})
       query_uri = self.class.query_uri(index)
       query     = self.class.build_query(query_string, options)
-      response  = connection.get(query_uri, query).body
+      response  = request(:get, query_uri, query)
 
       case index.to_sym
       when :node

data/lib/ridley/version.rb

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

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

@@ -51,6 +51,57 @@ describe Ridley::HostConnector::WinRM::Worker do
     end
   end
 
+  describe "#run" do
+    subject(:run) { winrm_worker.run(command) }
+    let(:command) { "dir" }
+    let(:command_uploader_stub) { double('CommandUploader') }
+    let(:stdout) { "stdout" }
+    let(:stderr) { nil }
+    let(:winrm_stub) { double }
+
+    before do
+      Ridley::HostConnector::WinRM::CommandUploader.stub(:new).and_return(command_uploader_stub)
+      winrm_worker.stub(:winrm).and_return(winrm_stub)
+      winrm_stub.stub(:run_cmd).and_yield(stdout, stderr).and_return({exitcode: 0})
+    end
+
+    context "when the exit_code is 0" do
+      it "returns an :ok with the response" do
+        status, response = run
+        expect(status).to eq(:ok)
+        expect(response.stdout).to eq("stdout")
+      end
+    end
+
+    context "when the exit_code is not 0" do
+      let(:stderr) { "stderr" }
+
+      before do
+        winrm_stub.stub(:run_cmd).and_yield(stdout, stderr).and_return({exitcode: 1})
+      end
+
+      it "returns an :error with the response" do
+        status, response = run
+        expect(status).to eq(:error)
+        expect(response.stderr).to eq("stderr")        
+      end
+    end
+
+    context "when an error is raised" do
+      let(:stderr) { "error" }
+
+      before do
+        winrm_stub.stub(:run_cmd).and_yield(stdout, stderr).and_raise("error")
+      end
+
+      it "returns an :error with the response" do
+        status, response = run
+        expect(status).to eq(:error)
+        expect(response.stderr).to eq("error")
+      end
+    end
+  end
+
   describe "#chef_client" do
     subject(:chef_client) { winrm_worker.chef_client }
 

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(true)
-        subject.best_connector_for(host).should eq(Ridley::HostConnector::SSH)
+        subject.stub(:connector_port_open?).and_return(false, true)
+        expect(subject.best_connector_for(host)).to 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)
+        subject.stub(:connector_port_open?).and_return(true, false)
+        expect(subject.best_connector_for(host)).to 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(true)
+        subject.stub(:connector_port_open?).and_return(false, true)
         subject.best_connector_for(host) do |yielded|
-          yielded.should eq(Ridley::HostConnector::SSH)
+          expect(yielded).to eq(Ridley::HostConnector::SSH)
         end
       end
     end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 0.12.0.rc1
-  prerelease: 7
+  version: 0.12.0
+  prerelease: 
 platform: ruby
 authors:
 - Jamie Winsor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-09 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -306,7 +306,6 @@ files:
 - lib/ridley/bootstrap_bindings/windows_template_binding.rb
 - lib/ridley/bootstrapper.rb
 - lib/ridley/bootstrapper/context.rb
-- lib/ridley/chain_link.rb
 - lib/ridley/chef.rb
 - lib/ridley/chef/chefignore.rb
 - lib/ridley/chef/cookbook.rb
@@ -451,9 +450,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 1507028122842257977
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/ridley/chain_link.rb

@@ -1,25 +0,0 @@
-module Ridley
-  # @author Jamie Winsor <reset@riotgames.com>
-  # @api private
-  class ChainLink
-    attr_reader :parent
-    attr_reader :child
-
-    # @param [Class, Object] parent
-    #   the parent class or object to send to the child
-    # @param [Class, Object] child
-    #   the child class or instance to delegate functions to
-    def initialize(parent, child)
-      @parent = parent
-      @child  = child
-    end
-
-    def new(*args)
-      child.send(:new, parent, *args)
-    end
-
-    def method_missing(fun, *args, &block)
-      child.send(fun, parent, *args, &block)
-    end
-  end
-end