workerholic 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18ccc35feb06c737bac47883fd73955043900e4e
-  data.tar.gz: aa4ff158fc905d6966b885fe77feb12b8c61b185
+  metadata.gz: '02909e2b39a8d03796f21f57c2914f56a4b58a7b'
+  data.tar.gz: 7696ea1dd34cf1df6c6ed21b5a627ea1ce1e4f48
 SHA512:
-  metadata.gz: 7741e5a6a3388fd194b6231fd04f486d3a6d5e3e446d85d6774ebfc466c6d8077e595e2bffe9cdbe60d405dde166ca4e35b394f389673d974dd27ec4ee12fb59
-  data.tar.gz: b854e2f68bcd206ae8822889b517bd94f29e86c1b6acf39080e71bfd4f136a290528c56f3d9aa6822e2324d13060479bfc8fd839799db27dae8b354bd997ccb5
+  metadata.gz: '03138c50a4edcc225af7d17b9a55cc7cf3799ac3a8612864768629b3685bfc2d67a8a798edcc758130b2543c1e04469338fbbe4129f0fd4b1bd61f3272f49b22'
+  data.tar.gz: ff0cff28763276952f390d9b2263eb399a2c3910133f28d16d2015aea6c8f12c6dea1f0ac30b438f493e50af8c63ef30af4e1c81ad314d53b966764984a8c9e3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    workerholic (0.0.6)
+    workerholic (0.0.7)
       connection_pool (~> 2.2, >= 2.2.0)
       redis (~> 3.3, >= 3.3.3)
       sinatra

data/bin/workerholic

@@ -2,12 +2,4 @@
 
 require_relative '../lib/workerholic/cli'
 
-puts ENV['RAILS_ENV'] || 'This is not a rails app!'
-
-if defined?(Rails)
-  puts 'Loading Rails...'
-  require File.expand_path("./config/environment.rb")
-  require 'workerholic/adapters/active_job_adapter'
-end
-
-Workerholic::CLI.run
+Workerholic::CLI.instance.run

data/lib/workerholic.rb

@@ -23,8 +23,6 @@ require 'workerholic/job_serializer'
 require 'workerholic/statistics'
 require 'workerholic/log_manager'
 
-require_relative '../app_test/job_test' # require the application code
-
 module Workerholic
   def self.workers_count
     @workers_count || 25

data/lib/workerholic/cli.rb

@@ -1,21 +1,74 @@
 $LOAD_PATH << __dir__ + '/..'
 
 require 'workerholic'
+require 'optparse'
+require 'singleton'
 
 module Workerholic
   class CLI
-    def self.run
-      auto_balance = ARGV.any? { |arg| arg == '--auto-balance' }
-      workers_count = ARGV.find { |arg| arg.match? /^--workers=\d+$/ }
+    include Singleton
 
-      if workers_count
-        workers_count = workers_count[/\d+/].to_i
-        Workerholic.workers_count = workers_count
-      end
+    attr_reader :logger, :options
 
-      Manager.new.start
+    def initialize
+      @logger = LogManager.new
     end
-  end
-end
 
+    def run
+      parse_options
+      set_options
+
+      load_app
+
+      Manager.new(auto_balance: options[:auto_balance]).start
+    end
+
+    def parse_options
+      @options = {}
+
+      OptionParser.new do |opts|
+        opts.banner = 'Usage: workerholic [options]'
+
+        opts.on '-ab', '--auto-balance', 'auto-balance workers based on number of jobs in each queue' do
+          options[:auto_balance] = true
+        end
+
+        opts.on '-w', '--workers INT', 'number of concurrent workers' do |count|
+          options[:workers] = count.to_i
+        end
 
+        opts.on '-r', '--require PATH', 'file to be required to load your application' do |file|
+          options[:require] = file
+        end
+
+        opts.on '-h', '--help', 'show help' do
+          logger.info(opts)
+          exit
+        end
+      end.parse!
+    end
+
+    def set_options
+      Workerholic.workers_count = options[:workers_count] if options[:workers_count]
+    end
+
+    def load_app
+      if File.exist?('./config/environment.rb')
+        require File.expand_path('./config/environment.rb')
+        require 'workerholic/adapters/active_job_adapter'
+      elsif options[:require]
+        if File.exist?(options[:require])
+          require File.expand_path(options[:require])
+        else
+          log.info('The file you specified to load your application is not valid!')
+          exit
+        end
+      else
+        logger.info('If you are using a Rails app, make sure to navigate to your root directory before starting Workerholic!')
+        logger.info('If you are not using a Rails app, you can load your app by using the option --require and specifying the file needing to be required in order to load your application.')
+
+        exit
+      end
+    end
+  end
+end

data/lib/workerholic/job_processor.rb

@@ -13,14 +13,14 @@ module Workerholic
         job_result = job.perform
         job.statistics.completed_at = Time.now.to_f
 
-        # @logger.log('info', "Completed: your job from class #{job.klass} was completed on #{job.statistics.completed_at}.")
+        # @logger.info("Completed: your job from class #{job.klass} was completed on #{job.statistics.completed_at}.")
 
         job_result
       rescue Exception => e
         job.statistics.errors.push([e.class, e.message])
         JobRetry.new(job: job)
 
-        # @logger.log('error', "Failed: your job from class #{job.class} was unsuccessful. Retrying in 10 seconds.")
+        # @logger.error("Failed: your job from class #{job.class} was unsuccessful. Retrying in 10 seconds.")
       end
 
       # Push job into some collection

data/lib/workerholic/log_manager.rb

@@ -6,6 +6,14 @@ module Workerholic
       @logger = Logger.new(STDOUT)
     end
 
+    def info(message)
+      log('info', message)
+    end
+
+    def error(message)
+      log('error', message)
+    end
+
     def log(severity, message)
       return if $TESTING
 

data/lib/workerholic/queue.rb

@@ -11,7 +11,7 @@ module Workerholic
 
     def enqueue(serialized_job)
       storage.push(name, serialized_job)
-      logger.log('info', "Your job was placed in the #{name} queue on #{Time.now}.")
+      logger.info("Your job was placed in the #{name} queue on #{Time.now}.")
     end
 
     def dequeue

data/lib/workerholic/version.rb

@@ -1,3 +1,3 @@
 module Workerholic
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/lib/workerholic/worker.rb

@@ -20,7 +20,7 @@ module Workerholic
         #puts "DONE!"
       end
     rescue ThreadError => e
-      @logger.log('info', e.message)
+      @logger.info(e.message)
       raise Interrupt
     end
 

data/lib/workerholic/worker_balancer.rb

@@ -87,8 +87,8 @@ module Workerholic
     end
 
     def output_balancer_stats
-      @logger.log('info', queues.map { |q| { name: q.name, size: q.size } })
-      @logger.log('info', current_workers_count_per_queue)
+      @logger.info(queues.map { |q| { name: q.name, size: q.size } })
+      @logger.info(current_workers_count_per_queue)
     end
 
     def assign_one_worker_per_queue

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: workerholic
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Antoine Leclercq
@@ -143,6 +143,7 @@ files:
 - pkg/workerholic-0.0.4.gem
 - pkg/workerholic-0.0.5.gem
 - pkg/workerholic-0.0.6.gem
+- pkg/workerholic-0.0.7.gem
 - spec/helpers/helper_methods.rb
 - spec/helpers/job_tests.rb
 - spec/integration/dequeuing_and_job_processing_spec.rb