added cli arg support

Author: Steven Li

README.md

@@ -1,6 +1,7 @@
 # DisqueJockey
 DisqueJockey is a fast, concurrent background job processing framework for the Disque message queue.
-# Getting Started
+
+## Installation
 First, you should run a Disque server if you aren't already doing so.
 Disque source and build instructions can be found at: https://github.com/antirez/disque
 
@@ -48,10 +49,19 @@ Your worker class must do two things:
 
 Lastly, you must place your worker in a directory named 'workers'
 
-Once your worker is written and placed in a workers directory, you can call disque_jockey from the command line and it will start up your workers and begin delivering jobs to them.
+## Starting Disque Jockey
+Once your worker is written and placed in a workers directory,
+you can call `disque_jockey start` from the command line and it will
+start up your workers and begin delivering jobs to them.
+
+To see all the command line options, use the help command
+```
+disque_jockey help start
+```
 
+To start disque_jockey with the desired options
 ````
-disque_jockey
+disque_jockey start --env=production --daemonize=true --worker-groups=10  --nodes=127.0.0.1:7111,34.45.231.124:4242
 ````
 
 Messages successfully handled by a worker (ie no exceptions raised from the handle method) will be acknowledged and removed from the queue.
@@ -61,6 +71,5 @@ DisqueJockey is not a currently a production-ready system, and there are a numbe
 Here is a list of functionality I'd like to add to DisqueJockey in the near future:
 - Allow workers to set auto-acknowledge or fast-acknowledge of messages.
 - Better test coverage around worker groups
-- Command line options (e.g. environment)
 - Rails integration (ActiveJob Adapter)
 - More use cases in the README (e.g. how to use alongside Rails)

bin/disque_jockey

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
 
+$:.unshift(File.expand_path("../../lib", __FILE__))
+
 require 'disque_jockey'
-DisqueJockey.run!
+DisqueJockey::CLI.start(ARGV)

disque_jockey.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.add_runtime_dependency 'disque'
   gem.add_runtime_dependency 'logging'
+  gem.add_runtime_dependency 'thor'
   gem.add_development_dependency('rspec', '~> 3.1', '>= 3.0')
   gem.add_development_dependency('rake')
   gem.add_development_dependency('pry')

lib/disque_jockey.rb

@@ -1,4 +1,6 @@
 require 'disque_jockey/version'
+require 'disque_jockey/cli/help'
+require 'disque_jockey/cli'
 require 'disque_jockey/exceptions'
 require 'disque_jockey/broker'
 require 'disque_jockey/logger'
@@ -9,7 +11,6 @@
 require 'disque_jockey/worker_group'
 require 'timeout'
 
-
 module DisqueJockey
   # raise exceptions in all threads so we don't fail silently
   Thread.abort_on_exception = true
@@ -22,7 +23,10 @@ def self.configure
     yield(self.configuration)
   end
 
-  def self.run!
+  def self.run!(options)
+    @configuration = DisqueJockey::Configuration.new(options)
+
     DisqueJockey::Supervisor.work!
   end
-end
+end
+

lib/disque_jockey/cli.rb

@@ -0,0 +1,18 @@
+require "thor"
+
+module DisqueJockey
+  class CLI < Thor
+    desc "start", "Start disque_jockey"
+    option :env, :desc => "set environment"
+    option :worker_groups, :desc => "set number of worker groups"
+    option :log_path, :desc => "set path to logs"
+    option :nodes, :desc => "set nodes"
+    option :daemonize, :type => :boolean, :desc => "run disque_jockey as daemon"
+    long_desc DisqueJockey::CLI::Help.start
+
+    def start
+      DisqueJockey.run!(options)
+    end
+  end
+end
+

lib/disque_jockey/cli/help.rb

@@ -0,0 +1,24 @@
+require "thor"
+
+module DisqueJockey
+  class CLI < Thor
+    class Help
+      class << self
+        def start
+          <<-EOL
+            Starts disque_jockey processes to start processing Disque jobs.
+
+            Examples:
+
+            $ disque_jockey start --env=production
+
+            $ disque_jockey start --env=development --daemonize=true --work-groups=5
+
+            $ disque_jockey start --nodes=127.0.0.1:6534,54.634.23.43:3452,546.23.124.34:4353
+          EOL
+        end
+      end
+    end
+  end
+end
+

lib/disque_jockey/configuration.rb

@@ -1,23 +1,34 @@
 module DisqueJockey
   class Configuration
 
-    attr_accessor :logger, :worker_groups, :log_path, :env, :nodes
+    attr_accessor :logger, :worker_groups, :log_path, :env, :nodes, :daemonize
 
-    def initialize
-      # set defaults
-      @worker_groups = 2
-      @log_path = (env == 'test' ? 'spec/log' : 'log')
-      @nodes = ["127.0.0.1:7711"]
+    def initialize(options={})
+      @env = options["env"] || ENV["DISQUE_JOCKEY_ENV"] || "development"
+      @worker_groups = options["worker_groups"] || 2
+      @log_path = options["log_path"] || log_path_default
+      @nodes = parse_nodes(options["nodes"]) || ["127.0.0.1:7711"]
+      @daemonize = options["daemonize"] || daemonize_default
     end
 
-    def env
-      @env ||= ENV['DISQUE_JOCKEY_ENV'] || 'development'
+    def daemonize?
+      @daemonize
     end
 
-    def daemonize?
-      env != 'development'
+    private
+
+    def parse_nodes(nodes)
+      return unless nodes
+      nodes.split(",")
     end
 
+    def log_path_default
+      env == "test" ? "spec/log" : "log"
+    end
+
+    def daemonize_default
+      env != 'development'
+    end
   end
 end
 

lib/disque_jockey/supervisor.rb

@@ -82,4 +82,4 @@ def self.trap_signals_in_parent
 
 
   end
-end
+end

lib/disque_jockey/version.rb

@@ -1,3 +1,3 @@
 module DisqueJockey
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end