daikon 0.1.1 → 0.2.0

data/daikon.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{daikon}
-  s.version = "0.1.1"
+  s.version = "0.2.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-21}
+  s.date = %q{2010-11-23}
   s.default_executable = %q{daikon}
   s.description = %q{daikon, a radishapp.com client}
   s.email = %q{nick@quaran.to}

data/lib/daikon.rb

@@ -1,8 +1,10 @@
 require 'rubygems'
-require 'stringio'
+
 require 'logger'
+require 'pp'
 require 'shellwords'
 require 'socket'
+require 'stringio'
 
 require 'system_timer'
 require 'daemons'
@@ -22,5 +24,5 @@ require 'daikon/client'
 require 'daikon/daemon'
 
 module Daikon
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/daikon/client.rb

@@ -54,9 +54,11 @@ module Daikon
 
       commands.each do |id, command|
         result = evaluate_redis(command)
+        pretty = StringIO.new
+        PP.pp(result, pretty)
 
         http_request(:put, "api/v1/commands/#{id}.json") do |request|
-          request.body = result.to_json
+          request.body = {"response" => pretty.string.strip}.to_json
           request.add_field "Content-Length", request.body.size.to_s
           request.add_field "Content-Type",   "application/json"
         end
@@ -96,16 +98,16 @@ module Daikon
         rescue Exception => e
           STDERR.puts e.message
           e.backtrace.each {|bt| STDERR.puts bt}
-          return { "response" => e.message }
+          return e.message
         end
-      return { "response" => "No command received." } unless argv[0]
+      return "No command received." unless argv[0]
 
       begin
-        { "response" => execute_redis(argv) }
+        execute_redis(argv)
       rescue Exception => e
         STDERR.puts e.message
         e.backtrace.each {|bt| STDERR.puts bt}
-        { "response" => e.message }
+        e.message
       end
     end
 

data/spec/client_spec.rb

@@ -70,7 +70,7 @@ describe Daikon::Client, "fetching commands" do
   let(:body)    { {"42" => "INCR foo", "43" => "DECR foo"}.to_json }
 
   before do
-    subject.stubs(:evaluate_redis => {"response" => "9999"})
+    subject.stubs(:evaluate_redis => 9999)
     stub_request(:get, "#{server}/api/v1/commands.json").to_return(:body => body)
     stub_request(:put, %r{#{server}/api/v1/commands/\d+\.json})
 
@@ -209,3 +209,24 @@ describe Daikon::Client, "rotate monitor" do
     it_should_behave_like "a monitor api consumer"
   end
 end
+
+describe Daikon::Client, "pretty printing results" do
+  subject      { Daikon::Client.new }
+  let(:body)   { {"13" => "LRANGE foo 0 -1"}.to_json }
+  let(:list)   { %w[apples bananas carrots] }
+  let(:server) { "https://radishapp.com" }
+  let(:config) { Daikon::Configuration.new }
+
+  before do
+    subject.stubs(:evaluate_redis => list)
+    stub_request(:get, "#{server}/api/v1/commands.json").to_return(:body => body)
+    stub_request(:put, %r{#{server}/api/v1/commands/\d+\.json})
+    subject.setup(config)
+    subject.fetch_commands
+  end
+
+  it "returns pretty printed results" do
+    WebMock.should have_requested(:put, "#{server}/api/v1/commands/13.json").
+      with(:body => {"response" => "[\"apples\", \"bananas\", \"carrots\"]"})
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: daikon
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Nick Quaranto
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-21 00:00:00 -05:00
+date: 2010-11-23 00:00:00 -05:00
 default_executable: daikon
 dependencies: 
 - !ruby/object:Gem::Dependency