visage-app 0.2.7 → 0.3.0

data/.gitignore

@@ -8,3 +8,4 @@ webrat*
 visage-app.gemspec
 lib/visage/config/profiles.yaml
 _site
+features/data/config/*/*.yaml

data/README.md

@@ -129,6 +129,7 @@ Run all cucumber features:
 TODO
 ----
 
+ * make other lines slightly opaque when hovering over labels
  * detailed point-in-time data on hover (timestamp, value)
  * give graph profile an alternate private url
  * make notes/annotations on private url

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.3.0

data/features/builder.feature

@@ -0,0 +1,16 @@
+Feature: Build profiles
+  To find out how particular systems are performing
+  A user
+  Must be able to select a host
+  And some metrics
+  And see a page of graphs
+
+  Scenario: Build a simple profile
+    When I go to /builder
+    And I fill in "hosts" with "*"
+    And I fill in "metrics" with "*"
+    And I press "metrics"
+    And I fill in "profile_name" with "all on all"
+    And I press "create"
+    Then I should see a list of graphs
+    And I should see a profile heading

data/features/cli.feature

@@ -14,4 +14,11 @@ Feature: command line utility
     When I start the visage server helper with "visage start"
     Then I should see "Looking for RRDs in /.*collectd" on the terminal
 
+  Scenario: Specified configuration directory
+    Given the "visage" gem is installed
+    And there is no file at "features/data/config/with_no_profiles/profiles.yaml"
+    When I start the visage server helper with "visage start" and the following variables:
+      | CONFIG_PATH                           |
+      | features/data/config/with_no_profiles |
+    Then I should see a file at "features/data/config/with_no_profiles/profiles.yaml"
 

data/features/{site.feature → profiles.feature}

@@ -3,11 +3,6 @@ Feature: Visit site
   A user
   Must be able to visualise the data
 
-  Scenario: Show graphs
-    When I go to /profiles
-    And I visit the first profile
-    Then I should see a list of graphs
-
   Scenario: List profiles
     When I go to /profiles
     Then I should see a list of profiles
@@ -16,3 +11,17 @@ Feature: Visit site
     When I follow "name"
     Then I should see a list of profiles sorted alphabetically
 
+  Scenario: Show profile
+    When I go to /profiles
+    And I visit the first profile
+    Then I should see a list of graphs
+    And I should see a profile heading
+
+  Scenario: Navigate profiles
+    When I go to /profiles
+    And I visit the first profile
+    Then I should see a list of graphs
+    And I should see a profile heading
+    When I follow "back to profiles"
+    Then I should see a list of profiles
+

data/features/step_definitions/site_steps.rb

@@ -7,7 +7,7 @@ end
 
 Then /^I should see a list of graphs$/ do
   doc = Nokogiri::HTML(response_body)
-  doc.search('div#profile div.graph').size.should > 1
+  doc.search('div#profile div.graph').size.should > 0
 end
 
 Then /^I should see a list of profiles$/ do
@@ -25,3 +25,12 @@ Then /^I should see a list of profiles sorted alphabetically$/ do
 
   unsorted.should == sorted
 end
+
+Then /^I should see a profile heading$/ do
+  doc = Nokogiri::HTML(response_body)
+  doc.search('div#profile h2#profile_name').size.should == 1
+end
+
+Then /^show me the page source$/ do
+  puts response_body
+end

data/features/step_definitions/visage_steps.rb

@@ -23,3 +23,24 @@ Then /^I should see "([^"]*)" on the terminal$/ do |string|
   output = @pipe.read(250)
   output.should =~ /#{string}/
 end
+
+Given /^there is no file at "([^"]*)"$/ do |filename|
+  FileUtils.rm_f(filename).should be_true
+end
+
+When /^I start the visage server helper with "([^"]*)" and the following variables:$/ do |cmd, table|
+  table.hashes.each do |hash|
+    hash.each_pair do |variable, value|
+      ENV[variable] = value
+    end
+  end
+  When %(I start the visage server helper with "#{cmd}")
+end
+
+Then /^I should see a file at "([^"]*)"$/ do |filename|
+  File.exists?(filename).should be_true
+end
+
+Then /^show me the output$/ do
+  puts @pipe.read(250)
+end

data/features/support/env.rb

@@ -10,6 +10,8 @@ require 'spec/expectations'
 require 'rack/test'
 require 'webrat'
 
+ENV['CONFIG_PATH'] = @root.join('features/data/config/default')
+
 require app_file
 # Force the application name because polyglot breaks the auto-detection logic.
 Sinatra::Application.app_file = app_file

data/lib/visage/config/init.rb

@@ -1,38 +1,57 @@
 #!/usr/bin/env ruby
 
 @root = Pathname.new(File.dirname(__FILE__)).parent.parent.parent.expand_path
-@config_directory = Pathname.new(File.dirname(__FILE__)).expand_path
 require @root.join('lib/visage/config')
 require 'yaml'
 
-Visage::Config.use do |c|
-  # setup profiles file
-  profile_filename = @config_directory.join('profiles.yaml')
-  unless File.exists?(profile_filename)
-    FileUtils.touch(profile_filename)
-  end
-
-  # setup plugin colors file
-  plugin_colors_filename = @config_directory.join('plugin-colors.yaml')
-  unless File.exists?(plugin_colors_filename)
-    puts "It's highly recommended you specify graph line colors in config/plugin-colors.yaml!"
-  end
-
-  # load config from profiles + plugin colors file
-  [profile_filename, plugin_colors_filename].each do |filename|
-    if File.exists?(filename)
-      config = YAML::load_file(filename) || {}
-      config.each_pair {|key, value| c[key] = value}
+module Visage
+  class Config
+    class File
+      @@config_directories = []
+      @@config_directories << Pathname.new(::File.dirname(__FILE__)).expand_path
+      @@config_directories << Pathname.new(ENV["CONFIG_PATH"]).expand_path if ENV["CONFIG_PATH"]
+      @@config_directories.reverse!
+
+      def self.find(filename, opts={})
+        range = opts[:ignore_bundled] ? (0..-2) : (0..-1)
+        potential_filenames = @@config_directories[range].map {|d| d.join(filename)}
+        potential_filenames.find { |f| ::File.exists?(f) }
+      end
+
+      def self.load(filename, opts={})
+        unless path = self.find(filename, opts)
+          if opts[:create]
+            path = @@config_directories.first.join(filename)
+            begin
+              FileUtils.touch(path)
+            rescue Errno::EACCES => e
+              raise Errno::EACCES, "Couldn't write #{path}. Do you have CONFIG_PATH set?"
+            end
+          end
+        end
+
+        YAML::load_file(path)
+      end
+
+      def self.open(filename, &block)
+        path = self.find(filename)
+        ::File.open(path, 'r+') do |f|
+          block.call(f)
+        end
+      end
+
+      def initialize(filename, opts={})
+        unless ::File.exists?(filename)
+          path = @@config_directories.first.join(filename)
+          FileUtils.touch(path)
+        end
+        @file = ::File.open(filename, 'r+')
+      end
+
+      def to_s
+        @file.path
+      end
     end
   end
-
-  # load fallback colors
-  c['fallback_colors'] = YAML::load(File.read(@config_directory.join('fallback-colors.yaml')))
-
-  # Location of collectd's RRD - you may want to edit this!
-  c['rrddir'] = "/var/lib/collectd/rrd"
-
-  # whether to shade in graphs
-  c['shade'] = false
 end
 

data/lib/visage/config/plugin-colors.yaml

@@ -1,67 +1,60 @@
 ---
-plugin_colors:
-  memory:
-    memory-used:
-      value: "#cc0000"
-    memory-buffered:
-      value: "#edd400"
-    memory-cached:
-      value: "#3465a4"
-    memory-free:
-      value: "#73d216"
-  cpu:
-    cpu-idle:
-      value: "#eeeeec"
-    cpu-wait:
-      value: "#edd400"
-    cpu-user:
-      value: "#3465a4"
-    cpu-system:
-      value: "#cc0000"
-    cpu-nice:
-      value: "#73d216"
-    cpu-softirq:
-      value: "#ad7fa8"
-    cpu-interrupt:
-      value: "#5c3566"
-    cpu-steal:
-      value: "#2e3436"
-  swap:
-    swap-used:
-      value: "#cc0000"
-    swap-free:
-      value: "#73d216"
-    swap-cached:
-      value: "#3465a4"
-    swap_io-in:
-      value: "#edd400"
-    swap_io-out:
-      value: "#5c3566"
+memory:
+  memory-used:
+    value: "#cc0000"
+  memory-buffered:
+    value: "#edd400"
+  memory-cached:
+    value: "#3465a4"
+  memory-free:
+    value: "#73d216"
+cpu:
+  cpu-idle:
+    value: "#eeeeec"
+  cpu-wait:
+    value: "#edd400"
+  cpu-user:
+    value: "#3465a4"
+  cpu-system:
+    value: "#cc0000"
+  cpu-nice:
+    value: "#73d216"
+  cpu-softirq:
+    value: "#ad7fa8"
+  cpu-interrupt:
+    value: "#5c3566"
+  cpu-steal:
+    value: "#2e3436"
+swap:
+  swap-used:
+    value: "#cc0000"
+  swap-free:
+    value: "#73d216"
+  swap-cached:
+    value: "#3465a4"
+  swap_io-in:
+    value: "#edd400"
+  swap_io-out:
+    value: "#5c3566"
+load:
   load:
-    load:
-      longterm: "#ef2929"
-      shortterm: "#73d216"
-      midterm: "#3465a4"
+    longterm: "#ef2929"
+    shortterm: "#73d216"
+    midterm: "#3465a4"
+df:
   df:
-    df:
-      used: "#cc0000"
-      free: "#73d216"
-  disk:
-    disk_merged:
-       read: "#8ae234"
-       write: "#ef2929"
-    disk_time:
-       read: "#729fcf"
-       write: "#fcaf3e"
-    disk_ops:
-       read: "#ad7fa8"
-       write: "#fce94f"
-    disk_octets:
-       read: "#c17d11"
-       write: "#888a85"
-
-
-
-
-
-
+    used: "#cc0000"
+    free: "#73d216"
+disk:
+  disk_merged:
+     read: "#8ae234"
+     write: "#ef2929"
+  disk_time:
+     read: "#729fcf"
+     write: "#fcaf3e"
+  disk_ops:
+     read: "#ad7fa8"
+     write: "#fce94f"
+  disk_octets:
+     read: "#c17d11"
+     write: "#888a85"

data/lib/visage/config.rb

@@ -1,6 +1,5 @@
 module Visage
   class Config
-
     class << self
       def use
         @configuration ||= {}

data/lib/visage/profile.rb

@@ -11,18 +11,15 @@ module Visage
     attr_reader :options, :selected_hosts, :hosts, :selected_metrics, :metrics,
                 :name, :errors
 
-    @@root = Pathname.new(File.dirname(__FILE__)).parent.parent.expand_path
-    @@profiles_filename = @@root.join('lib/visage/config/profiles.yaml')
-
     def self.get(id)
       url = id.downcase.gsub(/[^\w]+/, "+")
-      profiles = YAML::load_file(@@profiles_filename) || {}
+      profiles = Visage::Config.profiles || {}
       profiles[url] ? self.new(profiles[url]) : nil
     end
 
     def self.all(opts={})
       sort = opts[:sort]
-      profiles = YAML::load_file(@@profiles_filename) || {}
+      profiles = Visage::Config.profiles || {}
       profiles = sort == "name" ? profiles.sort.map {|i| i.last } : profiles.values
       profiles.map { |prof| self.new(prof) }
     end
@@ -66,10 +63,10 @@ module Visage
                   :url => @options[:profile_name].downcase.gsub(/[^\w]+/, "+") }
 
         # Save it.
-        profiles = YAML::load_file(@@profiles_filename) || {}
+        profiles = Visage::Config.profiles || {}
         profiles[attrs[:url]] = attrs
 
-        File.open(@@profiles_filename, 'w') do |file|
+        Visage::Config::File.open('profiles.yaml') do |file|
           file << profiles.to_yaml
         end
 

data/lib/visage/public/javascripts/graph.js

@@ -76,7 +76,10 @@ var visageBase = new Class({
         header = $chk(this.options.name) ? this.options.name : this.options.plugin
         this.graphHeader = new Element('h3', {
             'class': 'graph-title',
-            'html': header
+            'html': header,
+            'styles': {
+                'color': "#121212"
+            }
         });
         $(this.parentElement).grab(this.graphHeader);
     },

data/lib/visage/public/stylesheets/screen.css

@@ -15,10 +15,9 @@ a {
 /* styles */
 
 a               { color: #3465a4; padding: 2px 0px; }
-a:hover         { color: white; background-color: #3465a4; }
+a:hover         { text-decoration: underline; }
 a:visited       { color: #75507b; }
-a:hover:visited { color: white; background-color: #75507b; }
-a:active        { color: white; background-color: #cc0000; }
+a:hover:visited { text-decoration: underline; }
 
 p {
   margin: 0 0 1em;
@@ -34,6 +33,8 @@ div#header {
   background-color: #3465a4;
   margin-bottom: 16px;
   border-bottom: 6px solid #c5d6ed;
+  background: -moz-linear-gradient(100% 100% 90deg, #3465a4, #142e52);
+  background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#142e52), to(#3465a4));
 }
 
 div#nav {
@@ -53,7 +54,7 @@ div#nav a {
 
 div#nav a:hover {
   text-shadow: 0 1px 6px rgba(115,157,211,0.9);
-  background-color: #3465a4;
+  text-decoration: none;
 }
 
 div#content, div#nav {
@@ -206,7 +207,7 @@ h1, h2, h3, h4, h5 {
 
 h2 {
   font-weight: bold;
-  color: #666;
+  color: #333;
   border-bottom: 4px solid #888;
   margin-bottom: 12px;
 }
@@ -221,6 +222,27 @@ h1 span.project-name {
   color: white;
 }
 
+h2#profile_name {
+  margin: 36px 0;
+}
+
+h4.error {
+  margin: 8px 0;
+}
+
+div.graph pre {
+  line-height: 1.6em;
+  font-size: 90%;
+  margin-top: -10px;
+}
+
+div#bottom_nav {
+  margin: 32px 0;
+  border-top: 1px dotted #aaa;
+  padding-top: 12px;
+  font-size: 85%;
+}
+
 div#footer {
   font-size: 0.6em;
   color: gray;
@@ -255,5 +277,8 @@ div#profiles ul {
 }
 
 div#profiles p.create {
+  border-top: 1px dotted #aaa;
+  padding-top: 8px;
+  margin-top: 24px;
   font-size: 85%;
 }

data/lib/visage/views/layout.haml

@@ -10,7 +10,6 @@
     %script{:type => "text/javascript", :src => link_to("/javascripts/mootools-1.2.3-core.js")}
     %script{:type => "text/javascript", :src => link_to("/javascripts/mootools-1.2.3.1-more.js")}
     %script{:type => "text/javascript", :src => link_to("/javascripts/graph.js")}
-    %script{:type => "text/javascript", :src => link_to("/javascripts/application.js")}
 
   %body
     %div#wrapper

data/lib/visage/views/profile.haml

@@ -1,6 +1,8 @@
-- page_title @profile.options[:profile_name]
+- profile_name = @profile.options[:profile_name]
+- page_title(profile_name)
 
 %div#profile
+  %h2#profile_name= profile_name
   - @profile.graphs.each do |graph|
     %div{:id => graph.id, :class => 'graph'}
       :javascript
@@ -17,4 +19,17 @@
             finish: '#{@finish}'
           });
         });
+  - if @profile.graphs.size == 0
+    %div.graph
+      %h4.error Oops! Looks like there aren't any graphs matching the specified patterns.
+      %p These are the patterns:
+      %pre
+        :preserve
+          Host:    #{@profile.options[:hosts]}
+          Metrics: #{@profile.options[:metrics]}
+
+  %div#bottom_nav
+    %a{:href => link_to("/profiles")} ← Back to profiles
+
+
 

data/lib/visage/views/profiles.haml

@@ -14,5 +14,5 @@
         %a{:href => link_to("/profiles/#{prof.url}")}= prof.profile_name
 
   %p.create
-    %a{:href => link_to("/builder")} Create a new profile.
+    %a{:href => link_to("/builder")} Create a profile
 

data/lib/visage-app.rb

@@ -22,6 +22,19 @@ module Visage
 
     helpers Sinatra::LinkToHelper
     helpers Sinatra::PageTitleHelper
+
+    configure do
+      Visage::Config.use do |c|
+        # Base configuration files.
+        c['profiles']        = Visage::Config::File.load('profiles.yaml', :create => true, :ignore_bundled => true)
+        c['plugin_colors']   = Visage::Config::File.load('plugin-colors.yaml')
+        c['fallback_colors'] = Visage::Config::File.load('fallback-colors.yaml')
+
+        # FIXME: make this configurable through file
+        c['shade'] = false
+        c['rrddir'] = ENV["RRDDIR"] ? Pathname.new(ENV["RRDDIR"]).expand_path : Pathname.new("/var/lib/collectd/rrd").expand_path
+      end
+    end
   end
 
   class Profiles < Application
@@ -32,7 +45,7 @@ module Visage
     get '/profiles/:url' do
       @profile = Visage::Profile.get(params[:url])
       raise Sinatra::NotFound unless @profile
-      @start = params[:start]
+      @start  = params[:start]
       @finish = params[:finish]
       haml :profile
     end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 7
-  version: 0.2.7
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Lindsay Holmwood
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-26 00:00:00 +10:00
+date: 2010-10-15 00:00:00 +11:00
 default_executable: visage
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -101,9 +101,11 @@ files:
 - Rakefile
 - VERSION
 - bin/visage
+- features/builder.feature
 - features/cli.feature
+- features/data/config/with_no_profiles/.stub
 - features/json.feature
-- features/site.feature
+- features/profiles.feature
 - features/step_definitions/form_steps.rb
 - features/step_definitions/json_steps.rb
 - features/step_definitions/result_steps.rb
@@ -129,7 +131,6 @@ files:
 - lib/visage/public/images/hosts.png
 - lib/visage/public/images/metrics.png
 - lib/visage/public/images/search.png
-- lib/visage/public/javascripts/application.js
 - lib/visage/public/javascripts/g.line-min.js
 - lib/visage/public/javascripts/g.line.js
 - lib/visage/public/javascripts/g.raphael-min.js

data/lib/visage/public/javascripts/application.js

@@ -1,4 +0,0 @@
-window.addEvent('domready', function () {
-
-});
-