marathon_deploy 0.1.54 → 0.1.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56aa5c81bad40c47bf112ff8cec36f859d3706ce
-  data.tar.gz: 6063decec7f1a13cf98b82916e9c7f993b9fd29b
+  metadata.gz: 0b0289636d1856134a9bebb316c059306007928f
+  data.tar.gz: 1baee536c47b2de9ac27c732e6ca4ff2eea79d3e
 SHA512:
-  metadata.gz: 39e4852f16ef71a5311870e2ffe903c9121cfd3a9ad5151bc804f0d50cada69db26cf4e111f7bb67135d1a78fb7beaa720e5a646fe7334c1a3ba79a646945c77
-  data.tar.gz: 93d9544b1726289a8f33e3fb58e6e98bc450668f668e7f6892bff3371d6248d354ded440a407f747c0206a022be49e66f477cd1f407702a6f804a029b7939d9a
+  metadata.gz: 2882595a7a1053517a0b1e3316050e0fc4b11d5a066bf38f835b4803a07a45300a580e2edc1282f99a506a40125ef5b0c7c9f0a87691f6dedd28e53832bc3b05
+  data.tar.gz: fd9359ac1b8251e74c6447ec9fcef5646a62ee92047c7abc5271282deeb0659a0dc881610c5ff4a901b9512497cf4831868c5d58210361e9e067f576b095a5da

data/bin/marathon_deploy

@@ -18,6 +18,7 @@ options[:debug] = MarathonDeploy::MarathonDefaults::DEFAULT_LOGLEVEL
 options[:environment] = MarathonDeploy::MarathonDefaults::DEFAULT_ENVIRONMENT_NAME
 options[:marathon_endpoints] = MarathonDeploy::MarathonDefaults::DEFAULT_PREPRODUCTION_MARATHON_ENDPOINTS
 options[:logfile] = MarathonDeploy::MarathonDefaults::DEFAULT_LOGFILE
+options[:deployment_timeout] = MarathonDeploy::MarathonDefaults::DEPLOYMENT_TIMEOUT
 options[:force] = MarathonDeploy::MarathonDefaults::DEFAULT_FORCE_DEPLOY
 options[:noop] = MarathonDeploy::MarathonDefaults::DEFAULT_NOOP
 options[:remove_elements] = MarathonDeploy::MarathonDefaults::DEFAULT_REMOVE_ELEMENTS
@@ -46,6 +47,10 @@ OptionParser.new do |opts|
     options[:logfile] = l
   end
 
+  opts.on("-t", "--timeout SECONDS", "Default: 300") do |l|
+    options[:deployment_timeout] = l
+  end
+
   opts.on("-d", "--debug", "Run in debug mode") do |d|
     options[:debug] = Logger::DEBUG
   end
@@ -176,7 +181,7 @@ marathon_endpoints.each do |marathon_url|
   begin
     puts "[NOOP] Sending JSON deployment instructions to marathon endpoint: #{marathon_url}." if (noop)
     next if (noop)
-    client = MarathonDeploy::MarathonClient.new(marathon_url)
+    client = MarathonDeploy::MarathonClient.new(marathon_url, options)
     client.application = application
     client.deploy
   rescue MarathonDeploy::Error::MissingMarathonAttributesError,MarathonDeploy::Error::BadURLError, Timeout::Error => e

data/lib/marathon_deploy/deployment.rb

@@ -14,7 +14,7 @@ module MarathonDeploy
 
   attr_reader :url, :application, :deploymentId
 
-  def initialize(url, application)
+  def initialize(url, application, deployment_timeout = DEPLOYMENT_TIMEOUT)
     raise ArgumentError, "second argument to deployment object must be an Application", caller unless (!application.nil? && application.class == Application)
     raise Error::BadURLError, "invalid url => #{url}", caller if (!HttpUtil.valid_url(url))
     @url = HttpUtil.clean_url(url)

data/lib/marathon_deploy/marathon_client.rb

@@ -28,7 +28,7 @@ module MarathonDeploy
 
   def deploy
     
-    deployment = Deployment.new(@marathon_url,application)
+    deployment = Deployment.new(@marathon_url,application, options[:deployment_timeout])
     
     $LOG.info("Checking if any deployments are already running for application #{application.id}")    
     begin

data/lib/marathon_deploy/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marathon_deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.54
+  version: 0.1.55
 platform: ruby
 authors:
 - Jonathan Colby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-17 00:00:00.000000000 Z
+date: 2017-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger