visage-app 0.1.6 → 0.1.7

data/README.md

@@ -14,7 +14,13 @@ Features
  * drop-down or mouse selection of timeframes (also rendered asynchronously)
  * JSON interface onto `collectd` RRDs
 
-Check out [a demo](http://visage.unstated.net/nadia/cpu+load).
+Here, have a graph:
+
+
+![Something I prepared earlier.](http://farm2.static.flickr.com/1020/4730994504_c8c6fc9c18_z.jpg)
+
+
+Or check out [a live demo](http://visage.unstated.net/nadia/cpu+load).
 
 Installing
 ----------

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/bin/visage

@@ -14,7 +14,7 @@ when "start"
 when "genapache"
   require 'socket'
   fqdn = Socket.gethostbyname(Socket.gethostname).first
-  public_dir = @root.join('lib/visage-app/public')
+  public_dir = @root.join('lib/visage/public')
 
   puts <<-CONFIG
 <VirtualHost *>
@@ -24,11 +24,11 @@ when "genapache"
   DocumentRoot #{public_dir}
 
   <Directory "#{public_dir}">
-     Options FollowSymLinks Indexes
-     AllowOverride None
-     Order allow,deny
-     Allow from all
-   </Directory>
+    Options FollowSymLinks Indexes
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+  </Directory>
 
 </VirtualHost>
   CONFIG

data/lib/visage/config/init.rb

@@ -2,6 +2,7 @@
 
 __DIR__ = File.expand_path(File.dirname(__FILE__))
 require File.join(__DIR__, '..', 'config')
+require 'yaml'
 
 Visage::Config.use do |c|
   c['fallback_colors'] = YAML::load(File.read(File.join(__DIR__, 'fallback-colors.yaml')))

data/lib/visage/config.ru

@@ -1,5 +1,8 @@
 #!/usr/bin/env ruby
 
+@root = Pathname.new(File.dirname(__FILE__)).parent.parent.expand_path
+$: << @root.to_s
+
 $0 = "visage"
 
 require 'lib/visage-app'

data/lib/visage/helpers.rb

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+
+require 'sinatra/base'
+
+module Sinatra
+  module LinkToHelper
+    # from http://gist.github.com/98310
+    def link_to(url_fragment, mode=:path_only)
+      case mode
+      when :path_only
+        base = request.script_name
+      when :full_url
+        if (request.scheme == 'http' && request.port == 80 ||
+            request.scheme == 'https' && request.port == 443)
+          port = ""
+        else
+          port = ":#{request.port}"
+        end
+        base = "#{request.scheme}://#{request.host}#{port}#{request.script_name}"
+      else
+        raise "Unknown script_url mode #{mode}"
+      end
+      "#{base}#{url_fragment}"
+    end
+  end
+
+  helpers LinkToHelper
+end

data/lib/visage/views/index.haml

@@ -11,8 +11,8 @@
       - else
         - @hosts.each do |host|
           %li
-            %a{:href => "/#{host}"}= host
-  
+            %a{:href => link_to("/#{host}")}= host
+
   - if host = params[:host]
     %div#profiles.nav
       %h2 Profiles
@@ -20,7 +20,7 @@
       %ul
         - @profiles.each do |profile|
           %li
-            %a{:href => "/#{host}/#{profile.splat}"}= profile.name
+            %a{:href => link_to("/#{host}/#{profile.splat}")}= profile.name
 
 %div#graphs
   - if @profile && @profile.plugins
@@ -41,8 +41,8 @@
               name: '#{plugin} on #{host}'
             });
           });
-  
+
   - else
     %div#nothing
       Sorry, nothing to display!
-  
+

data/lib/visage-app.rb

@@ -1,22 +1,22 @@
 #!/usr/bin/env ruby
 
 require 'pathname'
-@root = Pathname.new(File.dirname(__FILE__)).expand_path
+@root = Pathname.new(File.dirname(__FILE__)).parent.expand_path
 $: << @root.to_s
 
 require 'sinatra'
 require 'errand'
 require 'yajl'
 require 'haml'
-require 'visage/collectd/json'
-require 'visage/config'
+require 'lib/visage/config'
+require 'lib/visage/helpers'
+require 'lib/visage/config/init'
+require 'lib/visage/collectd/json'
 
-set :public, @root.join('visage/public')
-set :views,  @root.join('visage/views')
+set :public, @root.join('lib/visage/public')
+set :views,  @root.join('lib/visage/views')
 
 configure do
-  require 'visage/config/init'
-
   CollectdJSON.rrddir = Visage::Config.rrddir
   Visage::Config::Profiles.profiles = Visage::Config.profiles
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Lindsay Holmwood
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-24 00:00:00 -07:00
+date: 2010-06-25 00:00:00 -07:00
 default_executable: visage
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -120,6 +120,7 @@ files:
 - lib/visage/config/plugin-colors.yaml
 - lib/visage/config/profiles.yaml
 - lib/visage/config/profiles.yaml.sample
+- lib/visage/helpers.rb
 - lib/visage/patches.rb
 - lib/visage/public/favicon.gif
 - lib/visage/public/javascripts/application.js
@@ -133,7 +134,6 @@ files:
 - lib/visage/public/stylesheets/screen.css
 - lib/visage/views/index.haml
 - lib/visage/views/layout.haml
-- lib/visage/views/single.haml
 has_rdoc: true
 homepage: http://auxesis.github.com/visage
 licenses: []

data/lib/visage/views/single.haml

@@ -1,43 +0,0 @@
-%div#header
-  %h1 Visage
-
-%div#single
-  %h3 Graph
-  %div.labels.container
-  %div#graph.holder
-  :javascript
-    window.addEvent('domready', function() {
-      var graph = new visageGraph('graph', 'theodor', 'cpu-0', {
-        width: 900,
-        height: 220,
-        gridWidth: 800,
-        gridHeight: 200
-      });
-    });
-
-  %h3 Load
-  %div.labels.container
-  %div#graph-load.holder
-  :javascript
-    window.addEvent('domready', function() {
-      var graph = new visageGraph('graph-load', 'theodor', 'load', {
-        width: 900,
-        height: 220,
-        gridWidth: 800,
-        gridHeight: 200
-      });
-    });
-
-  %h3 Memory
-  %div.labels.container
-  %div#graph-memory.holder
-  :javascript
-    window.addEvent('domready', function() {
-      var graph = new visageGraph('graph-memory', 'theodor', 'memory', {
-        width: 900,
-        height: 220,
-        gridWidth: 800,
-        gridHeight: 200
-      });
-    });
-