marathon_deploy 0.1.43 → 0.1.44

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDkxMGI4MjYyMjRhNjBjNTU0MzBjNjM2MjlkYzZjY2Y1NzY0NmViNQ==
+    YTU5M2ZiNjVmNjlhZWYyYzc2ZmI3ZDhmMDgwZGQ2OGE4NTJkMjE0Mg==
   data.tar.gz: !binary |-
-    ZWIxNDUyNzVlNGNkZjEwYzI1YmJkMzA0NjVmYjk3NGNmMzVjZmZiMg==
+    NjIyNWZiYTQ4MjkxMmUwOWJjZWNjZDA0OWU4OTQwZmNkNTYwM2U5Mg==
 SHA512:
   metadata.gz: !binary |-
-    ZjNkZTQzYjBkN2I1Y2MyNWQ0MmQyYmE3MzI4ODA5ODY1ODcxOTExYmNjMzVj
-    ZmIxYWM2Y2FiYTU2NTNjZjgzYjRjZjVkYThkYTdmYjRhZDFmZDc0NGJlMzM5
-    MTA2MTc2OGFmMDA1MDQ1ZjViYzc5ZjE2MDZjYjMyMmEzYWJhOTk=
+    YTc3NDVkZGFmMTU2YzhhNGJiMTc3MGY4ZDlkZDRlMDAyZGRkM2YwOGZkODFm
+    ZDk0NDRmOGM0NWJkYmM4NTEwMTUxYzdjZmQ3Y2QzMGJiNWY2MzBiYjI0YTg1
+    NTdlNDY3MGZmNzA2M2ZkMDNkNDI2MmU4NDNiZmRiMDRjZjE3ZTA=
   data.tar.gz: !binary |-
-    ZjNiNjQwMzA3YzQ5YWEzMGU3OWQzYTIzYzIwNzc4MDY4ZTJiYmM4NGYzNTNj
-    MDM5MTU5MDgwNWZlMWNhZWU5MTkwNjBkYTVmZGY2Mjk2MjYxYWFlNWU3ZmIy
-    NTVmNDAxODg3NGIyZDI4Y2QxMjQ4YTMzOWQ4NzRjY2VmZTI4ZTI=
+    MDk1ZjAwMjMxMWE3N2ViMDljNWJlZDE4ODkwZGU4YWZjY2JhMDE5NzY2YWI5
+    ZTRjZDBmOTFjODM0YWQ2ZDk0OGNmYWZkZDg0MTUzYTc0N2QyZjRkNDE5MjA0
+    ZjYwMjI0NzNiZTg2ODdlNjI3ZjViNzBiY2EzZTM1ZWZmMmJhYzc=

data/lib/marathon_deploy/marathon_defaults.rb

@@ -20,16 +20,22 @@ 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 = []
+  DEFAULT_KEEP_ELEMENTS = [':cpus', ':mem', ':instances', ':env']
   ENVIRONMENT_VARIABLE_PREFIX = 'MARATHON_DEPLOY_'
 
   @@preproduction_override = {
     :instances => 5,
     :mem => 4096,
-    :cpus => 0.5      
-  } 
-  
+    :cpus => 0.5
+  }
+
+  @@defaults_minimum= {
+    :instances => 1,
+    :mem => 256,
+    :cpus => 0.1
+  }
+
   @@preproduction_env = {
     :DATACENTER_NUMBER => "44"
   }  
@@ -69,6 +75,10 @@ module MarathonDeploy
   def self.overlay_preproduction_settings(json)
     json = Utils.deep_symbolize(json)
       @@preproduction_override.each do |property,value|
+        if (!json[property])
+          $LOG.debug("Missing property [#{property}] overriding with default [#{property}: #{@@defaults_minimum[property]}]")
+          json[property] = @@defaults_minimum[property]
+        end
         given_value = json[property]
         if (given_value > @@preproduction_override[property])
           $LOG.debug("Overriding property [#{property}: #{json[property]}] with preproduction default [#{property}: #{@@preproduction_override[property]}]")

data/lib/marathon_deploy/version.rb

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

metadata

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