fixed the last merging bugs, added a test

lib/workling/starling/client.rb

@@ -8,7 +8,8 @@ class Client
 
       def initialize
         @starling_url = Workling::Starling.config[:listens_on]
-        @connection = ::MemCache.new(self.starling_url, Workling::Starling.config[:memcache_options])
+        options = [self.starling_url, Workling::Starling.config[:memcache_options]].compact
+        @connection = ::MemCache.new(*options)
       end
 
       def method_missing(method, *args)

lib/workling/starling/poller.rb

@@ -21,7 +21,7 @@ def logger
       end
 
       def listen
-
+                
         # Allow concurrency for our tasks
         ActiveRecord::Base.allow_concurrency = true
 

script/listen.rb

@@ -10,15 +10,15 @@
 
 ActiveRecord::Base.logger = Workling::Base.logger
 ActionController::Base.logger = Workling::Base.logger
-RAILS_DEFAULT_LOGGER = Workling::Base.logger
 
-client = Workling::Starling::Poller.new(Workling::Starling::Routing::ClassAndMethodRouting.new)
+poller = Workling::Starling::Poller.new(Workling::Starling::Routing::ClassAndMethodRouting.new)
 
 trap(:INT) { exit }
 
 begin
-  client.listen
+  poller.listen
 ensure
+  puts '** No Worklings found.' if Workling::Discovery.discovered.blank?
   puts '** Exiting'
 end
 

script/workling_starling_client

@@ -8,7 +8,7 @@ options = {
   :ARGV       => ARGV,
   :dir_mode   => :normal,
   :dir        => 'log',
-  :log_output => true
+  :log_output => true,
   :multiple   => false,
   :backtrace  => true,
   :monitor    => true

test/starling_client_test.rb

@@ -10,4 +10,12 @@
     client.connection.servers.first.port.should == 12345    
     client.connection.namespace.should.equal "myapp_development"
   end
+
+  specify "should load it's config correctly if no memcache options are given" do
+    Workling::Starling.send :class_variable_set, "@@config", nil
+    YAML.expects(:load).returns({ "test" => { "listens_on" => "localhost:12345" } })
+
+    client = Workling::Starling::Client.new
+    client.starling_url.should.equal "localhost:12345"
+  end  
 end