timberline 0.2.1 → 0.3.0

data/lib/timberline/config.rb

@@ -5,19 +5,17 @@ class Timberline
     def initialize
       if defined? TIMBERLINE_YAML
         if File.exists?(TIMBERLINE_YAML)
-          load_from_yaml(TIMBERLINE_YAML)
+          yaml = YAML.load_file(TIMBERLINE_YAML)
+          load_from_yaml(yaml)
         else
           raise "Specified Timberline config file #{TIMBERLINE_YAML} is not present."
         end
-      elsif defined? RAILS_ROOT
-        config_file = File.join(RAILS_ROOT, 'config', 'timberline.yaml')
-        if File.exists?(config_file)
-          load_from_yaml(config_file)
-        end
       elsif defined? Rails.root
         config_file = File.join(Rails.root, 'config', 'timberline.yaml')
         if File.exists?(config_file)
-          load_from_yaml(config_file)
+          configs = YAML.load_file(config_file)
+          config = configs[Rails.env]
+          load_from_yaml(config)
         end
       end
 
@@ -37,8 +35,8 @@ class Timberline
       config
     end
 
-    def load_from_yaml(filename)
-      yaml_config = YAML.load_file(filename)
+    def load_from_yaml(yaml_config)
+      raise "Missing yaml configs!" if yaml_config.nil?
       ["database","host","port","timeout","password","logger","namespace"].each do |setting|
         self.instance_variable_set("@#{setting}", yaml_config[setting])
       end

data/lib/timberline/version.rb

@@ -1,3 +1,3 @@
 class Timberline
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/test/fake_rails/config/timberline.yaml

@@ -1,6 +1,14 @@
-host: localhost
-port: 12345
-timeout: 10
-password: foo
-database: 3
-namespace: treecurve
+development:
+  host: localhost
+  port: 12345
+  timeout: 10
+  password: foo
+  database: 3
+  namespace: treecurve
+production:
+  host: redis.myawesomeproduct.com
+  port: 56789
+  timeout: 10
+  password: foo
+  database: 3
+  namespace: myawesomeproduct

data/test/test_helper.rb

@@ -1,4 +1,5 @@
 require 'test/unit'
+require 'ostruct'
 
 require 'nutrasuite'
 

data/test/unit/config_test.rb

@@ -30,7 +30,9 @@ class ConfigTest < Test::Unit::TestCase
     it "reads configuration from a YAML config file" do
       base_dir = File.dirname(File.path(__FILE__))
       yaml_file = File.join(base_dir, "..", "test_config.yaml")
-      @config.load_from_yaml(yaml_file)
+      config = YAML.load_file(yaml_file)
+
+      @config.load_from_yaml(config)
       assert_equal "localhost", @config.host
       assert_equal 12345, @config.port
       assert_equal 10, @config.timeout
@@ -42,12 +44,12 @@ class ConfigTest < Test::Unit::TestCase
 
   a "Config object in a Rails app without a config file" do
     before do
-      Object::RAILS_ROOT = File.join(File.dirname(File.path(__FILE__)), "..", "gibberish")
+      Object::Rails = OpenStruct.new(:root => File.join(File.dirname(File.path(__FILE__)), "..", "gibberish"), :env => "development")
       @config = Timberline::Config.new
     end
 
     after do
-      Object.send(:remove_const, :RAILS_ROOT)
+      Object.send(:remove_const, :Rails)
     end
 
     it "loads successfully without any configs." do
@@ -64,12 +66,12 @@ class ConfigTest < Test::Unit::TestCase
 
   a "Config object in a Rails app with a config file" do
     before do
-      Object::RAILS_ROOT = File.join(File.dirname(File.path(__FILE__)), "..", "fake_rails")
+      Object::Rails = OpenStruct.new(:root => File.join(File.dirname(File.path(__FILE__)), "..", "fake_rails"), :env => "development")
       @config = Timberline::Config.new
     end
 
     after do
-      Object.send(:remove_const, :RAILS_ROOT)
+      Object.send(:remove_const, :Rails)
     end
 
     it "loads the config/timberline.yaml file" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timberline
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-25 00:00:00.000000000 Z
+date: 2012-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70170052225180 !ruby/object:Gem::Requirement
+  requirement: &70151341609740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70170052225180
+  version_requirements: *70151341609740
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70170052221160 !ruby/object:Gem::Requirement
+  requirement: &70151341608540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70170052221160
+  version_requirements: *70151341608540
 - !ruby/object:Gem::Dependency
   name: redis-expiring-set
-  requirement: &70170052235160 !ruby/object:Gem::Requirement
+  requirement: &70151341607980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70170052235160
+  version_requirements: *70151341607980
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70170052233420 !ruby/object:Gem::Requirement
+  requirement: &70151341607400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70170052233420
+  version_requirements: *70151341607400
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &70170052228980 !ruby/object:Gem::Requirement
+  requirement: &70151341606860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70170052228980
+  version_requirements: *70151341606860
 - !ruby/object:Gem::Dependency
   name: nutrasuite
-  requirement: &70170052243880 !ruby/object:Gem::Requirement
+  requirement: &70151341606340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170052243880
+  version_requirements: *70151341606340
 description: Timberline is a simple and extensible queuing system built in Ruby and
   backed by Redis. It makes as few assumptions as possible about how you want to interact
   with your queues while also allowing for some functionality that should be universally