pencil 0.2.10 → 0.3.0

data/lib/pencil/public/style.css

@@ -0,0 +1,307 @@
+body {
+    background-color: #000;
+    color: #fff;
+    margin: 0px;
+    font-family: Verdana, Arial, Tahoma, sans-serif;
+    min-width: 1200px;
+}
+
+#header {
+    padding: 10px;
+    border-bottom: 3px #222 solid;
+    height: 45px;
+    background-color: #111;
+}
+
+#header h1{
+    padding: 0px;
+    margin: 0px;
+    font-weight: bold;
+}
+
+#header h4{
+    margin: 0px;
+    padding: 0px;
+    color: #ccc;
+}
+
+div#nav {
+    width: 15%;
+    padding: 10px;
+    float: left;
+    color: green;
+    border-left: 1px #444 solid;
+    border-right: 1px #444 solid;
+    border-bottom: 1px #444 solid;
+    background-color: #222;
+    font-size: 12px;
+}
+
+div#nav h3{
+    color: #d0cfcf;
+    font-size: 12px;
+}
+
+div#nav ul{
+    list-style-type: square;
+    padding-left: 15px;
+}
+
+div#main ul{
+    list-style-type: square;
+    padding-left: 25px;
+}
+
+div#nav ul li a,
+div#main ul li a {
+    color: #99ccff;
+}
+
+div.nav-box {
+    margin-top: 10px;
+    background-color: #111;
+    font-size: 10px;
+}
+
+div.nav-box-inner {
+    padding: 3px;
+    color: #fff;
+}
+
+div.nav-box-inner label{
+    clear: left;
+    width: 70px;
+    padding-right: 4px;
+    float: left;
+    display: inline;
+    text-align: right;
+    height: 16px;
+    margin-top: 4px;
+}
+
+div.nav-box-inner input{
+    float: left;
+    display: inline-block;
+    height: 16px;
+    margin-top: 4px;
+    color: #fff;
+}
+
+div.nav-box-inner div.button-holder input {
+    float: none;
+    height: 20px;
+    font-size: 9px;
+}
+
+
+div.nav-box-inner div.button-holder {
+    text-align: center;
+    font-size: 10px;
+    clear: both;
+    padding-top: 5px;
+}
+
+div.nav-box-inner a.inline-link {
+    float: left;
+    position: relative;
+    top: 4px;
+    left: 4px;
+    color: #f0f0f0;
+}
+
+div.nav-box h3 {
+    margin: 0px;
+    padding: 2px;
+    font-size: 11px;
+}
+
+div#timeslice_container{
+    position: relative;
+}
+
+div#timeslice_container a{
+    position: absolute;
+    top: 0px;
+    color: #fff;
+    right: 0px;
+    text-align: right;
+}
+
+div.group_container {
+    background-color: #111;
+    border: 1px #333 solid;
+    padding: 2px;
+    font-size: 13px;
+}
+
+div.group_container.first {
+    border-bottom: none;
+}
+div.group_container.last {
+    
+}
+
+div.group_container a {
+    color: #99ccff;
+    font-size: 13px;
+}
+
+div.group_container h4 {
+    display: inline-block;
+    margin: 0px;
+    padding: 0px;
+    font-size: 16px;
+}
+
+div.path_container {
+    position: relative;
+}
+
+div.path_container span.zoom {
+    position: absolute;
+    top: 7px;
+    right:0px;
+}
+
+div.path_container span.zoom a {
+    color: #99ccff;
+}
+
+div.group_container_small {
+    margin-top: 15px;
+    background-color: #333;
+    border: 1px #555 solid;
+    padding: 2px;
+    font-size: 11px;
+}
+
+div.group_container_small a {
+    color: #99ccff;
+    font-size: 11px;
+}
+
+div.group_container_small h4 {
+    display: inline-block;
+    margin: 0px;
+    padding: 0px;
+    font-size: 14px;
+}
+
+div.graph_container {
+    position: relative;
+    border: 1px #333 dotted;
+    margin-top: 10px;
+}
+
+div.graph_container h3{
+    border-bottom: 1px #666666 solid;
+    background-color: #222;
+    margin: 0px;
+    padding: 2px;
+}
+
+div.graph_container h3 span.tools{
+    position: absolute;
+    top:5px;
+    right:5px;
+    font-size: 11px;
+    color: #fff;
+}
+
+div.graph_container h3 span.tools a{
+    color: #99ccff;
+}
+
+div.graph_container div.graph{
+    text-align: center;
+    padding-bottom: 8px;
+}
+
+h2 {
+    color: #ADFF2F;
+}
+
+h3,
+h3 a{
+    color: #32cd32;
+}
+
+.graphtitle {
+    text-shadow: 1px 1px 1px #333333;
+}
+
+.dashlinks {
+    color: green;
+    font-size: small;
+}
+
+a {
+    color: #15317E;
+}
+
+a:visited {
+    color: #15317E;
+}
+
+.graphsection {
+    border: dotted 2px #333333;
+    width: 500;
+    margin-left: 5px;
+    margin-top: 10px;
+}
+
+
+div#main {
+    margin-left: 18%;
+    padding: 10px;
+    color: #4CBB17;
+    margin-bottom: 30px;
+}
+
+div#footer {
+    width: 100%;
+    background-color: #222;
+    position: fixed;
+    bottom: 0px;
+    text-align: center;
+    border-top: 1px #333 solid;
+    margin-top: 15px;
+    font-size: 11px;
+    padding: 5px;
+    color: #fff;
+}
+
+div#footer a{
+    color: #ccc;
+    font-weight: bold;
+}
+
+table {
+    color: green;
+}
+
+input {
+    border: solid 1px #15317E;
+    color: green;
+    background-color: #1f1f1f;
+    font-size: small;
+}
+
+.invisible {
+    display: none;
+}
+
+select {
+    border: solid 1px #15317E;
+    color: green;
+    background-color: #1f1f1f;
+}
+
+.select2 {
+    color: #4CBB17;
+    font-size: large;
+}
+
+.error {
+    color: red;
+}

data/lib/pencil/version.rb

@@ -0,0 +1,3 @@
+module Pencil
+  VERSION = "0.3.0"
+end

data/lib/{views → pencil/views}/cluster.erb

@@ -4,7 +4,7 @@
    boards = @dashboards.select { |d| d.clusters.member?(@cluster) }
    seen_hosts = Set.new %>
 
-<% boards.each do |b| %>
+<% boards.sort.each do |b| %>
 <h3><a href="/dash/<%= "#{@cluster}/#{append_query_string(b.name)}" %>"><%= b.name %></a>
   <% dash_hosts = b.get_all_hosts(@cluster)[0]
      seen_hosts += dash_hosts %>

data/lib/{views → pencil/views}/dash-cluster-zoom.erb

@@ -5,7 +5,7 @@
 <%= graph_switcher %>
 <%= shortcuts(hosts.collect { |h| "<a href=\"##{h}\">#{h}</a>" }.join(" ")) %>
 
-<div class="graph_container">
+<div class="graph_container" style="width:<%= @zoom.width(merge_opts) %>;">
   <h3><%= @zoom.name %> / <%= @cluster %> :: summary
   </h3>
   <div class="graph">
@@ -14,7 +14,7 @@
 </div>
 
 <% hosts.each do |host| %>
-<div class="graph_container">
+<div class="graph_container" style="width:<%= @zoom.width(merge_opts) %>;">
   <a name="<%= host %>"></a>
   <% image_url, zoom_url = cluster_zoom_graph(@zoom, @cluster, host, "#{@zoom.name} / #{@cluster} / #{host}") %>
   <h3><%= @zoom.name %> / <%= @cluster %> / <%= host %>

data/lib/{views → pencil/views}/dash-cluster.erb

@@ -4,7 +4,7 @@
 <%= shortcuts(@dash.graphs.collect { |g| "<a href=\"##{g.name}\">#{g.name}</a>" }.join(" ")) %>
 
 <% @dash.graphs.each do |g| %>
-<div class="graph_container">
+<div class="graph_container" style="width:<%= g.width(merge_opts) %>;">
   <a name="<%= g.name %>"></a>
   <% image_url, zoom_url = cluster_graph(g, @cluster, "#{g.name} / #{@cluster}") %>
   <h3><%= g.name %>

data/lib/{views → pencil/views}/dash-global-zoom.erb

@@ -5,7 +5,7 @@
 <%= graph_switcher %>
 <%= shortcuts(clusters.sort.collect { |h| "<a href=\"##{h}\">#{h}</a>" }.join(" ")) %>
 
-<div class="graph_container">
+<div class="graph_container" style="width:<%= @zoom.width(merge_opts) %>;">
   <% graph_name = "#{@zoom.name} overview" %>
   <h3><%= graph_name %></h3>
   <div class="graph">
@@ -14,7 +14,7 @@
 </div>
 
 <% clusters.sort.each do |cluster| %>
-<div class="graph_container">
+<div class="graph_container" style="width:<%= @zoom.width(merge_opts) %>;">
   <a name="<%= cluster %>"></a>
   <% graph_name = "#{@dash.name} / #{@zoom.name} / #{cluster}" %>
   <% image_url, zoom_url = cluster_graph(@zoom, cluster, graph_name) %>

data/lib/{views → pencil/views}/dash-global.erb

@@ -5,7 +5,7 @@
 <%= shortcuts(@dash.graphs.collect { |g| "<a href=\"##{g.name}\">#{g.name}</a>" }.join(" ")) %>
 
 <% @dash.graphs.each do |g| %>
-<div class="graph_container">
+<div class="graph_container" style="width:<%= g.width(merge_opts) %>;">
   <a name="<%= g.name %>"></a>
     <h3><%= g.name %>
       <span class="tools">

data/lib/{views → pencil/views}/global.erb

@@ -4,7 +4,7 @@
    boards = @dashboards
    seen_hosts = Set.new %>
 
-<% boards.each do |b| %>
+<% boards.sort.each do |b| %>
 <h3><a href="/dash/<%= "#{@cluster}/#{append_query_string(b.name)}" %>"><%= b.name %></a>
   <% dash_hosts = b.get_all_hosts()[0]
      seen_hosts += dash_hosts %>

data/lib/{views → pencil/views}/host.erb

@@ -2,7 +2,7 @@
 <%= shortcuts(@host.graphs.collect { |g| "<a href=\"##{g.name}\">#{g.name}</a>" }.join(" ")) %>
 
 <% @host.graphs.each do |g| %>
-  <div class="graph_container">
+  <div class="graph_container" style="width:<%= g.width(merge_opts) %>;">
     <a name="<%= g.name %>"></a>
       <h3><%= g.name %>
         <span class="tools"><%= suggest_dashboards_links(@host, g) %></span>

data/lib/{views → pencil/views}/layout.erb

@@ -1,7 +1,7 @@
 <html>
   <head>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-    <link href="/css/thedoc.css" rel="stylesheet" type="text/css">
+    <link href="/style.css" rel="stylesheet" type="text/css">
     <link href="/css/jquery_themes/pencil/jquery-ui-1.8.16.custom.css" rel="stylesheet" type="text/css">
     <link href="/favicon.ico" rel="icon" type="text/x-icon">
     <link href="/favicon.ico" rel="shortcut icon" type="text/x-icon">
@@ -67,7 +67,7 @@
       </div><!--/closes middle-->
       <div style="clear:both;"></div>
       <div id="footer">
-        generated <%= @request_time %> by <a href="https://github.com/fetep/pencil" target="_blank">pencil</a> v<%= PENCIL_VERSION %>
+        generated <%= @request_time %> by <a href="https://github.com/fetep/pencil" target="_blank">pencil</a> v<%= Pencil::VERSION %>
       </div>
     </div>
     <script type="text/javascript">

data/lib/{dash.rb → pencil.rb}

@@ -1,10 +1,4 @@
-require "rubygems"
-require "namespace"
-
-require "config"
 require "erb"
-require "helpers"
-require "models"
 require "rack"
 require "sinatra/base"
 require "json"
@@ -13,20 +7,23 @@ require "yaml"
 require "chronic"
 require "chronic_duration"
 require "optparse"
-require "rubyfixes"
 
-$:.unshift(File.dirname(__FILE__))
+require "pencil/version"
+require "pencil/config"
+require "pencil/helpers"
+require "pencil/models"
+require "pencil/rubyfixes"
 
