visage-app 2.0.4 → 2.0.5

data/.gitignore

@@ -8,3 +8,5 @@ webrat*
 lib/visage-app/config/profiles.yaml
 _site
 features/data/config/*/*.yaml
+vendor
+.bundle

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+2.0.5 - 2012/03/30
+ - Fix a bug where metrics occasionally won't appear in the builder interface.
+   Thanks to Jesse Reynolds for the patch!
+ - Add documentation on how to do a release, for when I get hit by a bus.
+
 2.0.4 - 2012/03/27
  - Add extra input validation in the builder, so invalid data can't be entered
    into `profiles.yaml`, per [issue 92](https://github.com/auxesis/visage/issues/92)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    visage-app (2.0.4)
+    visage-app (2.0.5)
       errand (= 0.7.3)
       haml (= 3.1.4)
       sinatra (= 1.3.2)

data/README.md

@@ -224,6 +224,15 @@ To create and install a new gem from the current source tree:
 rake install
 ```
 
+Releasing
+---------
+
+# Bump the version in lib/visage-app/version.rb
+# Add an entry to CHANGELOG.md
+# `git commit` everything.
+# Build the gem with `rake build`
+# Push the gem to RubyGems.org with `rake push`
+
 Licencing
 ---------
 

data/lib/visage-app/collectd/rrds.rb

@@ -17,7 +17,7 @@ module Visage
         def hosts(opts={})
           hosts = opts[:hosts]
           case hosts
-          when String && /,/
+          when String
             glob = "{#{hosts}}"
           when Array
             glob = "{#{opts[:hosts].join(',')}}"
@@ -41,14 +41,21 @@ module Visage
             metric_glob = "*/*"
           end
 
-          selected_hosts.map { |host|
+          dametrics = selected_hosts.map { |host|
             Dir.glob("#{rrddir}/#{host}/#{metric_glob}.rrd").map {|filename|
               filename[/#{rrddir}\/#{host}\/(.*)\.rrd/, 1]
             }
-          }.reduce(:&)
+          }
+          if (dametrics.length) == 1
+            dametrics.first
+          else
+            dametrics.reduce(:&)
+          end
+
           #else
           #  Dir.glob("#{rrddir}/#{host_glob}/#{glob}.rrd").map {|e| e.split('/')[-2..-1].join('/').gsub(/\.rrd$/, '')}.sort.uniq
           #end
+
         end
 
       end

data/lib/visage-app/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 module Visage
-  VERSION = "2.0.4"
+  VERSION = "2.0.5"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 0
-  - 4
-  version: 2.0.4
+  - 5
+  version: 2.0.5
 platform: ruby
 authors: 
 - Lindsay Holmwood
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-26 00:00:00 +11:00
+date: 2012-03-30 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency