smoke 0.0.1 → 0.0.3

data/History.txt

@@ -1,3 +1,13 @@
+== 0.0.3 2008-04-01
+
+* Updated History.txt - d'oh!
+
+== 0.0.2 2008-04-01
+
+* The scripts in bin/ now actually run which is nice.
+* Example of using smoke-0.0.2 is available at
+    http://barkingiguana.com/2008/04/01/port-monitoring-with-smoke
+
 == 0.0.1 2008-03-29
 
 * Initial release

data/Manifest.txt

@@ -7,11 +7,10 @@ bin/smoke
 bin/smoked
 config/hoe.rb
 config/requirements.rb
-etc/smoke.d/processors/smoke/remote_port_status_check_processor.rb
-etc/smoke.d/processors/smoke/system_load_processor.rb
-etc/smoke.d/signals/smoke/random_status_demo.rb
-etc/smoke.d/signals/smoke/remote_port_status_check.rb
-etc/smoke.d/signals/smoke/system_load.rb
+contrib/processors/smoke/remote_port_status_check_processor.rb
+contrib/processors/smoke/system_load_processor.rb
+contrib/signals/smoke/remote_port_status_check.rb
+contrib/signals/smoke/system_load.rb
 lib/smoke.rb
 lib/smoke/client.rb
 lib/smoke/client/connection.rb
@@ -24,7 +23,6 @@ lib/smoke/server/version.rb
 lib/smoke/signal.rb
 lib/smoke/signal_processor.rb
 lib/smoke/version.rb
-load_average.png
 log/debug.log
 log/development.log
 log/production.log

data/bin/smoke

@@ -1,9 +1,7 @@
 #!/usr/bin/env ruby
 
-GEM_ROOT = File.expand_path(File.dirname(File.dirname(__FILE__)))
-SIGNAL_DIRECTORIES = [ "#{GEM_ROOT}/etc/smoke.d/signals", "/etc/smoke.d/signals" ]
+SIGNAL_DIRECTORIES = [ "/etc/smoke.d/signals" ]
 
-$: << File.join(GEM_ROOT, 'lib')
 SIGNAL_DIRECTORIES.each_with_index do |directory, index|
   if directory =~ /[^\/]$/
     directory += '/'

data/bin/smoked

@@ -4,10 +4,9 @@
 #  Copyright (c) 2008 Craig R Webster <craig@barkingiguana.com>
 #
 
-$: << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'rubygems'
 require 'mongrel'
-require 'lib/smoke/server'
+require 'smoke/server'
 require 'optparse'
 
 OPTIONS = {

data/{etc/smoke.d → contrib}/processors/smoke/remote_port_status_check_processor.rb

@@ -1,3 +1,5 @@
+# This Smoke::SignalProcessor simple prints out any signals it receives.
+#
 module Smoke
   class RemotePortStatusCheckProcessor < Smoke::SignalProcessor
     def process(signal)

data/{etc/smoke.d → contrib}/processors/smoke/system_load_processor.rb

@@ -1,3 +1,14 @@
+# An example SignalProcessor that generates a graph of the last 60 reported
+# SystemLoad signals.
+#
+# It's pretty naff - it doesn't do any sort of time bounding so I can't say 
+# that the graph is of the last 60 minutes or anything, but it's certainly 
+# possible to do so if you fancy recording the timestamp that came in with 
+# the report.
+#
+# Remember, if you're doing any heavy lifting such as generating images do
+# push that work off into another Thread to avoid blocking the current thread.
+#
 require 'rubygems'
 require 'scruffy'
 

data/{etc/smoke.d → contrib}/signals/smoke/remote_port_status_check.rb

@@ -1,3 +1,12 @@
+# This is an example of a signal which will interupt the SignalRunner when 
+# something important hapens. As you can see, all you need to do is implement 
+# the #start method. This should launch into a new Thread doing whatever you 
+# need. When something significant happens you should call @client.report and
+# give it some data to report in the form of a Hash.
+#
+# To deal with data on the server side, create a class that extends 
+# Smoke::SignalProcesor.
+#
 module Smoke
   class RemotePortStatusCheck < Smoke::Signal
     HOSTS_PORTS_AND_STATUSES = [
@@ -6,10 +15,6 @@ module Smoke
       [ "localhost", 80, :down ]
     ]
 
-    def initialize(client)
-      @client = client
-    end
-
     def start
       HOSTS_PORTS_AND_STATUSES.map do |check|
         Thread.new(@client, check) do |client, c|

data/contrib/signals/smoke/system_load.rb

@@ -0,0 +1,23 @@
+# This is an example of a signal which will be polled for status by the
+# SignalRunner. As you can see, all you need to do is implement the #run 
+# method. Of course, nothing is stopping you doing anything else: the class 
+# can be as complicated as you want and do anything you want it to, as long as
+# it returns a Hash of data using #run.
+#
+# To deal with data on the server side, create a class that extends 
+# Smoke::SignalProcesor.
+#
+module Smoke
+  class SystemLoad < Smoke::Signal
+    def run
+      one_minute, five_minutes, fifteen_minutes = %x[uptime].strip.split(/load averages: /).last.split(/ /)
+      {
+        :report => {
+          :one_minute => one_minute.to_f,
+          :five_minutes => five_minutes.to_f,
+          :fifteen_minutes => fifteen_minutes.to_f
+        }
+      }
+    end
+  end
+end

data/lib/smoke/version.rb

@@ -2,7 +2,7 @@ module Smoke #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 1
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/website/index.html

@@ -5,7 +5,7 @@
   <link rel="stylesheet" href="stylesheets/screen.css" type="text/css" media="screen" />
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>
-      server
+      Smoke
   </title>
   <script src="javascripts/rounded_corners_lite.inc.js" type="text/javascript"></script>
 <style>
@@ -30,12 +30,12 @@
 <body>
 <div id="main">
 
-    <h1>server</h1>
+    <h1>Smoke</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/server"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/server" class="numbers">0.0.1</a>
+      <a href="http://rubyforge.org/projects/server" class="numbers">0.0.3</a>
     </div>
-    <h1>&#x2192; &#8216;server&#8217;</h1>
+    <h1>&#x2192; &#8216;A distributed reporting framework&#8217;</h1>
 
 
 	<h2>What</h2>
@@ -44,7 +44,7 @@
 	<h2>Installing</h2>
 
 
-	<p><pre class='syntax'><span class="ident">sudo</span> <span class="ident">gem</span> <span class="ident">install</span> <span class="ident">server</span></pre></p>
+	<p><pre class='syntax'><span class="ident">sudo</span> <span class="ident">gem</span> <span class="ident">install</span> <span class="ident">smoke</span></pre></p>
 
 
 	<h2>The basics</h2>
@@ -53,13 +53,7 @@
 	<h2>Demonstration of usage</h2>
 
 
-	<h2>Forum</h2>
-
-
-	<p><a href="http://groups.google.com/group/server">http://groups.google.com/group/server</a></p>
-
-
-	<p><span class="caps">TODO</span> &#8211; create Google Group &#8211; server</p>
+	<p>Still to be done (sorry!)</p>
 
 
 	<h2>How to submit patches</h2>
@@ -68,7 +62,7 @@
 	<p>Read the <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/">8 steps for fixing other people&#8217;s code</a> and for section <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups">8b: Submit patch to Google Groups</a>, use the Google Group above.</p>
 
 
-	<p>The trunk repository is <code>svn://rubyforge.org/var/svn/server/trunk</code> for anonymous access.</p>
+	<p>The origin is <code>git://barkingiguana.com/smoke.git</code>.</p>
 
 
 	<h2>License</h2>
@@ -80,9 +74,8 @@
 	<h2>Contact</h2>
 
 
-	<p>Comments are welcome. Send an email to <a href="mailto:FIXME"><span class="caps">FIXME</span> full name</a> email via the <a href="http://groups.google.com/group/server">forum</a></p>
+	<p>Comments are welcome. Send an email to <a href="mailto:craig@barkingiguana.com">Craig Webster</a>.</p>
     <p class="coda">
-      <a href="TODO">TODO</a>, 29th March 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>,
       by Daniel Cadenas via <a href="http://depgraph.rubyforge.org/">DepGraph</a>
     </p>

data/website/index.txt

@@ -1,33 +1,24 @@
-h1. server
-
-h1. → 'server'
+h1. Smoke
 
+h1. → 'A distributed reporting framework'
 
 h2. What
 
-
 h2. Installing
 
-<pre syntax="ruby">sudo gem install server</pre>
+<pre syntax="ruby">sudo gem install smoke</pre>
 
 h2. The basics
 
-
 h2. Demonstration of usage
 
-
-
-h2. Forum
-
-"http://groups.google.com/group/server":http://groups.google.com/group/server
-
-TODO - create Google Group - server
+Still to be done (sorry!)
 
 h2. How to submit patches
 
 Read the "8 steps for fixing other people's code":http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/ and for section "8b: Submit patch to Google Groups":http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups, use the Google Group above.
 
-The trunk repository is <code>svn://rubyforge.org/var/svn/server/trunk</code> for anonymous access.
+The origin is <code>git://barkingiguana.com/smoke.git</code>.
 
 h2. License
 
@@ -35,5 +26,4 @@ This code is free to use under the terms of the MIT license.
 
 h2. Contact
 
-Comments are welcome. Send an email to "FIXME full name":mailto:FIXME email via the "forum":http://groups.google.com/group/server
-
+Comments are welcome. Send an email to "Craig Webster":mailto:craig@barkingiguana.com.

data/website/template.rhtml

@@ -37,7 +37,6 @@
     </div>
     <%= body %>
     <p class="coda">
-      <a href="TODO">TODO</a>, <%= modified.pretty %><br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>,
       by Daniel Cadenas via <a href="http://depgraph.rubyforge.org/">DepGraph</a>
     </p>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: smoke
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors: 
 - Craig R Webster
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-29 23:00:00 +00:00
+date: 2008-04-01 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -37,11 +37,10 @@ files:
 - bin/smoked
 - config/hoe.rb
 - config/requirements.rb
-- etc/smoke.d/processors/smoke/remote_port_status_check_processor.rb
-- etc/smoke.d/processors/smoke/system_load_processor.rb
-- etc/smoke.d/signals/smoke/random_status_demo.rb
-- etc/smoke.d/signals/smoke/remote_port_status_check.rb
-- etc/smoke.d/signals/smoke/system_load.rb
+- contrib/processors/smoke/remote_port_status_check_processor.rb
+- contrib/processors/smoke/system_load_processor.rb
+- contrib/signals/smoke/remote_port_status_check.rb
+- contrib/signals/smoke/system_load.rb
 - lib/smoke.rb
 - lib/smoke/client.rb
 - lib/smoke/client/connection.rb
@@ -54,7 +53,6 @@ files:
 - lib/smoke/signal.rb
 - lib/smoke/signal_processor.rb
 - lib/smoke/version.rb
-- load_average.png
 - log/debug.log
 - log/development.log
 - log/production.log

data/etc/smoke.d/signals/smoke/random_status_demo.rb

@@ -1,7 +0,0 @@
-module Smoke
-  class RandomStatusDemo < Smoke::Signal
-    def run
-      { :report => { :status => %W(OK FAIL UNKNOWN)[rand(3).round] } }
-    end
-  end
-end

data/etc/smoke.d/signals/smoke/system_load.rb

@@ -1,14 +0,0 @@
-module Smoke
-  class SystemLoad < Smoke::Signal
-    def run
-      one_minute, five_minutes, fifteen_minutes = %x[uptime].strip.split(/load averages: /).last.split(/ /)
-      {
-        :report => {
-          :one_minute => one_minute.to_f,
-          :five_minutes => five_minutes.to_f,
-          :fifteen_minutes => fifteen_minutes.to_f
-        }
-      }
-    end
-  end
-end