vmc 0.4.0.beta.74 → 0.4.0.beta.75
Sign up to get free protection for your applications and to get access to all the features.
- data/vmc-ng/lib/vmc/cli/app.rb +2 -5
- data/vmc-ng/lib/vmc/cli.rb +4 -3
- data/vmc-ng/lib/vmc/version.rb +1 -1
- metadata +7 -7
data/vmc-ng/lib/vmc/cli/app.rb
CHANGED
@@ -167,9 +167,6 @@ module VMC
|
|
167
167
|
app.start!
|
168
168
|
end
|
169
169
|
|
170
|
-
# TODO: reenable for v2
|
171
|
-
next if v2?
|
172
|
-
|
173
170
|
check_application(app)
|
174
171
|
|
175
172
|
if app.debug_mode && !quiet?
|
@@ -963,8 +960,6 @@ module VMC
|
|
963
960
|
app.create!
|
964
961
|
end
|
965
962
|
|
966
|
-
invoke :map, :app => app, :url => url if url && v2?
|
967
|
-
|
968
963
|
bindings = []
|
969
964
|
|
970
965
|
if input[:create_services] && !force?
|
@@ -996,6 +991,8 @@ module VMC
|
|
996
991
|
end
|
997
992
|
|
998
993
|
invoke :start, :app => app if input[:start]
|
994
|
+
|
995
|
+
invoke :map, :app => app, :url => url if url && v2?
|
999
996
|
end
|
1000
997
|
|
1001
998
|
def upload_app(app, path)
|
data/vmc-ng/lib/vmc/cli.rb
CHANGED
@@ -78,17 +78,18 @@ module VMC
|
|
78
78
|
line c("Please log in with 'vmc login'.", :warning)
|
79
79
|
line
|
80
80
|
invoke :login
|
81
|
+
invalidate_client
|
81
82
|
end
|
82
83
|
end
|
83
84
|
|
84
85
|
return unless v2?
|
85
86
|
|
86
87
|
unless client.current_organization
|
87
|
-
fail "Please select an organization with 'vmc target -
|
88
|
+
fail "Please select an organization with 'vmc target --ask-org'."
|
88
89
|
end
|
89
90
|
|
90
91
|
unless client.current_space
|
91
|
-
fail "Please select a space with 'vmc target -
|
92
|
+
fail "Please select a space with 'vmc target --ask-space'."
|
92
93
|
end
|
93
94
|
end
|
94
95
|
|
@@ -109,7 +110,7 @@ module VMC
|
|
109
110
|
rescue SystemExit
|
110
111
|
raise
|
111
112
|
rescue CFoundry::Denied => e
|
112
|
-
if !$vmc_asked_auth && e.error_code
|
113
|
+
if !$vmc_asked_auth && [200, 10002].include?(e.error_code)
|
113
114
|
$vmc_asked_auth = true
|
114
115
|
|
115
116
|
line
|
data/vmc-ng/lib/vmc/version.rb
CHANGED
metadata
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: vmc
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 1933729205
|
5
5
|
prerelease: 6
|
6
6
|
segments:
|
7
7
|
- 0
|
8
8
|
- 4
|
9
9
|
- 0
|
10
10
|
- beta
|
11
|
-
-
|
12
|
-
version: 0.4.0.beta.
|
11
|
+
- 75
|
12
|
+
version: 0.4.0.beta.75
|
13
13
|
platform: ruby
|
14
14
|
authors:
|
15
15
|
- VMware
|
@@ -17,7 +17,7 @@ autorequire:
|
|
17
17
|
bindir: bin
|
18
18
|
cert_chain: []
|
19
19
|
|
20
|
-
date: 2012-10-
|
20
|
+
date: 2012-10-29 00:00:00 Z
|
21
21
|
dependencies:
|
22
22
|
- !ruby/object:Gem::Dependency
|
23
23
|
name: json_pure
|
@@ -265,12 +265,12 @@ dependencies:
|
|
265
265
|
requirements:
|
266
266
|
- - ~>
|
267
267
|
- !ruby/object:Gem::Version
|
268
|
-
hash:
|
268
|
+
hash: 119
|
269
269
|
segments:
|
270
270
|
- 0
|
271
271
|
- 3
|
272
|
-
-
|
273
|
-
version: 0.3.
|
272
|
+
- 50
|
273
|
+
version: 0.3.50
|
274
274
|
type: :runtime
|
275
275
|
version_requirements: *id015
|
276
276
|
- !ruby/object:Gem::Dependency
|