web_task_runner 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5828a4e9a9b521c206ae34e2102f30ff0cfe5b9
-  data.tar.gz: ecec3fabb1fde45795da529adef6153adb9bc514
+  metadata.gz: bdec9baba18e0b759dc963ce14a40a2ca43e2d0b
+  data.tar.gz: 05347f39262584e75fdd616d97a392a7bcfc0a3c
 SHA512:
-  metadata.gz: 5b25a18f7e7f56786a4a13a617c4f70fd192db8f65be0a2638e0c40369998e7d0c1be8815ae8c962d8e39f298531ef66e21a58c901e9a40e67dc8131a4e62452
-  data.tar.gz: 3c2210c4ea5266cd889975bb4f5da9d200bd21abb9a88f8c1b111e19442489b2925ffc3add379d7acbf50cd1b0bbad7ee851cf82223f752227f0fe6c6bc8f0a9
+  metadata.gz: 7454a52b416e09857ca43f4efc25a45b18afab282126adc360141852e546037d46cfdedff700ae8a3875ee0a80df532ac709fbaf5535cbd293be88c2ddd81610
+  data.tar.gz: 27b3f5da7619976c9fe65d7ff843b3f952402795cc0019c7373c29c95038d73cd5988c0bb8ad7610847e7f09dda9910ef230971df9e8d3d6c93a125e9cb90046

data/README.md

@@ -1,4 +1,4 @@
-# WebTaskRunner
+# WebTaskRunner [![Gem Version](https://badge.fury.io/rb/web_task_runner.svg)](http://badge.fury.io/rb/web_task_runner) [![Build Status](https://travis-ci.org/Neson/web_task_runner.svg?branch=master)](https://travis-ci.org/Neson/web_task_runner) [![Documentation Status](http://inch-ci.org/github/Neson/web_task_runner.svg?branch=master)](http://inch-ci.org/github/Neson/web_task_runner)
 
 Web wrapper to run a specific task with [Sidekiq](http://sidekiq.org/).
 Provides HTTP API to start, stop, get status of the task running in background,

data/Rakefile

@@ -1 +1,6 @@
 require "bundler/gem_tasks"
+require File.join('rspec', 'core', 'rake_task')
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/lib/web_task_runner.rb

@@ -9,6 +9,8 @@ require "web_task_runner/redis_module"
 require "web_task_runner/task_worker"
 
 class WebTaskRunner < Sinatra::Application
+  VERSION = WebTaskRunnerVersion::VERSION
+
   @@jobs = []
 
   def self.jobs
@@ -46,13 +48,13 @@ class WebTaskRunner < Sinatra::Application
     return 'kill'
   end
 
-  # Report that a worker has done working, call this in each worker after
+  # Report that a job has been done, call this in each job after
   # the work has done
-  def self.work_ended(all: false)
+  def self.job_ended(all: false)
     if all
       WebTaskRunner::RedisModule.redis.set('task:working_jobs', 0)
     else
-      # decrease the working workers count
+      # decrease the working jobss count
       WebTaskRunner::RedisModule.redis.decr('task:working_jobs')
     end
 
@@ -64,11 +66,11 @@ class WebTaskRunner < Sinatra::Application
   end
 
   # Sets the progress of the current work
-  # It can be used like this in the worker: +WebTaskRunner.work_2_progress = 0.8+
+  # It can be used like this in the worker: +WebTaskRunner.job_2_progress = 0.8+
   1000.times do |i|
     i += 1
     define_singleton_method("job_#{i}_progress=") do |progress|
-      WebTaskRunner::RedisModule.redis.set("task:worker_#{i}_progress", progress)
+      WebTaskRunner::RedisModule.redis.set("task:job_#{i}_progress", progress)
     end
   end
 
@@ -78,7 +80,7 @@ class WebTaskRunner < Sinatra::Application
     WebTaskRunner::RedisModule.redis.set('task:state', 'working')
     WebTaskRunner::RedisModule.redis.set('task:started_at', Time.now)
 
-    # Set the count of worker that should be started
+    # Set the count of jobs that should be started
     jobs_count = @@jobs.count
 
     # Start the worker here
@@ -87,10 +89,10 @@ class WebTaskRunner < Sinatra::Application
     WebTaskRunner::RedisModule.redis.set('task:task_jobs', jobs_count)
     WebTaskRunner::RedisModule.redis.set('task:working_jobs', jobs_count)
 
-    # Reset the progress of each worker
+    # Reset the progress of each job
     jobs_count.times do |i|
       i -= 1
-      WebTaskRunner::RedisModule.redis.set("task:worker_#{i}_progress", 0)
+      WebTaskRunner::RedisModule.redis.set("task:job_#{i}_progress", 0)
     end
   end
 
@@ -138,12 +140,12 @@ class WebTaskRunner < Sinatra::Application
   def self.task_progress
     return nil if current_state == 'idle'
     task_jobs = WebTaskRunner::RedisModule.redis.get('task:task_jobs').to_i
-    return nil unless task_jobs
+    return nil if task_jobs < 1
     total_progress = 0.0
 
     task_jobs.times do |i|
       i += 1
-      total_progress += WebTaskRunner::RedisModule.redis.get("task:worker_#{i}_progress").to_f
+      total_progress += WebTaskRunner::RedisModule.redis.get("task:job_#{i}_progress").to_f
     end
 
     total_progress / task_jobs.to_f

data/lib/web_task_runner/task_worker.rb

@@ -15,7 +15,7 @@ class WebTaskRunner < Sinatra::Application
       exec
 
       puts "Job ##{job_number} done."
-      WebTaskRunner.work_ended
+      WebTaskRunner.job_ended
     end
 
     def job_number

data/lib/web_task_runner/version.rb

@@ -1,5 +1,3 @@
-require 'sinatra'
-
-class WebTaskRunner < Sinatra::Application
-  VERSION = "0.0.1"
+class WebTaskRunnerVersion
+  VERSION = "0.0.3"
 end

data/web_task_runner.gemspec

@@ -5,7 +5,7 @@ require 'web_task_runner/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "web_task_runner"
-  spec.version       = WebTaskRunner::VERSION
+  spec.version       = WebTaskRunnerVersion::VERSION
   spec.authors       = ["Neson"]
   spec.email         = ["neson@dex.tw"]
 
@@ -37,6 +37,7 @@ Gem::Specification.new do |spec|
   # Utilities
   spec.add_dependency "dotenv"
 
-  spec.add_development_dependency "bundler", "~> 1.9"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web_task_runner
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Neson
@@ -84,30 +84,44 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Web wrapper to run a specific task with Sidekiq. Provides HTTP API to
   start, stop, get status of the task running in background, and is deployable to
   cloud platforms like Heroku.