opts: --no-pidfile overrides --pidfile

Author: nevans

lib/resque/pool/cli.rb

@@ -41,8 +41,14 @@ def parse_options(argv=nil)
           opt.on('-o', '--stdout FILE', "Redirect stdout to logfile") { |c| opts[:stdout] = c }
           opt.on('-e', '--stderr FILE', "Redirect stderr to logfile") { |c| opts[:stderr] = c }
           opt.on('--nosync', "Don't sync logfiles on every write") { opts[:nosync] = true }
-          opt.on("-p", '--pidfile FILE', "PID file location") { |c| opts[:pidfile] = c }
-          opt.on('--no-pidfile', "Force no pidfile, even if daemonized") { opts[:no_pidfile] = true }
+          opt.on("-p", '--pidfile FILE', "PID file location") { |c|
+            opts[:pidfile] = c
+            opts[:no_pidfile] = false
+          }
+          opt.on('--no-pidfile', "Force no pidfile, even if daemonized") {
+            opts[:pidfile] = nil
+            opts[:no_pidfile] = true
+          }
           opt.on('-l', '--lock FILE' "Open a shared lock on a file") { |c| opts[:lock_file] = c }
           opt.on("-E", '--environment ENVIRONMENT', "Set RAILS_ENV/RACK_ENV/RESQUE_ENV") { |c| opts[:environment] = c }
           opt.on("-s", '--spawn-delay MS', Integer, "Delay in milliseconds between spawning missing workers") { |c| opts[:spawn_delay] = c }
@@ -54,9 +60,6 @@ def parse_options(argv=nil)
           opt.on("-v", "--version", "Show Version"){ puts "resque-pool #{VERSION} (c) nicholas a. evans"; exit}
         end
         parser.parse!(argv || parser.default_argv)
-        if opts[:pidfile]
-          opts.delete(:no_pidfile)
-        end
         if opts[:daemon]
           opts[:stdout]  ||= "log/resque-pool.stdout.log"
           opts[:stderr]  ||= "log/resque-pool.stderr.log"

spec/cli_spec.rb

@@ -42,10 +42,17 @@
       options[:pidfile].should be_nil
     end
 
-    it "--no-pidfile does not prevent explicit --pidfile setting" do
+    it "`--no-pidfile` does not prevent explicit `--pidfile` setting" do
       options = cli.parse_options(%w[--no-pidfile --pidfile my.pid])
       options[:pidfile].should == "my.pid"
       options[:no_pidfile].should be_falsey
     end
+
+    it "`--no-pidfile` overrides `--pidfile`" do
+      options = cli.parse_options(%w[--pidfile my.pid --no-pidfile])
+      options[:pidfile].should be_nil
+      options[:no_pidfile].should be_truthy
+    end
+
   end
 end