daikon 0.7.6 → 0.8.0

data/README.rdoc

@@ -1,10 +1,29 @@
 = daikon
 
-Client gem for http://radishapp.com.
+Dig deep into Redis. This is a client daemon for http://radishapp.com.
 
-Borrowed a bunch of code from https://github.com/alexmchale/try.redis, thanks!
+== Setup
+
+Hook up Radish to your Redis instance like so, this will start a daemon up in
+your current directory:
+
+    daikon start -- -k 1234567890
+
+If you want to just test it out and run in the foreground:
+
+    daikon run -- -k 1234567890
+
+Your redis is on a different port, box, or has a password? No problem, use the
+-u option that takes a standard Redis url:
+
+    daikon start -- -k 1234567890 -u redis://4.2.2.2:9999
+
+== Issues
+
+If you need to run more than one Daikon instance to monitor more than one
+Redis, the current workaround is to `cd` into different directories and start
+a Daikon for each instance. Patches welcome for this!
 
 == Copyright
 
-Copyright (c) 2010 Nick Quaranto. See LICENSE.txt for
-further details.
+Copyright (c) 2010-2011 thoughtbot, Nick Quaranto. See LICENSE.txt for further details.

data/daikon.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{daikon}
-  s.version = "0.7.6"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nick Quaranto"]
-  s.date = %q{2011-03-10}
+  s.date = %q{2011-03-17}
   s.default_executable = %q{daikon}
   s.description = %q{daikon, a radishapp.com client}
   s.email = %q{nick@quaran.to}
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
     "lib/daikon/client.rb",
     "lib/daikon/configuration.rb",
     "lib/daikon/daemon.rb",
+    "lib/daikon/daemons_hacks.rb",
     "lib/daikon/monitor.rb",
     "lib/daikon/redis_hacks.rb",
     "spec/client_spec.rb",

data/lib/daikon.rb

@@ -22,8 +22,10 @@ require 'daikon/configuration'
 require 'daikon/client'
 require 'daikon/daemon'
 require 'daikon/monitor'
+
+require 'daikon/daemons_hacks'
 require 'daikon/redis_hacks'
 
 module Daikon
-  VERSION = "0.7.6"
+  VERSION = "0.8.0"
 end

data/lib/daikon/client.rb

@@ -20,7 +20,7 @@ module Daikon
     end
 
     def connect
-      Redis.new(:host => config.redis_host, :port => config.redis_port)
+      Redis.connect(:url => config.redis_url)
     end
 
     def start_monitor

data/lib/daikon/configuration.rb

@@ -1,26 +1,49 @@
 module Daikon
   class Configuration
-    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://radish.heroku.com]
+    BLANK_KEY = "1234567890"
+    FLAGS     = ["-u",                   "-k",      "-s"]
+    OPTIONS   = ["redis_url",            "api_key", "server_prefix"]
+    DEFAULTS  = ["redis://0.0.0.0:6379", BLANK_KEY, "https://radish.heroku.com"]
 
     attr_accessor *OPTIONS
 
     def initialize(argv = [])
+      @argv = argv
+
+      validate_deprecated_options
+      parse
+      validate_api_key
+    end
+
+    private
+
+    def argv_matches?(regexp)
+      @argv.any? { |arg| arg =~ regexp }
+    end
+
+    def validate_deprecated_options
+      if argv_matches?(/\-h|\-p/)
+        abort "Please use '-u redis://127.0.0.1:6379' format instead to specify redis url"
+      end
+    end
+
+    def validate_api_key
+      if api_key == BLANK_KEY && argv_matches?(/start|run/)
+        abort "Must supply an api key to start the daemon.\nExample: daikon start #{FLAGS[2]} #{DEFAULTS[2]}"
+      end
+    end
+
+    def parse
       FLAGS.each_with_index do |flag, flag_index|
-        argv_index = argv.index(flag)
+        argv_index = @argv.index(flag)
         value = if argv_index
-                  argv[argv_index + 1]
+                  @argv[argv_index + 1]
                 else
                   DEFAULTS[flag_index]
                 end
 
         send "#{OPTIONS[flag_index]}=", value
       end
-
-      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
 end

data/lib/daikon/daemons_hacks.rb

@@ -0,0 +1,14 @@
+# More terrible overrides since the Daemons gem offers no way to override how
+# its output is formatted.
+module Daemons
+  class Controller
+    def print_usage_with_daikon_options
+      print_usage_without_daikon_options
+      puts "    -k 1234567890                    radishapp.com api key"
+      puts "    -u redis://0.0.0.0:6379          redis URL to monitor"
+    end
+
+    alias_method :print_usage_without_daikon_options, :print_usage
+    alias_method :print_usage, :print_usage_with_daikon_options
+  end
+end

data/spec/client_spec.rb

@@ -6,19 +6,20 @@ describe Daikon::Client, "setup" do
   let(:redis)  { 'redis instance' }
 
   before do
-    Redis.stubs(:new => redis)
+    Redis.stubs(:connect => redis)
     subject.stubs(:redis=)
   end
 
   context "with overrides" do
-    let(:config) { Daikon::Configuration.new(%w[-h 8.8.8.8 -p 1234]) }
+    let(:url)    { "redis://8.8.8.8:1234" }
+    let(:config) { Daikon::Configuration.new(["-u", url]) }
 
     before do
       subject.setup(config, logger)
     end
 
     it "sets redis to listen on the given port" do
-      Redis.should have_received(:new).with(:host => "8.8.8.8", :port => "1234").twice
+      Redis.should have_received(:connect).with(:url => url).twice
       subject.should have_received(:redis=).with(redis)
     end
   end
@@ -31,7 +32,7 @@ describe Daikon::Client, "setup" do
     end
 
     it "sets redis to listen on the given port" do
-      Redis.should have_received(:new).with(:host => "127.0.0.1", :port => "6379").twice
+      Redis.should have_received(:connect).with(:url => "redis://0.0.0.0:6379").twice
       subject.should have_received(:redis=).with(redis)
     end
   end
@@ -39,11 +40,15 @@ end
 
 describe Daikon::Client, "when server is down" do
   subject       { Daikon::Client.new }
+  let(:redis)   { stub("redis instance", :info => {}) }
+
   before do
-    subject.setup(Daikon::Configuration.new)
+    Redis.stubs(:connect => redis)
     http = stub("http", :reset => nil)
     http.stubs(:request).raises(Timeout::Error)
     subject.stubs(:http => http)
+
+    subject.setup(Daikon::Configuration.new)
   end
 
   it "does not commit suicide" do
@@ -55,10 +60,14 @@ end
 
 describe Daikon::Client, "when it returns bad json" do
   subject       { Daikon::Client.new }
+  let(:redis)   { stub("redis instance", :info => {}) }
+
   before do
-    subject.setup(Daikon::Configuration.new)
+    Redis.stubs(:connect => redis)
     http = stub("http", :request => Excon::Response.new(:body => "{'bad':'json}"), :reset => nil)
     subject.stubs(:http => http)
+
+    subject.setup(Daikon::Configuration.new)
   end
 
   it "does not commit suicide" do

data/spec/configuration_spec.rb

@@ -2,13 +2,11 @@ require 'spec_helper'
 
 describe Daikon::Configuration do
   subject     { Daikon::Configuration.new(flags) }
-  let(:flags) { %w[-h 4.2.2.2 -p 9001 -k deadbeef -s localhost:9337 -f 1337] }
+  let(:flags) { %w[-u redis://4.2.2.2:9001 -k deadbeef -s localhost:9337] }
 
   it "parses the given flags" do
-    subject.redis_host.should == "4.2.2.2"
-    subject.redis_port.should == "9001"
+    subject.redis_url.should == "redis://4.2.2.2:9001"
     subject.api_key.should == "deadbeef"
-    subject.field_id.should == "1337"
     subject.server_prefix == "localhost:9337"
   end
 end
@@ -17,10 +15,8 @@ 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.redis_url.should == "redis://0.0.0.0:6379"
     subject.api_key.should == "1234567890"
-    subject.field_id.should == "1"
     subject.server_prefix == "radish.heroku.com"
   end
 end
@@ -44,13 +40,19 @@ describe Daikon::Configuration do
 end
 
 describe Daikon::Configuration do
-  subject     { Daikon::Configuration.new(flags) }
-  let(:flags) { %w[-p 9001 -k deadbeef] }
+  it "fails if -h option given" do
+    capture do
+      lambda {
+        Daikon::Configuration.new(%w[-h 8.8.8.8])
+      }.should raise_error(SystemExit)
+    end
+  end
 
-  it "can handle defaults and given options" do
-    subject.redis_port.should == "9001"
-    subject.api_key.should == "deadbeef"
-    subject.field_id.should == "1"
-    subject.server_prefix == "radish.heroku.com"
+  it "fails if -p option given" do
+    capture do
+      lambda {
+        Daikon::Configuration.new(%w[-p 6380])
+      }.should raise_error(SystemExit)
+    end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: daikon
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.6
+  version: 0.8.0
 platform: ruby
 authors: 
 - Nick Quaranto
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-10 00:00:00 -05:00
+date: 2011-03-17 00:00:00 -06:00
 default_executable: daikon
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -134,6 +134,7 @@ files:
 - lib/daikon/client.rb
 - lib/daikon/configuration.rb
 - lib/daikon/daemon.rb
+- lib/daikon/daemons_hacks.rb
 - lib/daikon/monitor.rb
 - lib/daikon/redis_hacks.rb
 - spec/client_spec.rb