web_task_runner 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa3d96c91c52ee015b141cdfd3a166f9ab0ae680
-  data.tar.gz: 21bd106643b4e50183b9fa5232cff82f2902fc1b
+  metadata.gz: db3a6ff7044e2cf38418acfb0264c2617886f6ee
+  data.tar.gz: 18a2e1c11ad0ba7bae013df1180282600c2d84a0
 SHA512:
-  metadata.gz: 2118e07ec979f23255dcb1ab83ec17a58d131a0fcdf3033bd1ffcb0bd1e7f95ec4f7175939e5195f4863d3fb905389c67f058ef0f3e21c469cb0f3529270318d
-  data.tar.gz: a9c40f240304c6543d0d8bc6f38c14c9b3274c89223caf510c64b5514282ebb78dabcf2a4af9e0a181c0a2d6f537fdb1c823a7f6f1418d80346f1121059bf317
+  metadata.gz: 57904e2bd566bdced869a6eb04d32d305358d86e003f745311cc8463fd497a8aa51294180498eb219594663ffcdaa7daa1f5365c8080b340488281c4ebee24ec
+  data.tar.gz: eb6a81d215145061e69caffda120801ac7cdbc078e760cce181993cd6d3ed728de4c0573cb6554c45885cba4cee7aac841d70070c3a4dc123c1ef0044be8278e

data/README.md

@@ -155,9 +155,11 @@ require 'web_task_runner'
 
 class MyWorkOne < WebTaskRunner::TaskWorker
   def exec
-    # sleep one second for ten times
+    # yes - you can access all parameters passed with the request
+    x = params[:time] || 1
+    # sleep x second(s) for ten times
     10.times do |i|
-      sleep(1)
+      sleep(x)
       raise if Random.rand(100) < 2  # simulate errors
     end
   end
@@ -174,9 +176,11 @@ require 'web_task_runner'
 
 class MyWorkOne < WebTaskRunner::TaskWorker
   def exec
-    # sleep one second for ten times
+    # yes - you can access all parameters passed with the request
+    x = params[:time] || 1
+    # sleep x second(s) for ten times
     10.times do |i|
-      sleep(1)
+      sleep(x)
       raise if Random.rand(100) < 2  # simulate errors
       # report the current progress
       WebTaskRunner.job_1_progress = (i + 1) / 10.0

data/lib/web_task_runner.rb

@@ -17,31 +17,25 @@ class WebTaskRunner < Sinatra::Application
     @@jobs
   end
 
-  # GET /?key=<api_key> - retrieve current state of the task runner
-  get '/' do
+  before do
     # Authorize the request
     error 401, JSON.pretty_generate(error: 'Unauthorized') and \
       return if ENV['API_KEY'] != params[:key]
+  end
 
+  # GET /?key=<api_key> - retrieve current state of the task runner
+  get '/' do
     return JSON.pretty_generate(current_info)
   end
 
   # GET /?key=<api_key> - retrieve current status of the task
   get '/status' do
-    # Authorize the request
-    error 401, JSON.pretty_generate(error: 'Unauthorized') and \
-      return if ENV['API_KEY'] != params[:key]
-
     return JSON.pretty_generate(current_status)
   end
 
   # GET /start?key=<api_key> - start the task if idle
   get '/start' do
-    # Authorize the request
-    error 401, JSON.pretty_generate(error: 'Unauthorized') and \
-      return if ENV['API_KEY'] != params[:key]
-
-    start_task_if_idle
+    start_task_if_idle(params)
 
     link = "#{request.env['rack.url_scheme']}://#{request.env['HTTP_HOST']}/status?key=#{params[:key]}"
 
@@ -51,10 +45,6 @@ class WebTaskRunner < Sinatra::Application
 
   # GET /stop?key=<api_key> - kill the working task
   get '/stop' do
-    # Authorize the request
-    error 401, JSON.pretty_generate(error: 'Unauthorized') and \
-      return if ENV['API_KEY'] != params[:key]
-
     kill_task
 
     return JSON.pretty_generate(current_status)
@@ -88,7 +78,7 @@ class WebTaskRunner < Sinatra::Application
   end
 
   # Starts (or kill and restart) the task
-  def self.start_task
+  def self.start_task(params = nil)
     kill_task
     WebTaskRunner::RedisModule.redis.set('task:state', 'working')
     WebTaskRunner::RedisModule.redis.set('task:status', 'processing')
@@ -98,7 +88,9 @@ class WebTaskRunner < Sinatra::Application
     jobs_count = @@jobs.count
 
     # Start the worker here
-    @@jobs.each(&:perform_async)
+    @@jobs.each do |job|
+      job.perform_async(params)
+    end
 
     WebTaskRunner::RedisModule.redis.set('task:task_jobs', jobs_count)
     WebTaskRunner::RedisModule.redis.set('task:working_jobs', jobs_count)
@@ -110,18 +102,18 @@ class WebTaskRunner < Sinatra::Application
     end
   end
 
-  def start_task  # :nodoc:
-    WebTaskRunner.start_task
+  def start_task(params = nil)  # :nodoc:
+    WebTaskRunner.start_task(params)
   end
 
   # Starts the task if it's not running
-  def self.start_task_if_idle
+  def self.start_task_if_idle(params = nil)
     return unless current_state == 'idle'
-    start_task
+    start_task(params)
   end
 
-  def start_task_if_idle  # :nodoc:
-    WebTaskRunner.start_task_if_idle
+  def start_task_if_idle(params = nil)  # :nodoc:
+    WebTaskRunner.start_task_if_idle(params)
   end
 
   # Kills the running task

data/lib/web_task_runner/task_worker.rb

@@ -9,8 +9,11 @@ class WebTaskRunner < Sinatra::Application
     include Sidekiq::Worker
     include Sidekiq::Status::Worker
 
-    def perform
+    attr_accessor :params
+
+    def perform(params)
       return if WebTaskRunner.current_state == 'idle'
+      self.params = params || {}
 
       exec
 

data/lib/web_task_runner/version.rb

@@ -1,3 +1,3 @@
 class WebTaskRunnerVersion
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web_task_runner
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Neson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2015-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra