fog_tracker 0.1.3 → 0.1.4

data/.gitignore

@@ -11,3 +11,4 @@ log/*.log
 tmp/**/*
 doc
 doc/**/*
+.yardoc

data/.yardopts

@@ -0,0 +1 @@
+--no-private --protected lib/**/*.rb

data/Guardfile

@@ -1,6 +1,8 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard 'rake', :task => 'spec' do
-  watch(%r{^*.rb})
+guard 'rspec', :version => 2, :cli => "--color --format documentation" do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
 end

data/fog_tracker.gemspec

@@ -27,8 +27,8 @@ Gem::Specification.new do |s|
   # Development / Test dependencies
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
-  s.add_development_dependency "rdoc"
+  s.add_development_dependency "yard"
   s.add_development_dependency "guard"
-  s.add_development_dependency "guard-rake"
+  s.add_development_dependency "guard-rspec"
   s.add_development_dependency "ruby_gntp"
 end

data/lib/fog/core/model.rb

@@ -0,0 +1,21 @@
+module Fog
+
+  # Adds an accessor and a method to decorate Fog::Model instances
+  # with tracker account information
+  class Model
+
+    # a FogTracker::CollectionTracker
+    attr_accessor :_fog_collection_tracker
+
+    # Returns a cleaned copy of the resource's account information
+    # from the its collection tracker (credentials are removed).
+    def tracker_account
+      if _fog_collection_tracker
+        _fog_collection_tracker.clean_account_data
+      else
+        Hash.new
+      end
+    end
+
+  end
+end

data/lib/fog_tracker/account_tracker.rb

@@ -4,25 +4,24 @@ module FogTracker
   class AccountTracker
     require 'fog'
 
-    attr_reader :name, :account, :log, :delay
-    attr_reader :resource_trackers
+    # The name (String) of the account this tracker is polling
+    attr_reader :name
+    # A Hash of account-specific configuration data
+    attr_reader :account
+    # A Logger-compatible object
+    attr_reader :log
+    # How long to wait between successive polling of this account (Integer)
+    attr_reader :delay
 
     # Creates an object for tracking all collections in a single Fog account
-    #
-    # ==== Attributes
-    #
-    # * +account_name+ - a human-readable name for the account (String)
-    # * +account+ - a Hash of account information (see accounts.yml.example)
-    # * +options+ - Hash of optional parameters
-    #
-    # ==== Options
-    #
-    # * +:delay+ - Default time between polling of accounts
-    # * +:callback+ - A Method or Proc to call each time an account is polled.
-    #     It should take the name of the account as its only required parameter
-    # * +:error_callback+ - A Proc to call if polling errors occur.
-    #     It should take a single Exception as its only required parameter
-    # * +:logger+ - a Ruby Logger-compatible object
+    # @param [String] account_name a human-readable name for the account
+    # @param [Hash] options optional additional parameters:
+    #  - :delay (Integer) - Default time between polling of accounts
+    #  - :callback (Proc) - A Method or Proc to call each time an account is polled.
+    #    (should take the name of the account as its only required parameter)
+    #  - :error_callback (Proc) - A Method or Proc to call if polling errors occur.
+    #    (should take a single Exception as its only required parameter)
+    #  - :logger - a Ruby Logger-compatible object
     def initialize(account_name, account, options={})
       @name     = account_name
       @account  = account
@@ -32,10 +31,11 @@ module FogTracker
                               FogTracker::DEFAULT_POLLING_TIME
       @error_proc = options[:error_callback]
       @log.debug "Creating tracker for account #{@name}."
-      create_resource_trackers
+      create_collection_trackers
     end
 
-    # Starts a background thread, which updates all @resource_trackers
+    # Starts a background thread, which periodically polls for all the
+    # resource collections for this tracker's account
     def start
       if not running?
       @log.debug "Starting tracking for account #{@name}..."
@@ -43,7 +43,7 @@ module FogTracker
           begin
             while true do
               @log.info "Polling account #{@name}..."
-              @resource_trackers.each {|tracker| tracker.update}
+              @collection_trackers.each {|tracker| tracker.update}
               @callback.call(all_resources) if @callback
               sleep @delay
             end
@@ -60,7 +60,7 @@ module FogTracker
       end
     end
 
-    # Stops all the @resource_trackers
+    # Stops polling this tracker's account
     def stop
       if running?
         @log.info "Stopping tracker for #{name}..."
@@ -89,18 +89,18 @@ module FogTracker
 
     # Returns an Array of all this Account's currently tracked Resources
     def all_resources
-      (@resource_trackers.collect do |tracker|
+      (@collection_trackers.collect do |tracker|
         tracker.collection
       end).flatten
     end
 
     private
 
-    # Creates and returns an Array of ResourceTracker objects -
+    # Creates and returns an Array of CollectionTracker objects -
     # one for each resource type associated with this account's service
-    def create_resource_trackers
-      @resource_trackers = tracked_types.map do |fog_collection_name|
-        FogTracker::ResourceTracker.new(fog_collection_name.to_s, self)
+    def create_collection_trackers
+      @collection_trackers = tracked_types.map do |fog_collection_name|
+        FogTracker::CollectionTracker.new(fog_collection_name.to_s, self)
       end
     end
 

data/lib/fog_tracker/{resource_tracker.rb → collection_tracker.rb}

@@ -1,16 +1,16 @@
 module FogTracker
 
-  # Tracks a single Fog collection in a single account
-  class ResourceTracker
+  # Tracks a single Fog collection in a single account.
+  # Each {CollectionTracker} instance is tightly bound to an {AccountTracker}.
+  class CollectionTracker
 
+    # An Array of Fog::Model objects, all of the same resource type (class)
     attr_accessor :collection
 
     # Creates an object for tracking a single Fog collection in a single account
-    #
-    # ==== Attributes
-    #
-    # * +resource_type+ - the Fog collection name (String) for this resource type
-    # * +account_tracker+ - the AccountTracker for this tracker's @collection
+    # @param [String] resource_type the Fog collection name for this resource type
+    # @param [AccountTracker] account_tracker the AccountTracker for this tracker's
+    #       account. Usually the AccountTracker that created this object
     def initialize(resource_type, account_tracker)
       @type             = resource_type
       @account_tracker  = account_tracker
@@ -21,8 +21,8 @@ module FogTracker
       @log.debug "Created tracker for #{@type} on #{@account_name}."
     end
 
-    # Polls the account's connection for updated info on all existing
-    # instances of the relevant resource type, and saves them as @collection
+    # Polls the {AccountTracker}'s connection for updated info on all existing
+    # instances of this tracker's resource_type
     def update
       @log.info "Polling #{@type} on #{@account_name}..."
       fog_collection = @account_tracker.connection.send(@type) || Array.new
@@ -31,15 +31,15 @@ module FogTracker
       # Here's where most of the network overhead is actually incurred
       fog_collection.each do |resource|
         @log.debug "Fetching resource: #{resource.class} #{resource.identity}"
-        resource.fog_collection_tracker = self
+        resource._fog_collection_tracker = self
         new_collection << resource
         @log.debug "Got resource: #{resource.inspect}"
       end
       @collection = new_collection
     end
 
-    # Returns a Hash of account information as resource.tracker_account
-    # a :name parameter is added, and the :credentials are removed
+    # @return [Hash] a Hash of account information, slighly modified:
+    #    a :name parameter is added, and the :credentials are removed
     def clean_account_data
       @clean_data ||= @account  # generate this data only once per res
       @clean_data[:name] = @account_name

data/lib/fog_tracker/query/query_processor.rb

@@ -1,25 +1,25 @@
 module FogTracker
   module Query
+    # A class for gathering all Fog resources for a set of {AccountTracker}s,
+    # and filtering them based on a regular-expression-based query
     class QueryProcessor
 
+      # The Regular Expression which all resource queries must match
       QUERY_PATTERN = %r{(.*)::(.*)::(.*)::(.*)}
 
       # Creates an object for filtering Resources from a set of AccountTrackers
-      #
-      # ==== Attributes
-      #
-      # * +trackers+ - a Hash of AccountTrackers, indexed by Account name
-      # * +options+ - Hash of optional parameters
-      #
-      # ==== Options
-      #
-      # * +:logger+ - a Ruby Logger-compatible object
+      # @param [Hash] trackers a Hash of AccountTrackers, indexed by account name
+      # @param [Hash] options optional additional parameters:
+      #  - :logger - a Ruby Logger-compatible object
       def initialize(trackers, options={})
         @trackers = trackers
         @log      = options[:logger] || FogTracker.default_logger
       end
 
-      # Returns an Array of Resources, filtered by +query+
+      # Uses the query string to filter this account's resources 
+      # for a desired subset
+      # @param [String] query a string used to filter for matching resources
+      # @return [Array <Fog::Model>] an Array of Resources, filtered by query
       def execute(query)
         acct_pattern, svc_pattern, prov_pattern, col_pattern = parse_query(query)
         filter_by_collection(
@@ -48,20 +48,18 @@ module FogTracker
         end
       end
 
-      # Converts a String +token+ into a RegEx for matching query values
+      # Converts a String token into a RegEx for matching query values
       def regex_from_token(token)
         token = '.*' if token == '*'  # a single wildcard is a special case
         %r{^\s*#{token}\s*$}i         # otherwise, interpret as a RegEx
       end
 
-      # Returns a subset of all Resources, filtered only by +acct_name_pattern+
+      # Returns a subset of all Resources, filtered only by acct_name_pattern
       def get_results_by_account(acct_name_pattern)
         results = Array.new
         @trackers.each do |account_name, account_tracker|
           if account_name.match acct_name_pattern
-            account_tracker.resource_trackers.each do |resource_tracker|
-              results += resource_tracker.collection
-            end
+            results += account_tracker.all_resources
           end
         end
         results

data/lib/fog_tracker/tracker.rb

@@ -1,25 +1,21 @@
 module FogTracker
 
-  # Tracks one or more Fog accounts and exposes a query() on the results
+  # Tracks one or more Fog accounts and exposes a {#query} on the results
   class Tracker
 
+    #a Hash of account information (see accounts.yml.example)
     attr_accessor :accounts
 
-    # Creates an object for tracking Fog accounts
-    #
-    # ==== Attributes
-    #
-    # * +accounts+ - a Hash of account information (see accounts.yml.example)
-    # * +options+ - Hash of optional parameters
-    #
-    # ==== Options
-    #
-    # * +:delay+ - Time between polling of accounts. Overrides per-account value
-    # * +:callback+ - A Proc to call each time an account is polled.
-    #     It should take the name of the account as its only required parameter
-    # * +:error_callback+ - A Proc to call if polling errors occur.
-    #     It should take a single Exception as its only required parameter
-    # * +:logger+ - a Ruby Logger-compatible object
+    # Creates an object for tracking multiple Fog accounts
+    # @param [Hash] accounts a Hash of account information
+    #    (see accounts.yml.example)
+    # @param [Hash] options optional additional parameters:
+    #  - :delay (Integer) - Default time between polling of accounts
+    #  - :callback (Proc) - A Method or Proc to call each time an account is polled.
+    #    (should take the name of the account as its only required parameter)
+    #  - :error_callback (Proc) - A Method or Proc to call if polling errors occur.
+    #    (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]
@@ -28,9 +24,11 @@ module FogTracker
       @error_proc = options[:error_callback]
       # Create a Hash that maps account names to AccountTrackers
       create_trackers
+      @running  = false
     end
 
-    # Invokes the start method on all the @trackers
+    # Starts periodically polling all this tracker's accounts
+    # for all their Fog resource collections
     def start
       if not running?
         @log.info "Tracking #{@trackers.keys.count} accounts..."
@@ -41,7 +39,7 @@ module FogTracker
       end
     end
 
-    # Invokes the stop method on all the @trackers
+    # Stops polling for all this tracker's accounts
     def stop
       if running?
         @log.info "Stopping tracker..."
@@ -52,21 +50,22 @@ module FogTracker
       end
     end
 
-    # Returns true or false/nil depending on whether this tracker is polling
+    # Returns true or false, depending on whether this tracker is polling
+    # @return [true, false]
     def running? ; @running end
 
-    # Returns an array of Resource types (Strings) for a given account
+    # Returns an Array of resource types for a given account
+    # @param [String] name the name of the account
+    # @return [Array<String>] an array of Resource types 
     def types_for_account(account_name)
       @trackers[account_name].tracked_types
     end
 
-    # Returns an array of Resources matching the +query_string+
-    # Calls any block passed for each resulting resource
-    #
-    # ==== Attributes
-    #
-    # * +query_string+ - a String used to filter the discovered Resources
+    # Returns an array of Resources matching the {query_string}.
+    # Calls any block passed for each resulting resource.
+    # @param [String] query_string a string used to filter for matching resources
     #          it might look like: "Account Name::Compute::AWS::servers"
+    # @return [Array <Fog::Model>] an Array of Resources, filtered by query
     def query(query_string)
       results = FogTracker::Query::QueryProcessor.new(
         @trackers, :logger => @log
@@ -89,7 +88,7 @@ module FogTracker
       @accounts.each do |name, account|
         @log.debug "Setting up tracker for account #{name}"
         @trackers[name] = AccountTracker.new(name, account,
-        {:delay => @delay, :callback => @callback, 
+        {:delay => @delay, :callback => @callback,
           :error_callback => @error_proc, :logger => @log})
       end
     end

data/lib/fog_tracker/version.rb

@@ -1,3 +1,3 @@
 module FogTracker
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/fog_tracker.rb

@@ -1,8 +1,8 @@
 require 'logger'
 
 # Load all ruby files from the 'fog' and 'fog_tracker' directories
-Dir[File.join(File.dirname(__FILE__), "fog/**/*.rb")].each {|f| require f}
 Dir[File.join(File.dirname(__FILE__), "fog_tracker/**/*.rb")].each {|f| require f}
+Dir[File.join(File.dirname(__FILE__), "fog/**/*.rb")].each {|f| require f}
 
 module FogTracker
 

data/spec/lib/fog_tracker/account_tracker_spec.rb

@@ -5,8 +5,18 @@ module FogTracker
     describe AccountTracker do
 
       before(:each) do
+        @account_receiver = double "account callback object"
+        @account_receiver.stub(:callback)
+        @error_receiver = double "error callback object"
+        @error_receiver.stub(:callback)
         @tracker = AccountTracker.new(
-          FAKE_ACCOUNT_NAME, FAKE_ACCOUNT, :logger => LOG
+          FAKE_ACCOUNT_NAME, FAKE_ACCOUNT, #:logger => LOG, # uncomment to debug
+          :callback => Proc.new do |resources|
+              @account_receiver.callback(resources)
+          end,
+          :error_callback => Proc.new do |exception|
+              @error_receiver.callback(exception)
+          end
         )
       end
 
@@ -22,45 +32,33 @@ module FogTracker
       it "exposes the connection to its logger" do
         @tracker.log.should_not == nil
       end
-      it "exposes a collection of ResourceTrackers" do
-        @tracker.resource_trackers.size.should be > 0
-      end
 
       context "when it encounters an Exception while updating" do
         context "when initialized with an error callback" do
           it "should fire the callback" do
-            ResourceTracker.any_instance.stub(:update).and_raise
-            receiver = double "error callback object"
-            receiver.stub(:callback)
-            tracker = AccountTracker.new(
-              FAKE_ACCOUNT_NAME, FAKE_ACCOUNT, {
-                :error_callback => Proc.new {|err| receiver.callback(err)}
-              }
-            )
-            receiver.should_receive(:callback).exactly(:once)
-            tracker.start
+            CollectionTracker.any_instance.stub(:update).and_raise
+            @error_receiver.should_receive(:callback).exactly(:once)
+            @tracker.start
             sleep THREAD_STARTUP_DELAY
           end
         end
       end
 
       describe '#start' do
-        it "sends update() to its ResourceTrackers" do
-          @tracker.resource_trackers.each do |resource_tracker|
-            resource_tracker.should_receive(:update)
+        it "sends update() to its CollectionTrackers" do
+          update_catcher = double "mock for catching CollectionTracker::update"
+          update_catcher.stub(:update)
+          CollectionTracker.any_instance.stub(:update) do
+            update_catcher.update
           end
+          update_catcher.should_receive(:update)
           @tracker.start
           sleep THREAD_STARTUP_DELAY # wait for background thread to start
         end
         it "invokes its callback Proc when its account is updated" do
-          receiver = double "account callback object"
-          receiver.stub(:callback)
-          tracker = AccountTracker.new(
-            FAKE_ACCOUNT_NAME, FAKE_ACCOUNT, :logger => LOG,
-            :callback => Proc.new {|resources| receiver.callback(resources)}
-          )
-          receiver.should_receive(:callback).exactly(FAKE_ACCOUNTS.size).times
-          tracker.start
+          @account_receiver.should_receive(:callback).
+            exactly(FAKE_ACCOUNTS.size).times
+          @tracker.start
           sleep THREAD_STARTUP_DELAY
         end
       end
@@ -72,7 +70,7 @@ module FogTracker
         end
         it "kills its timer thread" do
           @tracker.start ; @tracker.stop
-          @tracker.resource_trackers.first.should_not_receive(:update)
+          @account_receiver.should_not_receive(:callback)
           sleep THREAD_STARTUP_DELAY # wait to make sure no update()s are sent
         end
       end
@@ -94,6 +92,14 @@ module FogTracker
         end
       end
 
-    end
+      describe '#all_resources' do
+        it "returns a flattened Array of all its CollectionTrackers collections" do
+          COLLECTION = [ 1, 2, 3 ]
+          NUM_TYPES = @tracker.tracked_types.size
+          CollectionTracker.any_instance.stub(:collection).and_return(COLLECTION)
+          @tracker.all_resources.should == ((1..NUM_TYPES).map {COLLECTION}).flatten
+        end
+      end
 
+    end
 end

data/spec/lib/fog_tracker/query/query_processor_spec.rb

@@ -23,7 +23,9 @@ module FogTracker
           QUERY.each do |name, query|
             it "should return an empty Array for a query #{name}" do
               QueryProcessor.new(
-                {FAKE_ACCOUNT_NAME => mock_account_tracker}, :logger => LOG
+                {FAKE_ACCOUNT_NAME => AccountTracker.new(
+                  FAKE_ACCOUNT_NAME, FAKE_ACCOUNT, :logger => LOG
+                )}, :logger => LOG
               ).execute(query).should == []
             end
           end
@@ -31,15 +33,24 @@ module FogTracker
 
         context "with a pre-populated, diverse set of Resources" do
           # Create a prepopulated QueryProcessor
-          NUMBER_OF_ACCOUNTS    = 8
-          RESOURCES_PER_ACCOUNT = 2
-          NUMBER_OF_COLLECTIONS = [5, NUMBER_OF_FAKE_RESOURCE_TYPES].min
+          NUMBER_OF_ACCOUNTS       = 8
+          NUMBER_OF_COLLECTIONS    = [5, NUMBER_OF_FAKE_RESOURCE_TYPES].min
+          RESOURCES_PER_COLLECTION = 10
           before(:each) do
             account_trackers =
               (1..NUMBER_OF_ACCOUNTS).inject({}) do |t, account_index|
-                t["Fake Account #{account_index}"] = mock_account_tracker(
-                  NUMBER_OF_COLLECTIONS, RESOURCES_PER_ACCOUNT
-                ) ; t
+                account_tracker = AccountTracker.new(
+                  FAKE_ACCOUNT_NAME, FAKE_ACCOUNT, :logger => LOG
+                )
+                account_tracker.stub(:all_resources).and_return(
+                  ((1..NUMBER_OF_COLLECTIONS).map do |collection_index|
+                    (1..RESOURCES_PER_COLLECTION).collect do |resource|
+                      create_resource(collection_index)
+                    end
+                  end).flatten
+                )
+                t["Fake Account #{account_index}"] = account_tracker
+                t
               end
             @processor = QueryProcessor.new(account_trackers, :logger => LOG)
           end
@@ -47,34 +58,34 @@ module FogTracker
           context "when running the query matching all Resources" do
             it "should return all Resources" do
               @processor.execute(QUERY['matching all Resources']).size.should ==
-                NUMBER_OF_ACCOUNTS * NUMBER_OF_COLLECTIONS * RESOURCES_PER_ACCOUNT
+                NUMBER_OF_ACCOUNTS * NUMBER_OF_COLLECTIONS* RESOURCES_PER_COLLECTION
             end
           end
           context "when running a query by account name" do
             it "should return all Resources for that account only" do
               @processor.execute(QUERY['by account name']).size.should ==
-                NUMBER_OF_ACCOUNTS * NUMBER_OF_COLLECTIONS * RESOURCES_PER_ACCOUNT
+                NUMBER_OF_ACCOUNTS * NUMBER_OF_COLLECTIONS* RESOURCES_PER_COLLECTION
               @processor.execute('wrong account::*::*::*').size.should == 0
             end
           end
           context "when running a query by Fog service name" do
             it "should return all Resources for that service only" do
               @processor.execute(QUERY['by Fog Service']).size.should ==
-                NUMBER_OF_ACCOUNTS * NUMBER_OF_COLLECTIONS * RESOURCES_PER_ACCOUNT
+                NUMBER_OF_ACCOUNTS * NUMBER_OF_COLLECTIONS* RESOURCES_PER_COLLECTION
               @processor.execute('*::wrong service::*::*').size.should == 0
             end
           end
           context "when running a query by Fog provider name" do
             it "should return all Resources for that provider only" do
               @processor.execute(QUERY['by Fog Provider']).size.should ==
-                NUMBER_OF_ACCOUNTS * NUMBER_OF_COLLECTIONS * RESOURCES_PER_ACCOUNT
+                NUMBER_OF_ACCOUNTS * NUMBER_OF_COLLECTIONS* RESOURCES_PER_COLLECTION
                 @processor.execute('*::*::wrong provider::*').size.should == 0
             end
           end
           context "when running a query by Fog collection name" do
             it "should return all Resources for that collection only" do
               @processor.execute(QUERY['by Fog collection name']).size.should ==
-                NUMBER_OF_ACCOUNTS * RESOURCES_PER_ACCOUNT
+                NUMBER_OF_ACCOUNTS * RESOURCES_PER_COLLECTION
               @processor.execute('*::*::*::wrong collection').size.should == 0
               true
             end

data/spec/lib/fog_tracker/resource_tracker_spec.rb

@@ -2,13 +2,13 @@ require 'spec_helper'
 
 module FogTracker
 
-    describe ResourceTracker do
+    describe CollectionTracker do
 
       before(:each) do
         @account_tracker = AccountTracker.new(
           FAKE_ACCOUNT_NAME, FAKE_ACCOUNT, :logger => LOG
         )
-        @tracker = ResourceTracker.new(
+        @tracker = CollectionTracker.new(
           FAKE_COLLECTION, @account_tracker
         )
       end
@@ -18,15 +18,14 @@ module FogTracker
       end
 
       describe '#update' do
-        it "refreshes its resource collection from its AccountTracker" do
+        it "refreshes its resource collection "+
+            "from its AccountTracker's connection" do
           @account_tracker.connection.should_receive(FAKE_COLLECTION)
           @tracker.update
         end
         it "attaches account information to all resources" do
-          account_tracker = mock_account_tracker(5,5)
-          tracker = ResourceTracker.new(FAKE_COLLECTION, account_tracker)
-          tracker.update
-          tracker.collection.each do |resource|
+          @tracker.update
+          @tracker.collection.each do |resource|
             resource.tracker_account[:name].should == FAKE_ACCOUNT_NAME
             resource.tracker_account[:credentials].should == {}
           end

data/spec/support/_mocks.rb

@@ -15,27 +15,12 @@ module FogTracker
     },
     :exclude_resources => [
       :spot_requests,   # No Fog mocks for this resource
-      #:account,
-      #:flavors,
-      #:images,
-      #:addresses,
-      #:volumes,
-      #:snapshots,
-      #:tags,
-      #:servers,
-      #:security_groups,
-      #:key_pairs,
-      #:spot_instance_requests
     ],
   }
   FAKE_ACCOUNTS = {FAKE_ACCOUNT_NAME => FAKE_ACCOUNT}
   module Query
     QUERY = {}  # Used in query_processor_spec.rb
   end
-  class MockFogResource < Fog::Model
-    #attr_accessor :tracker_account
-    def identity ; "random-resource-id-#{rand 65536}" end
-  end
 end
 
 # Create some fake Fog Resource and Collection Classes
@@ -55,38 +40,8 @@ module Fog
   end
 end
 
-def mock_account_tracker(num_collections = 1, resources_per_collection = 0)
-  fake_account_tracker = double('mock_account_tracker')
-  fake_account_tracker.stub(:account).and_return(Hash.new)
-  fake_account_tracker.stub(:name).and_return(FogTracker::FAKE_ACCOUNT_NAME)
-  fake_account_tracker.stub(:log).and_return(LOG)
-  fake_account_tracker.stub(:all_resources).and_return(Array.new)
-  fake_account_tracker.stub(:connection).and_return(mock_fog_connection)
-  # create an array of mock ResourceTrackers
-  trackers = (1..num_collections).map do |class_index|
-    mock_resource_tracker(
-      Fog::FakeService::FakeProvider.const_get("FakeResourceType#{class_index}"), 
-      resources_per_collection
-    )
-  end
-  fake_account_tracker.stub(:resource_trackers).and_return(trackers)
-  fake_account_tracker
-end
-
-def mock_fog_connection
-  fake_fog_connection = double('mock_fog_connection')
-  fake_fog_connection.stub(FogTracker::FAKE_COLLECTION).and_return(
-    [ FogTracker::MockFogResource.new, FogTracker::MockFogResource.new ]
-  )
-  fake_fog_connection
-end
-
-def mock_resource_tracker(resource_class, number_of_resources = 0)
-  fake_resource_tracker = double("mock_resource_tracker")
-  resources = Array.new
-  number_of_resources.times do
-    resources << resource_class.new
-  end
-  fake_resource_tracker.stub(:collection).and_return(resources)
-  fake_resource_tracker
+def create_resource(type_index = (rand NUMBER_OF_FAKE_RESOURCE_TYPES)+1)
+  Fog::FakeService::FakeProvider.const_get(
+    "FakeResourceType#{type_index}"
+  ).new
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog_tracker
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-27 00:00:00.000000000Z
+date: 2012-01-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &2151853820 !ruby/object:Gem::Requirement
+  requirement: &70093896997020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151853820
+  version_requirements: *70093896997020
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2151853060 !ruby/object:Gem::Requirement
+  requirement: &70093896996120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151853060
+  version_requirements: *70093896996120
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2151852120 !ruby/object:Gem::Requirement
+  requirement: &70093896994520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151852120
+  version_requirements: *70093896994520
 - !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &2151850540 !ruby/object:Gem::Requirement
+  name: yard
+  requirement: &70093896993060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151850540
+  version_requirements: *70093896993060
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2151848880 !ruby/object:Gem::Requirement
+  requirement: &70093896991540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151848880
+  version_requirements: *70093896991540
 - !ruby/object:Gem::Dependency
-  name: guard-rake
-  requirement: &2151844960 !ruby/object:Gem::Requirement
+  name: guard-rspec
+  requirement: &70093896989420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151844960
+  version_requirements: *70093896989420
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &2151843360 !ruby/object:Gem::Requirement
+  requirement: &70093896987000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151843360
+  version_requirements: *70093896987000
 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:
@@ -98,6 +98,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .yardopts
 - Gemfile
 - Guardfile
 - README.md
@@ -105,11 +106,11 @@ files:
 - bin/tracker
 - config/accounts.yml.example
 - fog_tracker.gemspec
+- lib/fog/core/model.rb
 - lib/fog_tracker.rb
 - lib/fog_tracker/account_tracker.rb
-- lib/fog_tracker/model.rb
+- lib/fog_tracker/collection_tracker.rb
 - lib/fog_tracker/query/query_processor.rb
-- lib/fog_tracker/resource_tracker.rb
 - lib/fog_tracker/tracker.rb
 - lib/fog_tracker/util/string_underscore.rb
 - lib/fog_tracker/version.rb
@@ -136,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 586888198881977126
+      hash: 589883015526840149
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -145,10 +146,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 586888198881977126
+      hash: 589883015526840149
 requirements: []
 rubyforge_project: fog_tracker
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Tracks the state of cloud computing resources across multiple accounts with
@@ -162,3 +163,4 @@ test_files:
 - spec/support/_configure_logging.rb
 - spec/support/_mocks.rb
 - spec/support/_threading_support.rb
+has_rdoc: 

data/lib/fog_tracker/model.rb

@@ -1,20 +0,0 @@
-# add an accessor and a method to decorate Fog::Model instances
-# with tracker account information
-module Fog
-  class Model
-
-    # a FogTracker::CollectionTracker
-    attr_accessor :fog_collection_tracker
-
-    # returns a clean copy of the resource's account information
-    # from the its collection tracker
-    def tracker_account
-      if fog_collection_tracker
-        fog_collection_tracker.clean_account_data
-      else
-        Hash.new
-      end
-    end
-
-  end
-end