fix config loading for Resque::CLI and update documentation

Author: tyre

README.md

@@ -175,21 +175,21 @@ Resque workers respond to a few different signals:
 
 ## Configuration
 
-You can configure Resque via a `.resque` file in the root of your project:
+You can configure Resque via a YAML `.resque` file in the root of your project:
 
 ```
---queues=high,med,low
---require='some_context.rb'
---pid_file='tmp/pids/resque.pid'
---interval=1
---daemon=true
---timeout=5
---graceful_term=false
+queues: 'high,med,low'
+require: 'some_context.rb'
+pid_file: 'tmp/pids/resque.pid'
+interval: 1
+daemon: true
+timeout: 5
+graceful_term: false
 ```
 
-These act just like you passed them in to `bin/resque work`.
+Then pass the configuration to the resque CLI: `bin/resque work -c='./.resque'`.
 
-You can also configure Resque via `.configure`:
+You can also configure Resque via `Resque.configure`:
 
 ```ruby
 Resque.configure do |config|

lib/resque/cli.rb

@@ -8,11 +8,12 @@ class CLI < Thor
     class_option :config,    :aliases => ["-c"], :type => :string
     class_option :redis,     :aliases => ["-R"], :type => :string
 
-    def initialize(args = [], opts = [], config = {})
+    def initialize(args = [], opts = {}, config = {})
       super(args, opts, config)
 
       if options[:config] && File.exists?(options[:config])
-        @options = YAML.load_file(options[:config]).symbolize_keys.merge(@options.symbolize_keys)
+        config_options = YAML.load_file(options[:config]).symbolize_keys
+        @options = @options.symbolize_keys.merge(config_options)
       end
 
       Resque.redis = options[:redis] || "localhost:6379/resque"