marathon_deploy 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f8d0a4336faa06669c943478f87d1ff276247f9
-  data.tar.gz: a4bbb96511efb2b4b6caf16d909a298e2e7d5d9b
+  metadata.gz: 4abfd6b40a89936ec8be09b0a2c7a601952b35c7
+  data.tar.gz: 8ea4c64c11065075a54ac8f6cf418e430f78a3a1
 SHA512:
-  metadata.gz: bbbdd7054f1313fb13ac369a1235dc40e86e27960221a2978391dce8195bea375e1f9966a11ede294b75e6abf95d96991a0781641d19657eeab2b6e57f40bf4f
-  data.tar.gz: 300dbbf4e32875e3ba169349571e98ffec0db5d4953d936863a28bf54fc885f7b851408628b09315da67290348b8dbab1a962806a6ebb62145a815b2719aba95
+  metadata.gz: c15fd3132c7be4ecaf8e078ed0f23d6b352b22ddca142c084b66115b17e21445139aab9d8ad697ebc371e31cd1851a142f4ffc6cc810d57df5c00ba5259b4b88
+  data.tar.gz: 788a7afa17eac64ef9ebd5fa9a94de1970771dbe5d15a953bdb10d00f30ee45ab1281d1cb111e3e5a3bea7a35bbc58a38f52ed138810d336555c1ea4d9ba294d

data/doc/MarathonDeploy/Application.html

@@ -106,33 +106,6 @@
   <h2>Instance Attribute Summary <small>(<a href="#" class="summary_toggle">collapse</a>)</small></h2>
   <ul class="summary">
     
-      <li class="public ">
-  <span class="summary_signature">
-    
-      <a href="#envs-instance_method" title="#envs (instance method)">- (Object) <strong>envs</strong> </a>
-    
-
-    
-  </span>
-  
-  
-  
-    
-    
-  
-  
-  
-  
-  
-
-  
-    <span class="summary_desc"><div class='inline'>
-<p>Returns the value of attribute envs.</p>
-</div></span>
-  
-</li>
-
-    
       <li class="public ">
   <span class="summary_signature">
     
@@ -251,7 +224,7 @@
         <li class="public ">
   <span class="summary_signature">
     
-      <a href="#env-instance_method" title="#env (instance method)">- (Object) <strong>env</strong> </a>
+      <a href="#env-instance_method" title="#env (instance method)">- (JSON) <strong>env</strong> </a>
     
 
     
@@ -265,7 +238,9 @@
   
 
   
-    <span class="summary_desc"><div class='inline'></div></span>
+    <span class="summary_desc"><div class='inline'>
+<p>List of ENV variables for this application.</p>
+</div></span>
   
 </li>
 
@@ -454,6 +429,7 @@ string value in the json marathon payload</p>
       <pre class="lines">
 
 
+16
 17
 18
 19
@@ -495,20 +471,14 @@ string value in the json marathon payload</p>
 55
 56
 57
-58
-59
-60</pre>
+58</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/marathon_deploy/application.rb', line 17</span>
+      <pre class="code"><span class="info file"># File 'lib/marathon_deploy/application.rb', line 16</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_initialize'>initialize</span><span class='lparen'>(</span><span class='id identifier rubyid_options'>options</span><span class='op'>=</span><span class='lbrace'>{</span> <span class='symbol'>:force</span> <span class='op'>=&gt;</span> <span class='kw'>false</span><span class='comma'>,</span> <span class='symbol'>:deployfile</span> <span class='op'>=&gt;</span> <span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>deploy.yml</span><span class='tstring_end'>&#39;</span></span><span class='rbrace'>}</span><span class='rparen'>)</span>
-  <span class='comment'>#default_options = {
-</span>  <span class='comment'>#  :force =&gt; false,
-</span>  <span class='comment'>#  :deployfile =&gt; &#39;deploy.yml&#39;
-</span>  <span class='comment'>#  }      
-</span>  <span class='comment'>#options = default_options.merge!(options)
-</span>  <span class='id identifier rubyid_deployfile'>deployfile</span> <span class='op'>=</span> <span class='id identifier rubyid_options'>options</span><span class='lbracket'>[</span><span class='symbol'>:deployfile</span><span class='rbracket'>]</span>
+
+  <span class='id identifier rubyid_deployfile'>deployfile</span> <span class='op'>=</span> <span class='id identifier rubyid_options'>options</span><span class='lbracket'>[</span><span class='symbol'>:deployfile</span><span class='rbracket'>]</span>
   
   <span class='kw'>if</span> <span class='lparen'>(</span><span class='op'>!</span><span class='const'>File</span><span class='period'>.</span><span class='id identifier rubyid_exist?'>exist?</span><span class='lparen'>(</span><span class='id identifier rubyid_deployfile'>deployfile</span><span class='rparen'>)</span><span class='rparen'>)</span>
     <span class='id identifier rubyid_message'>message</span> <span class='op'>=</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>\&#39;</span><span class='embexpr_beg'>#{</span><span class='const'>File</span><span class='period'>.</span><span class='id identifier rubyid_expand_path'>expand_path</span><span class='lparen'>(</span><span class='id identifier rubyid_deployfile'>deployfile</span><span class='rparen'>)</span><span class='embexpr_end'>}</span><span class='tstring_content'>\&#39; not found.</span><span class='tstring_end'>&quot;</span></span>
@@ -544,7 +514,10 @@ string value in the json marathon payload</p>
   <span class='ivar'>@json</span> <span class='op'>=</span>  <span class='const'>Utils</span><span class='period'>.</span><span class='id identifier rubyid_deep_symbolize'>deep_symbolize</span><span class='lparen'>(</span><span class='ivar'>@json</span><span class='rparen'>)</span>  
     
   <span class='id identifier rubyid_add_identifier'>add_identifier</span> <span class='kw'>if</span> <span class='lparen'>(</span><span class='id identifier rubyid_options'>options</span><span class='lbracket'>[</span><span class='symbol'>:force</span><span class='rbracket'>]</span><span class='rparen'>)</span>
- 
+    
+  <span class='id identifier rubyid_inject_envs'>inject_envs</span> <span class='op'>=</span> <span class='const'>ENV</span><span class='period'>.</span><span class='id identifier rubyid_select'>select</span> <span class='lbrace'>{</span> <span class='op'>|</span><span class='id identifier rubyid_k'>k</span><span class='comma'>,</span><span class='id identifier rubyid_v'>v</span><span class='op'>|</span> <span class='tstring'><span class='regexp_beg'>/</span><span class='tstring_content'>^</span><span class='embexpr_beg'>#{</span><span class='const'>MarathonDeploy</span><span class='op'>::</span><span class='const'>MarathonDefaults</span><span class='op'>::</span><span class='const'>ENVIRONMENT_VARIABLE_PREFIX</span><span class='embexpr_end'>}</span><span class='regexp_end'>/</span></span><span class='period'>.</span><span class='id identifier rubyid_match'>match</span><span class='lparen'>(</span><span class='id identifier rubyid_k'>k</span><span class='rparen'>)</span>  <span class='rbrace'>}</span>
+  <span class='id identifier rubyid_cleaned_envs'>cleaned_envs</span> <span class='op'>=</span> <span class='const'>Hash</span><span class='lbracket'>[</span><span class='id identifier rubyid_inject_envs'>inject_envs</span><span class='period'>.</span><span class='id identifier rubyid_map'>map</span> <span class='lbrace'>{</span> <span class='op'>|</span><span class='id identifier rubyid_k'>k</span><span class='comma'>,</span><span class='id identifier rubyid_v'>v</span><span class='op'>|</span> <span class='lbracket'>[</span><span class='id identifier rubyid_k'>k</span><span class='period'>.</span><span class='id identifier rubyid_gsub'>gsub</span><span class='lparen'>(</span><span class='tstring'><span class='regexp_beg'>/</span><span class='tstring_content'>^</span><span class='embexpr_beg'>#{</span><span class='const'>MarathonDeploy</span><span class='op'>::</span><span class='const'>MarathonDefaults</span><span class='op'>::</span><span class='const'>ENVIRONMENT_VARIABLE_PREFIX</span><span class='embexpr_end'>}</span><span class='regexp_end'>/</span></span><span class='comma'>,</span><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_end'>&#39;</span></span><span class='rparen'>)</span><span class='comma'>,</span> <span class='id identifier rubyid_v'>v</span> <span class='rbracket'>]</span> <span class='rbrace'>}</span><span class='rbracket'>]</span>   
+  <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_add_envs'>add_envs</span> <span class='id identifier rubyid_cleaned_envs'>cleaned_envs</span><span class='period'>.</span><span class='id identifier rubyid_to_h'>to_h</span> <span class='kw'>unless</span> <span class='id identifier rubyid_cleaned_envs'>cleaned_envs</span><span class='period'>.</span><span class='id identifier rubyid_empty?'>empty?</span>
 <span class='kw'>end</span></pre>
     </td>
   </tr>
@@ -557,52 +530,9 @@ string value in the json marathon payload</p>
     <h2>Instance Attribute Details</h2>
     
       
-      <span id="envs=-instance_method"></span>
-      <div class="method_details first">
-  <h3 class="signature first" id="envs-instance_method">
-  
-    - (<tt>Object</tt>) <strong>envs</strong> 
-  
-
-  
-
-  
-</h3><div class="docstring">
-  <div class="discussion">
-    
-<p>Returns the value of attribute envs</p>
-
-
-  </div>
-</div>
-<div class="tags">
-  
-
-</div><table class="source_code">
-  <tr>
-    <td>
-      <pre class="lines">
-
-
-11
-12
-13</pre>
-    </td>
-    <td>
-      <pre class="code"><span class="info file"># File 'lib/marathon_deploy/application.rb', line 11</span>
-
-<span class='kw'>def</span> <span class='id identifier rubyid_envs'>envs</span>
-  <span class='ivar'>@envs</span>
-<span class='kw'>end</span></pre>
-    </td>
-  </tr>
-</table>
-</div>
-    
-      
       <span id=""></span>
-      <div class="method_details ">
-  <h3 class="signature " id="id-instance_method">
+      <div class="method_details first">
+  <h3 class="signature first" id="id-instance_method">
   
     - (<tt>Object</tt>) <strong>id</strong>  <span class="extras">(readonly)</span>
   
@@ -707,6 +637,7 @@ string value in the json marathon payload</p>
       <pre class="lines">
 
 
+85
 86
 87
 88
@@ -714,11 +645,10 @@ string value in the json marathon payload</p>
 90
 91
 92
-93
-94</pre>
+93</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/marathon_deploy/application.rb', line 86</span>
+      <pre class="code"><span class="info file"># File 'lib/marathon_deploy/application.rb', line 85</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_add_envs'>add_envs</span><span class='lparen'>(</span><span class='id identifier rubyid_envs'>envs</span><span class='rparen'>)</span>
   <span class='kw'>if</span> <span class='lparen'>(</span><span class='id identifier rubyid_envs'>envs</span><span class='period'>.</span><span class='id identifier rubyid_is_a?'>is_a?</span><span class='lparen'>(</span><span class='const'>Hash</span><span class='rparen'>)</span><span class='rparen'>)</span>
@@ -749,14 +679,14 @@ string value in the json marathon payload</p>
       <pre class="lines">
 
 
+64
+65
 66
 67
-68
-69
-70</pre>
+68</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/marathon_deploy/application.rb', line 66</span>
+      <pre class="code"><span class="info file"># File 'lib/marathon_deploy/application.rb', line 64</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_add_identifier'>add_identifier</span>
   <span class='id identifier rubyid_random'>random</span> <span class='op'>=</span> <span class='const'>Utils</span><span class='period'>.</span><span class='id identifier rubyid_random'>random</span>
@@ -771,24 +701,53 @@ string value in the json marathon payload</p>
       <div class="method_details ">
   <h3 class="signature " id="env-instance_method">
   
-    - (<tt>Object</tt>) <strong>env</strong> 
+    - (<tt>JSON</tt>) <strong>env</strong> 
   
 
   
 
   
-</h3><table class="source_code">
+</h3><div class="docstring">
+  <div class="discussion">
+    
+<p>Returns list of ENV variables for this application</p>
+
+
+  </div>
+</div>
+<div class="tags">
+  
+<p class="tag_title">Returns:</p>
+<ul class="return">
+  
+    <li>
+      
+      
+        <span class='type'>(<tt>JSON</tt>)</span>
+      
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>list of ENV variables for this application</p>
+</div>
+      
+    </li>
+  
+</ul>
+
+</div><table class="source_code">
   <tr>
     <td>
       <pre class="lines">
 
 
+75
 76
-77
-78</pre>
+77</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/marathon_deploy/application.rb', line 76</span>
+      <pre class="code"><span class="info file"># File 'lib/marathon_deploy/application.rb', line 75</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_env'>env</span>
   <span class='ivar'>@json</span><span class='lbracket'>[</span><span class='symbol'>:env</span><span class='rbracket'>]</span>
@@ -813,14 +772,14 @@ string value in the json marathon payload</p>
       <pre class="lines">
 
 
+95
 96
 97
 98
-99
-100</pre>
+99</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/marathon_deploy/application.rb', line 96</span>
+      <pre class="code"><span class="info file"># File 'lib/marathon_deploy/application.rb', line 95</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_instances'>instances</span>
   <span class='kw'>if</span> <span class='lparen'>(</span><span class='ivar'>@json</span><span class='lbracket'>[</span><span class='symbol'>:instances</span><span class='rbracket'>]</span><span class='rparen'>)</span>
@@ -847,12 +806,12 @@ string value in the json marathon payload</p>
       <pre class="lines">
 
 
-62
-63
-64</pre>
+60
+61
+62</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/marathon_deploy/application.rb', line 62</span>
+      <pre class="code"><span class="info file"># File 'lib/marathon_deploy/application.rb', line 60</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_overlay_preproduction_settings'>overlay_preproduction_settings</span>
   <span class='ivar'>@json</span> <span class='op'>=</span> <span class='const'>MarathonDefaults</span><span class='period'>.</span><span class='id identifier rubyid_overlay_preproduction_settings'>overlay_preproduction_settings</span><span class='lparen'>(</span><span class='ivar'>@json</span><span class='rparen'>)</span>
@@ -877,12 +836,12 @@ string value in the json marathon payload</p>
       <pre class="lines">
 
 
-72
-73
-74</pre>
+70
+71
+72</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/marathon_deploy/application.rb', line 72</span>
+      <pre class="code"><span class="info file"># File 'lib/marathon_deploy/application.rb', line 70</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_to_s'>to_s</span>
   <span class='kw'>return</span> <span class='const'>JSON</span><span class='period'>.</span><span class='id identifier rubyid_pretty_generate'>pretty_generate</span><span class='lparen'>(</span><span class='ivar'>@json</span><span class='rparen'>)</span>
@@ -897,7 +856,7 @@ string value in the json marathon payload</p>
 </div>
 
     <div id="footer">
-  Generated on Thu Aug  6 12:50:37 2015 by
+  Generated on Mon Aug 10 12:48:06 2015 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.6 (ruby-2.2.0).
 </div>

data/doc/MarathonDeploy/Deployment.html

@@ -1339,7 +1339,7 @@
 </div>
 
     <div id="footer">
-  Generated on Thu Aug  6 12:50:37 2015 by
+  Generated on Mon Aug 10 12:48:06 2015 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.6 (ruby-2.2.0).
 </div>

data/doc/MarathonDeploy/Environment.html

@@ -471,7 +471,7 @@
 </div>
 
     <div id="footer">
-  Generated on Thu Aug  6 12:50:37 2015 by
+  Generated on Mon Aug 10 12:48:06 2015 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.6 (ruby-2.2.0).
 </div>

data/doc/MarathonDeploy/Error/BadFormatError.html

@@ -122,7 +122,7 @@
 </div>
 
     <div id="footer">
-  Generated on Thu Aug  6 12:50:37 2015 by
+  Generated on Mon Aug 10 12:48:05 2015 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.6 (ruby-2.2.0).
 </div>

data/doc/MarathonDeploy/Error/BadURLError.html

@@ -122,7 +122,7 @@
 </div>
 
     <div id="footer">
-  Generated on Thu Aug  6 12:50:37 2015 by
+  Generated on Mon Aug 10 12:48:05 2015 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.6 (ruby-2.2.0).
 </div>

data/doc/MarathonDeploy/Error/DeploymentError.html

@@ -122,7 +122,7 @@
 </div>
 
     <div id="footer">
-  Generated on Thu Aug  6 12:50:37 2015 by
+  Generated on Mon Aug 10 12:48:05 2015 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.6 (ruby-2.2.0).
 </div>

data/doc/MarathonDeploy/Error/IOError.html

@@ -122,7 +122,7 @@
 </div>
 
     <div id="footer">
-  Generated on Thu Aug  6 12:50:37 2015 by
+  Generated on Mon Aug 10 12:48:05 2015 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.6 (ruby-2.2.0).
 </div>

data/doc/MarathonDeploy/Error/MarathonError.html

@@ -118,7 +118,7 @@
 </div>
 
     <div id="footer">
-  Generated on Thu Aug  6 12:50:37 2015 by
+  Generated on Mon Aug 10 12:48:05 2015 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.6 (ruby-2.2.0).
 </div>

data/doc/MarathonDeploy/Error/MissingMarathonAttributesError.html

@@ -122,7 +122,7 @@
 </div>
 
     <div id="footer">
-  Generated on Thu Aug  6 12:50:37 2015 by
+  Generated on Mon Aug 10 12:48:05 2015 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.6 (ruby-2.2.0).
 </div>

data/doc/MarathonDeploy/Error/TimeoutError.html

@@ -122,7 +122,7 @@
 </div>
 
     <div id="footer">
-  Generated on Thu Aug  6 12:50:37 2015 by
+  Generated on Mon Aug 10 12:48:05 2015 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.6 (ruby-2.2.0).
 </div>

data/doc/MarathonDeploy/Error/UndefinedMacroError.html

@@ -122,7 +122,7 @@
 </div>
 
     <div id="footer">
-  Generated on Thu Aug  6 12:50:37 2015 by
+  Generated on Mon Aug 10 12:48:05 2015 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.6 (ruby-2.2.0).
 </div>

data/doc/MarathonDeploy/Error/UnsupportedFileExtension.html

@@ -122,7 +122,7 @@
 </div>
 
     <div id="footer">
-  Generated on Thu Aug  6 12:50:37 2015 by
+  Generated on Mon Aug 10 12:48:05 2015 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.6 (ruby-2.2.0).
 </div>

data/doc/MarathonDeploy/Error.html

@@ -106,7 +106,7 @@
 </div>
 
     <div id="footer">
-  Generated on Thu Aug  6 12:50:37 2015 by
+  Generated on Mon Aug 10 12:48:05 2015 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.6 (ruby-2.2.0).
 </div>

data/doc/MarathonDeploy/HttpUtil.html

@@ -655,7 +655,7 @@
 </div>
 
     <div id="footer">
-  Generated on Thu Aug  6 12:50:37 2015 by
+  Generated on Mon Aug 10 12:48:05 2015 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.6 (ruby-2.2.0).
 </div>

data/doc/MarathonDeploy/Macro.html

@@ -183,7 +183,7 @@
 </div>
 
     <div id="footer">
-  Generated on Thu Aug  6 12:50:37 2015 by
+  Generated on Mon Aug 10 12:48:05 2015 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.6 (ruby-2.2.0).
 </div>

data/doc/MarathonDeploy/MarathonClient.html

@@ -606,7 +606,7 @@
 </div>
 
     <div id="footer">
-  Generated on Thu Aug  6 12:50:37 2015 by
+  Generated on Mon Aug 10 12:48:06 2015 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.6 (ruby-2.2.0).
 </div>

data/doc/MarathonDeploy/MarathonDefaults.html

@@ -132,7 +132,7 @@
         <dt id="DEFAULT_DEPLOYFILE-constant" class="">DEFAULT_DEPLOYFILE =
           
         </dt>
-        <dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>deploy.yaml</span><span class='tstring_end'>&#39;</span></span></pre></dd>
+        <dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>deploy.yml</span><span class='tstring_end'>&#39;</span></span></pre></dd>
       
         <dt id="DEFAULT_LOGFILE-constant" class="">DEFAULT_LOGFILE =
           
@@ -164,22 +164,25 @@
         </dt>
         <dd><pre class="code"><span class='kw'>false</span></pre></dd>
       
+        <dt id="ENVIRONMENT_VARIABLE_PREFIX-constant" class="">ENVIRONMENT_VARIABLE_PREFIX =
+          
+        </dt>
+        <dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>MARATHON_DEPLOY_</span><span class='tstring_end'>&#39;</span></span></pre></dd>
+      
         <dt id="preproduction_override-classvariable" class="">@@preproduction_override =
           
         </dt>
         <dd><pre class="code"><span class='lbrace'>{</span>
   <span class='symbol'>:instances</span> <span class='op'>=&gt;</span> <span class='int'>5</span><span class='comma'>,</span>
-  <span class='symbol'>:mem</span> <span class='op'>=&gt;</span> <span class='int'>512</span><span class='comma'>,</span>
-  <span class='symbol'>:cpus</span> <span class='op'>=&gt;</span> <span class='float'>0.1</span>      
+  <span class='symbol'>:mem</span> <span class='op'>=&gt;</span> <span class='int'>4096</span><span class='comma'>,</span>
+  <span class='symbol'>:cpus</span> <span class='op'>=&gt;</span> <span class='float'>0.5</span>      
 <span class='rbrace'>}</span></pre></dd>
       
         <dt id="preproduction_env-classvariable" class="">@@preproduction_env =
           
         </dt>
         <dd><pre class="code"><span class='lbrace'>{</span>
-  <span class='symbol'>:DATACENTER_NUMBER</span> <span class='op'>=&gt;</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>44</span><span class='tstring_end'>&quot;</span></span><span class='comma'>,</span>
-  <span class='symbol'>:JAVA_XMS</span> <span class='op'>=&gt;</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>64m</span><span class='tstring_end'>&quot;</span></span><span class='comma'>,</span>
-  <span class='symbol'>:JAVA_XMX</span> <span class='op'>=&gt;</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>128m</span><span class='tstring_end'>&quot;</span></span>
+  <span class='symbol'>:DATACENTER_NUMBER</span> <span class='op'>=&gt;</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>44</span><span class='tstring_end'>&quot;</span></span>
 <span class='rbrace'>}</span></pre></dd>
       
         <dt id="required_marathon_env_variables-classvariable" class="">@@required_marathon_env_variables =
@@ -311,6 +314,7 @@ storeUrls].map(&amp;:to_sym)</p>
       <pre class="lines">
 
 
+40
 41
 42
 43
@@ -319,11 +323,10 @@ storeUrls].map(&amp;:to_sym)</p>
 46
 47
 48
-49
-50</pre>
+49</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/marathon_deploy/marathon_defaults.rb', line 41</span>
+      <pre class="code"><span class="info file"># File 'lib/marathon_deploy/marathon_defaults.rb', line 40</span>
 
 <span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_missing_attributes'>missing_attributes</span><span class='lparen'>(</span><span class='id identifier rubyid_json'>json</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_json'>json</span> <span class='op'>=</span> <span class='const'>Utils</span><span class='period'>.</span><span class='id identifier rubyid_symbolize'>symbolize</span><span class='lparen'>(</span><span class='id identifier rubyid_json'>json</span><span class='rparen'>)</span>
@@ -355,6 +358,7 @@ storeUrls].map(&amp;:to_sym)</p>
       <pre class="lines">
 
 
+51
 52
 53
 54
@@ -368,11 +372,10 @@ storeUrls].map(&amp;:to_sym)</p>
 62
 63
 64
-65
-66</pre>
+65</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/marathon_deploy/marathon_defaults.rb', line 52</span>
+      <pre class="code"><span class="info file"># File 'lib/marathon_deploy/marathon_defaults.rb', line 51</span>
 
 <span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_missing_envs'>missing_envs</span><span class='lparen'>(</span><span class='id identifier rubyid_json'>json</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_json'>json</span> <span class='op'>=</span> <span class='const'>Utils</span><span class='period'>.</span><span class='id identifier rubyid_symbolize'>symbolize</span><span class='lparen'>(</span><span class='id identifier rubyid_json'>json</span><span class='rparen'>)</span>
@@ -409,6 +412,7 @@ storeUrls].map(&amp;:to_sym)</p>
       <pre class="lines">
 
 
+67
 68
 69
 70
@@ -421,11 +425,10 @@ storeUrls].map(&amp;:to_sym)</p>
 77
 78
 79
-80
-81</pre>
+80</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/marathon_deploy/marathon_defaults.rb', line 68</span>
+      <pre class="code"><span class="info file"># File 'lib/marathon_deploy/marathon_defaults.rb', line 67</span>
 
 <span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_overlay_preproduction_settings'>overlay_preproduction_settings</span><span class='lparen'>(</span><span class='id identifier rubyid_json'>json</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_json'>json</span> <span class='op'>=</span> <span class='const'>Utils</span><span class='period'>.</span><span class='id identifier rubyid_deep_symbolize'>deep_symbolize</span><span class='lparen'>(</span><span class='id identifier rubyid_json'>json</span><span class='rparen'>)</span>
@@ -451,7 +454,7 @@ storeUrls].map(&amp;:to_sym)</p>
 </div>
 
     <div id="footer">
-  Generated on Thu Aug  6 12:50:37 2015 by
+  Generated on Mon Aug 10 12:48:05 2015 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.6 (ruby-2.2.0).
 </div>

data/doc/MarathonDeploy/Utils.html

@@ -345,7 +345,7 @@
 </div>
 
     <div id="footer">
-  Generated on Thu Aug  6 12:50:37 2015 by
+  Generated on Mon Aug 10 12:48:05 2015 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.6 (ruby-2.2.0).
 </div>

