ridley 0.3.1 → 0.3.2

data/lib/ridley/resources/node.rb

@@ -18,30 +18,34 @@ module Ridley
     attribute :override, default: HashWithIndifferentAccess.new
     attribute :run_list, default: Array.new
 
-    # @param [Hash] hash
-    def automatic=(hash)
-      super(HashWithIndifferentAccess.new(hash))
-    end
+    alias_method :normal_attributes, :normal
+    alias_method :automatic_attributes, :automatic
+    alias_method :default_attributes, :default
+    alias_method :override_attributes, :override
 
     # @param [Hash] hash
     def normal=(hash)
       super(HashWithIndifferentAccess.new(hash))
     end
+    alias_method :normal_attributes=, :normal=
 
     # @param [Hash] hash
-    def default=(hash)
+    def automatic=(hash)
       super(HashWithIndifferentAccess.new(hash))
     end
+    alias_method :automatic_attributes=, :automatic=
 
     # @param [Hash] hash
-    def override=(hash)
+    def default=(hash)
       super(HashWithIndifferentAccess.new(hash))
     end
+    alias_method :default_attributes=, :default=
 
     # @param [Hash] hash
-    def normal=(hash)
+    def override=(hash)
       super(HashWithIndifferentAccess.new(hash))
     end
+    alias_method :override_attributes=, :override=
 
     # Set a node level normal attribute given the dotted path representation of the Chef
     # attribute and value.
@@ -52,7 +56,7 @@ module Ridley
     # @example setting and saving a node level normal attribute
     #
     #   obj = node.find("jwinsor-1")
-    #   obj.set_normal_attribute("my_app.billing.enabled", false)
+    #   obj.set_attribute("my_app.billing.enabled", false)
     #   obj.save
     #
     # @param [String] key
@@ -64,12 +68,69 @@ module Ridley
       self.normal = self.normal.deep_merge(attr_hash)
     end
 
+    # Returns the public hostname of the instantiated node. This hostname should be used for
+    # public communications to the node.
+    #
+    # @example
+    #   node.public_hostname => "reset.riotgames.com"
+    #
+    # @return [String]
+    def public_hostname
+      self.cloud? ? self.automatic[:cloud][:public_hostname] : self.automatic[:fqdn]
+    end
+
+    # Returns the public IPv4 address of the instantiated node. This ip address should be
+    # used for public communications to the node.
+    #
+    # @example
+    #   node.public_ipv4 => "10.33.33.1"
+    #
+    # @return [String]
+    def public_ipv4
+      self.cloud? ? self.automatic[:cloud][:public_ipv4] : self.automatic[:ipaddress]
+    end
+    alias_method :public_ipaddress, :public_ipv4
+
+    # Returns the cloud provider of the instantiated node. If the node is not identified as
+    # a cloud node, then nil is returned.
+    #
+    # @example
+    #   node_1.cloud_provider => "eucalyptus"
+    #   node_2.cloud_provider => "ec2"
+    #   node_3.cloud_provider => "rackspace"
+    #   node_4.cloud_provider => nil
+    #
+    # @return [nil, String]
+    def cloud_provider
+      self.cloud? ? self.automatic[:cloud][:provider] : nil      
+    end
+
+    # Returns true if the node is identified as a cloud node.
+    #
+    # @return [Boolean]
+    def cloud?
+      self.automatic.has_key?(:cloud)
+    end
+
+    # Returns true if the node is identified as a cloud node using the eucalyptus provider.
+    #
+    # @return [Boolean]
     def eucalyptus?
-      self.automatic.has_key?(:eucalyptus)
+      self.cloud_provider == "eucalyptus"
     end
 
+    # Returns true if the node is identified as a cloud node using the ec2 provider.
+    #
+    # @return [Boolean]
     def ec2?
-      self.automatic.has_key?(:ec2)
+      self.cloud_provider == "ec2"
+    end
+
+    # Returns true if the node is identified as a cloud node using the rackspace provider.
+    #
+    # @return [Boolean]
+    def rackspace?
+      self.cloud_provider == "rackspace"
     end
   end
   

data/lib/ridley/version.rb

@@ -1,3 +1,3 @@
 module Ridley
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

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

@@ -85,35 +85,164 @@ describe Ridley::Node do
     end
   end
 
+  describe "#cloud?" do
+    it "returns true if the cloud automatic attribute is set" do
+      subject.automatic = {
+        "cloud" => Hash.new
+      }
+
+      subject.cloud?.should be_true
+    end
+
+    it "returns false if the cloud automatic attribute is not set" do
+      subject.automatic.delete(:cloud)
+
+      subject.cloud?.should be_false
+    end
+  end
+
   describe "#eucalyptus?" do
-    it "returns true if the eucalyptus automatic attribute is set" do
+    it "returns true if the node is a cloud node using the eucalyptus provider" do
       subject.automatic = {
-        "eucalyptus" => Hash.new
+        "cloud" => {
+          "provider" => "eucalyptus"
+        }
       }
 
       subject.eucalyptus?.should be_true
     end
 
-    it "returns false if the eucalyptus automatic attribute is not set" do
-      subject.automatic.delete(:eucalyptus)
+    it "returns false if the node is not a cloud node" do
+      subject.automatic.delete(:cloud)
+
+      subject.eucalyptus?.should be_false
+    end
+
+    it "returns false if the node is a cloud node but not using the eucalyptus provider" do
+      subject.automatic = {
+        "cloud" => {
+          "provider" => "ec2"
+        }
+      }
 
       subject.eucalyptus?.should be_false
     end
   end
 
   describe "#ec2?" do
-    it "returns true if the ec2 automatic attribute is set" do
+    it "returns true if the node is a cloud node using the ec2 provider" do
       subject.automatic = {
-        "ec2" => Hash.new
+        "cloud" => {
+          "provider" => "ec2"
+        }
       }
 
       subject.ec2?.should be_true
     end
 
-    it "returns false if the ec2 automatic attribute is not set" do
-      subject.automatic.delete(:ec2)
+    it "returns false if the node is not a cloud node" do
+      subject.automatic.delete(:cloud)
+
+      subject.ec2?.should be_false
+    end
+
+    it "returns false if the node is a cloud node but not using the ec2 provider" do
+      subject.automatic = {
+        "cloud" => {
+          "provider" => "rackspace"
+        }
+      }
 
       subject.ec2?.should be_false
     end
   end
+
+  describe "#rackspace?" do
+    it "returns true if the node is a cloud node using the rackspace provider" do
+      subject.automatic = {
+        "cloud" => {
+          "provider" => "rackspace"
+        }
+      }
+
+      subject.rackspace?.should be_true
+    end
+
+    it "returns false if the node is not a cloud node" do
+      subject.automatic.delete(:cloud)
+
+      subject.rackspace?.should be_false
+    end
+
+    it "returns false if the node is a cloud node but not using the rackspace provider" do
+      subject.automatic = {
+        "cloud" => {
+          "provider" => "ec2"
+        }
+      }
+
+      subject.rackspace?.should be_false
+    end
+  end
+
+  describe "#cloud_provider" do
+    it "returns the cloud provider if the node is a cloud node" do
+      subject.automatic = {
+        "cloud" => {
+          "provider" => "ec2"
+        }
+      }
+
+      subject.cloud_provider.should eql("ec2")
+    end
+
+    it "returns nil if the node is not a cloud node" do
+      subject.automatic.delete(:cloud)
+
+      subject.cloud_provider.should be_nil
+    end
+  end
+
+  describe "#public_ipv4" do
+    it "returns the public ipv4 address if the node is a cloud node" do
+      subject.automatic = {
+        "cloud" => {
+          "provider" => "ec2",
+          "public_ipv4" => "10.0.0.1"
+        }
+      }
+
+      subject.public_ipv4.should eql("10.0.0.1")
+    end
+
+    it "returns the ipaddress if the node is not a cloud node" do
+      subject.automatic = {
+        "ipaddress" => "192.168.1.1"
+      }
+      subject.automatic.delete(:cloud)
+
+      subject.public_ipv4.should eql("192.168.1.1")
+    end
+  end
+
+  describe "#public_hostname" do
+    it "returns the public hostname if the node is a cloud node" do
+      subject.automatic = {
+        "cloud" => {
+          "public_hostname" => "reset.cloud.riotgames.com"
+        }
+      }
+
+      subject.public_hostname.should eql("reset.cloud.riotgames.com")
+    end
+
+    it "returns the FQDN if the node is not a cloud node" do
+      subject.automatic = {
+        "fqdn" => "reset.internal.riotgames.com"
+      }
+      subject.automatic.delete(:cloud)
+
+      subject.public_hostname.should eql("reset.internal.riotgames.com")
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000 Z
+date: 2012-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chozo
@@ -450,7 +450,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 900476655936176139
+      hash: 2735262975561486812
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23