nosey 0.0.14 → 0.0.15

data/bin/nosey-test-client

@@ -13,4 +13,5 @@ Nosey::Munin.graph do
     # Only show these 3 dudes
     %w[min max avg].include? name
   end
+  labels ({"min" => "Minimum", "max" => "Maximus", "avg" => "Average Joe"})
 end

data/lib/nosey/munin.rb

@@ -11,20 +11,20 @@ module Nosey
 
     # Print the output of the munin graph to $stdout
     def self.graph(args=ARGV,out=$stdout,&block)
-      graph = Graph::DSL.new(&block).graph
+      dsl = Graph::DSL.new(&block)
 
-      # Munin passes configure into this to figure out the graph.
+      # Munin passes configure into this to figure out the graph.       
       out.puts case args.first
       when Argument::Configuration
-        graph.configure
+        dsl.graph(true).configure
       else
-        graph.sample
+        dsl.graph.sample
       end
     end
 
     # Parse a Nosey socket for Munin
     class Graph
-      attr_accessor :data, :title, :vertical_label, :category, :filter
+      attr_accessor :data, :title, :vertical_label, :category, :filter, :labels
       attr_writer :probe_set
 
       def initialize(data=nil)
@@ -45,9 +45,11 @@ module Nosey
         body.puts "graph_title #{title}"
         body.puts "graph_category #{category}"
         body.puts "graph_vlabel #{vertical_label}"
-        munin_hash.each do |field, (label, value)|
+        
+        (@labels || {}).each do |field, label|
           body.puts "#{field}.label #{label}"
         end
+        
         body.rewind
         body.read
       end
@@ -153,6 +155,11 @@ module Nosey
         self
       end
 
+      def labels(labels)
+        @labels = labels
+        self
+      end
+
       def data(data)
         @data = data
         self
@@ -170,13 +177,14 @@ module Nosey
       end
 
       # Configure an instance of a client.
-      def graph
-        Graph.new read_data do |c|
+      def graph(configure=false)
+        Graph.new (configure ? nil : read_data) do |c|
           c.probe_set = @probe_set
           c.category = @category
           c.title = @title
           c.vertical_label = @vertical_label
           c.filter = @filter
+          c.labels = @labels
         end
       end
 

data/lib/nosey/version.rb

@@ -1,3 +1,3 @@
 module Nosey
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

data/spec/lib/nosey/munin_spec.rb

@@ -18,6 +18,7 @@ describe Nosey::Munin::Graph do
     @graph = Nosey::Munin::Graph.new(@report.to_s) do |g|
       g.title = "Test Graph"
       g.vertical_label = "Response times"
+      g.labels = {"min" => "Min", "max" => "Max", "avg" => "Avg"}
     end
   end
 
@@ -39,7 +40,7 @@ describe Nosey::Munin::Graph do
     end
 
     it "should have labels" do
-      @text.scan(/[A-Za-z0-9_]+\.label .+\n/).should have(6).items
+      @text.scan(/[A-Za-z0-9_]+\.label .+\n/).should have(3).items
     end
   end
 
@@ -69,6 +70,7 @@ describe Nosey::Munin::Graph do
         g.category 'Bananas'
         g.title 'Fruit Fly Charts'
         g.vertical_label 'Wing speed (beats per second'
+        g.labels ({"min" => "min"})
       end
 
       out.rewind

metadata

@@ -1,146 +1,117 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: nosey
-version: !ruby/object:Gem::Version 
-  hash: 3
+version: !ruby/object:Gem::Version
+  version: 0.0.15
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 14
-  version: 0.0.14
 platform: ruby
-authors: 
+authors:
 - Brad Gessler
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-31 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-01 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: eventmachine
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70151060522320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70151060522320
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70151060521140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: guard-rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70151060521140
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &70151060519800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: guard-bundler
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70151060519800
+- !ruby/object:Gem::Dependency
+  name: guard-bundler
+  requirement: &70151060519100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: growl
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70151060519100
+- !ruby/object:Gem::Dependency
+  name: growl
+  requirement: &70151060518180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rb-fsevent
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70151060518180
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: &70151060517260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: em-ventually
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70151060517260
+- !ruby/object:Gem::Dependency
+  name: em-ventually
+  requirement: &70151060516140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug19
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70151060516140
+- !ruby/object:Gem::Dependency
+  name: ruby-debug19
+  requirement: &70151060515020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-description: Nosey is a way to instrument your Evented Ruby applications to track counts, aggregates, etc. It was built a Poll Everywhere because we need a way to peer into our Evented apps and grab some basic statistics so that we could graph on Munin. Since we needed this instrumentation available in several EM projects, we gathered the basics up into this gem.
-email: 
+  prerelease: false
+  version_requirements: *70151060515020
+description: Nosey is a way to instrument your Evented Ruby applications to track
+  counts, aggregates, etc. It was built a Poll Everywhere because we need a way to
+  peer into our Evented apps and grab some basic statistics so that we could graph
+  on Munin. Since we needed this instrumentation available in several EM projects,
+  we gathered the basics up into this gem.
+email:
 - brad@bradgessler.com
-executables: 
+executables:
 - nosey-test-client
 - nosey-test-server
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Guardfile
@@ -163,41 +134,31 @@ files:
 - spec/lib/nosey/report_spec.rb
 - spec/lib/nosey_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: https://github.com/polleverywhere/nosey
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: nosey
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Instrument Ruby EventMachine applications
-test_files: 
+test_files:
 - spec/lib/eventmachine_spec.rb
 - spec/lib/nosey/instrumentation_spec.rb
 - spec/lib/nosey/munin_spec.rb