shoryuken-later 0.0.5.1 → 0.0.5.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWVkNjJiZGRhODQ5MzgzYjg1MzBlZjYyNjJiMDQ0MGNkZmMzOWM2NA==
+    MGNlYzJmMTg4NTJlNDIwNTA5YjQwZjZmYjZlZTRkMTkyMzVmMGNiYQ==
   data.tar.gz: !binary |-
-    NTAzYjFmN2UzNzg1MDMyNmZiNzY0OWI5NjdmNDRhMWQyY2M5MGQ1MA==
+    NDczOWYzNmM5ZjAyY2ZjYWRiNTdjMTA3M2ZmZTFmODYzYTU1NDQ4Ng==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjFmNDMzMjE1NjIxYTAwMWNiOGUxYWIwOWRhNDQ3YjQ1YTYyM2M5ZjI5ODI5
-    Yzk2YTM4YTk3Y2JhZGUwNWE2NjExODY0YTBiOTI3NjE0YTIxYTUzNDNjNWU3
-    NjQ5ZTJmNTEyMTRiNzE1YmIxY2I5ZjJhODMzYmVlYTMwOWI0YTU=
+    ZjE0NDQwZDZhZWViMzhkYThmZTY1YjY2MDY4MDMyZTZkY2QyZmM0MDIzOTky
+    ZDI4ZDg0YjhiYWE4NDY4YTNmZDgwYWY2YzZjOWVjM2E3ZTg5ZTQxZjljNzM4
+    Y2JkNTVmZDZhNDNlMTc1YTEwMGJmNzE5YjBhOGNmNWUzZThjNWY=
   data.tar.gz: !binary |-
-    YWZjYzAzYzQzY2YyMmI4MTBiZTc5YzczYmRlMmIzMWFlODExMjNiNzhmZmIz
-    NjIwMGQ4OGEzMDBiMjQyZDk4NzYwNDhhNTQ4NmFhMThjOGU3ZDE2NmZkMDVm
-    ODM5YjFlZDhjOWUyZjE5OWE4YTFhMzE1OWI3MzAwN2U0Y2M5MDE=
+    YjlhOTE1ZWZjYTAxYjljNjJkMDZhMDkzNjk2N2EwN2VkODU5ZmUwNDkxNjUx
+    NWFmMzI3Y2JkY2UyNDA0MWEwYzMyNDE2OGM0ZTcxMjU5NDdiOTkwODkyOTc5
+    ZjhmODZiMTlkYzU2YWY4MTIwNDJlYWYyYjQ0MGMwMmI5OGU1N2I=

data/README.md

@@ -47,12 +47,12 @@ aws:
 # This key is only used by Shoryuken::Later
 later:
   delay: 5 * 60   # How frequently to poll the schedule table, in seconds.
+  pidfile: some/path/to/file.pid
   tables:
     - table1
     
 # These keys are used by both Shoryuken and Shoryuken::Later
 logfile: some/path/to/file.log
-pidfile: some/path/to/file.pid
 
 # These keys are only used by Shoryuken
 concurrency: 3

data/lib/shoryuken/later/cli.rb

@@ -117,7 +117,7 @@ module Shoryuken
       end
 
       def write_pid
-        if path = Shoryuken::Later.options[:pidfile]
+        if path = Shoryuken::Later.options[:later][:pidfile]
           File.open(path, 'w') do |f|
             f.puts Process.pid
           end
@@ -125,7 +125,7 @@ module Shoryuken
       end
 
       def parse_options(argv)
-        opts = {}
+        opts = {later: {}}
 
         @parser = OptionParser.new do |o|
           o.on '-d', '--daemon', 'Daemonize process' do |arg|
@@ -153,7 +153,7 @@ module Shoryuken
           end
 
           o.on '-P', '--pidfile PATH', 'Path to pidfile' do |arg|
-            opts[:pidfile] = arg
+            opts[:later][:pidfile] = arg
           end
 
           o.on '-v', '--verbose', 'Print more verbose output' do |arg|
@@ -215,8 +215,10 @@ module Shoryuken
 
         config = options[:config_file] ? parse_config(options[:config_file]).deep_symbolize_keys : {}
 
+        Shoryuken::Later.options[:later].merge!(config.delete(:later))
         Shoryuken::Later.options.merge!(config)
 
+        Shoryuken::Later.options[:later].merge!(options.delete(:later))
         Shoryuken::Later.options.merge!(options)
         
         # Tables from command line options take precedence...

data/lib/shoryuken/later/version.rb

@@ -1,5 +1,5 @@
 module Shoryuken
   module Later
-    VERSION = '0.0.5.1'
+    VERSION = '0.0.5.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoryuken-later
 version: !ruby/object:Gem::Version
-  version: 0.0.5.1
+  version: 0.0.5.2
 platform: ruby
 authors:
 - Joe Khoobyar
@@ -159,4 +159,3 @@ test_files:
 - spec/shoryuken/later/poller_spec.rb
 - spec/shoryuken/worker_spec.rb
 - spec/spec_helper.rb
-has_rdoc: