marathon_deploy 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3a0f127044b188815965b3e84ab4557089fba6c
-  data.tar.gz: 914fee4de65ceb166a9790fa4ca1b6d84af8981d
+  metadata.gz: 2064827ef363519d13290fa9e84e34b37d15a954
+  data.tar.gz: 9bb6235b0c8b3421cb3904561a67d022a6a72f5d
 SHA512:
-  metadata.gz: 3b380869cd355157e8f323de645cd8b5da55be01241447e1bb6e0dfe3bb6ba0ec697b61facc3255fa5e1b1a3c576083dca6dca7c5b9bb1f419ccc8bbd6e17f7a
-  data.tar.gz: 7244d59e9504ec09c195ff4bf73a0fca16030644c29bbbc036cc59f57152c17bca2e08b2f5a1237305a500cfe333040f9735acb83293b4341d8cb982c2b0c43d
+  metadata.gz: 652ed65844e48852e55d1eb8a69436ab042df65139c0c7af24c3d34f94008a511c6275a68aaf6e94499a01bceba4dfdf3e00149484350b2cb6b7dab10a461651
+  data.tar.gz: 7be0be184f7d07d62e2457965e1d1723a03fa926c0bb6e633b5b1f970d8e359ed81e42b18dafb122f4b5b02add40d87d76e29fbf23ff6e43bcf115948560af7d

data/bin/deploy.rb

@@ -11,11 +11,11 @@ require 'logger'
 options = {}
   
 # DEFAULTS
-options[:deployfile] = MarathonDefaults::DEFAULT_DEPLOYFILE
-options[:verbose] = MarathonDefaults::DEFAULT_LOGLEVEL
-options[:environment] = MarathonDefaults::DEFAULT_ENVIRONMENT_NAME
+options[:deployfile] = MarathonDeploy::MarathonDefaults::DEFAULT_DEPLOYFILE
+options[:verbose] = MarathonDeploy::MarathonDefaults::DEFAULT_LOGLEVEL
+options[:environment] = MarathonDeploy::MarathonDefaults::DEFAULT_ENVIRONMENT_NAME
 options[:marathon_endpoints] = nil
-options[:logfile] = MarathonDefaults::DEFAULT_LOGFILE
+options[:logfile] = MarathonDeploy::MarathonDefaults::DEFAULT_LOGFILE
   
 OptionParser.new do |opts|
   opts.banner = "Usage: deploy.rb [options]"
@@ -50,22 +50,22 @@ $LOG = options[:logfile] ? Logger.new(options[:logfile]) : Logger.new(STDOUT)
 $LOG.level = options[:verbose]
 
 deployfile = options[:deployfile]
-environment = Environment.new(options[:environment])
+environment = MarathonDeploy::Environment.new(options[:environment])
   
 marathon_endpoints = Array.new
 if (options[:marathon_endpoints].nil?)
   if (environment.is_production?)
-    marathon_endpoints = MarathonDefaults::DEFAULT_PRODUCTION_MARATHON_ENDPOINTS
+    marathon_endpoints = MarathonDeploy::MarathonDefaults::DEFAULT_PRODUCTION_MARATHON_ENDPOINTS
   else
-    marathon_endpoints = MarathonDefaults::DEFAULT_PREPRODUCTION_MARATHON_ENDPOINTS
+    marathon_endpoints = MarathonDeploy::MarathonDefaults::DEFAULT_PREPRODUCTION_MARATHON_ENDPOINTS
   end
 else
   marathon_endpoints = options[:marathon_endpoints]
 end
  
 begin
-  application = Application.new(deployfile)
-rescue Error::IOError, Error::UndefinedMacroError,Error::MissingMarathonAttributesError,Error::UnsupportedFileExtension  => e
+  application = MarathonDeploy::Application.new(deployfile)
+rescue MarathonDeploy::Error::IOError, MarathonDeploy::Error::UndefinedMacroError,MarathonDeploy::Error::MissingMarathonAttributesError,MarathonDeploy::Error::UnsupportedFileExtension  => e
   $LOG.debug(e)
   $LOG.error(e.message)
   exit!
@@ -73,7 +73,7 @@ end
 
 begin
   application.add_envs({ :APPLICATION_NAME => application.id, :ENVIRONMENT => environment})
-rescue Error::BadFormatError => e
+rescue MarathonDeploy::Error::BadFormatError => e
   $LOG.error(e)
   exit!
 end
@@ -89,16 +89,16 @@ puts "#" * 100
 # deploy to each endpoint
 marathon_endpoints.each do |marathon_url|
   begin
-    client = MarathonClient.new(marathon_url)
+    client = MarathonDeploy::MarathonClient.new(marathon_url)
     client.application = application
     client.deploy  
-  rescue Error::MissingMarathonAttributesError,Error::BadURLError, Timeout::Error => e
+  rescue MarathonDeploy::Error::MissingMarathonAttributesError,MarathonDeploy::Error::BadURLError, Timeout::Error => e
     $LOG.error(e.message)
     exit!
-  rescue Error::DeploymentError => e
+  rescue MarathonDeploy::Error::DeploymentError => e
     $LOG.error("Deployment of #{application} failed => #{e}")
     exit!
-  rescue SocketError, Error::MarathonError  => e
+  rescue SocketError, MarathonDeploy::Error::MarathonError => e
     $LOG.error("Problem talking to marathon endpoint => #{marathon_url} (#{e.message})")
     exit!
   end

data/bin/json2yaml.rb

@@ -2,4 +2,4 @@
 
 require 'marathon_deploy/yaml_json'
 yaml = ARGV[0]
-puts YamlJson.json2yaml(yaml,false)
+puts MarathonDeploy::YamlJson.json2yaml(yaml,false)

data/examples/jondeploy.yaml

@@ -4,13 +4,12 @@ cpus: 0.5
 env:
   APPLICATION_NAME: public-search-germany-webapp
   CONFIG_ASSEMBLER_BASE_URL: http://mobile-config-assembler.service.consul/config-assembler
-  DATACENTER_NUMBER: '666'
   JAVA_XMS: 252m
   JAVA_XMX: 504m
   SERVERCLASS_NAME: pubse
   SERVICE_8009_NAME: public-search-germany-webapp
   SERVICE_8009_TAGS: ajp
 id: public-search-germany-webapp
-instances: 15
+instances: 6
 mem: 32
 uris: []

data/examples/jondeploy2.yaml

@@ -2,17 +2,19 @@
 cmd: while true ; do echo "i got probed ..." ; /bin/nc -l -p $PORT0 ; done
 cpus: 0.5
 env:
+  A_MACRO_TEST: %%SPECIAL_PROPERTY%%
   APPLICATION_NAME: public-search-germany-webapp
   CONFIG_ASSEMBLER_BASE_URL: http://mobile-config-assembler.service.consul/config-assembler
   DATACENTER_NUMBER: '666'
   JAVA_XMS: 252m
   JAVA_XMX: 504m
-  SPECIAL_PROPERTY: %%SPECIAL_PROPERTY%%
+  SPECIAL_PROPERTY: %%SPECIAL_PROPERTY%%%%SPECIAL_PROPERTY%%
   SERVERCLASS_NAME: pubse
   SERVICE_8009_NAME: public-search-germany-webapp
   SERVICE_8009_TAGS: ajp
+  ANOTHER_MACRO_TEST: %%SPECIAL_PROPERTY%%
 id: content-webapp
-instances: 3
+instances: 6
 mem: 32
 uris: []
 healthChecks:

data/lib/marathon_deploy/application.rb

@@ -3,7 +3,9 @@ require 'marathon_deploy/yaml_json'
 require 'marathon_deploy/error'
 require 'marathon_deploy/utils'
 
-class Application
+module MarathonDeploy
+  
+  class Application
   
   attr_reader :json, :id
   attr_accessor :envs
@@ -82,4 +84,5 @@ class Application
     end    
   end  
      
+  end
 end

data/lib/marathon_deploy/deployment.rb

@@ -3,7 +3,8 @@ require 'marathon_deploy/utils'
 require 'marathon_deploy/marathon_defaults'
 require 'timeout'
 
-class Deployment
+module MarathonDeploy
+  class Deployment
   
   DEPLOYMENT_RECHECK_INTERVAL = MarathonDefaults::DEPLOYMENT_RECHECK_INTERVAL
   DEPLOYMENT_TIMEOUT = MarathonDefaults::DEPLOYMENT_TIMEOUT
@@ -57,7 +58,7 @@ class Deployment
         #STDOUT.puts "" if ( $LOG.level == 1 )
         if (deployment_seen)
           elapsedTime = '%.2f' % (Time.now - startTime)
-          $LOG.info("Deployment with deploymentId #{@deploymentId} ended (Total time #{elapsedTime}s )")  
+          $LOG.info("Deployment with deploymentId #{@deploymentId} ended (Total deployment time #{elapsedTime}s)")  
         end
       end    
   end
@@ -83,20 +84,25 @@ class Deployment
       end    
   end
   
-  def wait_until_healthy    
+  def wait_until_healthy  
+    startTime = Time.now  
     Timeout::timeout(HEALTHY_WAIT_TIMEOUT) do
       loop do
         break if (!health_checks_defined?)
         sick = get_alive("false")
+        elapsedTime = '%.2f' % (Time.now - startTime)
         if (!sick.empty?)
-          $LOG.info("#{sick.size}/#{@application.instances} instances are not healthy => " + sick.join(','))
+          $LOG.info("#{sick.size}/#{@application.instances} instances are not healthy, retrying in #{HEALTHY_WAIT_RECHECK_INTERVAL}s (elapsed time #{elapsedTime}s)")
+          $LOG.debug("Sick instances: " + sick.join(','))
         else
           healthy = get_alive("true")
           if (healthy.size == @application.instances)
-            $LOG.info("#{healthy.size}/#{@application.instances} instances are healthy => " + healthy.join(','))
+            elapsedTime = '%.2f' % (Time.now - startTime)
+            $LOG.info("#{healthy.size} of #{@application.instances} expected instances are healthy (Total health-check time #{elapsedTime}s).")
+            $LOG.debug("Healthy instances running: " + healthy.join(','))
             break
           else
-            $LOG.info("#{healthy.size}/#{@application.instances} healthy instances seen, retrying")
+            $LOG.info("#{healthy.size} healthy instances seen, #{@application.instances} healthy instances expected, retrying in in #{HEALTHY_WAIT_RECHECK_INTERVAL}s")
           end
         end      
         sleep(HEALTHY_WAIT_RECHECK_INTERVAL)
@@ -105,8 +111,8 @@ class Deployment
   end
     
   def cancel(deploymentId,force=false)
-    raise Error::BadURLError, "deploymentId must be specified to cancel deployment", caller if (deploymentId.empty?)
-    if (running_for_deployment_id?(deploymentId))
+    raise ArgumentError, "deploymentId must be specified to cancel deployment", caller if (deploymentId.empty?)
+    if (running_for_deployment_id?)
       response = HttpUtil.delete(@url + MarathonDefaults::MARATHON_DEPLOYMENT_REST_PATH + deploymentId + "?force=#{force}")
       $LOG.debug("Cancellation response [#{response.code}] => " + JSON.pretty_generate(JSON.parse(response.body)))
     end
@@ -266,4 +272,5 @@ class Deployment
     return payload.find_all { |d| d['affectedApps'].include?('/' + @application.id) }
   end
   
+  end
 end

data/lib/marathon_deploy/environment.rb

@@ -1,6 +1,7 @@
 require 'marathon_deploy/marathon_defaults'
 
-class Environment
+module MarathonDeploy
+  class Environment
   
   attr_reader :name
   
@@ -25,4 +26,6 @@ class Environment
   def to_s
     @name
   end
+  
+  end
 end

data/lib/marathon_deploy/error.rb

@@ -1,5 +1,6 @@
-module Error
-  
+module MarathonDeploy
+  module Error
+    
   class MarathonError < StandardError; end
    
   class TimeoutError < MarathonError; end
@@ -18,4 +19,5 @@ module Error
     
   class UndefinedMacroError < MarathonError ; end     
 
+  end
 end

data/lib/marathon_deploy/http_util.rb

@@ -2,7 +2,8 @@ require 'net/http'
 require 'uri'
 require 'marathon_deploy/error'
 
-module HttpUtil
+module MarathonDeploy
+  module HttpUtil
 
   def self.put(url,payload)
     uri = construct_uri url 
@@ -88,4 +89,5 @@ module HttpUtil
     end
   end
   
+  end
 end

data/lib/marathon_deploy/macro.rb

@@ -1,6 +1,7 @@
 require 'marathon_deploy/error'
 
-module Macro
+module MarathonDeploy
+  module Macro
   
   MACRO_BOUNDARY = '%%'
   
@@ -25,13 +26,13 @@ module Macro
   end
   
   def self.get_undefined_macros(macros)
-    raise ArgumentError, "argument must be an array", caller if (!macros.class == Array)
+    raise ArgumentError, "Argument must be an array", caller if (!macros.class == Array)
     undefined = Array.new
     return macros.select { |m| !has_env?(m) }
   end
   
   def self.has_env?(macro)
-    raise ArgumentError, "argument must be a String", caller if (!macro.class == String)
+    raise ArgumentError, "Argument must be a String", caller if (!macro.class == String)
     env_name = strip(macro)
     if (env_defined?(strip(env_name)))
       return true
@@ -46,10 +47,11 @@ module Macro
   
   def self.expand_macros(data)
     processed = ""
-    macros = get_macros(data)
+    macros = get_macros(data).uniq
+    $LOG.debug("Macros found in deploy file: #{macros.join(',')}")
     undefined = get_undefined_macros(macros)
     if (!undefined.empty?)
-      raise Error::UndefinedMacroError, "macros found in deploy file without defined environment variables: #{undefined.uniq.join(',')}", caller
+      raise Error::UndefinedMacroError, "Macros found in deploy file without defined environment variables: #{undefined.join(',')}", caller
     end
   
     data.each do |line|
@@ -68,4 +70,5 @@ module Macro
   
   private_class_method :get_macros, :get_env_keys, :strip, :has_env?, :get_undefined_macros, :env_defined?, :expand_macros
   
+  end
 end

data/lib/marathon_deploy/marathon_client.rb

@@ -3,7 +3,8 @@ require 'marathon_deploy/deployment'
 require 'marathon_deploy/utils'
 require 'marathon_deploy/marathon_defaults'
 
-class MarathonClient
+module MarathonDeploy
+  class MarathonClient
 
   attr_reader :marathon_url, :options
   attr_accessor :application
@@ -33,7 +34,7 @@ class MarathonClient
     begin
       deployment.wait_for_application("Deployment already running for application #{application.id}")
     rescue Timeout::Error => e
-      raise Timeout::Error, "Timed out after #{deployment.timeout}s waiting for existing deployment of #{application.id} to finish. Check marathon #{@marathon_url + '/#deployments'} for stuck deployments!", caller
+      raise Timeout::Error, "Timed out after #{deployment.timeout}s waiting for existing deployment of #{application.id} to finish. Check marathon ui #{@marathon_url + '/#deployments'} for stuck deployments!", caller
     end
     
     $LOG.info("Starting deployment of #{application.id}")
@@ -72,8 +73,9 @@ class MarathonClient
     begin
       deployment.wait_until_healthy
     rescue Timeout::Error => e
-      raise Timeout::Error, "Timed out after #{deployment.healthcheck_timeout}s waiting for #{application.instances} instances of #{application.id} to become healthy", caller
+      raise Timeout::Error, "Timed out after #{deployment.healthcheck_timeout}s waiting for #{application.instances} instances of #{application.id} to become healthy. Check marathon ui #{@marathon_url + '/#deployments'} for more information.", caller
     end
-
+  end
+  
   end
 end

data/lib/marathon_deploy/marathon_defaults.rb

@@ -2,15 +2,16 @@ require 'marathon_deploy/utils'
 require 'marathon_deploy/error'
 require 'logger'
 
-module MarathonDefaults
+module MarathonDeploy
+  module MarathonDefaults
  
   DEPLOYMENT_RECHECK_INTERVAL = 3
   DEPLOYMENT_TIMEOUT = 300
-  HEALTHY_WAIT_TIMEOUT = 300
+  HEALTHY_WAIT_TIMEOUT = 10 #300
   HEALTHY_WAIT_RECHECK_INTERVAL = 3
   PRODUCTION_ENVIRONMENT_NAME = 'PRODUCTION'
   DEFAULT_ENVIRONMENT_NAME = 'INTEGRATION'
-  DEFAULT_PREPRODUCTION_MARATHON_ENDPOINTS = ['http://192.168.59.103:8080']
+  DEFAULT_PREPRODUCTION_MARATHON_ENDPOINTS = ['http://localhost:8080']
   DEFAULT_PRODUCTION_MARATHON_ENDPOINTS = ['http://paasmaster46-1.mobile.rz:8080']
   DEFAULT_DEPLOYFILE = 'deploy.yaml'
   DEFAULT_LOGFILE = false
@@ -30,10 +31,7 @@ module MarathonDefaults
     :JAVA_XMX => "128m"
   }  
   
-  @@required_marathon_env_variables = %w[
-    DATACENTER_NUMBER
-    APPLICATION_NAME
-  ]
+  @@required_marathon_env_variables = %w[]
   
   #@@required_marathon_attributes = %w[id env container healthChecks args storeUrls].map(&:to_sym)
   @@required_marathon_attributes = %w[id].map(&:to_sym)
@@ -80,4 +78,5 @@ module MarathonDefaults
       return json
   end
   
+  end
 end

data/lib/marathon_deploy/utils.rb

@@ -1,4 +1,5 @@
-module Utils
+module MarathonDeploy
+  module Utils
   
   def self.symbolize(data) 
     data.inject({}){|h,(k,v)| h[k.to_sym] = v; h}
@@ -27,5 +28,6 @@ module Utils
     end
     return nil
   end
-  
+ 
+  end 
 end

data/lib/marathon_deploy/version.rb

@@ -1,3 +1,3 @@
 module MarathonDeploy
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/marathon_deploy/yaml_json.rb

@@ -2,7 +2,8 @@ require 'yaml'
 require 'json'
 require 'marathon_deploy/macro'
 
-module YamlJson
+module MarathonDeploy
+  module YamlJson
   
   def self.yaml2json(filename, process_macros=true)  
     if (process_macros)
@@ -42,4 +43,5 @@ module YamlJson
     return JSON.parse(data)
   end  
   
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marathon_deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Jonathan Colby
@@ -70,7 +70,6 @@ description: Pushes a yaml or json file to the Marathon API.
 email:
 - jcolby@team.mobile.de
 executables:
-- deploy
 - deploy.rb
 - json2yaml.rb
 extensions: []
@@ -83,7 +82,6 @@ files:
 - README.md
 - Rakefile
 - TODO
-- bin/deploy
 - bin/deploy.rb
 - bin/json2yaml.rb
 - examples/deploy.json
@@ -129,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Mesos/Marathon deployment tool.

data/bin/deploy

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-# TODO