workerholic 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a5590f9ad1e51677bc049f2d26efefd742d31cd
-  data.tar.gz: 87dbd78dae03cc60378747a06492543ab81e24c7
+  metadata.gz: bd7e07d27a135ac70338a061db747e0fe209c58c
+  data.tar.gz: 7df8a6e7fc49e27e44b151be044abe3d7a383a09
 SHA512:
-  metadata.gz: ffb207e35277c57e0f24661eac90496b76489a3dd3564274a131ba5935ebc4ba533358b78be7a8e1197de0113b7e4701641b6a0fc9d3d6d82eeac7e133b77415
-  data.tar.gz: a69bbdd0d0125b3ced9a464f1f1b98e923011803ac45544e6e9fc98be7617e0d4688f3d1baf2af2e8d2ca814863191d4b104c1e0212ff87201544db06abb1b15
+  metadata.gz: fe19b8b022fff53d1ad9a97148a29d9ae8d40bda40f3490cb49a9cc6bd05308d2176dc1f09ea3f68f01dfdd8867e3e77d525fbe8138b261c4ce4f418222c4af5
+  data.tar.gz: '087d1047d3d7bd1c36732b5d4b3f503f4d9a64a80644f2fd5ef73e0841a2a9cbf7326e4edef28be3e5716e0649b0148308401c33f351679ce0b202a09ab898c2'

data/.gitignore

@@ -1 +1,2 @@
 dump.rdb
+pkg/*.gem

data/bin/workerholic

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+#require 'workerholic/cli'
 require_relative '../lib/workerholic/cli'
 
 Workerholic::CLI.instance.run

data/bin/workerholic-web

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+require_relative '../web/application'
+
+WorkerholicWeb.run!
+

data/lib/workerholic/statistics_api.rb

@@ -29,7 +29,8 @@ module Workerholic
     def self.queued_jobs
       fetched_queues = storage.fetch_queue_names
       parsed_queues = fetched_queues.map do |queue|
-        [queue, storage.list_length(queue)]
+        clean_queue_name = queue.split(':').last
+        [clean_queue_name, storage.list_length(queue)]
       end
 
       # (parsed_queues.empty? ? 'No queues data is available yet.': parsed_queues)

data/lib/workerholic/version.rb

@@ -1,3 +1,3 @@
 module Workerholic
-  VERSION = '0.0.13'
+  VERSION = '0.0.14'
 end

data/web/application.rb

@@ -1,78 +1,81 @@
-require 'sinatra'
+require 'sinatra/base'
 
 # require 'sinatra/reloader'
 require 'json'
 require 'workerholic'
 
-get '/' do
-  redirect '/overview'
-end
+class WorkerholicWeb < Sinatra::Base
 
-get '/overview' do
-  erb :index
-end
+  get '/' do
+    redirect '/overview'
+  end
 
-get '/details' do
-  completed_jobs = Workerholic::StatsAPI.job_statistics( {category: 'completed_jobs', count_only: true} )
-  failed_jobs = Workerholic::StatsAPI.job_statistics( {category: 'failed_jobs', count_only: true} )
+  get '/overview' do
+    erb :index
+  end
 
-  @job_stats = {}
-  @completed_total = 0
-  @failed_total = 0
+  get '/details' do
+    completed_jobs = Workerholic::StatsAPI.job_statistics( {category: 'completed_jobs', count_only: true} )
+    failed_jobs = Workerholic::StatsAPI.job_statistics( {category: 'failed_jobs', count_only: true} )
 
-  completed_jobs.each do |job|
-    @job_stats[job[0]] = { completed: job[1] }
-    @completed_total += job[1]
-  end
+    @job_stats = {}
+    @completed_total = 0
+    @failed_total = 0
 
-  failed_jobs.each do |job|
-    @job_stats[job[0]].merge( { failed: job[1] })
-    @failed_total += job[1]
-  end
+    completed_jobs.each do |job|
+      @job_stats[job[0]] = { completed: job[1] }
+      @completed_total += job[1]
+    end
 
-  erb :details
-end
+    failed_jobs.each do |job|
+      @job_stats[job[0]].merge( { failed: job[1] })
+      @failed_total += job[1]
+    end
 
-get '/queues' do
-  @queues = Workerholic::StatsAPI.queued_jobs
-  @total = 0
-  @queues.each do |queue|
-    @total += queue[1]
+    erb :details
   end
 
-  erb :queues
-end
+  get '/queues' do
+    @queues = Workerholic::StatsAPI.queued_jobs
+    @total = 0
+    @queues.each do |queue|
+      @total += queue[1]
+    end
 
-# get '/workers' do
-#   erb :workers
-# end
-#
-# get '/failed' do
-#   erb :failed
-# end
-#
-# get '/scheduled' do
-#   erb :scheduled
-# end
+    erb :queues
+  end
 
-get '/overview-data' do
-  JSON.generate({
-    completed_jobs: Workerholic::StatsAPI.job_statistics( {category: 'completed_jobs', count_only: true} ),
-    failed_jobs: Workerholic::StatsAPI.job_statistics( {category: 'failed_jobs', count_only: true} ),
-    queued_jobs: Workerholic::StatsAPI.queued_jobs,
-    workers_count: Workerholic.workers_count
-  })
-end
+  # get '/workers' do
+  #   erb :workers
+  # end
+  #
+  # get '/failed' do
+  #   erb :failed
+  # end
+  #
+  # get '/scheduled' do
+  #   erb :scheduled
+  # end
 
-get '/detail-data' do
-  JSON.generate({
-    completed_jobs: Workerholic::StatsAPI.job_statistics( {category: 'completed_jobs', count_only: true} ),
-    failed_jobs: Workerholic::StatsAPI.job_statistics( {category: 'failed_jobs', count_only: true} )
-  })
-end
+  get '/overview-data' do
+    JSON.generate({
+      completed_jobs: Workerholic::StatsAPI.job_statistics( {category: 'completed_jobs', count_only: true} ),
+      failed_jobs: Workerholic::StatsAPI.job_statistics( {category: 'failed_jobs', count_only: true} ),
+      queued_jobs: Workerholic::StatsAPI.queued_jobs,
+      workers_count: Workerholic.workers_count
+    })
+  end
 
-get '/queue-data' do
-  JSON.generate({
-    queued_jobs: Workerholic::StatsAPI.queued_jobs
-  })
+  get '/detail-data' do
+    JSON.generate({
+      completed_jobs: Workerholic::StatsAPI.job_statistics( {category: 'completed_jobs', count_only: true} ),
+      failed_jobs: Workerholic::StatsAPI.job_statistics( {category: 'failed_jobs', count_only: true} )
+    })
+  end
+
+  get '/queue-data' do
+    JSON.generate({
+      queued_jobs: Workerholic::StatsAPI.queued_jobs
+    })
+  end
 end

data/workerholic.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- spec/*`.split("\n")
-  gem.executables   = ['workerholic']
+  gem.executables   = ['workerholic', 'workerholic-web']
   gem.require_paths = ['lib']
 
   gem.required_ruby_version = '>= 2.2.2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: workerholic
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Antoine Leclercq
@@ -107,6 +107,7 @@ email:
 - tim-lee92@outlook.com
 executables:
 - workerholic
+- workerholic-web
 extensions: []
 extra_rdoc_files: []
 files:
@@ -120,6 +121,7 @@ files:
 - app_test/job_test.rb
 - app_test/run.rb
 - bin/workerholic
+- bin/workerholic-web
 - lib/workerholic.rb
 - lib/workerholic/adapters/active_job_adapter.rb
 - lib/workerholic/cli.rb
@@ -140,17 +142,6 @@ files:
 - lib/workerholic/version.rb
 - lib/workerholic/worker.rb
 - lib/workerholic/worker_balancer.rb
-- pkg/workerholic-0.0.10.gem
-- pkg/workerholic-0.0.11.gem
-- pkg/workerholic-0.0.12.gem
-- pkg/workerholic-0.0.2.gem
-- pkg/workerholic-0.0.3.gem
-- pkg/workerholic-0.0.4.gem
-- pkg/workerholic-0.0.5.gem
-- pkg/workerholic-0.0.6.gem
-- pkg/workerholic-0.0.7.gem
-- pkg/workerholic-0.0.8.gem
-- pkg/workerholic-0.0.9.gem
 - spec/helpers/helper_methods.rb
 - spec/helpers/job_tests.rb
 - spec/integration/dequeuing_and_job_processing_spec.rb