schlep 0.1.0 → 0.2.0

data/lib/schlep.rb

@@ -2,11 +2,12 @@ require "schlep/version"
 
 require "json"
 require "redis"
+require "uri"
 
 module Schlep
   extend self
 
-  attr_writer :app, :hostname
+  attr_writer :app, :hostname, :redis_url
 
   def app
     @app ||= ""
@@ -37,11 +38,27 @@ module Schlep
   end
 
   def redis
-    @redis ||= Redis.new
+    @redis ||= Redis.new redis_options
+  end
+
+  def redis_options
+    return {} unless redis_url
+
+    parsed_url = URI::parse(redis_url)
+
+    {
+      :host     => parsed_url.host,
+      :port     => parsed_url.port,
+      :password => parsed_url.password
+    }
+  end
+
+  def redis_url
+    @redis_url ||= ENV["REDIS_URL"] or ENV["REDISTOGO_URL"]
   end
 
   def reset
-    %w[app hostname redis].each do |ivar|
+    %w[app hostname redis redis_url].each do |ivar|
       instance_variable_set "@#{ivar}", nil
     end
   end

data/lib/schlep/version.rb

@@ -1,3 +1,3 @@
 module Schlep
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/test/schlep_test.rb

@@ -5,6 +5,16 @@ rescue LoadError
 end
 
 class SchlepTest < Test::Unit::TestCase
+  def setup
+    Schlep.reset
+  end
+
+  def teardown
+    %w[REDIS_URL REDISTOGO_URL].each do |e|
+      ENV[e] = nil
+    end
+  end
+
   context "schlep" do
     should "be defined as a module" do
       assert_equal Module, Schlep.class
@@ -13,21 +23,25 @@ class SchlepTest < Test::Unit::TestCase
 
   context "configure" do
     should "be configurable with setters" do
-      Schlep.app      = "test_app_1"
-      Schlep.hostname = "test_hostname_1"
+      Schlep.app       = "test_app_1"
+      Schlep.hostname  = "test_hostname_1"
+      Schlep.redis_url = "redis://localhost:1234"
 
-      assert_equal "test_app_1",      Schlep.app,      "app"
-      assert_equal "test_hostname_1", Schlep.hostname, "hostname"
+      assert_equal "test_app_1",             Schlep.app,       "app"
+      assert_equal "test_hostname_1",        Schlep.hostname,  "hostname"
+      assert_equal "redis://localhost:1234", Schlep.redis_url, "redis_url"
     end
 
     should "be configurable with a block" do
       Schlep.configure do |config|
-        config.app      = "test_app_2"
-        config.hostname = "test_hostname_2"
+        config.app       = "test_app_2"
+        config.hostname  = "test_hostname_2"
+        config.redis_url = "redis://localhost:4321"
       end
 
-      assert_equal "test_app_2",      Schlep.app,      "app"
-      assert_equal "test_hostname_2", Schlep.hostname, "hostname"
+      assert_equal "test_app_2",             Schlep.app,       "app"
+      assert_equal "test_hostname_2",        Schlep.hostname,  "hostname"
+      assert_equal "redis://localhost:4321", Schlep.redis_url, "redis_url"
     end
   end
 
@@ -45,6 +59,45 @@ class SchlepTest < Test::Unit::TestCase
     end
   end
 
+  context "redis_url" do
+    should "connect locally by default" do
+      assert_equal "127.0.0.1", Schlep.redis.client.host
+      assert_equal 6379,        Schlep.redis.client.port
+    end
+
+    should "connect to a basic url" do
+      Schlep.redis_url = "redis://1.2.3.4:1234"
+
+      assert_equal "1.2.3.4", Schlep.redis.client.host
+      assert_equal 1234,      Schlep.redis.client.port
+      assert_nil              Schlep.redis.client.password
+    end
+
+    should "connect to a url with a username and password" do
+      Schlep.redis_url = "redis://redis:password@1.2.3.4:1234"
+
+      assert_equal "1.2.3.4",  Schlep.redis.client.host
+      assert_equal 1234,       Schlep.redis.client.port
+      assert_equal "password", Schlep.redis.client.password
+    end
+
+    should "detect the url from ENV[\"REDIS_URL\"]" do
+      ENV["REDIS_URL"] = "redis://redis:secret@4.3.2.1:4321"
+
+      assert_equal "4.3.2.1", Schlep.redis.client.host
+      assert_equal 4321,      Schlep.redis.client.port
+      assert_equal "secret",  Schlep.redis.client.password
+    end
+
+    should "detect the url from ENV[\"REDISTOGO_URL\"]" do
+      ENV["REDISTOGO_URL"] = "redis://redis:secret@4.3.2.1:4321"
+
+      assert_equal "4.3.2.1", Schlep.redis.client.host
+      assert_equal 4321,      Schlep.redis.client.port
+      assert_equal "secret",  Schlep.redis.client.password
+    end
+  end
+
   context "reset" do
     should "reset instance variables to nil" do
       Schlep.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schlep
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-12 00:00:00.000000000 Z
+date: 2011-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70138116747200 !ruby/object:Gem::Requirement
+  requirement: &70137973953740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70138116747200
+  version_requirements: *70137973953740
 - !ruby/object:Gem::Dependency
   name: guard-test
-  requirement: &70138116746760 !ruby/object:Gem::Requirement
+  requirement: &70137973953300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70138116746760
+  version_requirements: *70137973953300
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70138116746340 !ruby/object:Gem::Requirement
+  requirement: &70137973952880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70138116746340
+  version_requirements: *70137973952880
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70138116745900 !ruby/object:Gem::Requirement
+  requirement: &70137973952300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70138116745900
+  version_requirements: *70137973952300
 description: Ruby client for schlep. Schlep provides a simple interface for logging
   and broadcasting events.
 email: