worker-army 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59ec12d554f7bbbab1a78ce9d578eb136af8283e
-  data.tar.gz: e1aa674d2b057c4a4d5ab37b335920b5bd5b2ea9
+  metadata.gz: e57d4e2bbfc1b896a308f8c06888a786ca98c696
+  data.tar.gz: 9d9c51660c91ba974d121f7d031fed8374814be8
 SHA512:
-  metadata.gz: 4725ba9ea36829d7559820b753d34ea848b82ac8f92b1814a586da4e84972d3b006cd17ac552e39b58903feba450775f1574d1383f7f1fd0001d39d2b12a2883
-  data.tar.gz: b697e10af515e02eba24df71d63418c2ce4970ea87e8abfc0dc3f16c1e1b9632ed7ce63d3e09ff93f22251f813a58218cdec476de04b7a7718d4ac78eff44f5c
+  metadata.gz: 88e41f4f1049ab465061498191ed8ebdd8869dbfbeff04fcbc95f84a5fee303117121f0a7a1410fcc47e29ed37c2e3931f92beb904c72ae3aea26352777a0bda
+  data.tar.gz: 904cede0b5a5ce32094e9a2b772b43997f7647e1d704699ca8db831ad2dfacf5dd84bfcd67e25d82139489f24fdd76a5603ed258e1773d9de8bd37571529751f

data/README.md

@@ -31,6 +31,7 @@ If you can't provide or don't want to provide the config file at that location,
      worker_army_client_retry_count
      worker_army_callback_retry_count
      worker_army_store_job_data
+     worker_army_api_key
      worker_army_use_basic_auth
      worker_army_basic_auth_username
      worker_army_basic_auth_password

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.6.3

data/lib/worker_army/base.rb

@@ -32,6 +32,9 @@ module WorkerArmy
           if ENV['worker_army_basic_auth_password']
             config['basic_auth_password'] = ENV['worker_army_basic_auth_password']
           end
+          if ENV['worker_army_api_key']
+            config['api_key'] = ENV['worker_army_api_key']
+          end
         else
           begin
             # puts "Using config in your home directory"

data/lib/worker_army/client.rb

@@ -11,7 +11,7 @@ module WorkerArmy
         raise "No job class provided" unless job_class
         worker_army_base_url = config['endpoint']
         callback_url = "#{worker_army_base_url}/generic_callback" unless callback_url
-        response = nil
+        response = nil; response_data = { 'success' => false }
         begin
           response = RestClient.post "#{worker_army_base_url}/jobs",
             data.merge(
@@ -19,21 +19,22 @@ module WorkerArmy
               callback_url: "#{worker_army_base_url}/callback?callback_url=#{callback_url}",
               queue_prefix: queue_prefix
             ).to_json,
-            :content_type => :json, :accept => :json
+            :content_type => :json, :accept => :json, "api_key" => config['api_key']
         rescue => e
           puts "Failed! Retrying (#{retry_count})..."
           retry_count += 1
-          if retry_count < client_retry_count(config)
+          if retry_count < client_retry_count(config) and not e.message == '401 Unauthorized'
             sleep (retry_count * 2)
             push_job(job_class, data, callback_url, queue_prefix, retry_count)
+          elsif e.message == "401 Unauthorized"
+            response_data = response_data.merge('error_message' => '401 Unauthorized')
           end
         end
         if response and response.body and response.code == 200
           hash = JSON.parse(response.body)
-          hash.merge('success' => true)
-        else
-          { 'success' => false }
+          return hash.merge('success' => true)
         end
+        response_data
       end
     end
   end

data/lib/worker_army/web.rb

@@ -48,6 +48,9 @@ else
 end
 
 post '/jobs' do
+  unless request.env['HTTP_API_KEY'] == queue.config['api_key']
+    halt 401, "Not authorized\n"
+  end
   data = JSON.parse(request.body.read)
   queue_job = queue.push data if data
   json queue_job

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.2 ruby lib
+# stub: worker-army 0.6.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "worker-army"
-  s.version = "0.6.2"
+  s.version = "0.6.3"
 
   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-02"
+  s.date = "2014-08-03"
   s.description = "Simple redis based worker queue with a HTTP/Rest interface"
   s.email = "kiessler@inceedo.com"
   s.executables = ["worker_army"]

data/worker_army.yml.sample

@@ -5,6 +5,7 @@ redis_auth: "YOUR_PASS"
 client_retry_count: 10
 worker_retry_count: 10
 callback_retry_count: 5
+api_key: "YOUR_TOKEN"
 store_job_data: true
 use_basic_auth: false
 basic_auth_username: "admin"

metadata

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