timberline 0.2.0 → 0.2.1

data/lib/timberline/config.rb

@@ -14,6 +14,11 @@ class Timberline
         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)
+        end
       end
 
       # load defaults

data/lib/timberline/version.rb

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

data/test/test_helper.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
 
-require 'shoulda'
+require 'nutrasuite'
 
 # include the gem
 require 'timberline'

data/test/unit/{test_config.rb → config_test.rb}

@@ -1,12 +1,12 @@
 require 'test_helper'
 
 class ConfigTest < Test::Unit::TestCase
-  context "Without any preset YAML configs" do
-    setup do
+  a "Config object without any preset YAML configs" do
+    before do
       @config = Timberline::Config.new
     end
 
-    should "build a proper config hash for Redis" do
+    it "builds a proper config hash for Redis" do
       @logger = Logger.new STDERR
 
       @config.host = "localhost"
@@ -27,7 +27,7 @@ class ConfigTest < Test::Unit::TestCase
 
     end
 
-    should "reads configuration from a YAML config file" do
+    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)
@@ -40,17 +40,17 @@ class ConfigTest < Test::Unit::TestCase
     end
   end
 
-  context "when in a Rails app without a config file" do
-    setup do
+  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")
       @config = Timberline::Config.new
     end
 
-    teardown do
+    after do
       Object.send(:remove_const, :RAILS_ROOT)
     end
 
-    should "load successfully without any configs." do
+    it "loads successfully without any configs." do
       ["database","host","port","timeout","password","logger"].each do |setting|
         assert_equal nil, @config.instance_variable_get("@#{setting}")
       end
@@ -62,17 +62,17 @@ class ConfigTest < Test::Unit::TestCase
     end
   end
 
-  context "when in a Rails app with a config file" do
-    setup do
+  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")
       @config = Timberline::Config.new
     end
 
-    teardown do
+    after do
       Object.send(:remove_const, :RAILS_ROOT)
     end
 
-    should "load the config/timberline.yaml file" do
+    it "loads the config/timberline.yaml file" do
       assert_equal "localhost", @config.host
       assert_equal 12345, @config.port
       assert_equal 10, @config.timeout
@@ -82,17 +82,17 @@ class ConfigTest < Test::Unit::TestCase
     end
   end
 
-  context "when TIMBERLINE_YAML is defined" do
-    setup do
+  a "Config object when TIMBERLINE_YAML is defined" do
+    before do
       Object::TIMBERLINE_YAML = File.join(File.dirname(File.path(__FILE__)), "..", "test_config.yaml")
       @config = Timberline::Config.new
     end
 
-    teardown do
+    after do
       Object.send(:remove_const, :TIMBERLINE_YAML)
     end
 
-    should "load the specified yaml file" do
+    it "loads the specified yaml file" do
       assert_equal "localhost", @config.host
       assert_equal 12345, @config.port
       assert_equal 10, @config.timeout
@@ -102,16 +102,16 @@ class ConfigTest < Test::Unit::TestCase
     end
   end
 
-  context "when TIMBERLINE_YAML is defined, but doesn't exist" do
-    setup do
+  a "Config object when TIMBERLINE_YAML is defined, but doesn't exist" do
+    before do
       Object::TIMBERLINE_YAML = File.join(File.dirname(File.path(__FILE__)), "..", "fake_config.yaml")
     end
 
-    teardown do
+    after do
       Object.send(:remove_const, :TIMBERLINE_YAML)
     end
 
-    should "raise an exception" do
+    it "raises an exception" do
       assert_raises RuntimeError do 
         @config = Timberline::Config.new
       end

data/test/unit/{test_envelope.rb → envelope_test.rb}

@@ -3,51 +3,51 @@ require 'date'
 
 class EnvelopeTest < Test::Unit::TestCase
 
-  context "newly instantiated" do
-    setup do
+  a "newly instantiated Envelope object" do
+    before do
       @envelope = Timberline::Envelope.new
     end
 
-    should "raises a MissingContentException when to_s is called because the contents are nil" do
+    it "raises a MissingContentException when to_s is called because the contents are nil" do
       assert_raises Timberline::MissingContentException do
         @envelope.to_s
       end
     end
 
-    should "has an empty hash for metadata" do
+    it "has an empty hash for metadata" do
       assert_equal({}, @envelope.metadata)
     end
 
-    should "allows for the reading of attributes via method_missing magic" do
+    it "allows for the reading of attributes via method_missing magic" do
       @envelope.metadata["original_queue"] = "test_queue"
       assert_equal "test_queue", @envelope.original_queue
     end
 
-    should "allows for the setting of attributes via method_missing magic" do
+    it "allows for the setting of attributes via method_missing magic" do
       @envelope.original_queue = "test_queue"
       assert_equal "test_queue", @envelope.metadata["original_queue"]
     end
   end
 
-  context "with contents" do
-    setup do
+  an "Envelope object with contents" do
+    before do
       @envelope = Timberline::Envelope.new
       @envelope.contents = "Test data"
     end
 
-    should "returns a JSON string when to_s is called" do
+    it "returns a JSON string when to_s is called" do
       json_string = @envelope.to_s
       json_data = JSON.parse(json_string)
       assert_equal "Test data", json_data["contents"]
     end
 
-    should "only includes a 'contents' parameter by default" do
+    it "only includes a 'contents' parameter by default" do
       json_string = @envelope.to_s
       json_data = JSON.parse(json_string)
       assert_equal 1, json_data.keys.size
     end
 
-    should "also includes metadata, if provided" do
+    it "also includes metadata, if provided" do
       time = DateTime.now
       time_s = DateTime.now.to_s
       @envelope.first_posted = time
@@ -59,7 +59,7 @@ class EnvelopeTest < Test::Unit::TestCase
       assert_equal time_s, json_data["first_posted"]
     end
 
-    should "parses itself back correctly using from_json" do
+    it "parses itself back correctly using from_json" do
       json_string = @envelope.to_s
       new_envelope = Timberline::Envelope.from_json(json_string)
       assert_equal @envelope.contents, new_envelope.contents

data/test/unit/{test_queue.rb → queue_test.rb}

@@ -1,51 +1,51 @@
 require 'test_helper'
 
 class QueueTest < Test::Unit::TestCase
-  context "newly instantiated" do
-    setup do
+  a "newly instantiated Queue" do
+    before do
       clear_test_db
       @queue = Timberline::Queue.new("test_queue")
     end
 
-    should "saves the passed-in string as its queue name" do
+    it "saves the passed-in string as its queue name" do
       assert_equal "test_queue", @queue.queue_name
     end
 
-    should "saves its existence in timberline_queue_names" do
+    it "saves its existence in timberline_queue_names" do
       assert_equal true, Timberline.redis.sismember("timberline_queue_names", "test_queue")
     end
 
-    should "has a length of 0" do
+    it "has a length of 0" do
       assert_equal 0, @queue.length
     end
 
-    should "starts in an unpaused state" do
+    it "starts in an unpaused state" do
       assert_equal false, @queue.paused?
     end
 
-    should "allows itself to be paused and unpaused" do
+    it "allows itself to be paused and unpaused" do
       @queue.pause
       assert_equal true, @queue.paused?
       @queue.unpause
       assert_equal false, @queue.paused?
     end
 
-    should "has a default read_timeout of 0" do
+    it "has a default read_timeout of 0" do
       assert_equal 0, @queue.read_timeout
     end
 
-    should "responds nil to a pop request after the read_timeout occurs" do
+    it "responds nil to a pop request after the read_timeout occurs" do
       # Let's set the read_timeout to 1 in order for this test to return
       @queue.instance_variable_set("@read_timeout", 1)
       assert_equal nil, @queue.pop
     end
 
-    should "puts an item on the queue when that item is pushed" do
+    it "puts an item on the queue when that item is pushed" do
       test_item = "Test Queue Item"
       assert_equal 1, @queue.push(test_item)
     end
 
-    should "wraps an item in an envelope when that item is pushed" do
+    it "wraps an item in an envelope when that item is pushed" do
       test_item = "Test Queue Item"
       assert_equal 1, @queue.push(test_item)
       data = @queue.pop
@@ -53,7 +53,7 @@ class QueueTest < Test::Unit::TestCase
       assert_equal test_item, data.contents
     end
 
-    should "doesn't wrap an envelope that gets pushed in another envelope" do
+    it "doesn't wrap an envelope that gets pushed in another envelope" do
       test_item = "Test Queue Item"
       env = Timberline::Envelope.new
       env.contents = test_item
@@ -63,7 +63,7 @@ class QueueTest < Test::Unit::TestCase
       assert_equal test_item, data.contents
     end
 
-    should "removes everything associated with the queue when delete! is called" do
+    it "removes everything associated with the queue when delete! is called" do
       test_item = "Test Queue Item"
       assert_equal 1, @queue.push(test_item)
       Timberline.redis[@queue.attr("test")] = "test"
@@ -78,7 +78,7 @@ class QueueTest < Test::Unit::TestCase
       assert_equal false, Timberline.redis.sismember("timberline_queue_names","test_queue")
     end
 
-    should "uses any passed-in metadata to push when building the envelope" do
+    it "uses any passed-in metadata to push when building the envelope" do
       @queue.push("Howdy kids.", { :special_notes => "Super-awesome."})
       assert_equal 1, @queue.length
       data = @queue.pop
@@ -88,23 +88,23 @@ class QueueTest < Test::Unit::TestCase
 
   end
 
-  context "with one item" do
-    setup do
+  a "Queue with one item" do
+    before do
       clear_test_db
       @test_item = "Test Queue Item"
       @queue = Timberline::Queue.new("test_queue")
       @queue.push(@test_item)
     end
 
-    should "has a length of 1" do
+    it "has a length of 1" do
       assert_equal 1, @queue.length
     end
 
-    should "responds to pop with the one item" do
+    it "responds to pop with the one item" do
       assert_equal @test_item, @queue.pop.contents
     end
 
-    should "responds nil to a second pop" do
+    it "responds nil to a second pop" do
       # Let's set the read_timeout to 1 in order for this test to return
       @queue.instance_variable_set("@read_timeout", 1)
       assert_equal @test_item, @queue.pop.contents

data/test/unit/{test_timberline.rb → timberline_test.rb}

@@ -1,59 +1,59 @@
 require 'test_helper'
 
 class TimberlineTest < Test::Unit::TestCase
-  context "Freshly set up" do
-    setup do
+  a "Freshly set up Timberline" do
+    before do
       reset_timberline
     end
 
-    should "creates a new queue when asked if it doesn't exist" do
+    it "creates a new queue when asked if it doesn't exist" do
       queue = Timberline.queue("test_queue")
       assert_kind_of Timberline::Queue, queue
       assert_equal queue, Timberline.instance_variable_get("@queue_list")["test_queue"]
     end
 
-    should "doesn't create a new queue if a queue by the same name already exists" do
+    it "doesn't create a new queue if a queue by the same name already exists" do
       queue = Timberline.queue("test_queue")
       new_queue = Timberline.queue("test_queue")
       assert_equal queue, new_queue
     end
 
-    should "creates a new queue as necessary when 'push' is called and pushes the item" do
+    it "creates a new queue as necessary when 'push' is called and pushes the item" do
       Timberline.push("test_queue", "Howdy kids.")
       queue = Timberline.queue("test_queue")
       assert_equal 1, queue.length
       assert_equal "Howdy kids.", queue.pop.contents
     end
 
-    should "logs the existence of the queue so that other managers can see it" do
+    it "logs the existence of the queue so that other managers can see it" do
       queue = Timberline.queue("test_queue")
       assert_equal 1, Timberline.all_queues.size
       assert_equal "test_queue", Timberline.all_queues.first.queue_name
     end
 
-    should "saves a passed-in redis namespace" do
+    it "saves a passed-in redis namespace" do
       redis = Redis.new
       redisns = Redis::Namespace.new("timberline", redis)
       Timberline.redis = redisns
       assert_equal redisns, Timberline.redis
     end
 
-    should "Converts a standard redis server into a namespace" do
+    it "Converts a standard redis server into a namespace" do
       redis = Redis.new
       Timberline.redis = redis
       assert_equal Redis::Namespace, Timberline.redis.class
       assert_equal redis, Timberline.redis.instance_variable_get("@redis")
     end
 
-    should "generates a redis namespace on request if one isn't present" do
+    it "generates a redis namespace on request if one isn't present" do
       assert_equal Redis::Namespace, Timberline.redis.class
     end
 
-    should "uses a default namespace of 'timberline'" do
+    it "uses a default namespace of 'timberline'" do
       assert_equal "timberline", Timberline.redis.namespace
     end
 
-    should "can be configured" do
+    it "can be configured" do
       Timberline.config do |c|
         c.database = 3 
       end
@@ -61,7 +61,7 @@ class TimberlineTest < Test::Unit::TestCase
       assert_equal 3, Timberline.instance_variable_get("@config").database
     end
 
-    should "uses a pre-defined namespace name if configured" do
+    it "uses a pre-defined namespace name if configured" do
       Timberline.config do |c|
         c.namespace = "skyline"
       end
@@ -69,7 +69,7 @@ class TimberlineTest < Test::Unit::TestCase
       assert_equal "skyline", Timberline.redis.namespace
     end
 
-    should "properly configures Redis" do
+    it "properly configures Redis" do
       @logger = Logger.new STDERR
       Timberline.config do |c|
         c.host = "localhost"
@@ -87,7 +87,7 @@ class TimberlineTest < Test::Unit::TestCase
 
     end
 
-    should "allows you to retry a job that has failed" do
+    it "allows you to retry a job that has failed" do
       Timberline.push("test_queue", "Howdy kids.")
       queue = Timberline.queue("test_queue")
       data = queue.pop
@@ -105,7 +105,7 @@ class TimberlineTest < Test::Unit::TestCase
       assert_kind_of Time, Time.at(data.last_tried_at)
     end
 
-    should "will continue retrying until we pass the max retries (defaults to 5)" do
+    it "will continue retrying until we pass the max retries (defaults to 5)" do
       Timberline.push("test_queue", "Howdy kids.")
       queue = Timberline.queue("test_queue")
       data = queue.pop
@@ -126,7 +126,7 @@ class TimberlineTest < Test::Unit::TestCase
       assert_equal 1, Timberline.error_queue.length
     end
 
-    should "will allow you to directly error out a job" do
+    it "will allow you to directly error out a job" do
       Timberline.push("test_queue", "Howdy kids.")
       queue = Timberline.queue("test_queue")
       data = queue.pop

data/timberline.gemspec

@@ -27,5 +27,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "trollop"
   s.add_runtime_dependency "daemons"
 
-  s.add_development_dependency "shoulda"
+  s.add_development_dependency "nutrasuite"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timberline
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-14 00:00:00.000000000 Z
+date: 2012-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70354056089500 !ruby/object:Gem::Requirement
+  requirement: &70170052225180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70354056089500
+  version_requirements: *70170052225180
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70354056077200 !ruby/object:Gem::Requirement
+  requirement: &70170052221160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70354056077200
+  version_requirements: *70170052221160
 - !ruby/object:Gem::Dependency
   name: redis-expiring-set
-  requirement: &70354056075820 !ruby/object:Gem::Requirement
+  requirement: &70170052235160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70354056075820
+  version_requirements: *70170052235160
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70354056073880 !ruby/object:Gem::Requirement
+  requirement: &70170052233420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70354056073880
+  version_requirements: *70170052233420
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &70354056071600 !ruby/object:Gem::Requirement
+  requirement: &70170052228980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70354056071600
+  version_requirements: *70170052228980
 - !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: &70354056070520 !ruby/object:Gem::Requirement
+  name: nutrasuite
+  requirement: &70170052243880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70354056070520
+  version_requirements: *70170052243880
 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
@@ -102,10 +102,10 @@ files:
 - test/partial_minispec.rb
 - test/test_config.yaml
 - test/test_helper.rb
-- test/unit/test_config.rb
-- test/unit/test_envelope.rb
-- test/unit/test_queue.rb
-- test/unit/test_timberline.rb
+- test/unit/config_test.rb
+- test/unit/envelope_test.rb
+- test/unit/queue_test.rb
+- test/unit/timberline_test.rb
 - timberline.gemspec
 homepage: http://github.com/duwanis/timberline
 licenses: []
@@ -137,7 +137,8 @@ test_files:
 - test/partial_minispec.rb
 - test/test_config.yaml
 - test/test_helper.rb
-- test/unit/test_config.rb
-- test/unit/test_envelope.rb
-- test/unit/test_queue.rb
-- test/unit/test_timberline.rb
+- test/unit/config_test.rb
+- test/unit/envelope_test.rb
+- test/unit/queue_test.rb
+- test/unit/timberline_test.rb
+has_rdoc: