marathon_deploy 0.1.41 → 0.1.43

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGI0MDViY2U1ZWZlYzhjNmJhMzUxNDkzMGZlZDRkODgyN2JiZmUyZg==
+    NDkxMGI4MjYyMjRhNjBjNTU0MzBjNjM2MjlkYzZjY2Y1NzY0NmViNQ==
   data.tar.gz: !binary |-
-    NmJkMTBiYmRlOGRlMzljYTU2YTNlMTRkZTIwMWExN2I4ZDkxYzRjNA==
+    ZWIxNDUyNzVlNGNkZjEwYzI1YmJkMzA0NjVmYjk3NGNmMzVjZmZiMg==
 SHA512:
   metadata.gz: !binary |-
-    Njk3NDVkOGZiYjNmNDVkNzE0Njc2Nzg0NjIwMDhlNzEyZWU3Yjc4MGU4NWQx
-    NjAzZjhhOWJiODgyMjBmYmUwMWUwNTZmNzZjOWFhNzA2MzMwNjE4NjI4OTg5
-    YzRhZGMyMDU2NmM1MDgwMWJhYTc2OTI5YzY0NGIyODNmNDE2NGQ=
+    ZjNkZTQzYjBkN2I1Y2MyNWQ0MmQyYmE3MzI4ODA5ODY1ODcxOTExYmNjMzVj
+    ZmIxYWM2Y2FiYTU2NTNjZjgzYjRjZjVkYThkYTdmYjRhZDFmZDc0NGJlMzM5
+    MTA2MTc2OGFmMDA1MDQ1ZjViYzc5ZjE2MDZjYjMyMmEzYWJhOTk=
   data.tar.gz: !binary |-
-    MTgxM2RmYTlhMDQwMjU4ZDU2ODkxZjk5NDcxMjc1MDhjNjlmOGViMmJkZmYx
-    MjNkOGQ5NTg0YjI1MWFjNTgwZTc5NDYzMTBmMWRkMTIzNTExZTUxYzQyNzRj
-    Nzc5NjEzMjMwYzQzYzQ4OTQzYzcwODAxODVkYjljNjhkODk5ODk=
+    ZjNiNjQwMzA3YzQ5YWEzMGU3OWQzYTIzYzIwNzc4MDY4ZTJiYmM4NGYzNTNj
+    MDM5MTU5MDgwNWZlMWNhZWU5MTkwNjBkYTVmZGY2Mjk2MjYxYWFlNWU3ZmIy
+    NTVmNDAxODg3NGIyZDI4Y2QxMjQ4YTMzOWQ4NzRjY2VmZTI4ZTI=

data/README.md

@@ -1,4 +1,4 @@
-![Travis Build Status](https://travis-ci.org/joncolby/marathon_deploy.svg?branch=master)
+[![Build Status](https://travis-ci.org/eBayClassifiedsGroup/marathon_deploy.svg?branch=master)](https://travis-ci.org/eBayClassifiedsGroup/marathon_deploy)
 
 # Marathon Deploy
 

data/bin/marathon_deploy

@@ -11,7 +11,7 @@ require 'logger'
 
 STDOUT.sync = true
 options = {}
-  
+
 # DEFAULTS
 DEFAULT_DEPLOYFILE = MarathonDeploy::MarathonDefaults::DEFAULT_DEPLOYFILE
 options[:debug] = MarathonDeploy::MarathonDefaults::DEFAULT_LOGLEVEL
@@ -20,6 +20,7 @@ options[:marathon_endpoints] = MarathonDeploy::MarathonDefaults::DEFAULT_PREPROD
 options[:logfile] = MarathonDeploy::MarathonDefaults::DEFAULT_LOGFILE
 options[:force] = MarathonDeploy::MarathonDefaults::DEFAULT_FORCE_DEPLOY
 options[:noop] = MarathonDeploy::MarathonDefaults::DEFAULT_NOOP
+options[:remove_elements] = MarathonDeploy::MarathonDefaults::DEFAULT_REMOVE_ELEMENTS
   
   
 OptionParser.new do |opts|
@@ -42,20 +43,23 @@ OptionParser.new do |opts|
     puts "#{$0} version #{opts.release}"
     exit
   end
-  
+
   opts.on("-f", "--force", "Force deployment when sending same deploy JSON to Marathon") do |f|
     options[:force] = true
   end
-  
+
   opts.on("-n", "--noop", "No action. Just display what would be performed.") do |f|
     options[:noop] = true
   end
-  
-  
+
+  opts.on("-r", "--remove ELEMENTS", Array, "Remove elemensts from deploymnet plan (example -r :constraints,:healthChecks)") do |r|
+    options[:remove_elements] = r
+  end
+
   opts.on("-e", "--environment ENVIRONMENT", "Default: #{options[:environment]}" ) do |e|
     options[:environment] = e
   end
-  
+
   opts.on_tail("-h", "--help", "Show this message") do
     puts opts
     puts "   ----------------- Additional Info -----------------", <<-DESCRIPTION
@@ -102,9 +106,19 @@ marathon_endpoints = Array.new
   else
     marathon_endpoints = options[:marathon_endpoints]
   end
+
+remove_elements = Array.new
+  if (options[:remove_elements].nil?)
+    remove_elements = MarathonDeploy::MarathonDefaults::DEFAULT_REMOVE_ELEMENTS
+  else
+    # converts quotes srtings in array to strings
+    remove_elements = options[:remove_elements].map do |n|
+      eval n if not MarathonDeploy::MarathonDefaults::DEFAULT_KEEP_ELEMENTS.include? n
+    end
+  end
  
 begin
-  application = MarathonDeploy::Application.new(:deployfile => deployfile, :force => options[:force])
+  application = MarathonDeploy::Application.new(:deployfile => deployfile, :force => options[:force], :remove_elements => remove_elements)
 rescue MarathonDeploy::Error::IOError, MarathonDeploy::Error::UndefinedMacroError,MarathonDeploy::Error::MissingMarathonAttributesError,MarathonDeploy::Error::UnsupportedFileExtension  => e
   $LOG.debug(e)
   $LOG.error(e.message)

data/lib/marathon_deploy/application.rb

@@ -13,7 +13,7 @@ module MarathonDeploy
   # @param [Hash] options hash for the application object
   # @option options [Boolean] :force force a deployment by including an environment variable containing a random string value in the json marathon payload
   # @option options [String] :deployfile file template and path. default deploy.yml in current directory
-  def initialize(options={ :force => false, :deployfile => 'deploy.yml'})
+  def initialize(options={ :force => false, :deployfile => 'deploy.yml', :remove_elements => []})
 
     deployfile = options[:deployfile]
     
@@ -59,6 +59,7 @@ module MarathonDeploy
     @json =  Utils.deep_symbolize(@json)  
       
     add_identifier if (options[:force])
+    remove_elements(options[:remove_elements])
       
     inject_envs = ENV.select { |k,v| /^#{MarathonDeploy::MarathonDefaults::ENVIRONMENT_VARIABLE_PREFIX}/.match(k)  }
     cleaned_envs = Hash[inject_envs.map { |k,v| [k.gsub(/^#{MarathonDeploy::MarathonDefaults::ENVIRONMENT_VARIABLE_PREFIX}/,''), v ] }]   
@@ -78,7 +79,15 @@ module MarathonDeploy
     # Time.now.to_i
     @json[:env]['UNIQUE_ID'] = "#{id}_#{random}"
   end
-  
+
+  def remove_elements(remove_array)
+    if (remove_array.is_a?(Array))
+      remove_array.each do |element|
+        @json.delete(element)
+      end
+    end
+  end
+
   def to_s
     JSON.pretty_generate(@json)
   end

data/lib/marathon_deploy/marathon_defaults.rb

@@ -20,6 +20,8 @@ module MarathonDeploy
   MARATHON_DEPLOYMENT_REST_PATH = '/v2/deployments/'
   DEFAULT_FORCE_DEPLOY = false
   DEFAULT_NOOP = false
+  DEFAULT_KEEP_ELEMENTS = [':cpus', ':mem', ':instances', ':env']
+  DEFAULT_REMOVE_ELEMENTS = []
   ENVIRONMENT_VARIABLE_PREFIX = 'MARATHON_DEPLOY_'
 
   @@preproduction_override = {

data/lib/marathon_deploy/version.rb

@@ -1,3 +1,3 @@
 module MarathonDeploy
-  VERSION = "0.1.41"
+  VERSION = "0.1.43"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marathon_deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.41
+  version: 0.1.43
 platform: ruby
 authors:
 - Jonathan Colby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger