daikon 0.8.14 → 0.8.15

data/Gemfile

@@ -7,6 +7,7 @@ gem "redis",     "~> 2.2"
 
 # dev dependencies, appraisal doesn't like #group :(
 gem "appraisal", "~> 0.3.5"
+gem "aruba"
 gem "bourne"
 gem "cucumber"
 gem "rspec"

data/Gemfile.lock

@@ -48,6 +48,7 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 0.3.5)
+  aruba
   bourne
   cucumber
   daemons (~> 1.1.0)

data/Rakefile

@@ -1,21 +1,22 @@
 require 'appraisal'
-
 require 'rspec/core'
 require 'rspec/core/rake_task'
+require 'cucumber/rake/task'
+
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
   spec.ruby_opts = "-Ilib"
 end
 
+Cucumber::Rake::Task.new(:features)
+
 desc "run tests"
-task :default => :spec
+task :default => [:spec, :features]
 
 desc "test all appraisals"
 task :all do
   appraisals =
     %w[redis2-1   redis2-2
-       excon0-5   excon0-6
-       json1-4    json1-5
        daemons1-0 daemons1-1].map do |run|
     "bundle exec rake appraisal:#{run}"
   end
@@ -24,16 +25,6 @@ task :all do
   sh appraisals.join(' && ')
 end
 
-def parse_monitor
-  monitor = Daikon::Monitor.new(nil, nil)
-
-  File.open("monitor.log", "r") do |f|
-    until f.eof?
-      monitor.parse(f.readline)
-    end
-  end
-end
-
 desc "benchmark monitor.log against the monitor parsing"
 task :bench do
   require 'benchmark'
@@ -46,6 +37,16 @@ end
 
 desc "perf tools the monitor.log"
 task :perf do
+  def parse_monitor
+    monitor = Daikon::Monitor.new(nil, nil)
+
+    File.open("monitor.log", "r") do |f|
+      until f.eof?
+        monitor.parse(f.readline)
+      end
+    end
+  end
+
   require 'perftools'
   PerfTools::CpuProfiler.start("daikon.profile") do
     parse_monitor

data/daikon.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ['Nick Quaranto', 'thoughtbot']
-  s.date = %q{2011-06-16}
+  s.date = %q{2011-06-24}
   s.description = %q{daikon, a radishapp.com client}
   s.email = %q{nick@thoughtbot.com}
   s.executables = [%q{daikon}]
@@ -24,20 +24,17 @@ Gem::Specification.new do |s|
     "Rakefile",
     "bin/daikon",
     "daikon.gemspec"
-  ] + Dir["lib/**/*.rb"] + Dir["spec/*.rb"] + Dir["gemfiles/*"]
+  ] + Dir["lib/**/*.rb"]
   s.homepage = %q{http://github.com/qrush/daikon}
   s.licenses = [%q{MIT}]
   s.require_paths = [%q{lib}]
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.6")
   s.rubygems_version = %q{1.8.1}
   s.summary = %q{daikon, a radishapp.com client}
-  s.test_files = [
-    "spec/client_spec.rb",
-    "spec/configuration_spec.rb",
-    "spec/daemon_spec.rb",
-    "spec/monitor_spec.rb",
-    "spec/spec_helper.rb"
-  ]
+  s.test_files =
+    Dir["gemfiles/**/*"] +
+    Dir["spec/**/*"] +
+    Dir["features/**/*"]
 
   s.add_runtime_dependency(%q<daemons>, ["~> 1.0"])
   s.add_runtime_dependency(%q<excon>, ["~> 0.5"])

data/features/daemon.feature

@@ -0,0 +1,17 @@
+Feature: Run the daikon daemon
+
+  Scenario: Starting daikon normally should not start an HTTP server
+    When I run `bundle exec ruby -Ilib ./bin/daikon start -- -k abcd`
+    Then a file named "daikon.pid" should exist
+
+  Scenario: Starting daikon with port starts HTTP server
+    Given I set the "PORT" variable to "8080"
+    When I run `bundle exec ruby -Ilib ./bin/daikon start -- -k abcd PORT=8080`
+    Then a file named "daikon.pid" should exist
+    When I wait 1 second
+    And I run `curl http://0.0.0.0:8080`
+    Then the output should contain "Radish: Dig deep into Redis"
+
+  Scenario: Show version
+    When I run `bundle exec ruby -Ilib ./bin/daikon --version`
+    Then the output should contain the current version number

data/features/step_definitions/daikon_steps.rb

@@ -0,0 +1,13 @@
+When /^I set the "([^"]+)" variable to "([^"]+)"$/ do |key, value|
+  @env_vars ||= []
+  @env_vars << key
+  set_env(key, value)
+end
+
+When /^I wait (\d+) seconds?$/ do |seconds|
+  sleep seconds.to_i
+end
+
+Then /^the output should contain the current version number$/ do
+  all_output.should =~ /Daikon v#{Daikon::VERSION}/
+end

data/features/support/env.rb

@@ -0,0 +1,43 @@
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'daikon'
+
+require 'aruba/cucumber'
+require 'rspec/expectations'
+
+Before do
+  kill_daikon
+
+  @dirs = ["."]
+  @aruba_timeout_seconds = 5
+end
+
+After do
+  kill_daikon
+
+  if @env_vars
+    @env_vars.each do |key|
+      set_env(key, nil)
+    end
+  end
+end
+
+module KillHelpers
+  def kill_daikon
+    if File.exist?("daikon.pid")
+      system "bundle exec ruby -Ilib ./bin/daikon stop"
+      system "kill -TERM $(pgrep -f daikon)"
+      FileUtils.rm_rf("*.pid")
+    end
+  end
+end
+
+World(KillHelpers)

data/gemfiles/daemons1-0.gemfile

@@ -7,6 +7,7 @@ gem "excon", "~> 0.5"
 gem "json_pure", "~> 1.4.6"
 gem "redis", "~> 2.2"
 gem "appraisal", "~> 0.3.5"
+gem "aruba"
 gem "bourne"
 gem "cucumber"
 gem "rspec"

data/gemfiles/daemons1-0.gemfile.lock

@@ -48,6 +48,7 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 0.3.5)
+  aruba
   bourne
   cucumber
   daemons (~> 1.0.10)

data/gemfiles/daemons1-1.gemfile

@@ -7,6 +7,7 @@ gem "excon", "~> 0.5"
 gem "json_pure", "~> 1.4.6"
 gem "redis", "~> 2.2"
 gem "appraisal", "~> 0.3.5"
+gem "aruba"
 gem "bourne"
 gem "cucumber"
 gem "rspec"

data/gemfiles/daemons1-1.gemfile.lock

@@ -48,6 +48,7 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 0.3.5)
+  aruba
   bourne
   cucumber
   daemons (~> 1.1.3)

data/gemfiles/excon0-5.gemfile

@@ -7,6 +7,7 @@ gem "excon", "~> 0.5.0"
 gem "json_pure", "~> 1.4.6"
 gem "redis", "~> 2.2"
 gem "appraisal", "~> 0.3.5"
+gem "aruba"
 gem "bourne"
 gem "cucumber"
 gem "rspec"

data/gemfiles/excon0-5.gemfile.lock

@@ -14,19 +14,19 @@ GEM
     builder (3.0.0)
     childprocess (0.1.9)
       ffi (~> 1.0.6)
-    cucumber (0.10.6)
+    cucumber (1.0.0)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.0)
+      gherkin (~> 2.4.1)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.5)
-    daemons (1.1.3)
+    daemons (1.1.4)
     diff-lcs (1.1.2)
     excon (0.5.8)
     ffi (1.0.9)
-    gherkin (2.4.0)
+    gherkin (2.4.1)
       json (>= 1.4.6)
-    json (1.5.1)
+    json (1.5.3)
     json_pure (1.4.6)
     mocha (0.9.8)
       rake
@@ -48,6 +48,7 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 0.3.5)
+  aruba
   bourne
   cucumber
   daemons (~> 1.1.0)

data/gemfiles/excon0-6.gemfile

@@ -7,6 +7,7 @@ gem "excon", "~> 0.6.0"
 gem "json_pure", "~> 1.4.6"
 gem "redis", "~> 2.2"
 gem "appraisal", "~> 0.3.5"
+gem "aruba"
 gem "bourne"
 gem "cucumber"
 gem "rspec"

data/gemfiles/excon0-6.gemfile.lock

@@ -14,19 +14,19 @@ GEM
     builder (3.0.0)
     childprocess (0.1.9)
       ffi (~> 1.0.6)
-    cucumber (0.10.6)
+    cucumber (1.0.0)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.0)
+      gherkin (~> 2.4.1)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.5)
-    daemons (1.1.3)
+    daemons (1.1.4)
     diff-lcs (1.1.2)
     excon (0.6.3)
     ffi (1.0.9)
-    gherkin (2.4.0)
+    gherkin (2.4.1)
       json (>= 1.4.6)
-    json (1.5.1)
+    json (1.5.3)
     json_pure (1.4.6)
     mocha (0.9.8)
       rake
@@ -48,6 +48,7 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 0.3.5)
+  aruba
   bourne
   cucumber
   daemons (~> 1.1.0)

data/gemfiles/json1-4.gemfile

@@ -7,6 +7,7 @@ gem "excon", "~> 0.5"
 gem "json_pure", "~> 1.4.6"
 gem "redis", "~> 2.2"
 gem "appraisal", "~> 0.3.5"
+gem "aruba"
 gem "bourne"
 gem "cucumber"
 gem "rspec"

data/gemfiles/json1-4.gemfile.lock

@@ -14,19 +14,19 @@ GEM
     builder (3.0.0)
     childprocess (0.1.9)
       ffi (~> 1.0.6)
-    cucumber (0.10.6)
+    cucumber (1.0.0)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.0)
+      gherkin (~> 2.4.1)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.5)
-    daemons (1.1.3)
+    daemons (1.1.4)
     diff-lcs (1.1.2)
     excon (0.6.3)
     ffi (1.0.9)
-    gherkin (2.4.0)
+    gherkin (2.4.1)
       json (>= 1.4.6)
-    json (1.5.1)
+    json (1.5.3)
     json_pure (1.4.6)
     mocha (0.9.8)
       rake
@@ -48,6 +48,7 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 0.3.5)
+  aruba
   bourne
   cucumber
   daemons (~> 1.1.0)

data/gemfiles/json1-5.gemfile

@@ -7,6 +7,7 @@ gem "excon", "~> 0.5"
 gem "json_pure", "~> 1.4.6"
 gem "redis", "~> 2.2"
 gem "appraisal", "~> 0.3.5"
+gem "aruba"
 gem "bourne"
 gem "cucumber"
 gem "rspec"

data/gemfiles/json1-5.gemfile.lock

@@ -14,19 +14,19 @@ GEM
     builder (3.0.0)
     childprocess (0.1.9)
       ffi (~> 1.0.6)
-    cucumber (0.10.6)
+    cucumber (1.0.0)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.0)
+      gherkin (~> 2.4.1)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.5)
-    daemons (1.1.3)
+    daemons (1.1.4)
     diff-lcs (1.1.2)
     excon (0.6.3)
     ffi (1.0.9)
-    gherkin (2.4.0)
+    gherkin (2.4.1)
       json (>= 1.4.6)
-    json (1.5.1)
+    json (1.5.3)
     json_pure (1.4.6)
     mocha (0.9.8)
       rake
@@ -48,6 +48,7 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 0.3.5)
+  aruba
   bourne
   cucumber
   daemons (~> 1.1.0)

data/gemfiles/redis2-1.gemfile

@@ -7,6 +7,7 @@ gem "excon", "~> 0.5"
 gem "json_pure", "~> 1.4.6"
 gem "redis", "~> 2.1"
 gem "appraisal", "~> 0.3.5"
+gem "aruba"
 gem "bourne"
 gem "cucumber"
 gem "rspec"

data/gemfiles/redis2-1.gemfile.lock

@@ -48,6 +48,7 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 0.3.5)
+  aruba
   bourne
   cucumber
   daemons (~> 1.1.0)

data/gemfiles/redis2-2.gemfile

@@ -7,6 +7,7 @@ gem "excon", "~> 0.5"
 gem "json_pure", "~> 1.4.6"
 gem "redis", "~> 2.2"
 gem "appraisal", "~> 0.3.5"
+gem "aruba"
 gem "bourne"
 gem "cucumber"
 gem "rspec"

data/gemfiles/redis2-2.gemfile.lock

@@ -48,6 +48,7 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 0.3.5)
+  aruba
   bourne
   cucumber
   daemons (~> 1.1.0)

data/lib/daikon.rb

@@ -13,6 +13,7 @@ require 'redis'
 require 'daikon/version'
 require 'daikon/configuration'
 require 'daikon/client'
+require 'daikon/server'
 require 'daikon/daemon'
 require 'daikon/monitor'
 require 'daikon/daemons_hacks'

data/lib/daikon/daemon.rb

@@ -35,9 +35,13 @@ module Daikon
           logger = Logger.new("/tmp/radish.log")
         end
 
-        rotated_at  = Time.now
-        reported_at = Time.now
-        client      = Daikon::Client.new
+        if port = ENV["PORT"]
+          logger.info "Port detected, starting server on port #{port}"
+          Daikon::Server.start(logger, port)
+        end
+
+        rotated_at = reported_at = Time.now
+        client = Daikon::Client.new
 
         client.setup(config, logger)
         client.start_monitor

data/lib/daikon/server.rb

@@ -0,0 +1,20 @@
+module Daikon
+  class Server
+    def self.start(logger, port)
+      fork do
+        require 'webrick'
+        server = WEBrick::HTTPServer.new :Logger => logger, :Port => port
+        server.mount_proc('/') do |req, resp|
+          resp.body = <<-HTML
+                <a href='http://radishapp.com'>Radish: Dig deep into Redis.</a>
+                <br />
+                Running Daikon v#{VERSION}
+                HTML
+        end
+        trap('INT')  { server.stop }
+        trap('TERM') { server.stop }
+        server.start
+      end
+    end
+  end
+end

data/lib/daikon/version.rb

@@ -1,3 +1,3 @@
 module Daikon
-  VERSION = "0.8.14"
+  VERSION = "0.8.15"
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: daikon
 version: !ruby/object:Gem::Version 
-  hash: 35
-  prerelease: false
-  segments: 
-  - 0
-  - 8
-  - 14
-  version: 0.8.14
+  prerelease: 
+  version: 0.8.15
 platform: ruby
 authors: 
 - Nick Quaranto
@@ -16,8 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-16 00:00:00 -04:00
-default_executable: 
+date: 2011-06-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: daemons
@@ -27,10 +21,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
         version: "1.0"
   type: :runtime
   version_requirements: *id001
@@ -42,10 +32,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 5
         version: "0.5"
   type: :runtime
   version_requirements: *id002
@@ -57,10 +43,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
         version: "1.4"
   type: :runtime
   version_requirements: *id003
@@ -72,10 +54,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 2
-        - 1
         version: "2.1"
   type: :runtime
   version_requirements: *id004
@@ -87,9 +65,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id005
@@ -101,9 +76,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id006
@@ -115,9 +87,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id007
@@ -129,9 +98,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id008
@@ -143,9 +109,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id009
@@ -174,13 +137,9 @@ files:
 - lib/daikon/daemons_hacks.rb
 - lib/daikon/monitor.rb
 - lib/daikon/redis_hacks.rb
+- lib/daikon/server.rb
 - lib/daikon/version.rb
 - lib/daikon.rb
-- spec/client_spec.rb
-- spec/configuration_spec.rb
-- spec/daemon_spec.rb
-- spec/monitor_spec.rb
-- spec/spec_helper.rb
 - gemfiles/daemons1-0.gemfile
 - gemfiles/daemons1-0.gemfile.lock
 - gemfiles/daemons1-1.gemfile
@@ -197,7 +156,13 @@ files:
 - gemfiles/redis2-1.gemfile.lock
 - gemfiles/redis2-2.gemfile
 - gemfiles/redis2-2.gemfile.lock
-has_rdoc: true
+- spec/client_spec.rb
+- spec/configuration_spec.rb
+- spec/monitor_spec.rb
+- spec/spec_helper.rb
+- features/daemon.feature
+- features/step_definitions/daikon_steps.rb
+- features/support/env.rb
 homepage: http://github.com/qrush/daikon
 licenses: 
 - MIT
@@ -211,31 +176,41 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 59
-      segments: 
-      - 1
-      - 8
-      - 6
       version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: daikon, a radishapp.com client
 test_files: 
+- gemfiles/daemons1-0.gemfile
+- gemfiles/daemons1-0.gemfile.lock
+- gemfiles/daemons1-1.gemfile
+- gemfiles/daemons1-1.gemfile.lock
+- gemfiles/excon0-5.gemfile
+- gemfiles/excon0-5.gemfile.lock
+- gemfiles/excon0-6.gemfile
+- gemfiles/excon0-6.gemfile.lock
+- gemfiles/json1-4.gemfile
+- gemfiles/json1-4.gemfile.lock
+- gemfiles/json1-5.gemfile
+- gemfiles/json1-5.gemfile.lock
+- gemfiles/redis2-1.gemfile
+- gemfiles/redis2-1.gemfile.lock
+- gemfiles/redis2-2.gemfile
+- gemfiles/redis2-2.gemfile.lock
 - spec/client_spec.rb
 - spec/configuration_spec.rb
-- spec/daemon_spec.rb
 - spec/monitor_spec.rb
 - spec/spec_helper.rb
+- features/daemon.feature
+- features/step_definitions/daikon_steps.rb
+- features/support/env.rb

data/spec/daemon_spec.rb

@@ -1,36 +0,0 @@
-require 'spec_helper'
-
-describe Daikon::Daemon do
-  let(:client) { stub("client") }
-
-  before do
-    Daikon::Client.stubs(:new => client)
-    Daikon::Daemon.sleep_time = 0.05
-    client.stubs(:setup => true,
-                 :start_monitor => true,
-                 :rotate_monitor => true,
-                 :report_info => true)
-  end
-
-  it "submits the last minute of data" do
-    thread = Thread.new do
-      Daikon::Daemon.start(["run", "--", "-k", "1234"], true)
-    end
-    sleep 3.1
-    Daikon::Daemon.run = false
-    client.should have_received(:rotate_monitor)
-    client.should have_received(:report_info).times(6)
-  end
-end
-
-describe Daikon::Daemon, "flags" 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