leveret 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14ea608b7f0a42d15bb1ea0ff2cf515869791c67
-  data.tar.gz: 3385ea7758e726cacb8229d5ba0969e5ce1a89fc
+  metadata.gz: 0fa818a1ffcc9bc99f240661a7f4d6b8fac47ce4
+  data.tar.gz: 4eff94051e933d7fb226a21a7026755459bc14cc
 SHA512:
-  metadata.gz: 5235a4ff684179954cb012bb852219a948ff2c0afd6e41f6738e97ad0e90c895f5d627b8e6ed1972a4dc9086d29f8fb35bbc5308d4958d8f9c033fccb01fbf86
-  data.tar.gz: 57dfcf5d29949acf97b494b46d3b5c187ea6adaf7a89cd3cb0fc48fe812df3b0c2b00ea8b24e865115a20f49038052ca485af5e9b0709e07dfabb9ae02348ee1
+  metadata.gz: 8d3a79bede854e7fc939c5d01208a0d79463b9d2e8f6212ff9721e947d4a14c48e0bdef30bbc8b52269de7ccee0aa98437ef1f200eb98767c9dc2cf674cc4727
+  data.tar.gz: b93bfe1b96cae3dd7923dc005fa31a2da00d7582d80df9ba57f66fa041d318aa91516f6882c6a6251e756330ee09ac167e3427b92a360ec955a9f0c3702eedeb

data/README.md

@@ -113,22 +113,24 @@ MyJob.enqueue(test_text: "Hi there! Please write me to the test file.", priority
 To start a leveret worker, simply run the `leveret_worker` executable included in the gem. Started with no arguments it
 will create a worker monitoring the default queue and process one job at a time.
 
-Changing the queues that a worker monitors requires passing a comma separated list of queue names in the environment
-variable `QUEUES`. The example below watches for jobs on the queues `standard` and `other`.
+Changing the queues that a worker monitors requires passing a comma separated list of queue names in the option
+`--queues`. The example below watches for jobs on the queues `standard` and `other`.
 
 ```bash
-bundle exec leveret_worker QUEUES=standard,other
+bundle exec leveret_worker --queues standard,other
 ```
 
 By default, workers will only process one job at a time. For each job that is executed, a child process is forked, and
 the job run in the new process. When the job completes, the fork exits. We can process more jobs simultaniously simply
-by allowing more forks to run. To increase this limit set the `PROCESSES` environment variable. There is no limit to
+by allowing more forks to run. To increase this limit set the `--processes` option. There is no limit to
 this variable in Leveret, but you should be aware of your own OS and resource limits.
 
 ```bash
-bundle exec leveret_worker PROCESSES=5
+bundle exec leveret_worker --processes 5
 ```
 
+It's also possible to set the log level and output from the command line, call up `--help` for more details.
+
 ## Configuration
 
 Configuration in Leveret is done via a configure block. In a Rails application it is recommended you place your

data/exe/leveret_worker

@@ -2,15 +2,10 @@
 
 require "bundler/setup"
 require "leveret"
+require "leveret/cli"
 
 if File.exist?("./config/environment.rb")
   require File.expand_path("./config/environment.rb")
 end
 
-queues = ENV["QUEUES"].to_s.split(',')
-queues << Leveret.configuration.default_queue_name if queues.empty?
-
-concurrent_fork_count = ENV["PROCESSES"] || Leveret.configuration.concurrent_fork_count
-
-worker = Leveret::Worker.new(queues: queues, concurrent_fork_count: concurrent_fork_count)
-worker.do_work
+Leveret::CLI.new(ARGV)

data/lib/leveret/cli.rb

@@ -0,0 +1,77 @@
+module Leveret
+  class CLI
+    attr_accessor :options
+
+    def initialize(args)
+      self.options = {}
+
+      parse_options(args)
+      configure_leveret
+      start_worker
+    end
+
+    private
+
+    def parse_options(args)
+      option_parser.parse!(args)
+    end
+
+    def configure_leveret
+      Leveret.configure do |config|
+        config.concurrent_fork_count = options[:processes] if options[:processes]
+        config.log_level = options[:log_level] if options[:log_level]
+        config.log_file = options[:log_file] if options[:log_file]
+      end
+    end
+
+    def start_worker
+      Leveret::Worker.new(*options[:queues]).do_work
+    end
+
+    def option_parser
+      @option_parser ||= OptionParser.new do |opts|
+        opts.banner = "Usage: leveret_worker [options]"
+        opts.separator ""
+        opts.separator "Options:"
+
+        opts.on "-q", "--queues [QUEUES]", String, "Comma separated list of queues to subscribe to" do |queues|
+          options[:queues] = queues.split(',')
+        end
+
+        opts.on "-p", "--processes [PROCESSES]", Integer, "Number of concurrent jobs to process" do |processes|
+          options[:processes] = processes
+        end
+
+        opts.on '-l', '--log-level [LEVEL]', String, "Level of log output (debug, info, warning, error, fatal)" do |lvl|
+          options[:log_level] = convert_log_level(lvl)
+        end
+
+        opts.on '-o', '--log-output [FILE]', String, "Location to write log file to" do |logfile|
+          options[:log_file] = logfile
+        end
+
+        opts.on_tail '-h', '--help', "Show this message" do
+          STDOUT.puts opts
+          exit
+        end
+
+        opts.on_tail '-v', '--version', "Show the version" do
+          STDOUT.puts Leveret::VERSION
+          exit
+        end
+      end
+    end
+
+    def convert_log_level(level)
+      case level
+      when 'debug' then Logger::DEBUG
+      when 'info' then Logger::INFO
+      when 'warn' then Logger::WARN
+      when 'error' then Logger::ERROR
+      when 'fatal' then Logger::FATAL
+      else
+        Logger::INFO
+      end
+    end
+  end
+end

data/lib/leveret/version.rb

@@ -1,3 +1,3 @@
 module Leveret
-  VERSION = "0.1.1"
+  VERSION = "0.1.2".freeze
 end

data/lib/leveret/worker.rb

@@ -15,19 +15,12 @@ module Leveret
 
     # Create a new worker to process jobs from the list of queue names passed
     #
-    # @option options [Array<String>] queues ([Leveret.configuration.default_queue_name]) A list of queue names for
-    #   this worker to subscribe to and process
-    # @option options [Integer] concurrent_fork_count (Leveret.configuration.concurrent_fork_count) How many messages
-    #   at a time should this worker process?
-    def initialize(options = {})
-      options = {
-        queues: [configuration.default_queue_name],
-        concurrent_fork_count: [configuration.concurrent_fork_count]
-      }.merge(options)
-
-      Leveret.configuration.concurrent_fork_count = options[:concurrent_fork_count]
-
-      self.queues = options[:queues].map { |name| Leveret::Queue.new(name) }
+    # @param [Array<String>] queue_names ([Leveret.configuration.default_queue_name]) A list of queue names for this
+    #   worker to subscribe to and process
+    def initialize(*queue_names)
+      queue_names << configuration.default_queue_name if queue_names.empty?
+
+      self.queues = queue_names.map { |name| Leveret::Queue.new(name) }
       self.consumers = []
       @time_to_die = false
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leveret
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Dan Wentworth
@@ -99,6 +99,7 @@ files:
 - exe/leveret_worker
 - leveret.gemspec
 - lib/leveret.rb
+- lib/leveret/cli.rb
 - lib/leveret/configuration.rb
 - lib/leveret/job.rb
 - lib/leveret/log_formatter.rb