tronprint 0.0.11 → 0.0.13

data/lib/tronprint/version.rb

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

data/lib/tronprint.rb

@@ -86,7 +86,7 @@ module Tronprint
 
   # The current configuration.
   def config
-    load_config || default_config
+    default_config.update load_config
   end
 
   def config=(val)
@@ -99,6 +99,7 @@ module Tronprint
     return @loaded_config unless @loaded_config.nil?
     path = File.expand_path('config/tronprint.yml', Dir.pwd)
     @loaded_config = YAML::load_file path if File.exist? path
+    @loaded_config ||= {}
   end
 
   # By default, the YAML adapter is used and aggregate statistics 
@@ -112,7 +113,7 @@ module Tronprint
     @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'],
+        :uri => ENV['MONGOHQ_URL'],
         :adapter => :mongodb
       }
     end

data/spec/tronprint_spec.rb

@@ -49,17 +49,19 @@ describe Tronprint do
 
   describe '.config' do
     it 'should return a configuration loaded from disk' do
-      Tronprint.stub!(:load_config).and_return nil
-      Tronprint.stub!(:default_config).and_return :foo => :bar
-      Tronprint.config.should == { :foo => :bar }
+      Tronprint.stub!(:load_config).and_return :foo => :bar
+      Tronprint.config.should include(:foo => :bar)
     end
     it 'should return a default configuration if no config file exists' do
-      Tronprint.stub!(:load_config).and_return :foo => :bar
-      Tronprint.config.should == { :foo => :bar }
+      Tronprint.stub!(:default_config).and_return :foo => :bar
+      Tronprint.config.should include(:foo => :bar)
     end
   end
 
   describe '.load_config' do
+    before :each do
+      Tronprint.instance_variable_set :@loaded_config, nil
+    end
     it 'should load a config file from cwd/config/tronprint.yml if it exists' do
       Dir.stub!(:pwd).and_return '/some/dir'
       File.stub!(:exist?).and_return true
@@ -71,7 +73,7 @@ describe Tronprint do
       Tronprint.instance_variable_set :@loaded_config, nil
       Dir.stub!(:pwd).and_return '/some/dir'
       File.stub!(:exist?).and_return false
-      Tronprint.load_config.should be_nil
+      Tronprint.load_config.should be_empty
     end
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - Derek Kastner
@@ -19,7 +19,6 @@ default_executable:
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cucumber
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -29,10 +28,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: 
@@ -44,10 +43,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: 
@@ -57,10 +56,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: 
@@ -71,10 +70,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: 
@@ -84,10 +83,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: 
@@ -99,10 +98,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: 
@@ -112,10 +111,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: 
@@ -125,6 +124,7 @@ 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
@@ -177,6 +177,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 4030675026006526045
       segments: 
       - 0
       version: "0"
@@ -185,6 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 4030675026006526045
       segments: 
       - 0
       version: "0"