riemann-dash 0.2.1 → 0.2.3

data/.gitignore

@@ -0,0 +1,9 @@
+pkg/
+._*
+.sass-cache/
+*~
+.DS_Store
+.*.swp
+*.log
+/test/tmp/
+/config

data/Gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gemspec
+
+group :test do
+  gem 'pry'
+end

data/Gemfile.lock

@@ -0,0 +1,52 @@
+PATH
+  remote: .
+  specs:
+    reslike-dash (0.2.2)
+      erubis (>= 2.7.0)
+      multi_json (= 1.3.6)
+      riemann-client (>= 0.0.7)
+      sass (>= 3.1.14)
+      sinatra (>= 1.3.2)
+      thin (>= 1.3.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    beefcake (0.3.7)
+    coderay (1.0.9)
+    daemons (1.1.9)
+    erubis (2.7.0)
+    eventmachine (1.0.3)
+    method_source (0.8.1)
+    mtrc (0.0.4)
+    multi_json (1.3.6)
+    pry (0.9.12)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rack (1.5.2)
+    rack-protection (1.4.0)
+      rack
+    riemann-client (0.0.8)
+      beefcake (>= 0.3.5)
+      mtrc (>= 0.0.4)
+      trollop (>= 1.16.2)
+    sass (3.2.7)
+    sinatra (1.3.5)
+      rack (~> 1.4)
+      rack-protection (~> 1.3)
+      tilt (~> 1.3, >= 1.3.3)
+    slop (3.4.3)
+    thin (1.5.0)
+      daemons (>= 1.0.9)
+      eventmachine (>= 0.12.6)
+      rack (>= 1.0.0)
+    tilt (1.3.5)
+    trollop (2.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  pry
+  reslike-dash!

data/README.markdown

@@ -7,8 +7,8 @@ Get started
 ==========
 
 ``` bash
-gem install riemann-dash
-riemann-dash
+    $ gem install riemann-dash
+    $ riemann-dash
 ```
 
 Then open http://localhost:4567 in a browser. Riemann-dash will connect to the local host (relative to your browser) by default, and show you a small manual.
@@ -19,10 +19,34 @@ Configuring
 Riemann-dash takes an optional config file, which you can specify as the first
 command-line argument. If none is given, it looks for a file in the local
 directory: config.rb. That file can override any configuration options on the
-Dash class (hence all Sinatra configuration) as well as the Riemann client
-options, etc.
+Dash class, and hence, all Sinatra configuration.
 
 ``` ruby
 set :port, 6000 # HTTP server on port 6000
-config[:client][:host] = 'my.ustate.server'
+config[:ws_config] = 'custom/config.json' # Specify custom workspace config
 ```
+
+
+
+Development
+===========
+
+    $ git clone git://github.com/aphyr/riemann-dash.git
+    $ cd riemann-dash
+    $ bundle
+
+Testing
+=======
+    # run tests
+    $ sh/test
+
+Releasing
+==========
+    $ rake build
+    $ rake release
+
+REPL
+====
+    $ sh/c
+    > irb :001 > Riemann::Dash::VERSION
+    > => "0.2.2"

data/Rakefile.rb

@@ -0,0 +1,11 @@
+#$:.unshift(File.join(File.dirname(__FILE__), 'lib'))
+#require 'rubygems'
+require "bundler/gem_tasks"
+
+task :default => :test
+require 'rake/testtask'
+Rake::TestTask.new do |t|
+  t.libs.push "lib"
+  t.test_files = FileList['test/**/*_test.rb']
+  t.verbose    = false
+end

data/bin/riemann-dash

@@ -3,5 +3,5 @@
 $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')))
 require 'riemann/dash'
 
-Riemann::Dash.load ARGV.first 
-Riemann::Dash.run!
+Riemann::Dash::App.load ARGV.first
+Riemann::Dash::App.run!

data/example/config.rb

@@ -0,0 +1,17 @@
+# Serve HTTP traffic on this port
+set  :port, 4567
+
+riemann_base = '.'
+riemann_src = "#{riemann_base}/lib/riemann/dash"
+
+# Add custom controllers in controller/
+config.store[:controllers] = ["#{riemann_src}/controller"]
+
+# Use the local view directory instead of the default
+config.store[:views] = "#{riemann_src}/views"
+
+# Specify a custom path to your workspace config.json
+config.store[:ws_config] = "#{riemann_base}/config/config.json"
+
+# Serve static files from this directory
+config.store[:public] = "#{riemann_src}/public"

data/lib/riemann/dash/app.rb

@@ -0,0 +1,32 @@
+module Riemann
+  module Dash
+    class App < Sinatra::Base
+      # A little dashboard sinatra application.
+
+      require 'yaml'
+      require 'find'
+      require 'erubis'
+      require 'sass'
+
+      def self.config
+        Riemann::Dash::Config.instance
+      end
+
+      def config
+        self.class.config
+      end
+
+      def self.load(filename)
+        filename ||= 'config.rb'
+        unless config.load_config(filename)
+          # Configuration failed; load a default view.
+          puts "No configuration loaded; using defaults."
+        end
+
+        config.load_controllers
+        config.setup_views
+        config.setup_public_dir
+      end
+    end
+  end
+end

data/lib/riemann/dash/config.rb

@@ -0,0 +1,154 @@
+class Riemann::Dash::Config
+  attr_accessor :config_path
+  attr_accessor :store
+
+  def initialize
+    self.store = {}
+    setup_default_values
+  end
+
+  def self.instance
+    @instance ||= Riemann::Dash::Config.new
+  end
+
+  def self.reset!
+    @instance = nil
+  end
+
+  def setup_default_values
+    store.merge!({
+      :controllers => [File.join(File.dirname(__FILE__), 'controller')],
+      :views       => File.join(File.dirname(__FILE__), 'views'),
+      :ws_config   => File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'config', 'config.json')),
+      :public      => File.join(File.dirname(__FILE__), 'public')
+    })
+  end
+
+  def ws_config_file
+    store[:ws_config]
+  end
+
+  # backwards compatible forwarder to store-ivar
+  def [](k)
+    store[k]
+  end
+
+  def []=(k,v)
+    store[k] = v
+  end
+
+
+  # Executes the configuration file.
+  def load_config(path)
+    self.config_path = path
+    begin
+      Riemann::Dash::App.instance_eval File.read(config_path)
+      true
+    rescue Errno::ENOENT
+      false
+    end
+  end
+
+  def load_controllers
+    store[:controllers].each { |d| load_controllers_from(d) }
+  end
+
+  def setup_views
+    Riemann::Dash::App.set :views, File.expand_path(store[:views])
+  end
+
+  def setup_public_dir
+    require 'riemann/dash/rack/static'
+    Riemann::Dash::App.use Riemann::Dash::Static, :root => store[:public]
+  end
+
+  # Load controllers.
+  def load_controllers_from(dir)
+    sorted_controller_list(dir).each do |r|
+      require r
+    end
+  end
+
+  # Controllers can be regular old one-file-per-class, but
+  # if you prefer a little more modularity, this method will allow you to
+  # define all controller methods in their own files.  For example, get
+  # "/posts/*/edit" can live in controller/posts/_/edit.rb. The sorting
+  # system provided here requires files in the correct order to handle
+  # wildcards appropriately.
+  def sorted_controller_list(dir)
+    rbs = []
+    Find.find(
+      File.expand_path(dir)
+    ) do |path|
+      rbs << path if path =~ /\.rb$/
+    end
+
+    # Sort paths with _ last, becase those are wildcards.
+    rbs.sort! do |a, b|
+      as = a.split File::SEPARATOR
+      bs = b.split File::SEPARATOR
+
+      # Compare common subpaths
+      l = [as.size, bs.size].min
+      catch :x do
+        (0...l).each do |i|
+          a, b = as[i], bs[i]
+          if a[/^_/] and not b[/^_/]
+            throw :x, 1
+          elsif b[/^_/] and not a[/^_/]
+            throw :x, -1
+          elsif ord = (a <=> b) and ord != 0
+            throw :x, ord
+          end
+        end
+
+        # All subpaths are identical; sort longest first
+        if as.size > bs.size
+          throw :x, -1
+        elsif as.size < bs.size
+          throw :x, -1
+        else
+          throw :x, 0
+        end
+      end
+    end
+  end
+
+
+  require 'multi_json'
+  require 'fileutils'
+
+
+  def read_ws_config
+    if File.exists? ws_config_file
+      File.read(ws_config_file)
+    else
+      MultiJson.encode({})
+    end
+  end
+
+  def update_ws_config(update)
+    update = MultiJson.decode(update)
+
+    # Read old config
+    if File.exists? ws_config_file
+      old = MultiJson.decode File.read(ws_config_file)
+    else
+      old = {}
+    end
+
+    new_config = {}
+
+    # Server
+    new_config['server'] = update['server'] or old['server']
+
+    #p update['workspaces']
+    new_config['workspaces'] = update['workspaces'] or old['workspaces']
+
+    # Save new config
+    FileUtils.mkdir_p File.dirname(ws_config_file)
+    File.open(ws_config_file, 'w') do |f|
+      f.write(MultiJson.encode(new_config, :pretty => true))
+    end
+  end
+end

data/lib/riemann/dash/controller/css.rb

@@ -1,4 +1,4 @@
-class Riemann::Dash
+class Riemann::Dash::App
   get '/css' do
     scss :css, :layout => false
   end

data/lib/riemann/dash/controller/index.rb

@@ -1,50 +1,20 @@
-class Riemann::Dash
-  require 'multi_json'
-  require 'fileutils'
-  require 'set'
-
-  WS_CONFIG_FILE = "config/config.json"
-
+class Riemann::Dash::App
   get '/' do
     erb :index, :layout => false
   end
 
   get '/config', :provides => 'json' do
-    if File.exists? WS_CONFIG_FILE
-      send_file WS_CONFIG_FILE, :type => :json
-    else
-      MultiJson.encode({})
-    end
+    content_type "application/json"
+    config.read_ws_config
   end
 
   post '/config' do
     # Read update
     request.body.rewind
-    update = MultiJson.decode(request.body.read)
-
-    # Read old config
-    if File.exists? WS_CONFIG_FILE
-      old = MultiJson.decode File.read WS_CONFIG_FILE
-    else
-      old = {}
-    end
-
-    new = {}
-
-    # Server
-    new['server'] = update['server'] or old['server']
-
-    p update['workspaces']
-    new['workspaces'] = update['workspaces'] or old['workspaces']
-
-    # Save new config
-    FileUtils.mkdir_p 'config'
-    File.open(WS_CONFIG_FILE, 'w') do |f|
-      f.write(MultiJson.encode(new))
-    end
+    config.update_ws_config(request.body.read)
 
     # Return current config
     content_type "application/json"
-    MultiJson.encode(new)
+    config.read_ws_config
   end
-end
+end

data/lib/riemann/dash/public/dash.js

@@ -37,14 +37,18 @@ dash = (function() {
   }
 
   // Find a workspace by ID.
-  var workspace = function(id) {
-    for (var i = 0; i < workspaces.length; i++) {
-      if (workspaces[i].id === id) {
-        return workspaces[i];
-      }
-    }
-    return null;
-  }
+  var workspaceByProperty = function(property) {
+    return function(match) {
+      return _.find(workspaces, function(w) {
+        return _.isEqual(match, w[property]);
+      }) || null;
+      // for some reason we can't return undefined and we must
+      // explicitly return null upon failure
+    };
+  };
+
+  var workspace = workspaceByProperty("id");
+  var workspaceByName = workspaceByProperty("name");
 
   // Get current workspace.
   var currentWorkspace = function() {
@@ -60,7 +64,7 @@ dash = (function() {
     var currentIndex = currentWorkspaceIndex();
     if (currentIndex != null) {
       //console.log(util.merge(currentWorkspace(), {view: currentView.json()}));
-      workspaces[currentIndex] = 
+      workspaces[currentIndex] =
         util.merge(currentWorkspace(), {view: currentView.json()});
     }
     toolbar.workspaces(workspaces);
@@ -73,6 +77,19 @@ dash = (function() {
     return w;
   }
 
+  var getLocation = function() {
+    return window.location.hash.slice(1);
+  };
+
+  var toLocation = function(workspace) {
+    window.history.pushState(workspace, workspace.name, "#" + workspace.name);
+  };
+
+  var switchWorkspaceByName = function(name) {
+    var workspace = workspaceByName(name) || workspaces[0];
+    return switchWorkspace(workspace);
+  };
+
   // Switch between workspaces.
   var switchWorkspace = function(workspace) {
     // Shut down current setup
@@ -87,6 +104,13 @@ dash = (function() {
     currentWorkspaceId = workspace.id;
     toolbar.workspace(workspace);
 
+    document.title = workspace.name;
+
+    // update URL
+    if (getLocation() !== workspace.name) {
+      toLocation(workspace);
+    }
+
     // Create new view
     currentView = view.reify(
       $.extend({container: $('#view')}, workspace.view));
@@ -121,22 +145,24 @@ dash = (function() {
         });
         toolbar.workspaces(workspaces);
       }
-  
+
       // Ensure there's a default workspace.
       if (workspaces.length === 0) {
         workspaces = [defaultWorkspace];
       }
 
-      // Don't preserve current state.
       var replacement = workspace(currentWorkspace.id);
       currentWorkspaceId = null;
-      if (replacement) {
-        // Load current workspace, if it's still there
-        switchWorkspace(replacement);
-      } else {
-        // Or revert to the first workspace
+
+      var currentLocation = getLocation()
+      if (currentLocation) { // check URL first
+        switchWorkspaceByName(currentLocation);
+      } else if (replacement) { // otherwise use replacement
+        switchWorkspace(replacement)
+      } else { // failing that use the first
         switchWorkspace(workspaces[0]);
       }
+
     });
   }
 
@@ -150,7 +176,7 @@ dash = (function() {
         workspaces: workspaces
       },
       function() { toastr.info("Configuration saved.") },
-      function(xhr, msg) { 
+      function(xhr, msg) {
         console.log("Error saving config", msg);
         toastr.error("Error saving config: " + msg);
       }
@@ -249,7 +275,7 @@ dash = (function() {
       } catch (e) { }
     }
   });
-  
+
   return {
     workspaces: function() { return workspaces },
     currentWorkspace: function() { return currentWorkspace },

data/lib/riemann/dash/public/format.js

@@ -6,15 +6,15 @@ var format = (function() {
     return Math.round(number * base) / base;
   }
 
-  var metricTemplate = '<div class="bar {{class}}" style="width: {{percent}}%">{{metric}}</div>';
+  var metricTemplate = _.template('<div class="bar {{state}}" style="width: {{percent}}%">{{metric}}</div>'); 
   var metric = function(e, max) {
     var max = (max || 1);
     var data = {
-      'class': e.state,
+      'state': e.state,
       'percent': (e.metric / max * 100),
       'metric': formatFloat(e.metric)
     }
-    return Mustache.render(metricTemplate, data);
+    return metricTemplate(data);
   };
 
   return {

data/lib/riemann/dash/public/persistence.js

@@ -3,7 +3,7 @@ var persistence = (function() {
   // Saves configuration to persistent store. Calls success() or error() when 
   // complete.
   var save = function(config, success, error) {
-    jQuery.ajax('/config', {
+    jQuery.ajax('config', {
       type: 'POST',
       success: success,
       error: error,
@@ -15,7 +15,7 @@ var persistence = (function() {
 
   // Returns configuration from persistent store.
   var load = function(success, error) {
-    jQuery.ajax('/config', {
+    jQuery.ajax('config', {
         type: 'GET',
         success: success,
         error: error,