baton 0.4.5 → 0.4.8

data/.gitignore

@@ -16,4 +16,6 @@ test/tmp
 test/version_tmp
 tmp
 log/*
-.DS_Store
+.DS_Store
+coverage
+*.swp

data/Gemfile

@@ -5,6 +5,6 @@ gemspec
 
 group :darwin do
   gem "guard-rspec", "~> 0.5.8"
-  gem 'rb-fsevent', "~> 0.4.3.1"
+  gem 'rb-fsevent', "~> 0.9.1"
   gem 'growl_notify', "~> 0.0.3"
 end

data/README.md

@@ -28,12 +28,26 @@ Or, in your Gemfile:
 
 ## How to use
 
-Please check an existing extension, e.g. [baton-ping](https://github.com/digital-science/baton-ping), for more information about how to use and extend baton. 
+Please check an existing extension, e.g. [baton-ping](https://github.com/digital-science/baton-ping), for more information about how to use and extend baton.
 Since baton was created as a base for other extensions, it doesn't do anything in particular by itself but provide the structure and a basic setup on top of RabbitMQ and EventMachine.
 
+## Submitting a Pull Request
+
+1. [Fork the repository.](https://help.github.com/articles/fork-a-repo)
+2. [Create a topic branch.](http://learn.github.com/p/branching.html)
+3. Add specs for your unimplemented feature or bug fix.
+4. Run `bundle exec rake test`. If your specs pass, return to step 3.
+5. Implement your feature or bug fix.
+6. Run `bundle exec rake test`. If your specs fail, return to step 5.
+7. Run `open coverage/index.html`. If your changes are not completely covered
+   by your tests, return to step 3.
+8. Add documentation for your feature or bug fix.
+9. Add, commit, and push your changes.
+10. [Submit a pull request.](https://help.github.com/articles/using-pull-requests)
+
 ## Details and Building Extensions
 
-Baton relies on [EventMachine](http://rubyeventmachine.com/) and [AMQP](http://rubyamqp.info/) for message passing. The gem defines a basic set of classes operating on top of RabbitMQ. The initial configuration will setup an input exchange and an output exchange. 
+Baton relies on [EventMachine](http://rubyeventmachine.com/) and [AMQP](http://rubyamqp.info/) for message passing. The gem defines a basic set of classes operating on top of RabbitMQ. The initial configuration will setup an input exchange and an output exchange.
 
 On the input exchange, baton will wait for meaningful messages to perform actions (described by each service) and it will output messages to the output exchange.
 
@@ -59,7 +73,7 @@ This class must be extended in order to process each received message. One shoul
 
 ### Channel
 
-Like the consumer manager, this class doesn't need to be extended. It provides functionality to setup the exchanges and add consumers. 
+Like the consumer manager, this class doesn't need to be extended. It provides functionality to setup the exchanges and add consumers.
 
 ### Observer
 

data/baton.gemspec

@@ -15,10 +15,10 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Baton::VERSION
 
-  gem.add_runtime_dependency "amqp", "~> 0.8.4"
-  gem.add_runtime_dependency "eventmachine", "~> 1.0.0.beta.4"
-  gem.add_runtime_dependency "em-http-request", "1.0.0"
-  gem.add_runtime_dependency "bunny", "~> 0.7.8"
+  gem.add_runtime_dependency "amqp", "~> 0.9.7"
+  gem.add_runtime_dependency "eventmachine", "~> 1.0.0"
+  gem.add_runtime_dependency "em-http-request", "1.0.3"
+  gem.add_runtime_dependency "bunny", "~> 0.8.0"
   gem.add_runtime_dependency "ohai", "~> 0.6.12"
   gem.add_runtime_dependency "thor"
 
@@ -26,6 +26,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "moqueue", "~> 0.1.4"
   gem.add_development_dependency "fakefs", "~> 0.4.0"
   gem.add_development_dependency "rake", "~> 0.9.2"
-  gem.add_development_dependency "webmock", "~> 1.7.7"
+  gem.add_development_dependency "webmock", "~> 1.8.7"
   gem.add_development_dependency "minitar", "0.5.3"
+  gem.add_development_dependency "simplecov", "0.6.4"
 end

data/lib/baton/channel.rb

@@ -7,7 +7,7 @@ module Baton
 
     attr_accessor :channel, :exchange_in, :exchange_out, :connection, :connection_options, :amqp_hosts
 
-    # Public: Initialize a Channel. It creates an AMQP  connection, a channel, 
+    # Public: Initialize a Channel. It creates an AMQP  connection, a channel,
     # an input and an output exchange and finally attaches the handle_channel_exception
     # callback to the on_error event on the channel.
     def initialize
@@ -20,9 +20,19 @@ module Baton
       @connection   = AMQP.connect(@connection_options)
       @channel      = AMQP::Channel.new(@connection)
       @channel.auto_recovery = true
+
+      # Not everything needs an input exchange, default to the "" exchange if there isn't
+      # one defined in the config (monitors for example)
+      Baton.configuration.exchange = '' if Baton.configuration.exchange.nil?
+
+      # Create the exchanges
       @exchange_in  = channel.direct(Baton.configuration.exchange)
       @exchange_out = channel.direct(Baton.configuration.exchange_out)
+
+      # Attach callbacks for error handling
       @connection.on_tcp_connection_loss(&method(:handle_tcp_failure))
+      @connection.on_tcp_connection_failure(&method(:handle_tcp_failure))
+      @connection.on_connection_interruption(&method(:handle_tcp_failure))
       @channel.on_error(&method(:handle_channel_exception))
     end
 
@@ -45,7 +55,7 @@ module Baton
     # Public: Callback to handle errors on an AMQP channel.
     #
     # channel - An AMQP channel
-    # channel_close - 
+    # channel_close -
     #
     # Returns nothing.
     #
@@ -58,7 +68,7 @@ module Baton
     # amqp_hosts - An array of hostnames for your AMQP servers
     #
     # Returns a string of an AMQP hostname.
-    # 
+    #
     def get_new_amqp_host(amqp_hosts)
       amqp_hosts[Kernel.rand(amqp_hosts.size)]
     end

data/lib/baton/templates/gem/bin/gem-monitor.tt

@@ -4,7 +4,6 @@ require "baton/<%= config[:name] %>/<%= config[:name] %>-monitor"
 
 Baton.configure do |c|
   c.config_path  = "<%= File.join(Dir.pwd, config[:name], 'config', config[:name]) %>.cfg"
-  c.exchange     = "<%= config[:name] %>_monitor_in"
   c.exchange_out = "<%= config[:name] %>_out"
 end
 

data/lib/baton/version.rb

@@ -1,3 +1,3 @@
 module Baton
-  VERSION = "0.4.5"
+  VERSION = "0.4.8"
 end

data/spec/baton/configuration_spec.rb

@@ -7,24 +7,24 @@ describe Baton::Configuration do
       before(:each) do
         subject.config_path = "#{File.dirname(__FILE__)}/../fixtures/config.cfg"
       end
-      
+
       it "will set the host" do
         subject.host.should eq("fromconfig.com")
       end
-      
+
       it "will set the vhost" do
         subject.vhost.should eq("fromconfig")
       end
-      
+
       it "will set the user" do
         subject.user.should eq("fromconfiguser")
       end
-      
+
       it "will set the password" do
         subject.password.should eq("fromconfigpass")
       end
     end
-    
+
     context "given a non existing file" do
       it "will log an erorr" do
         subject.logger.should_receive(:error).with("Could not find a baton configuration file at bad_path")
@@ -32,22 +32,22 @@ describe Baton::Configuration do
       end
     end
   end
-  
+
   describe "#connection_opts" do
     before(:each) do
       subject.config_path = "#{File.dirname(__FILE__)}/../fixtures/config.cfg"
     end
-    
+
     context "give a config file" do
       it "will return a config hash" do
         subject.connection_opts.should eq({:host=>"fromconfig.com", :vhost=>"fromconfig", :user=>"fromconfiguser", :password=>"fromconfigpass", :pass=>"fromconfigpass"})
       end
     end
-    
+
     context "given one of the configuration options is nil" do
       it "will not be returned in the config hash" do
         subject.vhost = nil
-        subject.connection_opts.should eq({:host=>"fromconfig.com", :user=>"fromconfiguser", :password=>"fromconfigpass", :pass=>"fromconfigpass"})        
+        subject.connection_opts.should eq({:host=>"fromconfig.com", :user=>"fromconfiguser", :password=>"fromconfigpass", :pass=>"fromconfigpass"})
       end
     end
   end

data/spec/baton/consumer_manager_spec.rb

@@ -68,5 +68,23 @@ describe Baton::ConsumerManager do
         subject.handle_message(metadata, payload)
       end
     end
+
+    context "given an error message" do
+      it "should log the error and publish it to the exchange" do
+        message = {:type => "error", :message => "an error message"}
+        subject.logger.should_receive(:error).with(message)
+        subject.exchange_out.should_receive(:publish)
+        subject.update(message)
+      end
+    end
+
+    context "given an info message" do
+      it "should log the info and publish it to the exchange" do
+        message = {:type => "info", :message => "an info message"}
+        subject.logger.should_receive(:info).with(message)
+        subject.exchange_out.should_receive(:publish)
+        subject.update(message)
+      end
+    end
   end
 end

data/spec/baton/consumer_spec.rb

@@ -60,4 +60,12 @@ describe Baton::Consumer do
     end
   end
 
+  describe "#attributes" do
+    context "given an instance of a consumer" do
+      it "should have empty attributes" do
+        subject.attributes.should eq({})
+      end
+    end
+  end
+
 end

data/spec/baton/observer_spec.rb

@@ -0,0 +1,57 @@
+require "spec_helper"
+require "baton/observer"
+
+describe "Baton::Observer module" do
+
+  let(:my_observer) {
+    class MyObserver
+      include Baton::Observer
+
+      def attributes
+        {name: "my_observer_name"}
+      end
+    end
+    MyObserver.new
+  }
+
+  describe "#notify_error" do
+    context "given an error message" do
+      it "should notify the observers about it" do
+        my_observer.should_receive(:notify_observers).with(
+          {:name=>"my_observer_name", :type=>"error", :error_class=>Exception, :error_message=>"an error"})
+        my_observer.notify_error(Exception, "an error")
+      end
+    end
+  end
+
+  describe "#notify_info" do
+    context "given an info message" do
+      it "should notify the observers about it" do
+        my_observer.should_receive(:notify_observers).with(
+          {:name=>"my_observer_name", :type=>"info", :message=>"a message"})
+        my_observer.notify_info("a message")
+      end
+    end
+  end
+
+  describe "#notify_success" do
+    context "given a success message" do
+      it "should notify the observers about it" do
+        my_observer.should_receive(:notify_observers).with(
+          {:name=>"my_observer_name", :type=>"success", :message=>"a success message"})
+        my_observer.notify_success("a success message")
+      end
+    end
+  end
+
+  describe "#notify_log" do
+    context "given a set or attributes" do
+      it "should notify the observers with those attributes" do
+        my_observer.should_receive(:notify_observers).with(
+         {:name=>"my_observer_name", :attr_1=>1, :attr_2=>2})
+        my_observer.notify_log({attr_1: 1, attr_2: 2})
+      end
+    end
+  end
+
+end

data/spec/baton/server_spec.rb

@@ -46,4 +46,14 @@ describe Baton::Server do
       end
     end
   end
+
+  describe "#attributes" do
+    context "given an instance of a server" do
+      it "should have the attributes set" do
+        subject.attributes.should eq({:environment=>"production",
+          :fqdn=>"build-prod-i-722b0004.dsci.it",
+          :app_names=>["octobutler"]})
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,8 +1,13 @@
+require 'simplecov'
+SimpleCov.start do
+  add_filter "/spec"
+end
 require 'rubygems'
 require 'bundler'
 Bundler.setup
 require 'fakefs/spec_helpers'
 require "moqueue"
+require "rspec/expectations"
 require 'webmock/rspec'
 require "baton/logging"
 require 'json'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: baton
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,55 +10,55 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-20 00:00:00.000000000 Z
+date: 2012-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &70266370641740 !ruby/object:Gem::Requirement
+  requirement: &70113747826820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.9.7
   type: :runtime
   prerelease: false
-  version_requirements: *70266370641740
+  version_requirements: *70113747826820
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70266370640380 !ruby/object:Gem::Requirement
+  requirement: &70113747826260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.4
+        version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70266370640380
+  version_requirements: *70113747826260
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70266370639480 !ruby/object:Gem::Requirement
+  requirement: &70113747825660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70266370639480
+  version_requirements: *70113747825660
 - !ruby/object:Gem::Dependency
   name: bunny
-  requirement: &70266370638360 !ruby/object:Gem::Requirement
+  requirement: &70113747841380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.8
+        version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70266370638360
+  version_requirements: *70113747841380
 - !ruby/object:Gem::Dependency
   name: ohai
-  requirement: &70266370637580 !ruby/object:Gem::Requirement
+  requirement: &70113747840660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.6.12
   type: :runtime
   prerelease: false
-  version_requirements: *70266370637580
+  version_requirements: *70113747840660
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70266370635720 !ruby/object:Gem::Requirement
+  requirement: &70113747840100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70266370635720
+  version_requirements: *70113747840100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70266370650760 !ruby/object:Gem::Requirement
+  requirement: &70113747839200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70266370650760
+  version_requirements: *70113747839200
 - !ruby/object:Gem::Dependency
   name: moqueue
-  requirement: &70266370648860 !ruby/object:Gem::Requirement
+  requirement: &70113747838660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 0.1.4
   type: :development
   prerelease: false
-  version_requirements: *70266370648860
+  version_requirements: *70113747838660
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70266370647660 !ruby/object:Gem::Requirement
+  requirement: &70113747838200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *70266370647660
+  version_requirements: *70113747838200
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70266370645600 !ruby/object:Gem::Requirement
+  requirement: &70113747837720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,21 +121,21 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70266370645600
+  version_requirements: *70113747837720
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70266370644560 !ruby/object:Gem::Requirement
+  requirement: &70113747837260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: 1.8.7
   type: :development
   prerelease: false
-  version_requirements: *70266370644560
+  version_requirements: *70113747837260
 - !ruby/object:Gem::Dependency
   name: minitar
-  requirement: &70266370683360 !ruby/object:Gem::Requirement
+  requirement: &70113747836740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -143,7 +143,18 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *70266370683360
+  version_requirements: *70113747836740
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &70113747836280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.6.4
+  type: :development
+  prerelease: false
+  version_requirements: *70113747836280
 description: Baton
 email:
 - johnog@gmail.com
@@ -193,6 +204,7 @@ files:
 - spec/baton/configuration_spec.rb
 - spec/baton/consumer_manager_spec.rb
 - spec/baton/consumer_spec.rb
+- spec/baton/observer_spec.rb
 - spec/baton/server_spec.rb
 - spec/fixtures/config-multi.cfg
 - spec/fixtures/config.cfg
@@ -215,7 +227,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2228522700796728917
+      hash: -4118038194259217623
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -224,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2228522700796728917
+      hash: -4118038194259217623
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11
@@ -236,6 +248,7 @@ test_files:
 - spec/baton/configuration_spec.rb
 - spec/baton/consumer_manager_spec.rb
 - spec/baton/consumer_spec.rb
+- spec/baton/observer_spec.rb
 - spec/baton/server_spec.rb
 - spec/fixtures/config-multi.cfg
 - spec/fixtures/config.cfg