beanstalk-worker 0.0.2 → 0.0.4

data/Gemfile

@@ -4,10 +4,11 @@ source "http://rubygems.org"
 #   gem "activesupport", ">= 2.3.5"
 
 gem 'beanstalk-client'
-gem "mixlib-log", "~> 1.6.0"
-gem "mixlib-config", "~> 1.1.2"
-gem "mixlib-log-json", "~> 0.0.1"
-gem "yajl-ruby", "~> 1.1.0"
+gem 'mixlib-log', "~> 1.6.0"
+gem 'mixlib-config', "~> 1.1.2"
+gem 'mixlib-log-json', "~> 0.0.1"
+gem 'yajl-ruby', "~> 1.1.0"
+gem 'activesupport', "~> 4.0.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/lib/beanstalk-worker.rb

@@ -1,8 +1,8 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
+$:.unshift File.dirname(__FILE__)
 
 module BeanStalk
   class Worker
-    VERSION = '0.0.2'
+    VERSION = '0.0.4'
   end
 end
 

data/lib/beanstalk-worker/config.rb

@@ -1,10 +1,11 @@
 require 'mixlib/config'
+require 'active_support/core_ext/hash'
 require 'yajl'
 require 'yaml'
 
 # The configuration object for the gemindexer worker.
 class BeanStalk::Worker
-  class Config
+  module Config
     extend Mixlib::Config
 
     # Return the configuration itself upon inspection.
@@ -12,15 +13,24 @@ class BeanStalk::Worker
       configuration.inspect
     end
 
+    class << self
+      # Support merging via coercion to symbols.
+      #
+      # @param [ Hash ] hash The configuration hash to symbolize and merge.
+      alias basic_merge! merge!
+      def merge!(hash)
+        basic_merge!(hash.symbolize_keys)
+      end
+    end
+
     # Loads a given file and passes it to the appropriate parser.
     #
     # @raise [ IOError ] Any IO Exceptions that occur.
     #
     # @param [ String ] filename The filename to read.
     # @param [ String ] parser The parser to use.
-    # @param [ String ] environment The environment to read config for.
-    def self.from_file(filename, parser="yaml", environment="development")
-      send("from_file_#{parser}".to_sym, filename, environment)
+    def self.from_file(filename, parser="yaml")
+      send("from_file_#{parser}".to_sym, filename, self[:environment])
     end
 
     # Loads a given ruby file and runs instance_eval against it
@@ -72,7 +82,7 @@ class BeanStalk::Worker
     #
     # @return [ String ] The beanstalk uri.
     def self.beanstalk_uri
-      [self['beanstalk']['server'], self['beanstalk']['port']].join(":")
+      [self[:beanstalk][:server], self[:beanstalk][:port]].join(":")
     end
 
     # When you are using ActiveSupport, they monkey-patch 'daemonize' into
@@ -93,6 +103,12 @@ class BeanStalk::Worker
     log_location STDOUT
     log_formatter :json
 
+    # Environment
+    environment :development
+
+    # Config file
+    config_file "#{Dir.pwd}/beanstalk-worker.conf"
+
     # Beanstalk config
     beanstalk({
       :server => '127.0.0.1',

data/lib/beanstalk-worker/worker.rb

@@ -5,9 +5,12 @@ class BeanStalk::Worker
   
   def initialize(config = {})
     @config = BeanStalk::Worker::Config
+    if File.exists? @config[:config_file]
+      @config.from_file @config[:config_file]
+    end
     @config.merge!(config || {})
-    @logger = BeanStalk::Worker::Log
 
+    @logger = BeanStalk::Worker::Log
     @logger.info("Logging started")
     
     @stats = {

data/spec/beanstalk-worker_spec.rb

@@ -1,4 +1,4 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
+$:.unshift File.dirname(__FILE__)
 
 require 'spec_helper'
 require 'beanstalk-client-rspec'
@@ -18,9 +18,6 @@ describe "BeanStalk" do
         }
       }
       
-      @original_stdout = $stdout
-      $stdout = File.new('/dev/null', 'w')
-      
       stub_const("Beanstalk::Pool", Beanstalk::MockPool)
     end
     

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+$:.unshift File.dirname(__FILE__)
 
 if RUBY_VERSION.gsub('.', '').to_i >= 190
   require 'simplecov'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beanstalk-worker
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -91,6 +91,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -258,7 +274,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3743712853818560544
+      hash: 3857992451407684916
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: