right_agent 0.10.5 → 0.10.6

data/lib/right_agent/platform.rb

@@ -159,7 +159,7 @@ module RightScale
     # Are we in an EC2 cloud?
     #
     # === Return
-    # true:: If machine is located in an Ec2 cloud
+    # true:: If machine is located in an EC2 cloud
     # false:: Otherwise
     def ec2?
       resolve_cloud_type if @ec2.nil?
@@ -288,17 +288,22 @@ module RightScale
     # Determines which cloud we're on by the cheap but simple expedient of
     # reading the RightScale cloud file
     def resolve_cloud_type
-      cloud_type = File.read(File.join(self.filesystem.right_scale_state_dir, 'cloud')) rescue nil
+      cloud_type = read_cloud_file
       @ec2 = false
       @rackspace = false
       @eucalyptus = false
       case cloud_type
-        when 'ec2' then ec2 = true
+        when 'ec2' then @ec2 = true
         when 'rackspace' then @rackspace = true
         when 'eucalyptus' then @eucalyptus = true
       end
     end
 
+    # Reads the RightScale cloud file and returns its contents
+    def read_cloud_file
+      File.read(File.join(self.filesystem.right_scale_state_dir, 'cloud')) rescue nil
+    end
+
     # Retrieve platform specific service implementation
     #
     # === Parameters

data/right_agent.gemspec

@@ -24,7 +24,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name      = 'right_agent'
-  spec.version   = '0.10.5'
+  spec.version   = '0.10.6'
   spec.date      = '2012-05-08'
   spec.authors   = ['Lee Kirchhoff', 'Raphael Simon', 'Tony Spataro']
   spec.email     = 'lee@rightscale.com'

data/spec/platform/platform_spec.rb

@@ -58,6 +58,28 @@ module RightScale
         end
       end
     end
-    
+
+    context 'cloud-family queries' do
+      # PLEASE NOTE: we are unable to use the magic RSpec "subject" because
+      # we are dispatching calls to a Singleton and we must partially mock its
+      # calls, and both __send__ and flexmock partial-mocking gets confused by
+      # the fact that #subject returns a Proc, not the actual subject. Do not
+      # attempt to use the pretty RSpec feature within this context. You have
+      # been warned!
+      before(:each) do
+        @subject = subject.instance
+        @subject.instance_variable_set(:@ec2, nil)
+        @subject.instance_variable_set(:@rackspace, nil)
+        @subject.instance_variable_set(:@eucalyptus, nil)
+      end
+
+      ['ec2', 'rackspace', 'eucalyptus'].each do |cloud|
+        it "should detect #{cloud}" do
+          query = "#{cloud}?".to_sym
+          flexmock(@subject).should_receive(:read_cloud_file).once.and_return(cloud)
+          @subject.__send__(query).should be_true
+        end
+      end
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_agent
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: 
   segments: 
   - 0
   - 10
-  - 5
-  version: 0.10.5
+  - 6
+  version: 0.10.6
 platform: ruby
 authors: 
 - Lee Kirchhoff