baton 0.5.2 → 0.5.4

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+# CHANGELOG for baton
+
+## 5.2.4
+
+* Deprecate Chef 10. Previous versions will work with Chef 10.12.0 and
+  lower.

data/Gemfile

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

data/README.md

@@ -1,6 +1,6 @@
 # Baton - Server Orchestration Tool
 
-[![Build Status](https://secure.travis-ci.org/digital-science/baton.png)](http://travis-ci.org/digital-science/baton)
+[![Build Status](https://secure.travis-ci.org/digital-science/baton.png?branch=master)](http://travis-ci.org/digital-science/baton)
 
 ## Description
 

data/Rakefile

@@ -2,6 +2,8 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
+task :default => [:test]
+
 RSpec::Core::RakeTask.new(:test)
 task :test => :spec
 

data/baton.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |gem|
   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 "chef", ">= 11.0"
   gem.add_runtime_dependency "thor"
 
   gem.add_development_dependency "rspec", "~> 2.7"
@@ -30,4 +31,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "webmock", "~> 1.8.7"
   gem.add_development_dependency "minitar", "0.5.3"
   gem.add_development_dependency "simplecov", "0.6.4"
+  gem.add_development_dependency "pry"
 end

data/lib/baton/server.rb

@@ -8,7 +8,7 @@ module Baton
     # Public: Initialize a Server. ALso, configures the server by reading Baton's configuration
     # file.
     def initialize
-      Ohai::Config[:plugin_path] << "/etc/chef/ohai_plugins"
+      Ohai::Config[:plugin_path] << ohai_plugin_path
       @ohai = Ohai::System.new
       @ohai.all_plugins
       configure
@@ -48,5 +48,12 @@ module Baton
       {environment: environment, fqdn: fqdn, app_names: app_names}
     end
 
+    private
+
+    # Private: Path where ohai plugins are
+    def ohai_plugin_path
+      "/etc/chef/ohai_plugins"
+    end
+
   end
 end

data/lib/baton/version.rb

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

data/spec/baton/server_spec.rb

@@ -2,57 +2,74 @@ require "spec_helper"
 require "baton/server"
 
 describe Baton::Server do
-  before(:each) do
-    Ohai::System.any_instance.stub(:all_plugins).and_return(true)
-    Ohai::System.any_instance.stub(:data).and_return({
-      "chef_environment" => "production",
-      "fqdn" => "build-prod-i-722b0004.dsci.it",
-      "trebuchet" => ["octobutler"]
-    })
-  end
+  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({
+        "chef_environment" => "production",
+        "fqdn" => "build-prod-i-722b0004.dsci.it",
+        "trebuchet" => ["octobutler"]
+      })
+    end
 
-  describe "#configure" do
-    context "given data from Ohai" do
+    describe "#configure" do
+      context "given data from Ohai" do
 
-      it "will set the fqdn" do
-        subject.fqdn.should eq("build-prod-i-722b0004.dsci.it")
-      end
+        it "will set the fqdn" do
+          subject.fqdn.should eq("build-prod-i-722b0004.dsci.it")
+        end
 
-      it "will set the environment" do
-        subject.environment.should eq("production")
-      end
+        it "will set the environment" do
+          subject.environment.should eq("production")
+        end
 
-      it "will set the apps" do
-        subject.app_names.first.should eq("octobutler")
+        it "will set the apps" do
+          subject.app_names.first.should eq("octobutler")
+        end
       end
-    end
 
-    context "given the required facts are not available" do
-      before(:each) do
-        Baton::Server.any_instance.stub(:facts).and_return({})
-        subject.configure
-      end
+      context "given the required facts are not available" do
+        before(:each) do
+          Baton::Server.any_instance.stub(:facts).and_return({})
+          subject.configure
+        end
 
-      it "will default the fqdn to an empty string" do
-        subject.fqdn.should be_empty
-      end
+        it "will default the fqdn to an empty string" do
+          subject.fqdn.should be_empty
+        end
+
+        it "will default environment to development" do
+          subject.environment.should eq("development")
+        end
 
-      it "will default environment to development" do
-        subject.environment.should eq("development")
+        it "will default apps to an empty array" do
+          subject.app_names.should be_empty
+        end
       end
+    end
 
-      it "will default apps to an empty array" do
-        subject.app_names.should be_empty
+    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
 
-  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"]})
+  context "ohai integration" do
+    before(:each) do
+      ohai_fixtures = File.expand_path('../../fixtures/ohai_plugins', __FILE__)
+      Baton::Server.any_instance.stub(:ohai_plugin_path).and_return(ohai_fixtures)
+    end
+
+    describe "#environment" do
+      context "production" do
+        it "should have the correct environment set" do
+          subject.environment.should eq('production')
+        end
       end
     end
   end

data/spec/fixtures/etc/chef/client.rb

@@ -0,0 +1,8 @@
+log_level          :info
+log_location       STDOUT
+ssl_verify_mode    :verify_none
+file_cache_path    "/var/cache/chef"
+file_backup_path   "/var/lib/chef/backup"
+pid_file           "/var/run/chef/client.pid"
+environment        "production"
+

data/spec/fixtures/ohai_plugins/chef_environment.rb

@@ -0,0 +1,5 @@
+require 'chef/config'
+provides 'chef_environment'
+
+Chef::Config.from_file File.expand_path('../../etc/chef/client.rb', __FILE__)
+chef_environment Chef::Config[:environment]

data/spec/spec_helper.rb

@@ -11,6 +11,7 @@ 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.2
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
@@ -108,6 +108,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.12
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '11.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -236,6 +252,22 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.6.4
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Baton
 email:
 - johnog@gmail.com
@@ -248,6 +280,7 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- CHANGELOG.md
 - COPYING
 - Gemfile
 - Guardfile
@@ -289,10 +322,12 @@ files:
 - spec/baton/server_spec.rb
 - spec/fixtures/config-multi.cfg
 - spec/fixtures/config.cfg
+- spec/fixtures/etc/chef/client.rb
 - spec/fixtures/file
 - spec/fixtures/file.sum
 - spec/fixtures/invalid_file
 - spec/fixtures/invalid_file.sum
+- spec/fixtures/ohai_plugins/chef_environment.rb
 - spec/spec_helper.rb
 homepage: https://github.com/digital-science/baton
 licenses: []
@@ -306,21 +341,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1528221756626291784
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1528221756626291784
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Baton
@@ -333,8 +362,11 @@ test_files:
 - spec/baton/server_spec.rb
 - spec/fixtures/config-multi.cfg
 - spec/fixtures/config.cfg
+- spec/fixtures/etc/chef/client.rb
 - spec/fixtures/file
 - spec/fixtures/file.sum
 - spec/fixtures/invalid_file
 - spec/fixtures/invalid_file.sum
+- spec/fixtures/ohai_plugins/chef_environment.rb
 - spec/spec_helper.rb
+has_rdoc: