maitredee 0.9.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8ab48c3eedbdfd585222799791ca1b6a4a8c0e5a6ef6c24495a391b83599224
-  data.tar.gz: 4bb3669032410bead0eef5f87b1754f01ea916f5e0d408d19f8f72524bccf2d5
+  metadata.gz: 5140585e2de3476dde09da11d0679d7e53fe6ca1c3848751751d80f9d849fb9d
+  data.tar.gz: d62ec6bfa4d2eafc4e35f5b8146ef454dc1d52e0f93ae5ac335ab6b90fd89980
 SHA512:
-  metadata.gz: e61d350335b57239f0ea3334b90b24ffc2bd9fcc85eeeab741ffeb50fd4803acf679f95876512293500f707dfd1a993c957f0b59a96062732651f93889b7588f
-  data.tar.gz: 78952421e2d1e4bb0e7ec5bc312c552de4cc58d03880743100c518a08c0b397976afc6aca319e7db86294194470a1e6b8e9000f6c2b1a6cce68ef1b910aecb84
+  metadata.gz: f7723db7092eaa156cf4026b78d9c3962bce00c7eba71baf03366d723d188875bf2cbda263edc3874d0d8c52395144c1f645da91e6abc4bdea91abde42150895
+  data.tar.gz: 131c3811fa4750331028112a002836267c110826076ae679366646d3b2dcf563ebe56a8141502e10d1cc763758ccb0ddec90a22e41e753b481ad379ccf0ee0a0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    maitredee (0.9.0)
+    maitredee (0.10.1)
       activesupport
       aws-sdk-sns
       aws-sdk-sqs
@@ -34,19 +34,20 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     aws-eventstream (1.0.2)
-    aws-partitions (1.144.0)
-    aws-sdk-core (3.46.2)
-      aws-eventstream (~> 1.0)
+    aws-partitions (1.146.0)
+    aws-sdk-core (3.48.2)
+      aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1.0)
-      aws-sigv4 (~> 1.0)
+      aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-sns (1.9.0)
-      aws-sdk-core (~> 3, >= 3.39.0)
-      aws-sigv4 (~> 1.0)
-    aws-sdk-sqs (1.10.0)
-      aws-sdk-core (~> 3, >= 3.39.0)
-      aws-sigv4 (~> 1.0)
-    aws-sigv4 (1.0.3)
+    aws-sdk-sns (1.12.0)
+      aws-sdk-core (~> 3, >= 3.48.2)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-sqs (1.13.0)
+      aws-sdk-core (~> 3, >= 3.48.2)
+      aws-sigv4 (~> 1.1)
+    aws-sigv4 (1.1.0)
+      aws-eventstream (~> 1.0, >= 1.0.2)
     builder (3.2.3)
     byebug (10.0.2)
     coderay (1.1.2)
@@ -145,4 +146,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.17.2
+   1.17.3

data/lib/maitredee/adapters/sns_sqs_adapter.rb

@@ -122,7 +122,8 @@ module Maitredee
       def default_shoryuken_options
         @default_shoryuken_options ||= {
           body_parser: :json,
-          auto_delete: true
+          auto_delete: true,
+          retry_intervals: ->(attempts) { ((attempts - 1) ** 4) + 15 + (rand(30) * (attempts)) }
         }
       end
 

data/lib/maitredee/cli/runner.rb

@@ -27,11 +27,27 @@ module Maitredee
       method_option :verbose,     aliases: '-v', type: :boolean, desc: 'Print more verbose output'
       method_option :delay,       aliases: '-D', type: :numeric, desc: 'Number of seconds to pause fetching from an empty queue'
       def start
-        opts = options.to_h.symbolize_keys
+        cli_opts = options.to_h.symbolize_keys
 
-        say '[DEPRECATED] Please use --config instead of --config-file', :yellow if opts[:config_file]
+        say '[DEPRECATED] Please use --config instead of --config-file', :yellow if cli_opts[:config_file]
 
-        opts[:config_file] = opts.delete(:config) if opts[:config]
+        cli_opts[:config_file] = cli_opts.delete(:config) if cli_opts[:config]
+
+        config_file_opts = {}
+        if cli_opts[:config_file]
+          path = cli_opts.delete(:config_file)
+          fail ArgumentError, "The supplied config file #{path} does not exist" unless File.exist?(path)
+
+          config_file_opts = YAML.load(ERB.new(IO.read(path)).result)
+          config_file_opts.deep_symbolize_keys!
+        end
+
+        opts = config_file_opts.merge(cli_opts)
+
+        opts[:subscribers] = []
+        opts[:subscribers] += cli_opts[:subscribers] if cli_opts[:subscribers]
+        opts[:subscribers] += config_file_opts[:subscribers] if config_file_opts[:subscribers]
+        opts[:subscribers].uniq!
 
         if opts[:rails]
           opts.delete(:rails)
@@ -42,40 +58,17 @@ module Maitredee
           require_workers(opts.delete(:require))
         end
 
-        if opts[:config_file]
-          path = opts.delete(:config_file)
-          fail ArgumentError, "The supplied config file #{path} does not exist" unless File.exist?(path)
-
-          if (result = YAML.load(ERB.new(IO.read(path)).result))
-            file = Tempfile.new(['maitredee-to-shoryuken', '.yml'])
-
-            result.deep_symbolize_keys!
-
-            if result[:rails]
-              load_rails
-            end
-            
-            if result[:subscribers]
-              subscribers = result.delete(:subscribers)
-              result[:queues] = subscribers.map(&:constantize).map(&:queue_resource_name)
-            end
-
-            file.write(YAML.dump(result))
-            file.flush
-
-            opts[:config_file] = file.path
-          end
-        end
-
         if opts[:subscribers]
           opts[:queues] = opts.delete(:subscribers).map(&:constantize).map(&:queue_resource_name)
         end
 
         fail_task "You should set a logfile if you're going to daemonize" if opts[:daemon] && opts[:logfile].nil?
 
-        Shoryuken::Runner.instance.run(opts.freeze)
+        file = Tempfile.new(['maitredee-to-shoryuken', '.yml'])
+        file.write(YAML.dump(opts))
+        file.flush
 
-        opts
+        Shoryuken::Runner.instance.run(config_file: file.path)
       end
 
       desc 'version', 'Prints version'

data/lib/maitredee/version.rb

@@ -1,3 +1,3 @@
 module Maitredee
-  VERSION = "0.9.0"
+  VERSION = "0.10.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maitredee
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Plated Devs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-15 00:00:00.000000000 Z
+date: 2019-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -286,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Opinionated pub/sub framework