visage-app 0.9.0.pre1 → 0.9.0.pre2

data/README.md

@@ -29,7 +29,7 @@ N.B: Visage must be deployed on a machine where `collectd` stores its stats in R
 
 On Ubuntu, to install dependencies run:
 
-    $ sudo apt-get install -y librrd-ruby ruby ruby-dev rubygems collectd
+    $ sudo apt-get install -y build-essential librrd-ruby ruby ruby-dev rubygems collectd
 
 On CentOS, to install dependencies run:
 

data/VERSION

@@ -1 +1 @@
-0.9.0.pre1
+0.9.0.pre2

data/lib/visage-app/profile.rb

@@ -67,7 +67,7 @@ module Visage
                   :url => @options[:profile_name].downcase.gsub(/[^\w]+/, "+") }
 
         # Save it.
-        profiles = self.load
+        profiles = self.class.load
         profiles[attrs[:url]] = attrs
 
         Visage::Config::File.open('profiles.yaml') do |file|

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

@@ -308,15 +308,12 @@ var visageGraph = new Class({
             },
             plotOptions: {
               series: {
-                stacking: 'normal',
                 marker: {
-                  enabled: false
-                },
-                states: {
-                  hover: {
-                    enabled: true,
-                    marker: {
-                      symbol: 'triangle'
+                  enabled: false,
+                  stacking: 'normal',
+                  states: {
+                    hover: {
+                      enabled: true
                     }
                   }
                 }

data/lib/visage-app/public/javascripts/keyboard.js

@@ -1,72 +1,121 @@
-function gotoBuilder() {
-    var uri = new URI('/builder')
-    uri.go()
+"use strict";
+
+var mask;
+
+function checkForInput(e) {
+  var element;
+
+  if (e.target) {
+    element = e.target;
+  }
+  else if (e.srcElement) {
+    element = e.srcElement;
+  }
+
+  // 3 == TEXT_NODE
+  if (element.nodeType == 3) {
+    element = element.parentNode;
+  }
+
+  if (element.tagName == 'INPUT' || element.tagName == 'TEXTAREA') {
+    return true;
+  }
+
+  return false;
 }
 
-function gotoProfiles() {
-    var uri = new URI('/profiles')
-    uri.go()
+
+function gotoBuilder(e) {
+    if (checkForInput(e)) {
+      return;
+    }
+
+    var uri = new URI('/builder');
+    uri.go();
 }
 
-function moveUp() {
+function gotoProfiles(e) {
+    if (checkForInput(e)) {
+      return;
+    }
+    var uri = new URI('/profiles');
+    uri.go();
+}
+
+function moveUp(e) {
+    if (checkForInput(e)) {
+      return;
+    }
     if ( $('navigation') ) {
-        var active    = $('navigation').getElement('.active')
-        var previous  = active.getPrevious('.shortcut')
+        var active    = $('navigation').getElement('.active');
+        var previous  = active.getPrevious('.shortcut');
 
         if (previous) {
             var previousY = previous.getPosition().y,
-                windowY   = window.getSize().y
+                windowY   = window.getSize().y;
 
             if (previousY > windowY) {
-                var scroller = new Fx.Scroll(window, {duration: 10})
-                scroller.toElement(previous)
+                var scroller = new Fx.Scroll(window, {duration: 10});
+                scroller.toElement(previous);
             }
 
-            active.toggleClass('active')
-            previous.toggleClass('active')
+            active.toggleClass('active');
+            previous.toggleClass('active');
         }
     }
 }
 
-function moveDown() {
+function moveDown(e) {
+    if (checkForInput(e)) {
+      return;
+    }
     if ( $('navigation') ) {
-        var active = $('navigation').getElement('.active')
-        var next   = active.getNext('.shortcut')
+        var active = $('navigation').getElement('.active');
+        var next   = active.getNext('.shortcut');
         if (next) {
             var nextY   = next.getPosition().y,
-                windowY = window.getSize().y
+                windowY = window.getSize().y;
 
             if (nextY > windowY) {
-                var scroller = new Fx.Scroll(window, {duration: 10})
-                scroller.toElement(next)
+                var scroller = new Fx.Scroll(window, {duration: 10});
+                scroller.toElement(next);
             }
 
-            active.toggleClass('active')
-            next.toggleClass('active')
+            active.toggleClass('active');
+            next.toggleClass('active');
         }
     }
 }
 
-function select() {
+function select(e) {
+    if (checkForInput(e)) {
+      return;
+    }
     if ( $('navigation') ) {
-        var active      = $('navigation').getElement('.active')
-        var destination = active.getElement('a').get('href')
-        var uri         = new URI(destination)
-        uri.go()
+        var active      = $('navigation').getElement('.active');
+        var destination = active.getElement('a').get('href');
+        var uri         = new URI(destination);
+        uri.go();
     }
 }
 
-function back() {
-    history.go(-1)
+function back(e) {
+    if (checkForInput(e)) {
+      return;
+    }
+    history.go(-1);
 }
 
-function help() {
-    mask.toggle();
+function help(e) {
+    if (checkForInput(e)) {
+      return;
+    }
+    mask.toggle();;
 }
 
 window.addEvent('domready', function() {
     /* bindings */
-    vKeyboard = new Keyboard({defaultEventType: 'keydown'});
+    var vKeyboard = new Keyboard({defaultEventType: 'keydown'});
     vKeyboard.addShortcuts({
         'builder': {
             'keys':        'c',
@@ -112,28 +161,28 @@ window.addEvent('domready', function() {
             shortcutsContainer.hide()
         },
         onShow: function() {
-            var offset = document.body.getScroll().y + 100
-            shortcutsContainer.setStyle('top', offset)
-            shortcutsContainer.show()
+            var offset = document.body.getScroll().y + 100;
+            shortcutsContainer.setStyle('top', offset);
+            shortcutsContainer.show();
         }
     });
 
-    shortcutsContainer = new Element('div', {
-        'id': 'shortcuts',
+    var shortcutsContainer = new Element('div', {
+        'id': 'shortcuts'
     });
 
-    var rows = []
+    var rows = [];
     vKeyboard.getShortcuts().each(function(shortcut) {
-        rows.push([shortcut.keys, shortcut.description])
+        rows.push([shortcut.keys, shortcut.description]);
     });
     var table = new HtmlTable({
         headers: ['Keys', 'Description'],
         rows:    rows
     });
 
-    shortcutsContainer.hide()
-    shortcutsContainer.grab(table)
-    document.body.grab(shortcutsContainer, 'top')
+    shortcutsContainer.hide();
+    shortcutsContainer.grab(table);
+    document.body.grab(shortcutsContainer, 'top');
 
     var shortcutsLink = new Element('a', {
         'html': 'Shortcuts',
@@ -144,8 +193,8 @@ window.addEvent('domready', function() {
             }
         }
     });
-    var footer = $('footer')
-    footer.set('html', footer.get('html') + ' | ')
-    $('footer').grab(shortcutsLink)
+    var footer = $('footer');
+    footer.set('html', footer.get('html') + ' | ');
+    $('footer').grab(shortcutsLink);
 
 });

data/lib/visage-app/views/profile.haml

@@ -5,13 +5,14 @@
   %h2#profile_name= profile_name
   - @profile.graphs.each do |graph|
     %div{:id => graph.id, :class => 'graph'}
-      %img{:src => "/images/loader.gif"}
+      %img{:src => link_to("/images/loader.gif")}
       :javascript
         window.addEvent('domready', function() {
           var graph = new visageGraph('#{graph.id}', '#{graph.host}', '#{graph.plugin}', {
             pluginInstance: '#{graph.instances.join(',')}',
             name: '#{graph.plugin} on #{graph.host}',
             start: '#{@start}',
+            #{ "baseurl: '" + ENV['VISAGE_APP_BASE_URL_PATH'].gsub(/^\//, '') + "'," if ENV['VISAGE_APP_BASE_URL_PATH'] }
             finish: '#{@finish}'
           });
         });

data/visage-app.gemspec

@@ -0,0 +1,104 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{visage-app}
+  s.version = "0.9.0.pre2"
+
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Lindsay Holmwood"]
+  s.date = %q{2011-01-24}
+  s.default_executable = %q{visage-app}
+  s.description = %q{Visage is a web interface for viewing collectd statistics. It also provides a JSON interface onto collectd's RRD data, giving you an easy way to mash up the data.}
+  s.email = %q{lindsay@holmwood.id.au}
+  s.executables = ["visage-app"]
+  s.extra_rdoc_files = [
+    "README.md"
+  ]
+  s.files = [
+    ".gitignore",
+     "AUTHORS",
+     "LICENCE",
+     "README.md",
+     "Rakefile",
+     "VERSION",
+     "bin/visage-app",
+     "features/builder.feature",
+     "features/cli.feature",
+     "features/data/config/with_no_profiles/.stub",
+     "features/json.feature",
+     "features/profiles.feature",
+     "features/step_definitions/form_steps.rb",
+     "features/step_definitions/json_steps.rb",
+     "features/step_definitions/result_steps.rb",
+     "features/step_definitions/site_steps.rb",
+     "features/step_definitions/visage_steps.rb",
+     "features/step_definitions/webrat_steps.rb",
+     "features/support/env.rb",
+     "lib/visage-app.rb",
+     "lib/visage-app/collectd/json.rb",
+     "lib/visage-app/collectd/profile.rb",
+     "lib/visage-app/collectd/rrds.rb",
+     "lib/visage-app/config.rb",
+     "lib/visage-app/config.ru",
+     "lib/visage-app/config/file.rb",
+     "lib/visage-app/graph.rb",
+     "lib/visage-app/helpers.rb",
+     "lib/visage-app/patches.rb",
+     "lib/visage-app/profile.rb",
+     "lib/visage-app/public/favicon.gif",
+     "lib/visage-app/public/images/active.png",
+     "lib/visage-app/public/images/add.png",
+     "lib/visage-app/public/images/hosts.png",
+     "lib/visage-app/public/images/loader.gif",
+     "lib/visage-app/public/images/metrics.png",
+     "lib/visage-app/public/images/search.png",
+     "lib/visage-app/public/javascripts/graph.js",
+     "lib/visage-app/public/javascripts/highcharts.js",
+     "lib/visage-app/public/javascripts/highcharts.src.js",
+     "lib/visage-app/public/javascripts/keyboard.js",
+     "lib/visage-app/public/javascripts/mootools-1.2.3-core.js",
+     "lib/visage-app/public/javascripts/mootools-1.2.5.1-more.js",
+     "lib/visage-app/public/stylesheets/screen.css",
+     "lib/visage-app/views/builder.haml",
+     "lib/visage-app/views/layout.haml",
+     "lib/visage-app/views/profile.haml",
+     "lib/visage-app/views/profiles.haml",
+     "man/visage-app.5",
+     "man/visage-app.5.ronn",
+     "visage-app.gemspec"
+  ]
+  s.homepage = %q{http://visage-app.com/}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{a web (interface | service) for viewing collectd statistics}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<sinatra>, ["= 1.0"])
+      s.add_runtime_dependency(%q<tilt>, ["= 1.0.1"])
+      s.add_runtime_dependency(%q<haml>, ["= 3.0.13"])
+      s.add_runtime_dependency(%q<errand>, ["= 0.7.2"])
+      s.add_runtime_dependency(%q<yajl-ruby>, ["= 0.7.6"])
+    else
+      s.add_dependency(%q<sinatra>, ["= 1.0"])
+      s.add_dependency(%q<tilt>, ["= 1.0.1"])
+      s.add_dependency(%q<haml>, ["= 3.0.13"])
+      s.add_dependency(%q<errand>, ["= 0.7.2"])
+      s.add_dependency(%q<yajl-ruby>, ["= 0.7.6"])
+    end
+  else
+    s.add_dependency(%q<sinatra>, ["= 1.0"])
+    s.add_dependency(%q<tilt>, ["= 1.0.1"])
+    s.add_dependency(%q<haml>, ["= 3.0.13"])
+    s.add_dependency(%q<errand>, ["= 0.7.2"])
+    s.add_dependency(%q<yajl-ruby>, ["= 0.7.6"])
+  end
+end
+

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 9
   - 0
-  - pre1
-  version: 0.9.0.pre1
+  - pre2
+  version: 0.9.0.pre2
 platform: ruby
 authors: 
 - Lindsay Holmwood
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-05 00:00:00 +11:00
+date: 2011-01-24 00:00:00 +11:00
 default_executable: visage-app
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -146,6 +146,7 @@ files:
 - lib/visage-app/views/profiles.haml
 - man/visage-app.5
 - man/visage-app.5.ronn
+- visage-app.gemspec
 has_rdoc: true
 homepage: http://visage-app.com/
 licenses: []