casseo 0.1.0 → 0.1.1

data/README.md

@@ -24,18 +24,19 @@ 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
+* `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
 
 Dashboards
 ----------
 
-Dashboards are configured via simple Ruby in a manner reminiscent of Tasseo. All `*.rb` files in `~/.casseo/dashboards` or in any of its subdirectories are loaded automatically at startup. Dashboards are assigned names so that they can be referenced and opened like so:
+Dashboards are configured via simple Ruby in a manner reminiscent of Tasseo. All `*.rb` files in `~/.casseo/dashboards` or in any of its subdirectories are loaded automatically. Dashboards are assigned names so that they can be referenced and opened like so:
 
     casseo home
 
-An example dashboard that can be saved to `~/.casseo/dashboards/home.rb`:
+An example dashboard (save to `~/.casseo/dashboards/home.rb`):
 
 ``` ruby
 Casseo::Dashboard.define(:api) do |d|
@@ -65,13 +66,13 @@ Key Bindings
 
 For now, there are no options on key bindings. Here's what you get:
 
-    * `j` page down
-    * `k` page up
-    * `q` quit
-    * `1` 5 minute range
-    * `2` 60 minute range
-    * `3` 3 hour range
-    * `4` 24 hour range
-    * `5` 7 day range
+* `j` page down
+* `k` page up
+* `q` quit
+* `1` 5 minute range
+* `2` 60 minute range
+* `3` 3 hour range
+* `4` 24 hour range
+* `5` 7 day range
 
 [tasseo]: https://github.com/obfuscurity/tasseo

data/Rakefile

@@ -1,2 +1,18 @@
-task :standalone
+task :standalone do
+  # lib/casseo.rb knows the correct load order
+  source_files = File.read("./lib/casseo.rb").
+    scan(/require_relative "(.*)"/).map { |f| "./lib/#{f.first}.rb" }
+
+  # use bin/casseo as an executable template
+  skeleton = File.read("./bin/casseo")
+  source = source_files.map { |f| File.read(f) }.join("\n")
+  source = skeleton.gsub(
+    /# @@STANDALONE_START@@.*# @@STANDALONE_END@@\n\n/m, source)
+
+  target = "./casseo"
+  File.open(target, 'w') do |f|
+    f.puts source
+    f.chmod 0755
+  end
+  puts "Saved to #{target}"
 end

data/bin/casseo

@@ -7,48 +7,10 @@ require "net/https"
 require "timeout"
 require "uri"
 
-require_relative "../lib/casseo"
-
-# load all user dashboards
-dir = "#{File.expand_path("~")}/.casseo/dashboards"
-if File.exists?(dir)
-  # clever hack to get symlinks working properly
-  Dir["#{dir}/**{,/*/**}/*.rb"].each do |d|
-    require d
-  end
-end
-
-$exit_message = nil
+# @@STANDALONE_START@@
 
-["TERM", "INT"].each do |s|
-  Signal.trap(s) do
-    $exit_message = "Caught deadly signal"
-    Kernel.exit(0)
-  end
-end
-
-begin
-  Curses.cbreak      # no need for a newline to get type chars
-  Curses.curs_set(1) # invisible
-  Curses.noecho      # don't echo character on a getch
-
-  Curses.init_screen
+require_relative "../lib/casseo"
 
-  # fail fast on missing required config
-  Casseo::Config.required
+# @@STANDALONE_END@@
 
-  if ARGV.count > 0 && File.exists?(ARGV.first)
-    require ARGV.first
-  elsif ARGV.count > 0 && ["-l", "--list"].include?(ARGV.first)
-    $exit_message = Casseo::Dashboard.index.sort.join("\n")
-  elsif ARGV.first
-    Casseo::Dashboard.run(ARGV.first.to_sym)
-  else
-    Casseo::Dashboard.run(Casseo::Config.dashboard_default)
-  end
-rescue Casseo::ConfigError, Casseo::DashboardNotFound => e
-  $exit_message = e.message
-ensure
-  Curses.close_screen
-  puts $exit_message if $exit_message
-end
+Casseo::Runner.execute(ARGV)

data/lib/casseo.rb

@@ -1,4 +1,5 @@
 require_relative "casseo/config"
 require_relative "casseo/index"
 require_relative "casseo/dashboard"
+require_relative "casseo/runner"
 require_relative "casseo/version"

data/lib/casseo/config.rb

@@ -24,6 +24,11 @@ module Casseo
       config(:interval) || 2.0
     end
 
+    # minutes
+    def period_default
+      config(:period_default) || 5
+    end
+
     def required
       [ Casseo::Config.graphite_auth,
         Casseo::Config.graphite_url ]

data/lib/casseo/dashboard.rb

@@ -10,7 +10,7 @@ module Casseo
       @confs = []
       @data = nil
       @page = 0
-      @period = 5 # minutes
+      @period = Config.period_default # minutes
     end
 
     def blank
@@ -128,34 +128,38 @@ module Casseo
         next unless i >= @page * Curses.lines && i < (@page + 1) * Curses.lines
 
         data_points = @data.detect { |d| d["target"] == conf[:metric] }
-        data_points = data_points ? data_points["datapoints"] : []
+        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.
-          select { |p| p[0] != nil }.
-          max { |p1, p2| p1[0] <=> p2[0] }
+        max = data_points.max { |p1, p2| p1[0] <=> p2[0] }
         max = max ? max[0] : nil
 
-        latest = data_points.detect { |p| p[0] != nil }
-        latest = latest ? latest[0] : 0.0
+        latest = data_points.count > 0 ? data_points[0][0] : 0.0
+
+        unit = conf[:unit] || " "
+        str = "%-#{@longest_display}s %8.1f%s " %
+          [conf[:display] || conf[:metric], latest, unit]
 
-        current = nil
         chart = ""
         if max && max > 0
-          data_points.each do |p|
-            current = p[0] || current
-            next unless current
-            index = (current.to_f / max * CHART_CHARS.count).to_i - 1
+          num_samples = Curses.cols - str.length
+          (1..num_samples).each do |i|
+            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]
+
+            index = (sample / max * CHART_CHARS.count).to_i - 1
             chart += CHART_CHARS[index]
             chart += " " unless Config.compressed_chart
           end
         end
 
