ridley 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b0ad1830d01965e26fcc813c5b4ee4357a9734b
-  data.tar.gz: 747af04209ec46baa7063af405dcf23e87ae3396
+  metadata.gz: 216f146a9f80f6c69560dd58c6c8f79a0ccc3a8b
+  data.tar.gz: 66c4fed1770ed8d1c2f7493c01280cc01e2f15fe
 SHA512:
-  metadata.gz: 45e1c84592692fa67f781d3aa420549a454f77180ac295844be33dbedbb9a9aeffabec72d8ecd08640297217f7bac7a6f5cf42f68326d89692e663b080f12319
-  data.tar.gz: d2a8d1b0d247cf26ae19f3950a72c9518bbf43cb6fc2ec04fba9749df9ef7e4449bd741005e80f4f085e649b8e6fefc93380d877fd490ca1e0b3836ebef02228
+  metadata.gz: 9ec951c99b32ff1588fdc1609f2a1e0bb594f091b0b3bd90757c728ded0a35e154860e66f29ed57c683426c3d188cda1efb963f2e3ab6a31f97ad206382c6b4e
+  data.tar.gz: 18d53a050989ae16eae0b8aa6d99c3bc4740b01bffd082bb46cecea04eea05e9e70955c6ee7c34c2d54b8a170ac0c1711f485667cfa294db91ddd3d5f68654a0

data/lib/ridley/chef_objects/environment_object.rb

@@ -54,5 +54,51 @@ module Ridley
       attr_hash = Hashie::Mash.from_dotted_path(key, value)
       self.override_attributes = self.override_attributes.deep_merge(attr_hash)
     end
+
+    # Removes a environment default attribute given its dotted path
+    # representation. Returns the default attributes of the environment.
+    # 
+    # @param [String] key
+    #   the dotted path to an attribute
+    # 
+    # @return [Hashie::Mash]
+    def delete_default_attribute(key)
+      delete_attribute(key, :default)
+    end
+
+    # Removes a environment override attribute given its dotted path
+    # representation. Returns the override attributes of the environment.
+    # 
+    # @param [String] key
+    #   the dotted path to an attribute
+    # 
+    # @return [Hashie::Mash]
+    def delete_override_attribute(key)
+      delete_attribute(key, :override)
+    end
+
+    private
+
+      # Deletes an attribute at the given precedence using its dotted-path key.
+      # 
+      # @param [String] key
+      #   the dotted path to an attribute
+      # @param [Symbol] precedence
+      #   the precedence level to delete the attribute from
+      # 
+      # @return [Hashie::Mash]
+      def delete_attribute(key, precedence)
+        dotted_path = key.split('.')
+        leaf_key = dotted_path.pop
+        case precedence
+        when :default
+          attributes_to_change = self.default_attributes  
+        when :override
+          attributes_to_change = self.override_attributes
+        end
+        leaf_hash = dotted_path.inject(attributes_to_change) { |hash, element| hash[element] }
+        leaf_hash.delete(leaf_key) unless leaf_hash.nil?
+        attributes_to_change
+      end
   end
 end

data/lib/ridley/host_commander.rb

@@ -210,7 +210,7 @@ module Ridley
       # @return [Boolean]
       def connector_port_open?(host, port, wait_time = nil)
         defer {
-          timeout(wait_time || PORT_CHECK_TIMEOUT) { Celluloid::IO::TCPSocket.new(host, port).close; true }
+          Timeout.timeout(wait_time || PORT_CHECK_TIMEOUT) { Celluloid::IO::TCPSocket.new(host, port).close; true }
         }
       rescue Errno::ETIMEDOUT, Timeout::Error, SocketError, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::EADDRNOTAVAIL => ex
         false

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "1.6.0"
+  VERSION = "1.7.0"
 end

data/spec/unit/ridley/chef_objects/environment_object_spec.rb

@@ -53,5 +53,51 @@ describe Ridley::EnvironmentObject do
         subject.default_attributes["deep"]["nested"]["item"].should be_true
       end
     end
+
+    describe "#delete_default_attribute" do
+      let(:delete_default_attribute) { subject.delete_default_attribute(attribute_key) }
+      let(:attribute_key) { "hello.world" }
+
+      before do
+        subject.set_default_attribute(attribute_key, true)
+      end
+
+      it "removes the default attribute" do
+        delete_default_attribute
+        expect(subject.default_attributes[:hello][:world]).to be_nil
+      end
+
+      context "when the attribute does not exist" do
+        let(:delete_default_attribute) { subject.delete_default_attribute("not.existing") }
+
+        it "does not delete anything" do
+          delete_default_attribute
+          expect(subject.default_attributes[:hello][:world]).to be_true
+        end
+      end
+    end
+
+    describe "#delete_override_attribute" do
+      let(:delete_override_attribute) { subject.delete_override_attribute(attribute_key) }
+      let(:attribute_key) { "hello.world" }
+
+      before do
+        subject.set_override_attribute(attribute_key, true)
+      end
+
+      it "removes the override attribute" do
+        delete_override_attribute
+        expect(subject.override_attributes[:hello][:world]).to be_nil
+      end
+
+      context "when the attribute does not exist" do
+        let(:delete_override_attribute) { subject.delete_override_attribute("not.existing") }
+
+        it "does not delete anything" do
+          delete_override_attribute
+          expect(subject.override_attributes[:hello][:world]).to be_true
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-14 00:00:00.000000000 Z
+date: 2013-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -452,7 +452,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 reliable Chef API client with a clean syntax