worker-army 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e57d4e2bbfc1b896a308f8c06888a786ca98c696
-  data.tar.gz: 9d9c51660c91ba974d121f7d031fed8374814be8
+  metadata.gz: 73cd1c353f20a271842abf07f6f2d8a1888c9029
+  data.tar.gz: 12f49ffd632f13e4faff7e2c5ad67c4723c98c9c
 SHA512:
-  metadata.gz: 88e41f4f1049ab465061498191ed8ebdd8869dbfbeff04fcbc95f84a5fee303117121f0a7a1410fcc47e29ed37c2e3931f92beb904c72ae3aea26352777a0bda
-  data.tar.gz: 904cede0b5a5ce32094e9a2b772b43997f7647e1d704699ca8db831ad2dfacf5dd84bfcd67e25d82139489f24fdd76a5603ed258e1773d9de8bd37571529751f
+  metadata.gz: 1d3a0f621431ef876bbe65048d90e6170ca2cda1be89c1f7f02d57cbe942b12c28dd2c5b0ef1a9a8e90cdcedf51611e2bcb506f264929639f58851bf09b62565
+  data.tar.gz: ca8d5e355c9ec0dff577646149916ff6c94d7afedcd50684240d4547e07757ede00ff1090da062c44b8931d44a1d27bf041186a91acf0e2a7ac8ce59a314415f

data/VERSION

@@ -1 +1 @@
-0.6.3
+0.6.4

data/lib/worker_army/base.rb

@@ -3,8 +3,21 @@ module WorkerArmy
     class << self
       def config
         return $config if $config
-        if ENV['worker_army_redis_host'] and ENV['worker_army_redis_port']
-          config = { 'redis_host' => ENV['worker_army_redis_host'], 'redis_port' => ENV['worker_army_redis_port'] }
+        if File.exist?("#{ENV['HOME']}/.worker_army.yml")
+          # puts "Using config in your home directory"
+          config = YAML.load(File.read("#{ENV['HOME']}/.worker_army.yml"))
+        else
+          config = {}
+          if ENV['worker_army_endpoint'] # client use only
+            config['endpoint'] = ENV['worker_army_endpoint']
+          end
+          
+          if ENV['worker_army_redis_host']
+            config['redis_host'] = ENV['worker_army_redis_host']
+          end
+          if ENV['worker_army_redis_port']
+            config['redis_port'] = ENV['worker_army_redis_port']
+          end
           if ENV['worker_army_redis_auth']
             config['redis_auth'] = ENV['worker_army_redis_auth']
           end
@@ -17,9 +30,7 @@ module WorkerArmy
           if ENV['worker_army_callback_retry_count']
             config['callback_retry_count'] = ENV['worker_army_callback_retry_count'].to_i
           end
-          if ENV['worker_army_endpoint']
-            config['endpoint'] = ENV['worker_army_endpoint']
-          end
+          
           if ENV['worker_army_store_job_data']
             config['store_job_data'] = (ENV['worker_army_store_job_data'] == 'true')
           end
@@ -35,13 +46,9 @@ module WorkerArmy
           if ENV['worker_army_api_key']
             config['api_key'] = ENV['worker_army_api_key']
           end
-        else
-          begin
-            # puts "Using config in your home directory"
-            config = YAML.load(File.read("#{ENV['HOME']}/.worker_army.yml"))
-          rescue Errno::ENOENT
-            raise "worker-army configuration expected in ~/.worker_army.yml or provide env vars..."
-          end
+        end
+        if config.keys.size == 0
+          raise "worker-army configuration expected in ~/.worker_army.yml or provide env vars..."
         end
         $config = config
       end

data/worker-army.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: worker-army 0.6.3 ruby lib
+# stub: worker-army 0.6.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "worker-army"
-  s.version = "0.6.3"
+  s.version = "0.6.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Oliver Kiessler"]
-  s.date = "2014-08-03"
+  s.date = "2014-12-10"
   s.description = "Simple redis based worker queue with a HTTP/Rest interface"
   s.email = "kiessler@inceedo.com"
   s.executables = ["worker_army"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worker-army
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Oliver Kiessler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-03 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis