baton 0.5.4 → 0.5.5

data/.gitignore

@@ -19,3 +19,4 @@ log/*
 .DS_Store
 coverage
 *.swp
+*.rdb

data/.rspec

@@ -1 +1,2 @@
---color
+--color
+--order rand

data/.travis.yml

@@ -2,5 +2,6 @@ language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
+  - 2.0.0
 bundler_args: --without=darwin
 script: bundle exec rspec

data/Gemfile

@@ -3,7 +3,6 @@ source 'http://rubygems.org'
 gemspec
 
 group :darwin do
-  gem "guard-rspec", "~> 0.5.8"
   gem 'rb-fsevent', "~> 0.9.1"
   gem 'growl_notify', "~> 0.0.3"
 end

data/README.md

@@ -1,6 +1,8 @@
 # Baton - Server Orchestration Tool
 
+[![Gem Version](https://badge.fury.io/rb/baton.png)](http://badge.fury.io/rb/baton)
 [![Build Status](https://secure.travis-ci.org/digital-science/baton.png?branch=master)](http://travis-ci.org/digital-science/baton)
+[![Code Climate](https://codeclimate.com/github/digital-science/baton.png)](https://codeclimate.com/github/digital-science/baton)
 
 ## Description
 
@@ -89,3 +91,7 @@ If you would like to create your own extension, simply install baton (`gem insta
     batonize gem GEMNAME -b
 
 This will create a basic gem structure with the necessary files to create a minimum viable baton extension.
+
+# Copyright
+
+Copyright (c) Digital Science. See [LICENSE](https://github.com/digital-science/baton/blob/master/LICENSE) for details.

data/Rakefile

@@ -1,12 +1,18 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require "bueller"
 
 task :default => [:test]
 
+Bueller::Tasks.new
+
 RSpec::Core::RakeTask.new(:test)
+
+desc "Run RSpec tests"
 task :test => :spec
 
+desc "Run a console with baton lib loaded"
 task :console do
   sh "irb -rubygems -I lib -r baton.rb"
 end

data/baton.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "chef", ">= 11.0"
   gem.add_runtime_dependency "thor"
 
+  gem.add_development_dependency "bueller", "~> 0.0.9"
   gem.add_development_dependency "rspec", "~> 2.7"
   gem.add_development_dependency "moqueue", "~> 0.1.4"
   gem.add_development_dependency "fakefs", "~> 0.4.0"
@@ -32,4 +33,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "minitar", "0.5.3"
   gem.add_development_dependency "simplecov", "0.6.4"
   gem.add_development_dependency "pry"
+  gem.add_development_dependency "guard-rspec", "~> 3.0.0"
 end

data/lib/baton/channel.rb

@@ -31,6 +31,7 @@ module Baton
 
       # Attach callbacks for error handling
       @connection.on_tcp_connection_loss(&method(:handle_tcp_failure))
+      @connection.on_skipped_heartbeats(&method(:handle_tcp_failure))
       @channel.on_error(&method(:handle_channel_exception))
     end
 

data/lib/baton/server.rb

@@ -5,12 +5,10 @@ module Baton
 
     attr_accessor :environment, :fqdn, :app_names
 
-    # Public: Initialize a Server. ALso, configures the server by reading Baton's configuration
-    # file.
+    # Public: Initializes a server. Loads Ohai plugins and sets up basic
+    # server info, such as environment, fqdn and app names.
     def initialize
-      Ohai::Config[:plugin_path] << ohai_plugin_path
-      @ohai = Ohai::System.new
-      @ohai.all_plugins
+      setup_ohai
       configure
     end
 
@@ -55,5 +53,12 @@ module Baton
       "/etc/chef/ohai_plugins"
     end
 
+    # Load Ohai plugins from the server
+    def setup_ohai
+      Ohai::Config[:plugin_path] << ohai_plugin_path
+      @ohai = Ohai::System.new
+      @ohai.all_plugins
+    end
+
   end
 end

data/lib/baton/version.rb

@@ -1,3 +1,3 @@
 module Baton
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

data/lib/baton.rb

@@ -1,6 +1,10 @@
 require "baton/configuration"
 require "baton/version"
 require "baton/logging"
+require "baton/consumer_manager"
+require "baton/server"
+require "baton/consumer"
+require "json"
 
 module Baton
   def self.configuration

data/spec/baton/baton_spec.rb

@@ -1,5 +1,4 @@
 require "spec_helper"
-require "baton"
 
 describe Baton do
   describe ".configure" do
@@ -10,4 +9,4 @@ describe Baton do
       Baton.configuration.pusher_key.should eq("foo")
     end
   end
-end
+end

data/spec/baton/configuration_spec.rb

@@ -1,9 +1,9 @@
 require "spec_helper"
-require "baton/configuration"
 
 describe Baton::Configuration do
   describe "#config_path=" do
     context "given config file available" do
+
       before(:each) do
         subject.config_path = "#{File.dirname(__FILE__)}/../fixtures/config.cfg"
       end
@@ -45,12 +45,12 @@ describe Baton::Configuration do
     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",
-          :heartbeat=>666
+          host:      "fromconfig.com",
+          vhost:     "fromconfig",
+          user:      "fromconfiguser",
+          password:  "fromconfigpass",
+          pass:      "fromconfigpass",
+          heartbeat: 666
         })
       end
     end
@@ -59,11 +59,11 @@ describe Baton::Configuration 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",
-          :heartbeat=>666
+          host:      "fromconfig.com",
+          user:      "fromconfiguser",
+          password:  "fromconfigpass",
+          pass:      "fromconfigpass",
+          heartbeat: 666
         })
       end
     end

data/spec/baton/consumer_manager_spec.rb

@@ -1,41 +1,30 @@
 require "spec_helper"
-require "baton"
-require "baton/consumer"
-require "baton/consumer_manager"
-require "baton/server"
-require "ostruct"
+require "moqueue"
 
 describe Baton::ConsumerManager do
 
-  before :each do
+  subject { Baton::ConsumerManager.new(consumer, nil,
+                                       mock_exchange({:direct => true}),
+                                       mock_exchange({:direct => true})) }
+  let(:server) {
     Baton::Server.any_instance.stub(:facts).and_return({
       "fqdn" => "camac.dsci.it",
       "chef_environment" => "production"
     })
-    server = Baton::Server.new
-    @consumer = Baton::Consumer.new("camac", server)
-  end
-
-  subject {
-    Baton::ConsumerManager.new(@consumer, nil, mock_exchange({:direct => true}), mock_exchange({:direct => true}))
+    Baton::Server.any_instance.stub(:setup_ohai)
+    Baton::Server.new
   }
-
-  let(:metadata) do
-    obj = OpenStruct.new
-    obj.content_type = "application/json"
-    obj
-  end
-
-  let(:payload) do
-    JSON({"type" => "message type" })
-  end
+  let(:consumer) { Baton::Consumer.new("camac", server) }
+  let(:metadata) { o = OpenStruct.new ; o.content_type = "application/json"; o }
+  let(:payload)  { JSON({"type" => "message type" }) }
 
   describe "#start" do
     it "will subscribe to a queue using the correct routing key" do
       subject.exchange_in.stub(:name)
       allow_message_expectations_on_nil
       queue = mock("queue")
-      queue.should_receive(:bind).with(subject.exchange_in, routing_key: "camac.production")
+      queue.should_receive(:bind).with(subject.exchange_in,
+                                       routing_key: "camac.production")
       queue.should_receive(:subscribe)
       subject.channel.stub(:queue).and_return(queue)
       subject.start
@@ -61,8 +50,8 @@ describe Baton::ConsumerManager do
   describe "#update" do
     context "given a message is sent to the consumer and the consumer notifies" do
       it "should trigger update with a message" do
-        @consumer.stub(:process_message) do |message|
-          @consumer.notify("message from consumer")
+        consumer.stub(:process_message) do |message|
+          consumer.notify("message from consumer")
         end
         subject.should_receive(:update)
         subject.handle_message(metadata, payload)

data/spec/baton/consumer_spec.rb

@@ -1,26 +1,17 @@
 require "spec_helper"
-require "baton"
-require "baton/consumer"
-require "baton/server"
-require 'ostruct'
 
 describe Baton::Consumer do
 
-  before :each do
+  let(:server) {
     Baton::Server.any_instance.stub(:facts).and_return({
       "fqdn" => "camac.dsci.it",
       "chef_environment" => "production"
     })
-    @server = Baton::Server.new
-  end
-
-  let(:payload) do
-    JSON({"type" => "message type" })
-  end
-
-  subject {
-    Baton::Consumer.new("deploy-consumer", @server)
+    Baton::Server.any_instance.stub(:setup_ohai)
+    Baton::Server.new
   }
+  let(:payload) { JSON({"type" => "message type" }) }
+  let(:subject) { Baton::Consumer.new("deploy-consumer", server) }
 
   describe "#routing_key" do
     context "given an instance of Baton::Consumer" do

data/spec/baton/observer_spec.rb

@@ -1,5 +1,4 @@
 require "spec_helper"
-require "baton/observer"
 
 describe "Baton::Observer module" do
 

data/spec/baton/server_spec.rb

@@ -1,15 +1,16 @@
 require "spec_helper"
-require "baton/server"
 
 describe Baton::Server do
+
   context "stubbed ohai" do
+
     before(:each) do
-      Ohai::System.any_instance.stub(:all_plugins).and_return(true)
-      Ohai::System.any_instance.stub(:data).and_return({
+      Baton::Server.any_instance.stub(:facts).and_return({
         "chef_environment" => "production",
         "fqdn" => "build-prod-i-722b0004.dsci.it",
         "trebuchet" => ["octobutler"]
       })
+      Baton::Server.any_instance.stub(:setup_ohai)
     end
 
     describe "#configure" do
@@ -31,6 +32,7 @@ describe Baton::Server do
       context "given the required facts are not available" do
         before(:each) do
           Baton::Server.any_instance.stub(:facts).and_return({})
+          Baton::Server.any_instance.stub(:setup_ohai)
           subject.configure
         end
 
@@ -68,7 +70,7 @@ describe Baton::Server do
     describe "#environment" do
       context "production" do
         it "should have the correct environment set" do
-          subject.environment.should eq('production')
+          Baton::Server.new.environment.should eq('production')
         end
       end
     end

data/spec/spec_helper.rb

@@ -2,16 +2,16 @@ require 'simplecov'
 SimpleCov.start do
   add_filter "/spec"
 end
+
 require 'rubygems'
-require 'bundler'
-Bundler.setup
+require 'bundler/setup'
+
+dir = File.dirname(File.expand_path(__FILE__))
+$LOAD_PATH.unshift dir + '/../lib'
+require 'baton'
+
 require 'fakefs/spec_helpers'
-require "moqueue"
-require "rspec/expectations"
 require 'webmock/rspec'
-require "baton/logging"
-require 'json'
-require 'pry'
 
 WebMock.disable_net_connect!
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: baton
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
@@ -140,6 +140,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bueller
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.9
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.9
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -268,6 +284,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 description: Baton
 email:
 - johnog@gmail.com
@@ -281,14 +313,13 @@ files:
 - .rspec
 - .travis.yml
 - CHANGELOG.md
-- COPYING
 - Gemfile
 - Guardfile
+- LICENSE
 - README.md
 - Rakefile
 - baton.gemspec
 - bin/batonize
-- dump.rdb
 - lib/baton.rb
 - lib/baton/api.rb
 - lib/baton/channel.rb
@@ -369,4 +400,3 @@ test_files:
 - spec/fixtures/invalid_file.sum
 - spec/fixtures/ohai_plugins/chef_environment.rb
 - spec/spec_helper.rb
-has_rdoc: