worker-army 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a878a579e7e87921fa49e33ce8cd74e59fe8301
-  data.tar.gz: 15c9d919e599781984924e90503f3680485e9093
+  metadata.gz: 59ec12d554f7bbbab1a78ce9d578eb136af8283e
+  data.tar.gz: e1aa674d2b057c4a4d5ab37b335920b5bd5b2ea9
 SHA512:
-  metadata.gz: 8f25a98dc55a052ab8dda0a248d79ed563a656e584af6abb1b9524ad2637b7f566a31fb9e99607d7d4667700a8c3e864e3bb01a7b89f41e46615fb935c60d0aa
-  data.tar.gz: 6169a0494da5961f82dcc119a9e99b17f96eb8226f390fa4c0de50631d21473f870c5a4dff01479c8d9f95ffc1a6b3b9a2a16c5760b07feed9e56a197e3deb6f
+  metadata.gz: 4725ba9ea36829d7559820b753d34ea848b82ac8f92b1814a586da4e84972d3b006cd17ac552e39b58903feba450775f1574d1383f7f1fd0001d39d2b12a2883
+  data.tar.gz: b697e10af515e02eba24df71d63418c2ce4970ea87e8abfc0dc3f16c1e1b9632ed7ce63d3e09ff93f22251f813a58218cdec476de04b7a7718d4ac78eff44f5c

data/Gemfile

@@ -5,6 +5,7 @@ gem "redis"
 gem "multi_json"
 gem "sinatra"
 gem "sinatra-contrib"
+gem "sinatra-basic-auth"
 gem "rest-client"
 gem "rake"
 gem 'unicorn'

data/Gemfile.lock

@@ -65,6 +65,8 @@ GEM
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
+    sinatra-basic-auth (0.1.0)
+      sinatra
     sinatra-contrib (1.4.2)
       backports (>= 2.0)
       multi_json
@@ -92,5 +94,6 @@ DEPENDENCIES
   redis
   rest-client
   sinatra
+  sinatra-basic-auth
   sinatra-contrib
   unicorn

data/README.md

@@ -31,6 +31,9 @@ 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_use_basic_auth
+     worker_army_basic_auth_username
+     worker_army_basic_auth_password
 
 ## Server / Queue
 

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/lib/worker_army/base.rb

@@ -23,6 +23,15 @@ module WorkerArmy
           if ENV['worker_army_store_job_data']
             config['store_job_data'] = (ENV['worker_army_store_job_data'] == 'true')
           end
+          if ENV['worker_army_use_basic_auth']
+            config['use_basic_auth'] = (ENV['worker_army_use_basic_auth'] == 'true')
+          end
+          if ENV['worker_army_basic_auth_username']
+            config['basic_auth_username'] = ENV['worker_army_basic_auth_username']
+          end
+          if ENV['worker_army_basic_auth_password']
+            config['basic_auth_password'] = ENV['worker_army_basic_auth_password']
+          end
         else
           begin
             # puts "Using config in your home directory"

data/lib/worker_army/web.rb

@@ -2,16 +2,24 @@ require "json"
 require "multi_json"
 require "sinatra"
 require "sinatra/json"
+require "sinatra/basic_auth"
 require File.dirname(__FILE__) + '/log'
 require File.dirname(__FILE__) + '/queue'
 
 queue = WorkerArmy::Queue.new
+auth = false
+if queue.config['use_basic_auth'] and queue.config['basic_auth_username'] and queue.config['basic_auth_password']
+  authorize do |username, password|
+    username == queue.config['basic_auth_username'] && password == queue.config['basic_auth_password']
+  end
+  auth = true
+end
 
 before do
   content_type 'application/json', :charset => 'utf-8'
 end
 
-get '/' do
+def overview(queue)
   job_count = queue.get_job_count || 0
   workers = queue.get_known_workers
   last_ping = queue.last_ping || 0
@@ -25,7 +33,18 @@ get '/' do
     workers: workers, last_worker_ping: last_ping.to_i, queues: queues,
     current_jobs: current_jobs
   }
-  json data
+end
+
+if auth
+  protect do
+    get "/" do
+      json overview(queue)
+    end
+  end
+else
+  get '/' do
+    json overview(queue)
+  end
 end
 
 post '/jobs' do

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.1 ruby lib
+# stub: worker-army 0.6.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "worker-army"
-  s.version = "0.6.1"
+  s.version = "0.6.2"
 
   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-07-24"
+  s.date = "2014-08-02"
   s.description = "Simple redis based worker queue with a HTTP/Rest interface"
   s.email = "kiessler@inceedo.com"
   s.executables = ["worker_army"]
@@ -60,6 +60,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<multi_json>, [">= 0"])
       s.add_runtime_dependency(%q<sinatra>, [">= 0"])
       s.add_runtime_dependency(%q<sinatra-contrib>, [">= 0"])
+      s.add_runtime_dependency(%q<sinatra-basic-auth>, [">= 0"])
       s.add_runtime_dependency(%q<rest-client>, [">= 0"])
       s.add_runtime_dependency(%q<rake>, [">= 0"])
       s.add_runtime_dependency(%q<unicorn>, [">= 0"])
@@ -71,6 +72,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<multi_json>, [">= 0"])
       s.add_dependency(%q<sinatra>, [">= 0"])
       s.add_dependency(%q<sinatra-contrib>, [">= 0"])
+      s.add_dependency(%q<sinatra-basic-auth>, [">= 0"])
       s.add_dependency(%q<rest-client>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<unicorn>, [">= 0"])
@@ -83,6 +85,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<multi_json>, [">= 0"])
     s.add_dependency(%q<sinatra>, [">= 0"])
     s.add_dependency(%q<sinatra-contrib>, [">= 0"])
+    s.add_dependency(%q<sinatra-basic-auth>, [">= 0"])
     s.add_dependency(%q<rest-client>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<unicorn>, [">= 0"])

data/worker_army.yml.sample

@@ -6,3 +6,6 @@ client_retry_count: 10
 worker_retry_count: 10
 callback_retry_count: 5
 store_job_data: true
+use_basic_auth: false
+basic_auth_username: "admin"
+basic_auth_password: "something"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worker-army
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Oliver Kiessler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra-basic-auth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement