worker-army 0.2.0 → 0.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3333bafc54ba37dcac68ad1e8ea338ee18e26512
+  data.tar.gz: 273ea0c00e78379fa78d6b7808c34d08898d20c5
+SHA512:
+  metadata.gz: 62bd6433faf7aa220080946c80092e2e1f3abac80f9e716830ca43aeaada2cfca07611881b98e3ea3f577a751e4c277cd8142991faf8d2e2d84c50c184bff151
+  data.tar.gz: 46a3af7c5a75245bb6ebbd9b281317655bb012e589b15d9fae33fd99e1c229bd33b7471e06cf8f27a536b3bd10e1c9dd2119984a08e135117951dc945187c66d

data/.rvmrc

@@ -0,0 +1 @@
+rvm use ruby-2.1.2@worker-army --create

data/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-ruby '1.9.3'
+ruby '2.1.2'
 
 gem "redis"
 gem "multi_json"
@@ -9,10 +9,10 @@ gem "rest-client"
 gem "rake"
 gem 'unicorn'
 gem "foreman"
+gem "jeweler", "~> 2.0.1"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "bundler", "~> 1.3.5"
-  gem "jeweler", "~> 1.8.4"
+  gem "bundler", "~> 1.6.2"
 end

data/Gemfile.lock

@@ -1,78 +1,81 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.5)
-    backports (3.3.3)
+    addressable (2.3.6)
+    backports (3.6.0)
     builder (3.2.2)
-    dotenv (0.9.0)
-    eventmachine (1.0.3)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    foreman (0.63.0)
-      dotenv (>= 0.7)
-      thor (>= 0.13.6)
-    git (1.2.5)
-    github_api (0.10.1)
-      addressable
-      faraday (~> 0.8.1)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    dotenv (0.7.0)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    foreman (0.67.0)
+      dotenv (~> 0.7.0)
+      thor (~> 0.17.0)
+    git (1.2.6)
+    github_api (0.11.3)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.1)
+      faraday (~> 0.8, < 0.10)
       hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.0)
       oauth2
-    hashie (2.0.5)
-    highline (1.6.19)
-    httpauth (0.2.0)
-    jeweler (1.8.6)
+    hashie (2.1.1)
+    highline (1.6.21)
+    jeweler (2.0.1)
       builder
-      bundler (~> 1.0)
+      bundler (>= 1.0)
       git (>= 1.2.5)
-      github_api (= 0.10.1)
+      github_api
       highline (>= 1.6.15)
-      nokogiri (= 1.5.10)
+      nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.8.0)
-    jwt (0.1.8)
+    json (1.8.1)
+    jwt (0.1.13)
       multi_json (>= 1.5)
-    kgio (2.8.0)
-    mime-types (1.23)
-    multi_json (1.7.8)
+    kgio (2.9.2)
+    mime-types (2.3)
+    mini_portile (0.6.0)
+    multi_json (1.10.1)
     multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    nokogiri (1.5.10)
-    oauth2 (0.9.2)
-      faraday (~> 0.8)
-      httpauth (~> 0.2)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
+    multipart-post (2.0.0)
+    nokogiri (1.6.2.1)
+      mini_portile (= 0.6.0)
+    oauth2 (0.9.3)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 0.1.8)
+      multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
     rack (1.5.2)
-    rack-protection (1.5.0)
+    rack-protection (1.5.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    raindrops (0.11.0)
-    rake (10.1.0)
-    rdoc (4.0.1)
+    raindrops (0.13.0)
+    rake (10.3.2)
+    rdoc (4.1.1)
       json (~> 1.4)
-    redis (3.0.4)
+    redis (3.0.7)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    sinatra (1.4.3)
+    sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
-    sinatra-contrib (1.4.0)
+    sinatra-contrib (1.4.2)
       backports (>= 2.0)
-      eventmachine
+      multi_json
       rack-protection
       rack-test
-      sinatra (~> 1.4.2)
+      sinatra (~> 1.4.0)
       tilt (~> 1.3)
-    thor (0.18.1)
+    thor (0.17.0)
+    thread_safe (0.3.3)
     tilt (1.4.1)
-    unicorn (4.6.3)
+    unicorn (4.8.3)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
@@ -81,9 +84,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.3.5)
+  bundler (~> 1.6.2)
   foreman
-  jeweler (~> 1.8.4)
+  jeweler (~> 2.0.1)
   multi_json
   rake
   redis

data/Procfile

@@ -1 +1,2 @@
+# redis: redis-server
 web: bundle exec unicorn -p $PORT -c ./unicorn.rb

data/Rakefile

@@ -21,13 +21,6 @@ Jeweler::Tasks.new do |gem|
   gem.description = %Q{Simple redis based worker queue with a HTTP/Rest interface}
   gem.email = "kiessler@inceedo.com"
   gem.authors = ["Oliver Kiessler"]
-  gem.add_runtime_dependency 'sinatra'
-  gem.add_runtime_dependency 'sinatra-contrib'
-  gem.add_runtime_dependency 'rest-client'
-  gem.add_runtime_dependency 'redis'
-  gem.add_runtime_dependency 'json'
-  gem.add_runtime_dependency 'multi_json'
-  gem.add_runtime_dependency 'rake'
 end
 Jeweler::RubygemsDotOrgTasks.new
 

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/worker_army/queue.rb

@@ -78,6 +78,15 @@ module WorkerArmy
       end
     end
 
+    def ping(data)
+      Queue.redis_instance.lpush 'workers', data.to_json
+    end
+
+    def get_known_workers(recent_worker_pings = 1000)
+      worker_pings = Queue.redis_instance.lrange 'workers', 0, recent_worker_pings
+      worker_pings ? worker_pings.collect {|json| JSON.parse(json)} : []
+    end
+
     def get_job_count(queue_name = "queue")
       Queue.redis_instance["#{queue_name}_counter"]
     end

data/lib/worker_army/web.rb

@@ -8,7 +8,8 @@ queue = WorkerArmy::Queue.new
 
 get '/' do
   job_count = queue.get_job_count || 0
-  data = { :job_count => job_count }
+  workers = queue.get_known_workers
+  data = { job_count: job_count, workers: workers }
   json data
 end
 

data/lib/worker_army/worker.rb

@@ -14,6 +14,9 @@ module WorkerArmy
 
     def process_queue
       raise "No job class set!" unless @job
+      @queue.ping(worker_pid: Process.pid, job_name: @job.class.name, host_name: @host_name,
+        timestamp: Time.now.utc.to_i)
+      puts "Worker ready!"
       list, element = @queue.pop(@job.class.name)
       if list and element
         puts "List: #{list} => #{element}"

data/worker-army.gemspec

@@ -0,0 +1,91 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+# stub: worker-army 0.2.1 ruby lib
+
+Gem::Specification.new do |s|
+  s.name = "worker-army"
+  s.version = "0.2.1"
+
+  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-05-23"
+  s.description = "Simple redis based worker queue with a HTTP/Rest interface"
+  s.email = "kiessler@inceedo.com"
+  s.executables = ["worker_army"]
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".rvmrc",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "Procfile",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "bin/worker_army",
+    "config.ru",
+    "lib/worker-army.rb",
+    "lib/worker_army/client.rb",
+    "lib/worker_army/example_job.rb",
+    "lib/worker_army/queue.rb",
+    "lib/worker_army/web.rb",
+    "lib/worker_army/worker.rb",
+    "public/index.html",
+    "test/helper.rb",
+    "test/test_worker-army.rb",
+    "unicorn.rb",
+    "worker-army.gemspec",
+    "worker-army.yml.sample"
+  ]
+  s.homepage = "http://github.com/okiess/worker-army"
+  s.licenses = ["MIT"]
+  s.rubygems_version = "2.2.2"
+  s.summary = "Simple worker queue"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<redis>, [">= 0"])
+      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<rest-client>, [">= 0"])
+      s.add_runtime_dependency(%q<rake>, [">= 0"])
+      s.add_runtime_dependency(%q<unicorn>, [">= 0"])
+      s.add_runtime_dependency(%q<foreman>, [">= 0"])
+      s.add_runtime_dependency(%q<jeweler>, ["~> 2.0.1"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.6.2"])
+    else
+      s.add_dependency(%q<redis>, [">= 0"])
+      s.add_dependency(%q<multi_json>, [">= 0"])
+      s.add_dependency(%q<sinatra>, [">= 0"])
+      s.add_dependency(%q<sinatra-contrib>, [">= 0"])
+      s.add_dependency(%q<rest-client>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<unicorn>, [">= 0"])
+      s.add_dependency(%q<foreman>, [">= 0"])
+      s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
+      s.add_dependency(%q<bundler>, ["~> 1.6.2"])
+    end
+  else
+    s.add_dependency(%q<redis>, [">= 0"])
+    s.add_dependency(%q<multi_json>, [">= 0"])
+    s.add_dependency(%q<sinatra>, [">= 0"])
+    s.add_dependency(%q<sinatra-contrib>, [">= 0"])
+    s.add_dependency(%q<rest-client>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<unicorn>, [">= 0"])
+    s.add_dependency(%q<foreman>, [">= 0"])
+    s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
+    s.add_dependency(%q<bundler>, ["~> 1.6.2"])
+  end
+end
+

metadata

@@ -1,288 +1,155 @@
 --- !ruby/object:Gem::Specification
 name: worker-army
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.2.1
 platform: ruby
 authors:
 - Oliver Kiessler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-27 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: unicorn
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: foreman
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.4
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sinatra-contrib
-  requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: 1.6.2
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.2
 description: Simple redis based worker queue with a HTTP/Rest interface
 email: kiessler@inceedo.com
 executables:
@@ -292,7 +159,8 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- .document
+- ".document"
+- ".rvmrc"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -312,33 +180,30 @@ files:
 - test/helper.rb
 - test/test_worker-army.rb
 - unicorn.rb
+- worker-army.gemspec
 - worker-army.yml.sample
 homepage: http://github.com/okiess/worker-army
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2511990235631195321
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple worker queue
 test_files: []