marathon-api 1.2.1 → 1.2.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/bin/marathon +3 -3
- data/lib/marathon/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: cca83ebf910b41b549cd509b78dc7bd90d122d16
|
|
4
|
+
data.tar.gz: 6a38ec82298d05d1268359ec8e6aa952f3ba3ae9
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 4bee9d73f899e086fb3135ed861ebfad0aa6963ec7403a63ce4ad1eab9c8d18fd60d35676e2b1b1d99b3fae1b78430db27d24e827dad575a210000198d74cae7
|
|
7
|
+
data.tar.gz: e80bbe801c925548ad41a970911d39d55777c11823ff6f961c4cb93b65e6c1198fdb34c1caa25b5a7d26770bc0549613721df3c270703656a8c5c14c1936e501
|
data/bin/marathon
CHANGED
|
@@ -56,10 +56,10 @@ def subcmd_start(cmd_opts)
|
|
|
56
56
|
end
|
|
57
57
|
app_opts.merge!(cmd_opts.select { |k,_| ATTRIBUTES.include?(k) and cmd_opts["#{k.id2name}_given".to_sym] })
|
|
58
58
|
if cmd_opts[:env]
|
|
59
|
-
app_opts[:env] = Hash[cmd_opts[:env].map { |e| e.split('=', 2) }]
|
|
59
|
+
app_opts[:env] = app_opts.fetch(:env, {}).merge(Hash[cmd_opts[:env].map { |e| e.split('=', 2) }])
|
|
60
60
|
end
|
|
61
61
|
if cmd_opts[:constraints]
|
|
62
|
-
app_opts[:constraints] = cmd_opts[:constraint].map { |c| c.split(':') }
|
|
62
|
+
app_opts[:constraints] = app_opts.fetch(:constraints, {}).merge(cmd_opts[:constraint].map { |c| c.split(':') })
|
|
63
63
|
end
|
|
64
64
|
app = Marathon::App.new(app_opts)
|
|
65
65
|
puts "Starting app '#{app}'"
|
|
@@ -140,7 +140,7 @@ Available commands:
|
|
|
140
140
|
Global options:
|
|
141
141
|
EOS
|
|
142
142
|
|
|
143
|
-
opt :url, 'Marathon host (default http://localhost:8080, or
|
|
143
|
+
opt :url, 'Marathon host (default http://localhost:8080, or MARATHON_URL)',
|
|
144
144
|
:short => '-M', :type => String
|
|
145
145
|
opt :username, 'User name to authenticate against Marathon (optional, default unset, or MARATHON_USER).',
|
|
146
146
|
:short => '-U', :type => String
|
data/lib/marathon/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: marathon-api
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.2.
|
|
4
|
+
version: 1.2.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Felix Bechstein
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-03-
|
|
11
|
+
date: 2015-03-24 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: json
|