visage-app 0.2.5 → 0.2.6

data/.gitignore

@@ -7,3 +7,4 @@ pkg/*
 webrat*
 visage-app.gemspec
 lib/visage/config/profiles.yaml
+_site

data/AUTHORS

@@ -7,3 +7,8 @@ Contributors include
 Jeffrey Lim <jfs.world@gmail.com>
 Andrew Harvey <andrew@mootpointer.com>
 Xavier Mehrenberger <xavier.mehrenberger@gmail.com>
+
+Inspiration given by
+--------------------
+Gareth Stokes
+Asdrubal Ibarra

data/README.md

@@ -33,7 +33,7 @@ On Ubuntu, to install dependencies run:
 
 On CentOS, to install dependencies run:
 
-    $ sudo yum install -y rrdtool ruby rubygems collectd
+    $ sudo yum install -y ruby-rrdtool ruby rubygems collectd
 
 Then install the app with:
 

data/Rakefile

@@ -46,6 +46,7 @@ task :push => :lintian do
   system(command)
 end
 
+desc "perform lintian checks on the JavaScript about to be shipped"
 task :lintian do
   require 'pathname'
   @root = Pathname.new(File.dirname(__FILE__)).expand_path
@@ -54,3 +55,11 @@ task :lintian do
   count = `grep -c 'console.log' #{javascripts_path.join('graph.js')}`.strip.to_i
   abort("#{count} instances of console.log found in graph.js!") if count > 0
 end
+
+desc "clean up various generated files"
+task :clean do
+  [ "webrat.log", "pkg/", "visage-app-*.spec", "_site/"].each do |filename|
+    puts "Removing #{filename}"
+    FileUtils.rm_rf(filename)
+  end
+end

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/features/site.feature

@@ -3,9 +3,16 @@ Feature: Visit site
   A user
   Must be able to visualise the data
 
-  Scenario: Show available hosts
+  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
+    When I follow "created"
+    Then I should see a list of profiles
+    When I follow "name"
+    Then I should see a list of profiles sorted alphabetically
 

data/features/step_definitions/site_steps.rb

@@ -9,3 +9,19 @@ Then /^I should see a list of graphs$/ do
   doc = Nokogiri::HTML(response_body)
   doc.search('div#profile div.graph').size.should > 1
 end
+
+Then /^I should see a list of profiles$/ do
+  doc = Nokogiri::HTML(response_body)
+  doc.search('div#profiles ul li').size.should > 1
+end
+
+Then /^I should see a list of profiles sorted alphabetically$/ do
+  doc = Nokogiri::HTML(response_body)
+  profiles = doc.search('div#profiles ul li')
+  profiles.size.should > 1
+
+  unsorted = profiles.map { |p| p.text.strip }
+  sorted = profiles.map { |p| p.text.strip }.sort
+
+  unsorted.should == sorted
+end

data/features/support/env.rb

@@ -26,7 +26,12 @@ class SinatraWorld
   Webrat::Methods.delegate_to_session :response_code, :response_body, :response_headers, :response
 
   def app
-    Visage::JSON
+    Rack::Builder.new do
+      use Visage::Profiles
+      use Visage::Builder
+      use Visage::JSON
+      run Sinatra::Application
+    end
   end
 end
 

data/lib/visage-app.rb

@@ -38,7 +38,7 @@ module Visage
     end
 
     get '/profiles' do
-      @profiles = Visage::Profile.all
+      @profiles = Visage::Profile.all(:sort => params[:sort])
       haml :profiles
     end
   end

data/lib/visage/config.rb

@@ -1,5 +1,5 @@
 module Visage
-  class Config 
+  class Config
 
     class << self
       def use
@@ -20,32 +20,5 @@ module Visage
         @configuration
       end
     end
-
-    class Profiles
-      class << self
-        require 'ostruct'
-
-        attr_accessor :profiles
-
-        def get(id)
-          id.gsub!(/\s+/, '+')
-          if found = @profiles.find {|p| p[1]["splat"] == id }
-            OpenStruct.new(found[1])
-          else
-            nil
-          end
-        end
-
-        def all
-          # here be ugliness
-          profiles = @profiles.to_a.sort_by { |profile| 
-            profile[1]["order"] 
-          }.map { |profile| 
-            OpenStruct.new(profile[1].merge({'name' => profile[0]}))
-          }
-        end
-      end
-    end
-
   end
 end

data/lib/visage/profile.rb

@@ -20,9 +20,11 @@ module Visage
       profiles[url] ? self.new(profiles[url]) : nil
     end
 
-    def self.all
+    def self.all(opts={})
+      sort = opts[:sort]
       profiles = YAML::load_file(@@profiles_filename) || {}
-      profiles.values.map { |prof| self.new(prof) }
+      profiles = sort == "name" ? profiles.sort.map {|i| i.last } : profiles.values
+      profiles.map { |prof| self.new(prof) }
     end
 
     def initialize(opts={})

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

@@ -239,6 +239,12 @@ div#profiles {
   width: 450px;
 }
 
+div#profiles div#sort {
+  text-align: right;
+  font-size: 85%;
+  color: #888;
+}
+
 div#profiles ul li {
   margin-bottom: 8px;
   list-style-type: none;

data/lib/visage/views/profiles.haml

@@ -2,6 +2,11 @@
 
 %div#profiles
   %h2 Profiles
+  %div#sort
+    Sort by:
+    %a{:href => link_to("/profiles?sort=name")} name
+    |
+    %a{:href => link_to("/profiles?sort=created")} created
 
   %ul
     - @profiles.each do |prof|

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Lindsay Holmwood
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-11 00:00:00 +10:00
+date: 2010-09-26 00:00:00 +10:00
 default_executable: visage
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -120,7 +120,6 @@ files:
 - lib/visage/config/fallback-colors.yaml
 - lib/visage/config/init.rb
 - lib/visage/config/plugin-colors.yaml
-- lib/visage/config/profiles.yaml.sample
 - lib/visage/graph.rb
 - lib/visage/helpers.rb
 - lib/visage/patches.rb

data/lib/visage/config/profiles.yaml.sample

@@ -1,33 +0,0 @@
---- 
-profiles: 
-  cpu+load: 
-    plugins: 
-      - cpu-0
-      - cpu-1
-      - load/load
-      - battery-0
-    name: CPU + Load
-    order: 1
-  memory: 
-    plugins: 
-      - memory
-      - swap
-    name: Memory
-    order: 2
-  disk+usage: 
-    plugins: 
-      - df/df-root
-      - disk-sda
-    name: Disk Usage
-    order: 3
-  network: 
-    plugins: 
-      - tcpconns-9393-local
-      - tcpconns-80-local
-    name: Networking
-    order: 4
-  processes: 
-    plugins: 
-      - processes
-    name: Processes
-    order: 5