visage-app 0.2.4 → 0.2.5

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/bin/visage

@@ -4,7 +4,7 @@ require 'pathname'
 
 require 'socket'
 fqdn = Socket.gethostbyname(Socket.gethostname).first
-
+$stdout.sync = true
 @root = Pathname.new(File.dirname(__FILE__)).parent.expand_path
 action = ARGV[0]
 
@@ -22,6 +22,9 @@ when "start"
   puts
   puts "will be running at http://#{fqdn}:9292/"
   puts
+  require @root.join('lib/visage-app')
+  puts "Looking for RRDs in #{Visage::Config.rrddir}"
+  puts
 
   config = @root.join('lib/visage/config.ru').to_s
   server = Rack::Server.new(:config => config, :Port => 9292)

data/features/{visage.feature → cli.feature}

@@ -9,3 +9,9 @@ Feature: command line utility
     When I start the visage server helper with "visage start"
     Then a visage web server should be running
 
+  Scenario: Seeing where Visage is getting its data from
+    Given the "visage" gem is installed
+    When I start the visage server helper with "visage start"
+    Then I should see "Looking for RRDs in /.*collectd" on the terminal
+
+

data/features/json.feature

@@ -51,13 +51,13 @@ Feature: Export data
     And each plugin instance should have a different color
 
   Examples:
-    | path           |
-    | cpu-0/cpu-user |
-    | df/df-root     |
+    | path               |
+    | cpu-0/cpu-user     |
+    | memory/memory-used |
 
   Scenario: Retrieve single plugin instance with a color definition
     Given a list of hosts exist
-    When I visit "swap/swap-used" on the first available host
+    When I visit "load/load" on the first available host
     Then the request should succeed
     Then I should receive valid JSON
     And the plugin instance should have a color

data/features/step_definitions/visage_steps.rb

@@ -6,15 +6,20 @@ When /^I start the visage server helper with "([^"]*)"$/ do |cmd|
   @root = Pathname.new(File.dirname(__FILE__)).parent.parent.expand_path
   command = "#{@root.join('bin')}/#{cmd}"
 
-  pipe = IO.popen(command)
+  @pipe = IO.popen(command, "r")
   sleep 2 # so the visage server has a chance to boot
 
   # clean up the visage server when the tests finish
   at_exit do
-    Process.kill("KILL", pipe.pid)
+    Process.kill("KILL", @pipe.pid)
   end
 end
 
 Then /^a visage web server should be running$/ do
   `ps -eo cmd |grep ^visage`.size.should > 0
 end
+
+Then /^I should see "([^"]*)" on the terminal$/ do |string|
+  output = @pipe.read(250)
+  output.should =~ /#{string}/
+end

data/lib/visage/collectd/json.rb

@@ -126,7 +126,7 @@ class CollectdJSON
     attr_writer :rrddir
 
     def rrddir
-      @rrddir || @rrddir = "/var/lib/collectd/rrd"
+      @rrddir ||= Visage::Config.rrddir
     end
 
     def hosts

data/lib/visage/collectd/rrds.rb

@@ -10,7 +10,7 @@ module Visage
 
       class << self
         def rrddir
-          @rrddir = "/var/lib/collectd/rrd"
+          @rrddir ||= Visage::Config.rrddir
         end
 
         def hosts(opts={})

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Lindsay Holmwood
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-19 00:00:00 +10:00
+date: 2010-08-11 00:00:00 +10:00
 default_executable: visage
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -101,6 +101,7 @@ files:
 - Rakefile
 - VERSION
 - bin/visage
+- features/cli.feature
 - features/json.feature
 - features/site.feature
 - features/step_definitions/form_steps.rb
@@ -110,7 +111,6 @@ files:
 - features/step_definitions/visage_steps.rb
 - features/step_definitions/webrat_steps.rb
 - features/support/env.rb
-- features/visage.feature
 - lib/visage-app.rb
 - lib/visage/collectd/json.rb
 - lib/visage/collectd/profile.rb