fog_tracker 0.3.3 → 0.3.4

data/lib/fog_tracker.rb

@@ -21,4 +21,23 @@ module FogTracker
     logger
   end
 
+  # Performs validation and cleanup on an Array of account Hashes.
+  # Changes Strings to Symbols for all required keys.
+  # @param [Hash] account_array an Array of Hash objects.
+  # @return [Hash] the cleaned, validated Hash of account info.
+  def self.validate_accounts(account_hash)
+    account_hash.each do |name, account|
+      account.symbolize_keys
+      raise "Account #{name} defines no service" if not account[:service]
+      raise "Account #{name} defines no provider" if not account[:provider]
+      raise "Account #{name} defines no credentials" if not account[:credentials]
+      if account[:exclude_resources]
+        account[:exclude_resources] = account[:exclude_resources].map do |r|
+          r.to_sym
+        end
+      end
+    end
+    account_hash
+  end
+
 end

data/lib/fog_tracker/tracker.rb

@@ -4,7 +4,7 @@ module FogTracker
   class Tracker
 
     #a Hash of account information (see accounts.yml.example)
-    attr_accessor :accounts
+    attr_reader :accounts
 
     # Creates an object for tracking multiple Fog accounts
     # @param [Hash] accounts a Hash of account information
@@ -17,13 +17,12 @@ module FogTracker
     #    (should take a single Exception as its only required parameter)
     #  - :logger - a Ruby Logger-compatible object
     def initialize(accounts = {}, options = {})
-      @accounts   = accounts
       @delay      = options[:delay]
       @callback   = options[:callback]
       @log        = options[:logger] || FogTracker.default_logger
       @error_proc = options[:error_callback]
       @running    = false
-      validate_accounts  # Make sure account data are OK
+      self.accounts= accounts
       # Create a Hash that maps account names to AccountTrackers
       create_trackers
     end
@@ -103,6 +102,21 @@ module FogTracker
     # Returns this tracker's logger, for changing logging dynamically
     def logger ; @log end
 
+    # Sets the account information.
+    # If any account info has changed, all trackers are restarted.
+    # @param [Hash] accounts a Hash of account information
+    #    (see accounts.yml.example)
+    def accounts=(new_accounts)
+      old_accounts = @accounts
+      @accounts = FogTracker.validate_accounts(new_accounts)
+      if (@accounts != old_accounts)
+        stop if (was_running = running?)
+        create_trackers
+        start if was_running
+      end
+      @accounts
+    end
+
     private
 
     # Creates a Hash of AccountTracker objects, indexed by account name
@@ -124,18 +138,5 @@ module FogTracker
       end
     end
 
-    # Changes Strings to Symbols in Account keys
-    def validate_accounts
-      @accounts.each do |name, account|
-        account.symbolize_keys
-        raise "Account #{name} defines no service" if not account[:service]
-        raise "Account #{name} defines no provider" if not account[:provider]
-        raise "Account #{name} defines no credentials" if not account[:credentials]
-        account[:exclude_resources] = account[:exclude_resources].map do |r|
-          r.to_sym
-        end
-      end
-    end
-
   end
 end

data/lib/fog_tracker/version.rb

@@ -1,3 +1,3 @@
 module FogTracker
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/spec/lib/fog_tracker_spec.rb

@@ -0,0 +1,41 @@
+module FogTracker
+  
+  describe '#validate_accounts' do
+    it "should raise an exception when no service is specified" do
+      (Proc.new { FogTracker.validate_accounts(
+          FAKE_ACCOUNT_NAME => FAKE_ACCOUNT.merge({:service => nil})
+        )}).should raise_error
+    end
+    
+    it "should raise an exception when no provider is specified" do
+      (Proc.new { FogTracker.validate_accounts(
+          FAKE_ACCOUNT_NAME => FAKE_ACCOUNT.merge({:provider => nil})
+        )}).should raise_error
+    end
+    
+    it "should raise an exception when no credentials are specified" do
+      (Proc.new { FogTracker.validate_accounts(
+          FAKE_ACCOUNT_NAME => FAKE_ACCOUNT.merge({:credentials => nil})
+        )}).should raise_error
+    end
+
+    it "should symbolize all account keys" do
+      validated_accounts = FogTracker.validate_accounts(
+        FAKE_ACCOUNT_NAME => {
+          'provider'     => 'AWS',
+          'service'      => 'Compute',
+          'delay' => 10,
+          'credentials'  => {
+            'aws_access_key_id' => "fake user",
+            'aws_secret_access_key' => 'fake password'
+          }
+        }
+      )
+      validated_accounts.each do |name, account|
+        account.each do |account_key, account_value|
+          account_key.should be_a Symbol
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog_tracker
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-16 00:00:00.000000000 Z
+date: 2012-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70242453826620 !ruby/object:Gem::Requirement
+  requirement: &70164626570920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70242453826620
+  version_requirements: *70164626570920
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70242453825520 !ruby/object:Gem::Requirement
+  requirement: &70164626569880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70242453825520
+  version_requirements: *70164626569880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70242453840820 !ruby/object:Gem::Requirement
+  requirement: &70164626569020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70242453840820
+  version_requirements: *70164626569020
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70242453839260 !ruby/object:Gem::Requirement
+  requirement: &70164626568500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70242453839260
+  version_requirements: *70164626568500
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70242453838180 !ruby/object:Gem::Requirement
+  requirement: &70164626567940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70242453838180
+  version_requirements: *70164626567940
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70242453837060 !ruby/object:Gem::Requirement
+  requirement: &70164626567220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70242453837060
+  version_requirements: *70164626567220
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &70242453836320 !ruby/object:Gem::Requirement
+  requirement: &70164626564620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70242453836320
+  version_requirements: *70164626564620
 description: This gem peridically polls mutiple cloud computing services using the
   fog gem, asynchronously updating the state of the resulting collections of Fog Resources.
 email:
@@ -122,6 +122,7 @@ files:
 - spec/lib/fog_tracker/extensions/fog_model_spec.rb
 - spec/lib/fog_tracker/query/query_processor_spec.rb
 - spec/lib/fog_tracker/tracker_spec.rb
+- spec/lib/fog_tracker_spec.rb
 - spec/spec_helper.rb
 - spec/support/_configure_logging.rb
 - spec/support/_mocks.rb
@@ -140,7 +141,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3047578284791896007
+      hash: 358139871120298562
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -149,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3047578284791896007
+      hash: 358139871120298562
 requirements: []
 rubyforge_project: fog_tracker
 rubygems_version: 1.8.15
@@ -163,6 +164,7 @@ test_files:
 - spec/lib/fog_tracker/extensions/fog_model_spec.rb
 - spec/lib/fog_tracker/query/query_processor_spec.rb
 - spec/lib/fog_tracker/tracker_spec.rb
+- spec/lib/fog_tracker_spec.rb
 - spec/spec_helper.rb
 - spec/support/_configure_logging.rb
 - spec/support/_mocks.rb