marathon-api 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6f544d86ac002272d9ca88120d08ac5f962dcdf
-  data.tar.gz: b162427fda27112cf9c3ff72963e281aa54d8705
+  metadata.gz: cca83ebf910b41b549cd509b78dc7bd90d122d16
+  data.tar.gz: 6a38ec82298d05d1268359ec8e6aa952f3ba3ae9
 SHA512:
-  metadata.gz: cb2b6db99259b821d7ee0705fc0d5747fcfd385f02bbdde2c1761438ac28ceecce32b5e0c8b1f703834ce51a096c9b851735fed10ad7d0a5f1b61afec5c2e4f3
-  data.tar.gz: 9348d26af73d194b4176be16be50c55963cc0d2cca9d544189e1ddf17d014486c96eed30c92c4c6b340f805836382f499876a6998708f7a957debf970ab6ffec
+  metadata.gz: 4bee9d73f899e086fb3135ed861ebfad0aa6963ec7403a63ce4ad1eab9c8d18fd60d35676e2b1b1d99b3fae1b78430db27d24e827dad575a210000198d74cae7
+  data.tar.gz: e80bbe801c925548ad41a970911d39d55777c11823ff6f961c4cb93b65e6c1198fdb34c1caa25b5a7d26770bc0549613721df3c270703656a8c5c14c1936e501

data/bin/marathon

@@ -56,10 +56,10 @@ def subcmd_start(cmd_opts)
   end
   app_opts.merge!(cmd_opts.select { |k,_| ATTRIBUTES.include?(k) and cmd_opts["#{k.id2name}_given".to_sym] })
   if cmd_opts[:env]
-    app_opts[:env] = Hash[cmd_opts[:env].map { |e| e.split('=', 2) }]
+    app_opts[:env] = app_opts.fetch(:env, {}).merge(Hash[cmd_opts[:env].map { |e| e.split('=', 2) }])
   end
   if cmd_opts[:constraints]
-    app_opts[:constraints] = cmd_opts[:constraint].map { |c| c.split(':') }
+    app_opts[:constraints] = app_opts.fetch(:constraints, {}).merge(cmd_opts[:constraint].map { |c| c.split(':') })
   end
   app = Marathon::App.new(app_opts)
   puts "Starting app '#{app}'"
@@ -140,7 +140,7 @@ Available commands:
 Global options:
 EOS
 
-    opt :url, 'Marathon host (default http://localhost:8080, or MARATHON_HOST)',
+    opt :url, 'Marathon host (default http://localhost:8080, or MARATHON_URL)',
       :short => '-M', :type => String
     opt :username, 'User name to authenticate against Marathon (optional, default unset, or MARATHON_USER).',
       :short => '-U', :type => String

data/lib/marathon/version.rb

@@ -1,3 +1,3 @@
 module Marathon
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marathon-api
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Felix Bechstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json