baton 0.4.2 → 0.4.3

data/bin/batonize

@@ -2,6 +2,7 @@
 
 require 'rubygems'
 require 'thor'
+require 'fileutils'
 
 module Baton
   class CLI < Thor
@@ -50,7 +51,7 @@ module Baton
         template(File.join("gem/bin/gem.tt"),          baton_bin_name,    opts)
         template(File.join("gem/bin/gem-monitor.tt"),  monitor_bin_name,  opts)
         # Make them executable
-         FileUtils.chmod 0755, [baton_bin_name, monitor_bin_name]
+        FileUtils.chmod 0755, [baton_bin_name, monitor_bin_name]
       end
 
       Dir.chdir(target) { `git init`; `git add .` }

data/lib/baton/configuration.rb

@@ -5,9 +5,21 @@ module Baton
   class Configuration
     include Baton::Logging
 
-    attr_accessor :exchange, :exchange_out, :ohai_file,
-      :host, :vhost, :user, :password,
-      :pusher_app_id, :pusher_key, :pusher_secret, :config_path
+    attr_accessor :config, :host, :vhost, :user, :password
+
+    def initialize
+      @config = {}
+    end
+
+    # Public: ensure that any configuration options are automatically exposed.
+    #
+    def method_missing(name, *args, &block)
+      if name.to_s[-1] == '='
+        config[name[0..-2].to_s.upcase] = args[0]
+      else
+        config.fetch(name.to_s.upcase) {nil}
+      end
+    end
 
     # Public: Loads the config file given as parameter and sets up RabbitMQ's options.
     #
@@ -21,7 +33,8 @@ module Baton
     # Raises Errno::ENOENT if file cannot be found.
     def config_path=(path)
       config_file = YAML.load_file(path)
-      setup_rabbitmq_opts(config_file)
+      config.merge!(config_file)
+      setup_rabbitmq_opts
     rescue Errno::ENOENT => e
       self.host = "localhost"
       logger.error "Could not find a baton configuration file at #{path}"
@@ -41,11 +54,11 @@ module Baton
     #     })
     #
     # Returns nothing.
-    def setup_rabbitmq_opts(config_file)
-      self.host     = config_file.fetch("RABBIT_HOST") {"localhost"}
-      self.vhost    = config_file["RABBIT_VHOST"]
-      self.user     = config_file["RABBIT_USER"]
-      self.password = config_file["RABBIT_PASS"]
+    def setup_rabbitmq_opts
+      self.host     = config.fetch("RABBIT_HOST") {"localhost"}
+      self.vhost    = config["RABBIT_VHOST"]
+      self.user     = config["RABBIT_USER"]
+      self.password = config["RABBIT_PASS"]
     end
 
     # Public: Defines the connection options for RabbitMQ as a Hash.

data/lib/baton/server.rb

@@ -8,6 +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 = Ohai::System.new
       @ohai.all_plugins
       configure

data/lib/baton/templates/gem/gem.gemspec.tt

@@ -9,9 +9,9 @@ Gem::Specification.new do |gem|
   gem.homepage      = ""
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  gem.files         = `git ls-files`.split("\n")
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.files         = `git ls-files`.split("\n").reject { |fn| fn.include? ".tgz" }
+  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n").reject { |fn| fn.include? ".tgz" }
+
   gem.name          = <%=config[:name].inspect%>
   gem.require_paths = ["lib"]
   gem.version       = <%=config[:constant_name]%>::VERSION

data/lib/baton/version.rb

@@ -1,3 +1,3 @@
 module Baton
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: baton
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-03 00:00:00.000000000 Z
+date: 2012-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &70316358673880 !ruby/object:Gem::Requirement
+  requirement: &70333413794360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.8.4
   type: :runtime
   prerelease: false
-  version_requirements: *70316358673880
+  version_requirements: *70333413794360
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70316358673380 !ruby/object:Gem::Requirement
+  requirement: &70333413793500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0.beta.4
   type: :runtime
   prerelease: false
-  version_requirements: *70316358673380
+  version_requirements: *70333413793500
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70316358672920 !ruby/object:Gem::Requirement
+  requirement: &70333413791920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -44,10 +44,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70316358672920
+  version_requirements: *70333413791920
 - !ruby/object:Gem::Dependency
   name: bunny
-  requirement: &70316358672460 !ruby/object:Gem::Requirement
+  requirement: &70333413790720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.7.8
   type: :runtime
   prerelease: false
-  version_requirements: *70316358672460
+  version_requirements: *70333413790720
 - !ruby/object:Gem::Dependency
   name: ohai
-  requirement: &70316358672000 !ruby/object:Gem::Requirement
+  requirement: &70333413788900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.6.12
   type: :runtime
   prerelease: false
-  version_requirements: *70316358672000
+  version_requirements: *70333413788900
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70316363115760 !ruby/object:Gem::Requirement
+  requirement: &70333413787160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70316363115760
+  version_requirements: *70333413787160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70316363115220 !ruby/object:Gem::Requirement
+  requirement: &70333413808340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70316363115220
+  version_requirements: *70333413808340
 - !ruby/object:Gem::Dependency
   name: moqueue
-  requirement: &70316363114720 !ruby/object:Gem::Requirement
+  requirement: &70333413807000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 0.1.4
   type: :development
   prerelease: false
-  version_requirements: *70316363114720
+  version_requirements: *70333413807000
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70316363114260 !ruby/object:Gem::Requirement
+  requirement: &70333413806200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *70316363114260
+  version_requirements: *70333413806200
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70316363113800 !ruby/object:Gem::Requirement
+  requirement: &70333413805540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70316363113800
+  version_requirements: *70333413805540
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70316363113340 !ruby/object:Gem::Requirement
+  requirement: &70333413804580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 1.7.7
   type: :development
   prerelease: false
-  version_requirements: *70316363113340
+  version_requirements: *70333413804580
 - !ruby/object:Gem::Dependency
   name: minitar
-  requirement: &70316363112880 !ruby/object:Gem::Requirement
+  requirement: &70333413819540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -143,7 +143,7 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *70316363112880
+  version_requirements: *70333413819540
 description: Baton
 email:
 - johnog@gmail.com
@@ -214,7 +214,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -746487043283383730
+      hash: -1201032507903829942
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -223,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -746487043283383730
+      hash: -1201032507903829942
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11