tronprint 1.0.5 → 1.1.0

data/lib/tronprint/version.rb

@@ -1,3 +1,3 @@
 module Tronprint
-  VERSION = "1.0.5"
+  VERSION = "1.1.0"
 end

data/lib/tronprint.rb

@@ -32,7 +32,19 @@ module Tronprint
 
   # Options to send the aggregator. See Tronprint::Aggregator.new
   def aggregator_options
-    @aggregator_options ||= config[:aggregator_options]
+    if @aggregator_options.nil?
+      @aggregator_options = config[:aggregator_options]
+      @aggregator_options = @aggregator_options[env] if env && @aggregator_options[env]
+    end
+    @aggregator_options
+  end
+
+  def env
+    @env ||= if defined?(Rails)
+      Rails.env.to_sym
+    elsif ENV['RACK_ENV']
+      ENV['RACK_ENV'].to_sym
+    end
   end
 
   # The zip code of the server's hosting location. This affects 

data/spec/tronprint_spec.rb

@@ -1,11 +1,13 @@
 require 'spec_helper'
 
+class Rails
+  def self.env
+    'development'
+  end
+end
+
 describe Tronprint do
   let(:mock_cpu) { mock Tronprint::CPUMonitor, :total_recorded_cpu_time => 27.2 }
-  
-  before do
-    Tronprint.aggregator_options[:adapter] = :memory
-  end
 
   describe '.run' do
     it 'starts up each monitor' do
@@ -86,4 +88,44 @@ describe Tronprint do
       Tronprint.default_config[:aggregator_options][:uri].should == 'mongodb://foo.com/bar'
     end
   end
+
+  describe '.aggregator_options' do
+    before :each do
+      ENV['MONGOHQ_URL'] = nil
+      Tronprint.config = nil
+      Tronprint.instance_variable_set :@aggregator_options, nil
+    end
+    it 'loads default aggregator options' do
+      Tronprint.aggregator_options.should == Tronprint.default_config[:aggregator_options]
+    end
+    it 'loads custom aggregator options' do
+      Tronprint.config = {
+        :aggregator_options => { :uri => 'foo' }
+      }
+      Tronprint.aggregator_options[:uri].should == 'foo'
+    end
+    it 'loads options for the current Rails environment' do
+      Tronprint.config = {
+        :aggregator_options => { 
+          :production => {
+            :uri => 'production_uri'
+          },
+          :development => {
+            :uri => 'development_uri'
+          }
+        }
+      }
+      Tronprint.aggregator_options[:uri].should == 'development_uri'
+    end
+    it 'loads default configs if one environment is configured, but current is not' do
+      Tronprint.config = {
+        :aggregator_options => { 
+          :production => {
+            :uri => 'production_uri'
+          }
+        }
+      }
+      Tronprint.aggregator_options[:uri].should be_nil
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tronprint
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-06-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &2152857780 !ruby/object:Gem::Requirement
+  requirement: &2154082440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *2152857780
+  version_requirements: *2154082440
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2152857020 !ruby/object:Gem::Requirement
+  requirement: &2154081940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *2152857020
+  version_requirements: *2154081940
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2152855820 !ruby/object:Gem::Requirement
+  requirement: &2154081560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152855820
+  version_requirements: *2154081560
 - !ruby/object:Gem::Dependency
   name: bueller
-  requirement: &2152854640 !ruby/object:Gem::Requirement
+  requirement: &2154081020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.0.2
   type: :development
   prerelease: false
-  version_requirements: *2152854640
+  version_requirements: *2154081020
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152853960 !ruby/object:Gem::Requirement
+  requirement: &2154080600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152853960
+  version_requirements: *2154080600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152852440 !ruby/object:Gem::Requirement
+  requirement: &2154080060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *2152852440
+  version_requirements: *2154080060
 - !ruby/object:Gem::Dependency
   name: sandbox
-  requirement: &2152851480 !ruby/object:Gem::Requirement
+  requirement: &2154079640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152851480
+  version_requirements: *2154079640
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2152850980 !ruby/object:Gem::Requirement
+  requirement: &2154079180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152850980
+  version_requirements: *2154079180
 - !ruby/object:Gem::Dependency
   name: carbon
-  requirement: &2152850300 !ruby/object:Gem::Requirement
+  requirement: &2154078680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152850300
+  version_requirements: *2154078680
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2152849680 !ruby/object:Gem::Requirement
+  requirement: &2154078260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152849680
+  version_requirements: *2154078260
 - !ruby/object:Gem::Dependency
   name: dkastner-moneta
-  requirement: &2152848880 !ruby/object:Gem::Requirement
+  requirement: &2154077720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +131,7 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152848880
+  version_requirements: *2154077720
 description: A gem for monitoring the carbon footprint of your ruby app
 email: dkastner@gmail.com
 executables: []
@@ -188,7 +188,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3590681420513063003
+      hash: 3089760162619129351
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -197,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3590681420513063003
+      hash: 3089760162619129351
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.5