casseo 0.1.1 → 0.1.2

data/README.md

@@ -12,7 +12,7 @@ Or if you're really concerned about Rubygems' speed, clone the reposistory and c
     git clone https://github.com/brandur/casseo.git
     cd casseo
     rake standalone
-    mv casseo ~/bin/casseo
+    mv casseo ~/bin/
 
 Configuration
 -------------
@@ -24,10 +24,11 @@ Casseo expects to be able to find your Graphite credentials at `~/.casseorc`:
 
 Other allowed configuration options are:
 
-* `compressed_chart:` whether to include a space between chart symbols
-* `dashboard_default:` name of the dashboard to load if none is specified
-* `interval:` Graphite update interval in seconds
-* `period_default:` default period of data to show
+* `compressed_chart:` whether to include a space between chart symbols (default: false)
+* `dashboard_default:` name of the dashboard to load if none is specified (default: home)
+* `decimal_precision:` floating point precision to show (default: 1); see also `p` shortcut
+* `interval:` Graphite update interval in seconds (default: 2)
+* `period_default:` default period of data to show (default: 5 minutes)
 
 Dashboards
 ----------
@@ -68,6 +69,8 @@ For now, there are no options on key bindings. Here's what you get:
 
 * `j` page down
 * `k` page up
+* `m` show/hide max value column
+* `p` show more floating point precision
 * `q` quit
 * `1` 5 minute range
 * `2` 60 minute range

data/lib/casseo/config.rb

@@ -4,13 +4,18 @@ module Casseo
 
     # whether an extra space is inserted between chart characters
     def compressed_chart
-      config(:compressed_chart)
+      !!config(:compressed_chart)
     end
 
     def dashboard_default
       config(:dashboard_default) || :home
     end
 
+    # show extra decimal precision
+    def decimal_precision
+      config(:decimal_precision) || 1
+    end
+
     def graphite_auth
       config!(:graphite_auth)
     end

data/lib/casseo/dashboard.rb

@@ -9,8 +9,10 @@ module Casseo
     def initialize
       @confs = []
       @data = nil
+      @decimal_precision = Config.decimal_precision
       @page = 0
       @period = Config.period_default # minutes
+      @show_max = false
     end
 
     def blank
@@ -84,13 +86,18 @@ module Casseo
 
     def handle_key_presses
       loop do
-        new_page   = nil
-        new_period = nil
+        new_decimal_precision = nil
+        new_page              = nil
+        new_period            = nil
+        new_show_max          = nil
 
         case Curses.getch
         when Curses::KEY_RESIZE then show
         when ?j then new_page = clamp(@page + 1, 0, num_pages)
         when ?k then new_page = clamp(@page - 1, 0, num_pages)
+        when ?m then new_show_max = !@show_max
+        when ?p then new_decimal_precision = @decimal_precision == 3 ?
+          Config.decimal_precision : 3
         when ?q then Kernel.exit(0)
         when ?1 then new_period = 5
         when ?2 then new_period = 60
@@ -105,6 +112,18 @@ module Casseo
           show
         end
 
+        if new_show_max != nil
+          @show_max = new_show_max
+          Curses.clear
+          show
+        end
+
+        if new_decimal_precision && new_decimal_precision != @decimal_precision
+          @decimal_precision = new_decimal_precision
+          Curses.clear
+          show
+        end
+
         if new_period && new_period != @period
           @period = new_period
           # will update the next time the fetch loop runs
@@ -130,20 +149,25 @@ module Casseo
         data_points = @data.detect { |d| d["target"] == conf[:metric] }
         data_points = data_points ? data_points["datapoints"].dup : []
 
-        # smaller range high resolution requests will have nil values
-        data_points.reject! { |p| p[0] == nil }
-
         # show left to right latest to oldest
         data_points.reverse!
 
-        max = data_points.max { |p1, p2| p1[0] <=> p2[0] }
+        max = data_points.select { |p| p[0] != nil }.
+          max { |p1, p2| p1[0] <=> p2[0] }
         max = max ? max[0] : nil
 
-        latest = data_points.count > 0 ? data_points[0][0] : 0.0
+        # keep everything under a very small threshold at 0 bars
+        max = 0.0 if max && max < 0.01
+
+        latest = data_points.detect { |p| p[0] != nil }
+        latest = latest ? latest[0] : 0.0
 
         unit = conf[:unit] || " "
-        str = "%-#{@longest_display}s %8.1f%s " %
+        float_width = 7 + @decimal_precision
+        str = "%-#{@longest_display}s %#{float_width}.#{@decimal_precision}f%s " %
           [conf[:display] || conf[:metric], latest, unit]
+        str += "%#{float_width}.#{@decimal_precision}f%s " %
+          [max || 0.0, unit] if @show_max
 
         chart = ""
         if max && max > 0
@@ -152,6 +176,7 @@ module Casseo
             next if i % 2 == 0 unless Config.compressed_chart
             index = ((i.to_f / num_samples.to_f) * data_points.count.to_f).to_i - 1
             sample = data_points[index][0]
+            sample = 0.0 unless sample
 
             index = (sample / max * CHART_CHARS.count).to_i - 1
             chart += CHART_CHARS[index]

data/lib/casseo/version.rb

@@ -1,3 +1,3 @@
 module Casseo
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: casseo
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors: