pencil 0.3.0 → 0.3.1

data/lib/p

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+require 'pencil'
+
+Pencil::App.run!
+

data/lib/pencil.rb

@@ -40,10 +40,14 @@ module Pencil
       # time stuff
       start = param_lookup("start")
       duration = param_lookup("duration")
+
       @stime = Chronic.parse(start)
       if @stime
         @stime -= @stime.sec unless @params["noq"]
+      elsif start =~ /^\d+$/ #epoch
+        @stime = Time.at start.to_i
       end
+
       if duration
         @duration = ChronicDuration.parse(duration) || 0
       else

data/lib/pencil/config.rb

@@ -15,11 +15,13 @@ module Pencil
       port = 9292
       @rawconfig = {}
       @confdir = "."
+      @recursive = false
 
       optparse = OptionParser.new do |o|
         o.on("-d", "--config-dir DIR",
           "location of the config directory (default .)") do |arg|
           @confdir = arg
+          @recursive = true
         end
         o.on("-p", "--port PORT", "port to bind to (default 9292)") do |arg|
           port = arg.to_i
@@ -32,7 +34,9 @@ module Pencil
     end
 
     def reload!
-      configs = Dir.glob("#{@confdir}/**/*.y{a,}ml")
+      # only do a recursive search if "-d" is specified
+      configs = Dir.glob("#{@confdir}/#{@recursive ? '**/' : ''}*.y{a,}ml")
+
       configs.each do |c|
         yml = YAML.load(File.read(c))
         next unless yml

data/lib/pencil/helpers.rb

@@ -199,12 +199,16 @@ module Pencil
 
     end
 
+    def valid_time (s)
+      Chronic.parse(s) || s =~ /^\d+$/
+    end
+
     def permalink
       return "" unless @stime && @duration
       format = "%F %T" # chronic REALLY understands this
       url = request.path + "?"
-      url << "&start=#{@stime.strftime(format)}"
-      url << "&duration=#{ChronicDuration.output(@duration)}"
+      url << "&amp;start=#{@stime.strftime(format)}"
+      url << "&amp;duration=#{ChronicDuration.output(@duration)}"
       "<a id=\"permalink\" href=\"#{url}\">permalink</a>"
     end
   end

data/lib/pencil/models/dashboard.rb

@@ -14,13 +14,14 @@ module Pencil
 
         @graphs = []
         @graph_opts = {}
-        params["graphs"].each do |name|
-          # graphs map to option hashes
-          if name.respond_to?(:keys) # could be YAML::Omap
-            g = Graph.find(name.keys.first) # should only be one key
-            @graph_opts[g] = name[name.keys.first]||{}
+        params["graphs"].each do |n|
+          if n.respond_to?(:keys)
+            key = n.keys.first # should only be one key
+            val = n.values.first
+            g = Graph.find(key)
+            @graph_opts[g] = val||{}
           else
-            raise "Bad format for graph (must be a hash-y; #{name.class}:#{name.inspect} is not)"
+            raise "Bad format for graph (must be a hash-y; #{n.class}:#{n.inspect} is not)"
           end
 
           @graphs << g if g
@@ -101,7 +102,6 @@ module Pencil
         hosts = get_host_wildcards(graph)
         _, clusters = get_valid_hosts(graph)
 
-        next_url = ""
         type = opts[:zoom] ? :cluster : :global
         options = opts.merge({:sum => type})
         graph_url = graph.render_url(hosts, clusters, options)

data/lib/pencil/models/graph.rb

@@ -146,8 +146,8 @@ module Pencil
         colors = []
         #FIXME code duplication
         if opts[:sum] == :global
-          @params["targets"].each do |stat_name, opts|
-            z = new_map(opts)
+          @params["targets"].each do |stat_name, o|
+            z = new_map(o)
 
             z[:key] ||= stat_name
             #######################
@@ -175,25 +175,25 @@ module Pencil
             # target << handle_metric(translate(:sumSeries, metric), z)
 
             if z.keys.member?('divideSeries') # special case
-                # apply divideSeries, sumSeries then other options
-                res = translate(:divideSeries, metric)
-                res = translate(:sumSeries, res)
-                z.delete(:divideSeries)
-                h = YAML::Omap.new
-                z.each { |k,v| h[k] = v unless k == 'divideSeries' }
-                target << handle_metric(res, h)
-              else
-                target << handle_metric(translate(:sumSeries, metric), z)
-              end
+              # apply divideSeries, sumSeries then other options
+              res = translate(:divideSeries, metric)
+              res = translate(:sumSeries, res)
+              z.delete(:divideSeries)
+              h = YAML::Omap.new
+              z.each { |k,v| h[k] = v unless k == 'divideSeries' }
+              target << handle_metric(res, h)
+            else
+              target << handle_metric(translate(:sumSeries, metric), z)
+            end
             if !@params[:use_color] ||