-module Dash
+module Pencil
   class App < Sinatra::Base
-    include Dash::Models
-    helpers Dash::Helpers
-    config = Dash::Config.new
+    include Pencil::Models
+    helpers Pencil::Helpers
+    config = Pencil::Config.new
     set :config, config
     set :port, config.global_config[:port]
     set :run, true
     use Rack::Session::Cookie, :expire_after => 126227700 # 4 years
-    set :root, File.dirname(__FILE__)
+    set :root, File.expand_path('../pencil', __FILE__)
     set :static, true
     set :logging, true
     set :erb, :trim => '-'
@@ -64,8 +61,8 @@ module Dash
         @etime = @request_time
       end
 
-      params[:stime] = @stime.to_i.to_s
-      params[:etime] = @etime.to_i.to_s
+      session[:stime] = @stime.to_i.to_s
+      session[:etime] = @etime.to_i.to_s
       # fixme reload hosts after some expiry
     end
 
@@ -157,5 +154,5 @@ module Dash
         request.query_string.sub("&action=Submit", "").sub("?action=Submit", "")
       end
     end
-  end # Dash::App
-end # Dash
+  end # Pencil::App
+end # Pencil

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pencil
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 10
-  version: 0.2.10
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Pete Fritchman
@@ -16,10 +16,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-21 00:00:00 Z
+date: 2012-05-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: mongrel
+  name: map
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -115,60 +115,59 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- VERSION.rb
-- lib/models.rb
-- lib/public/js/jquery-ui-1.8.16.custom.min.js
-- lib/public/js/jquery-1.6.2.min.js
-- lib/public/js/cufon.js
-- lib/public/js/product-design.font.js
-- lib/public/js/pencil.js
-- lib/public/js/gotham.font.js
-- lib/public/css/jquery_themes/pencil/images/ui-bg_highlight-soft_80_eeeeee_1x100.png
-- lib/public/css/jquery_themes/pencil/images/ui-icons_a83300_256x240.png
-- lib/public/css/jquery_themes/pencil/images/ui-icons_cccccc_256x240.png
-- lib/public/css/jquery_themes/pencil/images/ui-icons_4b8e0b_256x240.png
-- lib/public/css/jquery_themes/pencil/images/ui-bg_gloss-wave_25_333333_500x100.png
-- lib/public/css/jquery_themes/pencil/images/ui-bg_inset-soft_30_ff4e0a_1x100.png
-- lib/public/css/jquery_themes/pencil/images/ui-bg_glass_40_000000_1x400.png
-- lib/public/css/jquery_themes/pencil/images/ui-icons_ffffff_256x240.png
-- lib/public/css/jquery_themes/pencil/images/ui-bg_glass_20_333333_1x400.png
-- lib/public/css/jquery_themes/pencil/images/ui-icons_222222_256x240.png
-- lib/public/css/jquery_themes/pencil/images/ui-bg_flat_50_5c5c5c_40x100.png
-- lib/public/css/jquery_themes/pencil/images/ui-bg_highlight-soft_15_000000_1x100.png
-- lib/public/css/jquery_themes/pencil/images/ui-bg_flat_30_cccccc_40x100.png
-- lib/public/css/jquery_themes/pencil/images/ui-bg_glass_40_ffc73d_1x400.png
-- lib/public/css/jquery_themes/pencil/jquery-ui-1.8.16.custom.css
-- lib/public/css/thedoc.css
-- lib/public/style.css
-- lib/public/favicon.ico
-- lib/config.rb
-- lib/models/host.rb
-- lib/models/graph.rb
-- lib/models/dashboard.rb
-- lib/models/base.rb
-- lib/views/cluster.erb
-- lib/views/global.erb
-- lib/views/dash-cluster-zoom.erb
-- lib/views/dash-global-zoom.erb
-- lib/views/dash-global.erb
-- lib/views/host.erb
-- lib/views/partials/graph_switcher.erb
-- lib/views/partials/hosts_selector.erb
-- lib/views/partials/input_boxes.erb
-- lib/views/partials/shortcuts.erb
-- lib/views/partials/cluster_selector.erb
-- lib/views/partials/cluster_switcher.erb
-- lib/views/partials/dash_switcher.erb
-- lib/views/layout.erb
-- lib/views/dash-cluster.erb
-- lib/rubyfixes.rb
-- lib/namespace.rb
-- lib/helpers.rb
-- lib/dash.rb
-- lib/config.ru
+- lib/pencil.rb
+- lib/pencil/config.rb
+- lib/pencil/config.ru
+- lib/pencil/version.rb
+- lib/pencil/public/css/thedoc.css
+- lib/pencil/public/css/jquery_themes/pencil/jquery-ui-1.8.16.custom.css
+- lib/pencil/public/css/jquery_themes/pencil/images/ui-bg_inset-soft_30_ff4e0a_1x100.png
+- lib/pencil/public/css/jquery_themes/pencil/images/ui-icons_a83300_256x240.png
+- lib/pencil/public/css/jquery_themes/pencil/images/ui-icons_4b8e0b_256x240.png
+- lib/pencil/public/css/jquery_themes/pencil/images/ui-bg_glass_40_ffc73d_1x400.png
+- lib/pencil/public/css/jquery_themes/pencil/images/ui-bg_highlight-soft_15_000000_1x100.png
+- lib/pencil/public/css/jquery_themes/pencil/images/ui-bg_gloss-wave_25_333333_500x100.png
+- lib/pencil/public/css/jquery_themes/pencil/images/ui-bg_glass_40_000000_1x400.png
+- lib/pencil/public/css/jquery_themes/pencil/images/ui-icons_222222_256x240.png
+- lib/pencil/public/css/jquery_themes/pencil/images/ui-bg_flat_50_5c5c5c_40x100.png
+- lib/pencil/public/css/jquery_themes/pencil/images/ui-bg_glass_20_333333_1x400.png
+- lib/pencil/public/css/jquery_themes/pencil/images/ui-icons_cccccc_256x240.png
+- lib/pencil/public/css/jquery_themes/pencil/images/ui-bg_flat_30_cccccc_40x100.png
+- lib/pencil/public/css/jquery_themes/pencil/images/ui-bg_highlight-soft_80_eeeeee_1x100.png
+- lib/pencil/public/css/jquery_themes/pencil/images/ui-icons_ffffff_256x240.png
+- lib/pencil/public/js/jquery-ui-1.8.16.custom.min.js
+- lib/pencil/public/js/gotham.font.js
+- lib/pencil/public/js/pencil.js
+- lib/pencil/public/js/jquery-1.6.2.min.js
+- lib/pencil/public/js/cufon.js
+- lib/pencil/public/js/product-design.font.js
+- lib/pencil/public/style.css
+- lib/pencil/public/favicon.ico
+- lib/pencil/views/dash-cluster.erb
+- lib/pencil/views/cluster.erb
+- lib/pencil/views/dash-global-zoom.erb
+- lib/pencil/views/dash-cluster-zoom.erb
+- lib/pencil/views/layout.erb
+- lib/pencil/views/global.erb
+- lib/pencil/views/dash-global.erb
+- lib/pencil/views/host.erb
+- lib/pencil/views/partials/graph_switcher.erb
+- lib/pencil/views/partials/shortcuts.erb
+- lib/pencil/views/partials/cluster_switcher.erb
+- lib/pencil/views/partials/hosts_selector.erb
+- lib/pencil/views/partials/dash_switcher.erb
+- lib/pencil/views/partials/input_boxes.erb
+- lib/pencil/views/partials/cluster_selector.erb
+- lib/pencil/models/host.rb
+- lib/pencil/models/graph.rb
+- lib/pencil/models/base.rb
+- lib/pencil/models/dashboard.rb
+- lib/pencil/models.rb
+- lib/pencil/helpers.rb
+- lib/pencil/rubyfixes.rb
 - docs/pencil_options.md
-- examples/pencil.yml
 - examples/graphs.yml
+- examples/pencil.yml
 - examples/dashboards.yml
 - bin/pencil
 homepage: https://github.com/fetep/pencil

data/VERSION.rb

@@ -1 +0,0 @@
-PENCIL_VERSION = "0.2.10"

data/lib/config.ru

@@ -1,2 +0,0 @@
-require 'dash'
-run Dash::App