worker-army 0.6.3 → 0.6.4

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e57d4e2bbfc1b896a308f8c06888a786ca98c696
4
- data.tar.gz: 9d9c51660c91ba974d121f7d031fed8374814be8
3
+ metadata.gz: 73cd1c353f20a271842abf07f6f2d8a1888c9029
4
+ data.tar.gz: 12f49ffd632f13e4faff7e2c5ad67c4723c98c9c
5
5
  SHA512:
6
- metadata.gz: 88e41f4f1049ab465061498191ed8ebdd8869dbfbeff04fcbc95f84a5fee303117121f0a7a1410fcc47e29ed37c2e3931f92beb904c72ae3aea26352777a0bda
7
- data.tar.gz: 904cede0b5a5ce32094e9a2b772b43997f7647e1d704699ca8db831ad2dfacf5dd84bfcd67e25d82139489f24fdd76a5603ed258e1773d9de8bd37571529751f
6
+ metadata.gz: 1d3a0f621431ef876bbe65048d90e6170ca2cda1be89c1f7f02d57cbe942b12c28dd2c5b0ef1a9a8e90cdcedf51611e2bcb506f264929639f58851bf09b62565
7
+ data.tar.gz: ca8d5e355c9ec0dff577646149916ff6c94d7afedcd50684240d4547e07757ede00ff1090da062c44b8931d44a1d27bf041186a91acf0e2a7ac8ce59a314415f
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.6.3
1
+ 0.6.4
@@ -3,8 +3,21 @@ module WorkerArmy
3
3
  class << self
4
4
  def config
5
5
  return $config if $config
6
- if ENV['worker_army_redis_host'] and ENV['worker_army_redis_port']
7
- config = { 'redis_host' => ENV['worker_army_redis_host'], 'redis_port' => ENV['worker_army_redis_port'] }
6
+ if File.exist?("#{ENV['HOME']}/.worker_army.yml")
7
+ # puts "Using config in your home directory"
8
+ config = YAML.load(File.read("#{ENV['HOME']}/.worker_army.yml"))
9
+ else
10
+ config = {}
11
+ if ENV['worker_army_endpoint'] # client use only
12
+ config['endpoint'] = ENV['worker_army_endpoint']
13
+ end
14
+
15
+ if ENV['worker_army_redis_host']
16
+ config['redis_host'] = ENV['worker_army_redis_host']
17
+ end
18
+ if ENV['worker_army_redis_port']
19
+ config['redis_port'] = ENV['worker_army_redis_port']
20
+ end
8
21
  if ENV['worker_army_redis_auth']
9
22
  config['redis_auth'] = ENV['worker_army_redis_auth']
10
23
  end
@@ -17,9 +30,7 @@ module WorkerArmy
17
30
  if ENV['worker_army_callback_retry_count']
18
31
  config['callback_retry_count'] = ENV['worker_army_callback_retry_count'].to_i
19
32
  end
20
- if ENV['worker_army_endpoint']
21
- config['endpoint'] = ENV['worker_army_endpoint']
22
- end
33
+
23
34
  if ENV['worker_army_store_job_data']
24
35
  config['store_job_data'] = (ENV['worker_army_store_job_data'] == 'true')
25
36
  end
@@ -35,13 +46,9 @@ module WorkerArmy
35
46
  if ENV['worker_army_api_key']
36
47
  config['api_key'] = ENV['worker_army_api_key']
37
48
  end
38
- else
39
- begin
40
- # puts "Using config in your home directory"
41
- config = YAML.load(File.read("#{ENV['HOME']}/.worker_army.yml"))
42
- rescue Errno::ENOENT
43
- raise "worker-army configuration expected in ~/.worker_army.yml or provide env vars..."
44
- end
49
+ end
50
+ if config.keys.size == 0
51
+ raise "worker-army configuration expected in ~/.worker_army.yml or provide env vars..."
45
52
  end
46
53
  $config = config
47
54
  end
@@ -2,16 +2,16 @@
2
2
  # DO NOT EDIT THIS FILE DIRECTLY
3
3
  # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
4
4
  # -*- encoding: utf-8 -*-
5
- # stub: worker-army 0.6.3 ruby lib
5
+ # stub: worker-army 0.6.4 ruby lib
6
6
 
7
7
  Gem::Specification.new do |s|
8
8
  s.name = "worker-army"
9
- s.version = "0.6.3"
9
+ s.version = "0.6.4"
10
10
 
11
11
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
12
12
  s.require_paths = ["lib"]
13
13
  s.authors = ["Oliver Kiessler"]
14
- s.date = "2014-08-03"
14
+ s.date = "2014-12-10"
15
15
  s.description = "Simple redis based worker queue with a HTTP/Rest interface"
16
16
  s.email = "kiessler@inceedo.com"
17
17
  s.executables = ["worker_army"]
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: worker-army
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.3
4
+ version: 0.6.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Oliver Kiessler
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-08-03 00:00:00.000000000 Z
11
+ date: 2014-12-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: redis