marathon_deploy 0.1.55 → 0.1.56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b0289636d1856134a9bebb316c059306007928f
-  data.tar.gz: 1baee536c47b2de9ac27c732e6ca4ff2eea79d3e
+  metadata.gz: 1e182d4388289931924735ff4831f9499932fc41
+  data.tar.gz: 4e83a35c61fdb0d2a60be351cb01f925986636f1
 SHA512:
-  metadata.gz: 2882595a7a1053517a0b1e3316050e0fc4b11d5a066bf38f835b4803a07a45300a580e2edc1282f99a506a40125ef5b0c7c9f0a87691f6dedd28e53832bc3b05
-  data.tar.gz: fd9359ac1b8251e74c6447ec9fcef5646a62ee92047c7abc5271282deeb0659a0dc881610c5ff4a901b9512497cf4831868c5d58210361e9e067f576b095a5da
+  metadata.gz: 679cf7e493b39e2da0db382b669dcd4eb47ceb03c6e27f27cf29f23e22cdc8a323d26efe7f34befa545bb96797e1eb4b4ebd94a9d8a4974af5a0982288447530
+  data.tar.gz: f508e2e650c988dd4bd9ca2bfd86376191e926ef713542b5dc1f9e96c6bd6a4998e44a481630503e850de62f85fba708a93d4566f8d5e296e7f6c2402bc76f97

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
-ruby:
-- 1.9.3
-before_install:
- - gem uninstall bundler -x
- - gem install bundler --version 1.11.2
+rvm:
+- 2.3.1
+#before_install:
+# - gem uninstall bundler -x
+# - gem install bundler --version 1.11.2
 deploy:
   provider: rubygems
   api_key:

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-ruby "1.9.3"
+ruby "2.3.1"
 
 # Specify your gem's dependencies in marathon_deploy.gemspec
 gemspec

data/README.md

@@ -49,6 +49,7 @@ Usage: bin/marathon_deploy [options]
     -f, --force                           Force deployment when sending same deploy JSON to Marathon
     -n, --noop                            No action. Just display what would be performed.
     -i, --ignore-preproduction-defaults   Ignores the preproduction defaults for cpu, memory, and instance limits
+    -R, --retry                           Will retry the deployment if the initial one fails
     -e, --environment ENVIRONMENT         Default: PREPRODUC
 ```
 

data/bin/marathon_deploy

@@ -23,6 +23,7 @@ options[:force] = MarathonDeploy::MarathonDefaults::DEFAULT_FORCE_DEPLOY
 options[:noop] = MarathonDeploy::MarathonDefaults::DEFAULT_NOOP
 options[:remove_elements] = MarathonDeploy::MarathonDefaults::DEFAULT_REMOVE_ELEMENTS
 options[:ignore_preproduction_defaults] = MarathonDeploy::MarathonDefaults::DEFAULT_IGNORE_PREPRODUCTION_DEFAULTS
+options[:retry] = MarathonDeploy::MarathonDefaults::DEFAULT_RETRY
 options[:marathon_username] = nil
 options[:marathon_password] = nil
 
@@ -51,6 +52,10 @@ OptionParser.new do |opts|
     options[:deployment_timeout] = l
   end
 
+  opts.on("-R", "--retry", "Default: #{options[:retry]}") do |i|
+    options[:retry] = true
+  end
+
   opts.on("-d", "--debug", "Run in debug mode") do |d|
     options[:debug] = Logger::DEBUG
   end
@@ -184,10 +189,15 @@ marathon_endpoints.each do |marathon_url|
     client = MarathonDeploy::MarathonClient.new(marathon_url, options)
     client.application = application
     client.deploy
-  rescue MarathonDeploy::Error::MissingMarathonAttributesError,MarathonDeploy::Error::BadURLError, Timeout::Error => e
+  rescue MarathonDeploy::Error::MissingMarathonAttributesError,MarathonDeploy::Error::BadURLError,Timeout::Error => e
     $LOG.error(e.message)
     exit!
   rescue MarathonDeploy::Error::DeploymentError => e
+    $LOG.error("Deployment of #{application} failed => #{e}")
+    if options[:retry]
+      $LOG.info("Deployment failed, retrying since retry is enabled")
+      client.deploy
+    end
     $LOG.error("Deployment of #{application} failed => #{e}")
     exit!
   rescue SocketError, MarathonDeploy::Error::MarathonError => e

data/lib/marathon_deploy/marathon_defaults.rb

@@ -26,6 +26,7 @@ module MarathonDeploy
   DEFAULT_FORCE_DEPLOY = false
   DEFAULT_NOOP = false
   DEFAULT_IGNORE_PREPRODUCTION_DEFAULTS = false
+  DEFAULT_RETRY = false
   DEFAULT_REMOVE_ELEMENTS = []
   DEFAULT_KEEP_ELEMENTS = [':id']
   ENVIRONMENT_VARIABLE_PREFIX = 'MARATHON_DEPLOY_'

data/lib/marathon_deploy/version.rb

@@ -1,3 +1,3 @@
 module MarathonDeploy
-  VERSION = "0.1.55"
+  VERSION = "0.1.56"
 end

data/marathon_deploy.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "json"
   spec.add_dependency "deep_merge", '~> 1.0', '>= 1.0.1'
 
-  spec.add_development_dependency "bundler", "~> 1.11.2"
+  spec.add_development_dependency "bundler", "~> 1.16.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.7"
   spec.add_development_dependency "yard"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marathon_deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.55
+  version: 0.1.56
 platform: ruby
 authors:
 - Jonathan Colby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-18 00:00:00.000000000 Z
+date: 2018-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 1.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 1.16.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -238,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Mesos/Marathon deployment tool.