-              (!z[:color] && @params[:use_color])
+                (!z[:color] && @params[:use_color])
               colors << next_color(colors, z[:color])
             end
           end # @params["targets"].each
         elsif opts[:sum] == :cluster # one line per cluster/metric
           clusters.each do |cluster|
-            @params["targets"].each do |stat_name, opts|
-              z = new_map(opts)
+            @params["targets"].each do |stat_name, o|
+              z = new_map(o)
 
               metrics = []
               #######################
@@ -207,14 +207,14 @@ module Pencil
                     # divideSeries is picky about the number of series given as
                     # arguments, so sum them in this case
                     handle_metric(translate(:sumSeries, mm),
-                           m[m.keys.first], true)
+                                  m[m.keys.first], true)
                   else
                     handle_metric(mm, m[m.keys.first], true)
                   end
                 end.join(",")
               else
                 metrics << handle_metric(compose_metric(stat_name,
-                                                 cluster, h), {}, true)
+                                                        cluster, h), {}, true)
               end
               #######################
               z[:key] = "#{cluster} #{z[:key]}"
@@ -229,7 +229,7 @@ module Pencil
                 target << handle_metric(res, h)
               else
                 target << handle_metric(translate(:sumSeries,
-                                        metrics.join(',')), z)
+                                                  metrics.join(',')), z)
               end
 
               if !@params[:use_color] || (!z[:color] && @params[:use_color])
@@ -238,8 +238,8 @@ module Pencil
             end # metrics.each
           end # clusters.each
         else # one line per {metric,host,colo}
-          @params["targets"].each do |stat_name, opts|
-            z = new_map(opts)
+          @params["targets"].each do |stat_name, o|
+            z = new_map(o)
             clusters.each do |cluster|
               hosts.each do |host|
                 label = "#{host} #{z[:key]}"
@@ -287,11 +287,11 @@ module Pencil
         url = URI.join(@params[:graphite_url], "/render/?").to_s
         url_parts = []
         url_opts.each do |k, v|
-          [v].flatten.each do |v|
-            url_parts << "#{URI.escape(k.to_s)}=#{URI.escape(v.to_s)}"
+          [v].flatten.each do |v2|
+            url_parts << "#{URI.escape(k.to_s)}=#{URI.escape(v2.to_s)}"
           end
         end
-        url += url_parts.join("&")
+        url += url_parts.join("&amp;")
         return url
       end
 
@@ -339,8 +339,8 @@ module Pencil
         end
         unless ci && hi
           last.reverse.each_with_index do |v, i|
-            ci = -1 -i if v.match("%c")
-            hi = -1 -i if v.match("%h")
+            ci = (-1) -i if v.match("%c")
+            hi = (-1) -i if v.match("%h")
           end
         end
         hosts = metrics.map do |m|

data/lib/pencil/models/host.rb

@@ -23,6 +23,7 @@ module Pencil
             end
           end # graph["hosts"].each
         end # Graph.each
+        @graphs.sort!
       end
 
       def self.find(name)

data/lib/pencil/version.rb

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

data/lib/pencil/views/partials/input_boxes.erb

@@ -8,7 +8,7 @@
       <input  <%= "value=\"#{val}\" " if val %> size="<%= name =~ /start|duration/ ? 10 : 4 %>" name="<%= name %>" id="<%= name %>" type="text"/>
       <% if name == "start" %>
       <a href="http://chronic.rubyforge.org/" class="inline-link" target="_blank">
-        <% if Chronic.parse(param_lookup(name)) %>
+        <% if valid_time(param_lookup(name)) %>
         ?
         <% else %>
         <div class="error">Bad timespec!</div>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pencil
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Pete Fritchman
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-29 00:00:00 Z
+date: 2012-06-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: map
@@ -165,6 +165,7 @@ files:
 - lib/pencil/models.rb
 - lib/pencil/helpers.rb
 - lib/pencil/rubyfixes.rb
+- lib/p
 - docs/pencil_options.md
 - examples/graphs.yml
 - examples/pencil.yml
@@ -199,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: pencil -- Graphite dashboard system