elastic_whenever 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 221091fd69b334eb2e1a29e0d98f5bd8154d3a6c
-  data.tar.gz: ed62915c7e06921b264dc21b9646a367cc747e13
+SHA256:
+  metadata.gz: b3f6314849f075346152b2b861572f3d6cc9830044c7410a9dcbfdca08c13ecc
+  data.tar.gz: db5b26247b18515ba576853fbdb826872b0ba7b6a7df68e329ac2e0eb05ae76d
 SHA512:
-  metadata.gz: 9173b91d178b252b455dd833e9d0bfdabf2dc730f593ac156c58ddc8bb55c268fcaf38614b7eda8402c8163b66a21a3caf15d114dd9b0b235b3c661853faae1d
-  data.tar.gz: 3bbf59e2d2265073a59159f941555f5b6b8d27934eeb6363cc692eb52172ad4f7bff4d667ef64f852d7bee1f2d00a5291967d38f8d27d7a37ed7b9e5bbc4f87a
+  metadata.gz: a1cf65a4cfe1a0af4cde63bb839bb44aab6aa875121145662bb5284148bd7879ee7544af14c280a65fb865c7e604fa615e97f21cc3c695300895af94d53117dc
+  data.tar.gz: 8a06af3797352eb946e87b415c7eb40aed31a59bb6a3ff11b347f03a94fe88dab58305bc0fed2dbe9c01909aedfe1d9ce6f1a65065e8fcabfbf76b0e266dddc7

data/.travis.yml

@@ -1,7 +1,9 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.4.5
-  - 2.5.3
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3
 before_install:
   - gem update --system
+  - gem install bundler

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## v0.4.1 (2019-07-23)
+
+### BugFixes
+
+- Retry for concurrent modification ([#41](https://github.com/wata727/elastic_whenever/pull/41))
+
+### Chore
+
+- CI against Ruby 2.6 ([#40](https://github.com/wata727/elastic_whenever/pull/40))
+
 ## v0.4.0 (2018-12-19)
 
 Elastic Whenever now supports Fargate launch type. Thanks @avinson.

data/elastic_whenever.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.15"
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 
@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "aws-sdk-cloudwatchevents", "~> 1.5"
   spec.add_dependency "aws-sdk-iam", "~> 1.0"
   spec.add_dependency "chronic", "~> 0.10"
+  spec.add_dependency "retryable", "~> 3.0"
 end

data/lib/elastic_whenever.rb

@@ -5,6 +5,7 @@ require "aws-sdk-iam"
 require "chronic"
 require "singleton"
 require "json"
+require "retryable"
 
 require "elastic_whenever/version"
 require "elastic_whenever/cli"

data/lib/elastic_whenever/cli.rb

@@ -14,10 +14,14 @@ module ElasticWhenever
           Logger.instance.message("Run `elastic_whenever --help' for more options.")
         when Option::UPDATE_MODE
           option.validate!
-          update_tasks(option, dry_run: false)
+          with_concurrent_modification_handling do
+            update_tasks(option, dry_run: false)
+          end
           Logger.instance.log("write", "scheduled tasks updated")
         when Option::CLEAR_MODE
-          clear_tasks(option)
+          with_concurrent_modification_handling do
+            clear_tasks(option)
+          end
           Logger.instance.log("write", "shceduled tasks cleared")
         when Option::LIST_MODE
           list_tasks(option)
@@ -104,6 +108,19 @@ module ElasticWhenever
           puts
         end
       end
+
+      def with_concurrent_modification_handling
+        Retryable.retryable(
+          tries: 5,
+          on: Aws::CloudWatchEvents::Errors::ConcurrentModificationException,
+          sleep: lambda { |_n| rand(1..10) },
+        ) do |retries, exn|
+          if retries > 0
+            Logger.instance.warn("concurrent modification detected; Retrying...")
+          end
+          yield
+        end
+      end
     end
   end
 end

data/lib/elastic_whenever/version.rb

@@ -1,3 +1,3 @@
 module ElasticWhenever
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic_whenever
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Kazuma Watanabe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-18 00:00:00.000000000 Z
+date: 2019-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: retryable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Manage ECS Scheduled Tasks like Whenever
 email:
 - watassbass@gmail.com
@@ -158,8 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Manage ECS Scheduled Tasks like Whenever