tronprint 0.0.10 → 0.0.11

data/lib/tronprint/version.rb

@@ -1,3 +1,3 @@
 module Tronprint
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/lib/tronprint.rb

@@ -50,7 +50,6 @@ module Tronprint
   # This is your Brighter Planet API key. Get one from 
   # {keys.brighterplanet.com}[http://keys.brighterplanet.com]
   def brighter_planet_key
-    @brighter_planet_key ||= ENV['TRONPRINT_API_KEY']
     @brighter_planet_key ||= config[:brighter_planet_key]
   end
 
@@ -90,6 +89,11 @@ module Tronprint
     load_config || default_config
   end
 
+  def config=(val)
+    @loaded_config = val
+    @default_config = val
+  end
+
   # Fetch the configuration stored in config/tronprint.yml.
   def load_config
     return @loaded_config unless @loaded_config.nil?
@@ -101,13 +105,22 @@ module Tronprint
   # are stored in `pwd`/tronprint_stats.yml. The application name 
   # is assumed to be the name of the current directory.
   def default_config
-    @default_config ||= {
-      :aggregator_options => {
-        :adapter => :YAML,
-        :path => File.expand_path('tronprint_stats.yml', Dir.pwd)
-      },
+    return @default_config unless @default_config.nil?
+    @default_config = {
       :application_name => File.basename(Dir.pwd)
     }
+    @default_config[:brighter_planet_key] = ENV['TRONPRINT_API_KEY'] if ENV['TRONPRINT_API_KEY']
+    if ENV['MONGOHQ_URL']
+      @default_config[:aggregator_options] = {
+        :url => ENV['MONGOHQ_URL'],
+        :adapter => :mongodb
+      }
+    end
+    @default_config[:aggregator_options] ||= {
+      :adapter => :YAML,
+      :path => File.expand_path('tronprint_stats.yml', Dir.pwd)
+    }
+    @default_config
   end
 
   # Calculate emissions using aggregated data. A call is made to 

data/spec/tronprint_spec.rb

@@ -40,14 +40,8 @@ describe Tronprint do
   end
 
   describe '.brighter_planet_key' do
-    it 'should return the key defined in ENV by default' do
-      Tronprint.brighter_planet_key = nil
-      ENV['TRONPRINT_API_KEY'] = 'abcc1234'
-      Tronprint.brighter_planet_key.should == 'abcc1234'
-    end
-    it 'should return the key defined in the configuration by default if no ENV is given' do
-      Tronprint.brighter_planet_key = nil
-      ENV['TRONPRINT_API_KEY'] = nil
+    it 'should return the brighter_planet_key config option' do
+      Tronprint.instance_variable_set :@brighter_planet_key, nil
       Tronprint.stub!(:config).and_return({ :brighter_planet_key => 'aaa' })
       Tronprint.brighter_planet_key.should == 'aaa'
     end
@@ -82,9 +76,25 @@ describe Tronprint do
   end
 
   describe '.default_config' do
+    before :each do
+      Tronprint.instance_variable_set :@default_config, nil
+    end
+    after :each do
+      ENV['TRONPRINT_API_KEY'] = nil
+      ENV['MONGOHQ_URL'] = nil
+    end
     it 'should return a default configuration' do
       Tronprint.default_config.should be_an_instance_of(Hash)
     end
+    it 'should set the brighter_planet_key if ENV["TRONPRINT_API_KEY"] is set' do
+      ENV['TRONPRINT_API_KEY'] = 'abc123'
+      Tronprint.default_config[:brighter_planet_key].should == 'abc123'
+    end
+    it 'should use MongoHQ if ENV["MONGOHQ_URL"] is set' do
+      ENV['MONGOHQ_URL'] = 'mongodb://foo.com/bar'
+      Tronprint.default_config[:aggregator_options][:adapter].should == :mongodb
+      Tronprint.default_config[:aggregator_options][:url].should == 'mongodb://foo.com/bar'
+    end
   end
 
   describe '.total_duration' do

data/tronprint.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version = Tronprint::VERSION
 
   s.authors = ['Derek Kastner']
-  s.date = "2011-01-26"
+  s.date = "2011-02-03"
   s.description = %q{A gem for monitoring the carbon footprint of your ruby app}
   s.email = %q{dkastner@gmail.com}
   s.homepage = %q{http://github.com/brighterplanet/tronprint}

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - Derek Kastner
@@ -14,11 +14,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 -05:00
+date: 2011-02-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cucumber
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -28,10 +29,10 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: bueller
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -43,10 +44,10 @@ dependencies:
         - 2
         version: 0.0.2
   type: :development
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rake
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -56,10 +57,10 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -70,10 +71,10 @@ dependencies:
         - 0
         version: "2.0"
   type: :development
-  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: sandbox
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -83,10 +84,10 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: carbon
+  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -98,10 +99,10 @@ dependencies:
         - 3
         version: 1.0.3
   type: :runtime
-  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: i18n
+  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -111,10 +112,10 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: dkastner-moneta
+  prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -124,7 +125,6 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id008
 description: A gem for monitoring the carbon footprint of your ruby app
 email: dkastner@gmail.com
@@ -137,12 +137,12 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - lib/tronprint/aggregator.rb
-- lib/tronprint/rails/generator.rb
-- lib/tronprint/rails/tronprint_helper.rb
-- lib/tronprint/version.rb
 - lib/tronprint/application.rb
 - lib/tronprint/cpu_monitor.rb
+- lib/tronprint/rails/generator.rb
+- lib/tronprint/rails/tronprint_helper.rb
 - lib/tronprint/rails.rb
+- lib/tronprint/version.rb
 - lib/tronprint.rb
 - .document
 - .rspec
@@ -152,17 +152,17 @@ files:
 - autotest/discover.rb
 - LICENSE
 - README.rdoc
+- spec/spec.opts
+- spec/spec_helper.rb
+- spec/tronprint/aggregator_spec.rb
 - spec/tronprint/application_spec.rb
-- spec/tronprint/rails/tronprint_helper_spec.rb
 - spec/tronprint/computer_spec.rb
-- spec/tronprint/aggregator_spec.rb
 - spec/tronprint/cpu_monitor_spec.rb
+- spec/tronprint/rails/tronprint_helper_spec.rb
 - spec/tronprint_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
+- features/step_definitions/tronprint_steps.rb
 - features/support/env.rb
 - features/tronprint.feature
-- features/step_definitions/tronprint_steps.rb
 has_rdoc: true
 homepage: http://github.com/brighterplanet/tronprint
 licenses: []
@@ -177,7 +177,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 174585741
       segments: 
       - 0
       version: "0"
@@ -186,7 +185,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 174585741
       segments: 
       - 0
       version: "0"
@@ -198,14 +196,14 @@ signing_key:
 specification_version: 3
 summary: Ruby process carbon footprinter
 test_files: 
+- spec/spec.opts
+- spec/spec_helper.rb
+- spec/tronprint/aggregator_spec.rb
 - spec/tronprint/application_spec.rb
-- spec/tronprint/rails/tronprint_helper_spec.rb
 - spec/tronprint/computer_spec.rb
-- spec/tronprint/aggregator_spec.rb
 - spec/tronprint/cpu_monitor_spec.rb
+- spec/tronprint/rails/tronprint_helper_spec.rb
 - spec/tronprint_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
+- features/step_definitions/tronprint_steps.rb
 - features/support/env.rb
 - features/tronprint.feature
-- features/step_definitions/tronprint_steps.rb