fog_tracker 0.3.4 → 0.3.7

data/fog_tracker.gemspec

@@ -22,7 +22,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Runtime dependencies
-  s.add_dependency "fog"
+  # Fog v1.2.0 has a bug in Compute[:aws].servers
+  s.add_dependency "fog", '=1.1.2'
 
   # Development / Test dependencies
   s.add_development_dependency "rake"

data/lib/fog_tracker.rb

@@ -21,6 +21,14 @@ module FogTracker
     logger
   end
 
+  # Loads account information defined in account_file.
+  # @param account_file the path to a YAML file (see accounts.example.yml).
+  # @return [Hash] the cleaned, validated Hash of account info.
+  def self.read_accounts(account_file = ENV['ACCOUNT_FILE'])
+    account_file ||= "./config/accounts.yml"
+    FogTracker.validate_accounts(YAML::load(File.read account_file))
+  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.

data/lib/fog_tracker/tracker.rb

@@ -3,12 +3,12 @@ module FogTracker
   # Tracks one or more Fog accounts and exposes a {#query} on the results
   class Tracker
 
-    #a Hash of account information (see accounts.yml.example)
+    #a Hash of account information (see accounts.example.yml)
     attr_reader :accounts
 
     # Creates an object for tracking multiple Fog accounts
     # @param [Hash] accounts a Hash of account information
-    #    (see accounts.yml.example)
+    #    (see accounts.example.yml)
     # @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.
@@ -105,7 +105,7 @@ module FogTracker
     # 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)
+    #    (see accounts.example.yml)
     def accounts=(new_accounts)
       old_accounts = @accounts
       @accounts = FogTracker.validate_accounts(new_accounts)

data/lib/fog_tracker/version.rb

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

data/lib/tasks/track.rake

@@ -0,0 +1,15 @@
+desc "Runs the tracker [LOG_LEVEL=[INFO]]"
+task :track do
+  require File.join(File.dirname(__FILE__), '..', 'fog_tracker')
+
+  # Setup logging
+  log = FogTracker.default_logger(STDOUT)
+  log.level = ::Logger.const_get((ENV['LOG_LEVEL'] || 'INFO').to_sym)
+
+  log.info "Loading account information..."
+  accounts = FogTracker.read_accounts './config/accounts.yml'
+
+  FogTracker::Tracker.new(accounts, {:logger => log}).start
+  while true do ; sleep 60 end    # Loop forever
+
+end

data/spec/lib/fog_tracker_spec.rb

@@ -1,25 +1,33 @@
 module FogTracker
-  
+
+  describe '#read_accounts' do
+    it "converts a YAML file into a Hash of account info" do
+      accounts = FogTracker.read_accounts('./config/accounts.example.yml')
+      accounts.should be_a Hash
+      accounts.should_not be_empty
+    end
+  end
+
   describe '#validate_accounts' do
-    it "should raise an exception when no service is specified" do
+    it "raises 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
+
+    it "raises 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
+
+    it "raises 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
+    it "symbolizes all account keys" do
       validated_accounts = FogTracker.validate_accounts(
         FAKE_ACCOUNT_NAME => {
           'provider'     => 'AWS',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog_tracker
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-19 00:00:00.000000000 Z
+date: 2012-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70164626570920 !ruby/object:Gem::Requirement
+  requirement: &70290730545600 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - =
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70164626570920
+  version_requirements: *70290730545600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70164626569880 !ruby/object:Gem::Requirement
+  requirement: &70290730539940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70164626569880
+  version_requirements: *70290730539940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70164626569020 !ruby/object:Gem::Requirement
+  requirement: &70290730530160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70164626569020
+  version_requirements: *70290730530160
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70164626568500 !ruby/object:Gem::Requirement
+  requirement: &70290730526680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70164626568500
+  version_requirements: *70290730526680
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70164626567940 !ruby/object:Gem::Requirement
+  requirement: &70290730524120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70164626567940
+  version_requirements: *70290730524120
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70164626567220 !ruby/object:Gem::Requirement
+  requirement: &70290730521300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70164626567220
+  version_requirements: *70290730521300
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &70164626564620 !ruby/object:Gem::Requirement
+  requirement: &70290730310040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,13 +87,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70164626564620
+  version_requirements: *70290730310040
 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:
 - benton@bentonroberts.com
-executables:
-- fog_tracker
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -104,8 +103,7 @@ files:
 - LICENSE.TXT
 - README.md
 - Rakefile
-- bin/fog_tracker
-- config/accounts.yml.example
+- config/accounts.example.yml
 - fog_tracker.gemspec
 - lib/fog_tracker.rb
 - lib/fog_tracker/account_tracker.rb
@@ -117,6 +115,7 @@ files:
 - lib/fog_tracker/util/string_underscore.rb
 - lib/fog_tracker/version.rb
 - lib/tasks/rspec.rake
+- lib/tasks/track.rake
 - spec/lib/fog_tracker/account_tracker_spec.rb
 - spec/lib/fog_tracker/collection_tracker_spec.rb
 - spec/lib/fog_tracker/extensions/fog_model_spec.rb
@@ -141,7 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 358139871120298562
+      hash: -1170305047196625380
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -150,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 358139871120298562
+      hash: -1170305047196625380
 requirements: []
 rubyforge_project: fog_tracker
 rubygems_version: 1.8.15

data/bin/fog_tracker

@@ -1,73 +0,0 @@
-#!/usr/bin/env ruby
-
-# == Synopsis
-#   Uses the Fog gem to track the status of cloud computing resources
-#
-# == Usage
-#   fog_tracker.rb [options] ACCOUNTS_CONFIG_FILE.YML
-#
-# == Options (all options can be put into the config file)
-#   -d, --delay [INTEGER]       Seconds between status updates.
-#   -l, --log-level [LEVEL]     Sets Log4r level for console output. default = INFO
-#   -h, --help                  Displays help message
-#
-# == Author
-#   Benton Roberts
-
-require 'optparse'
-require 'fog_tracker'
-LOG_LVLS = {
-  "DEBUG" => ::Logger::DEBUG,
-  "INFO"  => ::Logger::INFO,
-  "WARN"  => ::Logger::WARN,
-  "ERROR" => ::Logger::ERROR,
-  "FATAL" => ::Logger::FATAL
-}
-
-module FogTracker
-  class FogTrackerConsoleApp
-
-    def initialize
-      @log = FogTracker.default_logger(STDOUT)
-      parse_options
-      @log.info "Loading account information from #{ARGV[0]}"
-      @accounts = YAML::load(File.open(ARGV[0]))
-      @tracker = FogTracker::Tracker.new(
-        @accounts, {:logger => @log, :delay => @opts[:delay]}
-      )
-    end
-
-    def go
-      @tracker.start
-      while true do
-        sleep 60   # Loop forever
-      end
-    end
-
-    def parse_options
-      @opts = {:log_level  => 'INFO'}
-      optparse = OptionParser.new do |opts|
-        opts.banner = "Usage: tracker [options] ACCOUNTS.YML"
-        opts.on('-d', '--delay SECONDS', Integer,
-        'Number of seconds between status updates') do |delay|
-          @opts[:delay] = delay
-        end
-        opts.on('-l', '--log-level LEVEL', 'Set logging level') do |log_level|
-          @opts[:log_level] = log_level.upcase
-        end
-        opts.on('-h', '--help', 'Display this help message') do
-          puts opts ; exit
-        end
-      end
-      optparse.parse!
-      @log.level = LOG_LVLS[@opts[:log_level]] if LOG_LVLS[@opts[:log_level]]
-      if ARGV.count < 1
-        @log.error "A YAML file with account info must be specified"
-        exit 1
-      end
-    end
-
-  end
-end
-
-FogTracker::FogTrackerConsoleApp.new.go