data/doc/MarathonDeploy/YamlJson.html

@@ -365,7 +365,7 @@
 </div>
 
     <div id="footer">
-  Generated on Thu Aug  6 12:50:37 2015 by
+  Generated on Mon Aug 10 12:48:05 2015 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.6 (ruby-2.2.0).
 </div>

data/doc/MarathonDeploy.html

@@ -131,7 +131,7 @@
         <dt id="VERSION-constant" class="">VERSION =
           
         </dt>
-        <dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>0.1.4</span><span class='tstring_end'>&quot;</span></span></pre></dd>
+        <dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>0.1.9</span><span class='tstring_end'>&quot;</span></span></pre></dd>
       
     </dl>
   
@@ -147,7 +147,7 @@
 </div>
 
     <div id="footer">
-  Generated on Thu Aug  6 12:50:37 2015 by
+  Generated on Mon Aug 10 12:48:05 2015 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.6 (ruby-2.2.0).
 </div>

data/doc/_index.html

@@ -309,7 +309,7 @@
 </div>
 
     <div id="footer">
-  Generated on Thu Aug  6 12:50:37 2015 by
+  Generated on Mon Aug 10 12:48:05 2015 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.6 (ruby-2.2.0).
 </div>

data/doc/file.README.html

@@ -214,7 +214,7 @@ feature&#39;</code>)</p>
 </div></div>
 
     <div id="footer">
-  Generated on Thu Aug  6 12:50:37 2015 by
+  Generated on Mon Aug 10 12:48:05 2015 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.6 (ruby-2.2.0).
 </div>

data/doc/index.html

@@ -214,7 +214,7 @@ feature&#39;</code>)</p>
 </div></div>
 
     <div id="footer">
-  Generated on Thu Aug  6 12:50:37 2015 by
+  Generated on Mon Aug 10 12:48:05 2015 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.6 (ruby-2.2.0).
 </div>

data/doc/method_list.html

@@ -136,35 +136,35 @@
   
 
   <li class="r1 ">
-    <span class='object_link'><a href="MarathonDeploy/Application.html#envs-instance_method" title="MarathonDeploy::Application#envs (method)">#envs</a></span>
-    <small>MarathonDeploy::Application</small>
-  </li>
-  
-
-  <li class="r2 ">
     <span class='object_link'><a href="MarathonDeploy/HttpUtil.html#get-class_method" title="MarathonDeploy::HttpUtil.get (method)">get</a></span>
     <small>MarathonDeploy::HttpUtil</small>
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="MarathonDeploy/Deployment.html#health_checks_defined%3F-instance_method" title="MarathonDeploy::Deployment#health_checks_defined? (method)">#health_checks_defined?</a></span>
     <small>MarathonDeploy::Deployment</small>
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="MarathonDeploy/Deployment.html#healthcheck_timeout-instance_method" title="MarathonDeploy::Deployment#healthcheck_timeout (method)">#healthcheck_timeout</a></span>
     <small>MarathonDeploy::Deployment</small>
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="MarathonDeploy/Application.html#id-instance_method" title="MarathonDeploy::Application#id (method)">#id</a></span>
     <small>MarathonDeploy::Application</small>
   </li>
   
 
+  <li class="r1 ">
+    <span class='object_link'><a href="MarathonDeploy/Environment.html#initialize-instance_method" title="MarathonDeploy::Environment#initialize (method)">#initialize</a></span>
+    <small>MarathonDeploy::Environment</small>
+  </li>
+  
+
   <li class="r2 ">
     <span class='object_link'><a href="MarathonDeploy/MarathonClient.html#initialize-instance_method" title="MarathonDeploy::MarathonClient#initialize (method)">#initialize</a></span>
     <small>MarathonDeploy::MarathonClient</small>
@@ -178,161 +178,149 @@
   
 
   <li class="r2 ">
-    <span class='object_link'><a href="MarathonDeploy/Environment.html#initialize-instance_method" title="MarathonDeploy::Environment#initialize (method)">#initialize</a></span>
-    <small>MarathonDeploy::Environment</small>
-  </li>
-  
-
-  <li class="r1 ">
     <span class='object_link'><a href="MarathonDeploy/Application.html#initialize-instance_method" title="MarathonDeploy::Application#initialize (method)">#initialize</a></span>
     <small>MarathonDeploy::Application</small>
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="MarathonDeploy/Application.html#instances-instance_method" title="MarathonDeploy::Application#instances (method)">#instances</a></span>
     <small>MarathonDeploy::Application</small>
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="MarathonDeploy/Environment.html#is_production%3F-instance_method" title="MarathonDeploy::Environment#is_production? (method)">#is_production?</a></span>
     <small>MarathonDeploy::Environment</small>
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="MarathonDeploy/Application.html#json-instance_method" title="MarathonDeploy::Application#json (method)">#json</a></span>
     <small>MarathonDeploy::Application</small>
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="MarathonDeploy/YamlJson.html#json2yaml-class_method" title="MarathonDeploy::YamlJson.json2yaml (method)">json2yaml</a></span>
     <small>MarathonDeploy::YamlJson</small>
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="MarathonDeploy/Environment.html#marathon_endpoints-instance_method" title="MarathonDeploy::Environment#marathon_endpoints (method)">#marathon_endpoints</a></span>
     <small>MarathonDeploy::Environment</small>
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="MarathonDeploy/MarathonClient.html#marathon_url-instance_method" title="MarathonDeploy::MarathonClient#marathon_url (method)">#marathon_url</a></span>
     <small>MarathonDeploy::MarathonClient</small>
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="MarathonDeploy/MarathonDefaults.html#missing_attributes-class_method" title="MarathonDeploy::MarathonDefaults.missing_attributes (method)">missing_attributes</a></span>
     <small>MarathonDeploy::MarathonDefaults</small>
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="MarathonDeploy/MarathonDefaults.html#missing_envs-class_method" title="MarathonDeploy::MarathonDefaults.missing_envs (method)">missing_envs</a></span>
     <small>MarathonDeploy::MarathonDefaults</small>
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="MarathonDeploy/Environment.html#name-instance_method" title="MarathonDeploy::Environment#name (method)">#name</a></span>
     <small>MarathonDeploy::Environment</small>
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="MarathonDeploy/MarathonClient.html#options-instance_method" title="MarathonDeploy::MarathonClient#options (method)">#options</a></span>
     <small>MarathonDeploy::MarathonClient</small>
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="MarathonDeploy/Application.html#overlay_preproduction_settings-instance_method" title="MarathonDeploy::Application#overlay_preproduction_settings (method)">#overlay_preproduction_settings</a></span>
     <small>MarathonDeploy::Application</small>
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="MarathonDeploy/MarathonDefaults.html#overlay_preproduction_settings-class_method" title="MarathonDeploy::MarathonDefaults.overlay_preproduction_settings (method)">overlay_preproduction_settings</a></span>
     <small>MarathonDeploy::MarathonDefaults</small>
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="MarathonDeploy/HttpUtil.html#post-class_method" title="MarathonDeploy::HttpUtil.post (method)">post</a></span>
     <small>MarathonDeploy::HttpUtil</small>
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="MarathonDeploy/HttpUtil.html#print-class_method" title="MarathonDeploy::HttpUtil.print (method)">print</a></span>
     <small>MarathonDeploy::HttpUtil</small>
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="MarathonDeploy/Macro.html#process_macros-class_method" title="MarathonDeploy::Macro.process_macros (method)">process_macros</a></span>
     <small>MarathonDeploy::Macro</small>
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="MarathonDeploy/HttpUtil.html#put-class_method" title="MarathonDeploy::HttpUtil.put (method)">put</a></span>
     <small>MarathonDeploy::HttpUtil</small>
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="MarathonDeploy/Utils.html#random-class_method" title="MarathonDeploy::Utils.random (method)">random</a></span>
     <small>MarathonDeploy::Utils</small>
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="MarathonDeploy/YamlJson.html#read_json-class_method" title="MarathonDeploy::YamlJson.read_json (method)">read_json</a></span>
     <small>MarathonDeploy::YamlJson</small>
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="MarathonDeploy/YamlJson.html#read_json_w_macros-class_method" title="MarathonDeploy::YamlJson.read_json_w_macros (method)">read_json_w_macros</a></span>
     <small>MarathonDeploy::YamlJson</small>
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="MarathonDeploy/Utils.html#response_body-class_method" title="MarathonDeploy::Utils.response_body (method)">response_body</a></span>
     <small>MarathonDeploy::Utils</small>
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="MarathonDeploy/Deployment.html#rolling_restart-instance_method" title="MarathonDeploy::Deployment#rolling_restart (method)">#rolling_restart</a></span>
     <small>MarathonDeploy::Deployment</small>
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="MarathonDeploy/Utils.html#symbolize-class_method" title="MarathonDeploy::Utils.symbolize (method)">symbolize</a></span>
     <small>MarathonDeploy::Utils</small>
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="MarathonDeploy/Deployment.html#timeout-instance_method" title="MarathonDeploy::Deployment#timeout (method)">#timeout</a></span>
     <small>MarathonDeploy::Deployment</small>
   </li>
   
 
-  <li class="r1 ">
-    <span class='object_link'><a href="MarathonDeploy/Environment.html#to_s-instance_method" title="MarathonDeploy::Environment#to_s (method)">#to_s</a></span>
-    <small>MarathonDeploy::Environment</small>
-  </li>
-  
-
   <li class="r2 ">
     <span class='object_link'><a href="MarathonDeploy/Application.html#to_s-instance_method" title="MarathonDeploy::Application#to_s (method)">#to_s</a></span>
     <small>MarathonDeploy::Application</small>
@@ -340,48 +328,54 @@
   
 
   <li class="r1 ">
+    <span class='object_link'><a href="MarathonDeploy/Environment.html#to_s-instance_method" title="MarathonDeploy::Environment#to_s (method)">#to_s</a></span>
+    <small>MarathonDeploy::Environment</small>
+  </li>
+  
+
+  <li class="r2 ">
     <span class='object_link'><a href="MarathonDeploy/Deployment.html#update_app-instance_method" title="MarathonDeploy::Deployment#update_app (method)">#update_app</a></span>
     <small>MarathonDeploy::Deployment</small>
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="MarathonDeploy/Deployment.html#url-instance_method" title="MarathonDeploy::Deployment#url (method)">#url</a></span>
     <small>MarathonDeploy::Deployment</small>
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="MarathonDeploy/HttpUtil.html#valid_url-class_method" title="MarathonDeploy::HttpUtil.valid_url (method)">valid_url</a></span>
     <small>MarathonDeploy::HttpUtil</small>
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="MarathonDeploy/Deployment.html#versions-instance_method" title="MarathonDeploy::Deployment#versions (method)">#versions</a></span>
     <small>MarathonDeploy::Deployment</small>
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="MarathonDeploy/Deployment.html#wait_for_application-instance_method" title="MarathonDeploy::Deployment#wait_for_application (method)">#wait_for_application</a></span>
     <small>MarathonDeploy::Deployment</small>
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="MarathonDeploy/Deployment.html#wait_for_deployment_id-instance_method" title="MarathonDeploy::Deployment#wait_for_deployment_id (method)">#wait_for_deployment_id</a></span>
     <small>MarathonDeploy::Deployment</small>
   </li>
   
 
-  <li class="r1 ">
+  <li class="r2 ">
     <span class='object_link'><a href="MarathonDeploy/Deployment.html#wait_until_healthy-instance_method" title="MarathonDeploy::Deployment#wait_until_healthy (method)">#wait_until_healthy</a></span>
     <small>MarathonDeploy::Deployment</small>
   </li>
   
 
-  <li class="r2 ">
+  <li class="r1 ">
     <span class='object_link'><a href="MarathonDeploy/YamlJson.html#yaml2json-class_method" title="MarathonDeploy::YamlJson.yaml2json (method)">yaml2json</a></span>
     <small>MarathonDeploy::YamlJson</small>
   </li>

data/doc/top-level-namespace.html

@@ -103,7 +103,7 @@
 </div>
 
     <div id="footer">
-  Generated on Thu Aug  6 12:50:37 2015 by
+  Generated on Mon Aug 10 12:48:05 2015 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.6 (ruby-2.2.0).
 </div>

data/lib/marathon_deploy/application.rb

@@ -53,8 +53,8 @@ module MarathonDeploy
     add_identifier if (options[:force])
       
     inject_envs = ENV.select { |k,v| /^#{MarathonDeploy::MarathonDefaults::ENVIRONMENT_VARIABLE_PREFIX}/.match(k)  }
-    cleaned_envs = inject_envs.map { |k,v| [k.gsub(/^#{MarathonDeploy::MarathonDefaults::ENVIRONMENT_VARIABLE_PREFIX}/,''), v ] }    
-    self.add_envs cleaned_envs.to_h unless cleaned_envs.nil?
+    cleaned_envs = Hash[inject_envs.map { |k,v| [k.gsub(/^#{MarathonDeploy::MarathonDefaults::ENVIRONMENT_VARIABLE_PREFIX}/,''), v ] }]   
+    self.add_envs cleaned_envs.to_h unless cleaned_envs.empty?
   end
   
   def overlay_preproduction_settings
@@ -71,6 +71,7 @@ module MarathonDeploy
     return JSON.pretty_generate(@json)
   end
   
+  # @return [JSON] list of ENV variables for this application 
   def env
     @json[:env]
   end

data/lib/marathon_deploy/version.rb

@@ -1,3 +1,3 @@
 module MarathonDeploy
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marathon_deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Jonathan Colby
@@ -206,3 +206,4 @@ test_files:
 - test/fixtures/deploy.json
 - test/fixtures/deploy.yml
 - test/test_helper.rb
+has_rdoc: