sidekick-client 0.1.0 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/sidekick/client/sidekick_client.rb

@@ -13,10 +13,23 @@ SIDEKICK_CONFIG = "/etc/vamp/sidekick.conf" unless defined?(SIDEKICK_CONFIG)
 #
 class SidekickClient
   attr_reader :logger
+  attr_reader :config
   
   def initialize(config_override={})
-    @config ||= YAML.load_file(SIDEKICK_CONFIG).with_indifferent_access.merge(config_override)
-    @logger = SidekickLogger.new(@config[:sidekick_log_file].to_s.gsub("sidekick.log","sidekick_client.log"))
+    if File.exists? SIDEKICK_CONFIG
+      @config ||= YAML.load_file(SIDEKICK_CONFIG).with_indifferent_access.merge(config_override)
+    else
+      @config ||= config_override.with_indifferent_access
+    end
+
+    if @config[:sidekick_log_file]
+      @logger = SidekickLogger.new(@config[:sidekick_log_file].to_s.gsub("sidekick.log","sidekick_client.log")) 
+    else
+      @logger = SidekickLogger.new(STDOUT)
+    end
+    
+    @config[:exchange] ||= "amq.direct"
+    
     @logger.info "Initialized SidekickClient with config #{@config.inspect}"
     @qconn = SidekickQueuePublisher.new(@config, @logger)   
   end    

data/sidekick-client.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sidekick-client}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["yan"]
-  s.date = %q{2010-01-21}
+  s.date = %q{2010-01-22}
   s.email = %q{yan@pritzker.ws}
   s.extra_rdoc_files = [
     "LICENSE",

data/test/test_sidekick-client.rb

@@ -2,6 +2,13 @@ require 'helper'
 
 class TestSidekickClient < Test::Unit::TestCase
   should "instantiate" do
-    SidekickClient.send_and_disconnect :ping
+    SidekickClient.new
+  end
+  
+  should "use config override" do
+    expected_config = {:foo => :bar}
+    
+    client = SidekickClient.new(expected_config)
+    assert_equal :bar, client.config[:foo]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sidekick-client
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - yan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-21 00:00:00 -08:00
+date: 2010-01-22 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency