daikon 0.2.0 → 0.3.0

data/bin/daikon

@@ -2,4 +2,4 @@
 
 require File.join(File.dirname(__FILE__), '..', 'lib', 'daikon')
 
-Daikon::Daemon.start
+Daikon::Daemon.start(ARGV)

data/daikon.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{daikon}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nick Quaranto"]
-  s.date = %q{2010-11-23}
+  s.date = %q{2010-11-29}
   s.default_executable = %q{daikon}
   s.description = %q{daikon, a radishapp.com client}
   s.email = %q{nick@quaran.to}
@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
     "lib/daikon/namespace_tools.rb",
     "spec/client_spec.rb",
     "spec/configuration_spec.rb",
+    "spec/daemon_spec.rb",
     "spec/daikon_spec.rb",
     "spec/spec_helper.rb"
   ]
@@ -49,6 +50,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/client_spec.rb",
     "spec/configuration_spec.rb",
+    "spec/daemon_spec.rb",
     "spec/daikon_spec.rb",
     "spec/spec_helper.rb"
   ]

data/lib/daikon.rb

@@ -24,5 +24,5 @@ require 'daikon/client'
 require 'daikon/daemon'
 
 module Daikon
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/daikon/client.rb

@@ -17,7 +17,7 @@ module Daikon
     def setup(config, logger = nil)
       self.config = config
       self.logger = logger
-      self.redis  = Redis.new(:port => config.redis_port)
+      self.redis  = Redis.new(:host => config.redis_host, :port => config.redis_port)
       self.http   = Net::HTTP::Persistent.new
       http.headers['Authorization'] = config.api_key
 

data/lib/daikon/configuration.rb

@@ -1,8 +1,8 @@
 module Daikon
   class Configuration
-    FLAGS    = %w[-p         -k         -f       -s]
-    OPTIONS  = %w[redis_port api_key    field_id server_prefix]
-    DEFAULTS = %w[6379       1234567890 1        https://radishapp.com]
+    FLAGS    = %w[-h         -p         -k         -f       -s]
+    OPTIONS  = %w[redis_host redis_port api_key    field_id server_prefix]
+    DEFAULTS = %w[127.0.0.1  6379       1234567890 1        https://radishapp.com]
 
     attr_accessor *OPTIONS
 
@@ -18,8 +18,8 @@ module Daikon
         send "#{OPTIONS[flag_index]}=", value
       end
 
-      if api_key == DEFAULTS[1] && argv.any? { |arg| arg =~ /start|run/ }
-        abort "Must supply an api key to start the daemon.\nExample: daikon start #{FLAGS[1]} #{DEFAULTS[1]}"
+      if api_key == DEFAULTS[2] && argv.any? { |arg| arg =~ /start|run/ }
+        abort "Must supply an api key to start the daemon.\nExample: daikon start #{FLAGS[2]} #{DEFAULTS[2]}"
       end
     end
   end

data/lib/daikon/daemon.rb

@@ -1,10 +1,15 @@
 module Daikon
   class Daemon
-    def self.start
-      config = Daikon::Configuration.new(ARGV)
+    def self.start(argv)
+      config = Daikon::Configuration.new(argv)
+
+      if argv.include?("-v") || argv.include?("--version")
+        puts "Daikon v#{VERSION}"
+        return
+      end
 
       Daemons.run_proc("daikon", :log_output => true, :backtrace => true) do
-        if ARGV.include?("run")
+        if argv.include?("run")
           logger = Logger.new(STDOUT)
         else
           logger = Logger.new("/tmp/radish.log")

data/spec/client_spec.rb

@@ -10,20 +10,20 @@ describe Daikon::Client, "setup" do
     subject.stubs(:redis=)
   end
 
-  context "with defaults" do
-    let(:config) { Daikon::Configuration.new(%w[-p 1234]) }
+  context "with overrides" do
+    let(:config) { Daikon::Configuration.new(%w[-h 8.8.8.8 -p 1234]) }
 
     before do
       subject.setup(config, logger)
     end
 
     it "sets redis to listen on the given port" do
-      Redis.should have_received(:new).with(:port => "1234")
+      Redis.should have_received(:new).with(:host => "8.8.8.8", :port => "1234")
       subject.should have_received(:redis=).with(redis)
     end
   end
 
-  context "with overrides" do
+  context "with defaults" do
     let(:config) { Daikon::Configuration.new([]) }
 
     before do
@@ -31,7 +31,7 @@ describe Daikon::Client, "setup" do
     end
 
     it "sets redis to listen on the given port" do
-      Redis.should have_received(:new).with(:port => "6379")
+      Redis.should have_received(:new).with(:host => "127.0.0.1", :port => "6379")
       subject.should have_received(:redis=).with(redis)
     end
   end

data/spec/configuration_spec.rb

@@ -2,9 +2,10 @@ require 'spec_helper'
 
 describe Daikon::Configuration do
   subject     { Daikon::Configuration.new(flags) }
-  let(:flags) { %w[-p 9001 -k deadbeef -s localhost:9337 -f 1337] }
+  let(:flags) { %w[-h 4.2.2.2 -p 9001 -k deadbeef -s localhost:9337 -f 1337] }
 
   it "parses the given flags" do
+    subject.redis_host.should == "4.2.2.2"
     subject.redis_port.should == "9001"
     subject.api_key.should == "deadbeef"
     subject.field_id.should == "1337"
@@ -16,6 +17,7 @@ describe Daikon::Configuration do
   subject { Daikon::Configuration.new(%w[-k 1234567890]) }
 
   it "uses the default keys" do
+    subject.redis_host.should == "127.0.0.1"
     subject.redis_port.should == "6379"
     subject.api_key.should == "1234567890"
     subject.field_id.should == "1"

data/spec/daemon_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe Daikon::Daemon do
+  %w[-v --version].each do |flag|
+    it "shows the daikon version with #{flag}" do
+      old_stdout = $stdout
+      $stdout = StringIO.new("")
+      Daikon::Daemon.start([flag])
+      $stdout.string.should include(Daikon::VERSION)
+      $stdout = old_stdout
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: daikon
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Nick Quaranto
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-23 00:00:00 -05:00
+date: 2010-11-29 00:00:00 -05:00
 default_executable: daikon
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -197,6 +197,7 @@ files:
 - lib/daikon/namespace_tools.rb
 - spec/client_spec.rb
 - spec/configuration_spec.rb
+- spec/daemon_spec.rb
 - spec/daikon_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -236,5 +237,6 @@ summary: daikon, a radishapp.com client
 test_files: 
 - spec/client_spec.rb
 - spec/configuration_spec.rb
+- spec/daemon_spec.rb
 - spec/daikon_spec.rb
 - spec/spec_helper.rb