-        unit = conf[:unit] || " "
-        str = "%-#{@longest_display}s %8.1f%s %s" %
-          [conf[:display] || conf[:metric], latest, unit, chart]
+        str += chart
         str = str[0...Curses.cols]
         Curses.setpos(i % Curses.lines, 0)
         Curses.addstr(str)

data/lib/casseo/runner.rb

@@ -0,0 +1,62 @@
+module Casseo
+  class Runner
+    def self.execute(args)
+      new(args).execute
+    end
+
+    def initialize(args)
+      @args = args
+      @exit_message = nil
+      setup_signals
+    end
+
+    def execute
+      Curses.cbreak      # no need for a newline to get type chars
+      Curses.curs_set(1) # invisible
+      Curses.noecho      # don't echo character on a getch
+
+      Curses.init_screen
+
+      # fail fast on missing required config
+      Config.required
+
+      load_dashboards
+
+      if @args.count > 0 && File.exists?(File.expand_path(@args.first))
+        eval(File.read(@args.first)).run
+      elsif @args.count > 0 && ["-l", "--list"].include?(@args.first)
+        @exit_message = Dashboard.index.sort.join("\n")
+      elsif @args.first
+        Dashboard.run(@args.first.to_sym)
+      else
+        Dashboard.run(Config.dashboard_default)
+      end
+    rescue ConfigError, DashboardNotFound => e
+      @exit_message = e.message
+    ensure
+      Curses.close_screen
+      puts @exit_message if @exit_message
+    end
+
+    private
+
+    def load_dashboards
+      dir = "#{File.expand_path("~")}/.casseo/dashboards"
+      if File.exists?(dir)
+        # clever hack to get symlinks working properly
+        Dir["#{dir}/**{,/*/**}/*.rb"].each do |d|
+          require d
+        end
+      end
+    end
+
+    def setup_signals
+      ["TERM", "INT"].each do |s|
+        Signal.trap(s) do
+          @exit_message = "Caught deadly signal"
+          Kernel.exit(0)
+        end
+      end
+    end
+  end
+end

data/lib/casseo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: casseo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -25,6 +25,7 @@ files:
 - lib/casseo/config.rb
 - lib/casseo/dashboard.rb
 - lib/casseo/index.rb
+- lib/casseo/runner.rb
 - lib/casseo/version.rb
 - lib/casseo.rb
 homepage: https://github.com/brandur/casseo