vmc 0.4.0.beta.3 → 0.4.0.beta.5

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.
@@ -36,7 +36,7 @@ module VMC
36
36
  desc "push [NAME]", "Push an application, syncing changes if it exists"
37
37
  group :apps, :manage
38
38
  flag(:name) { ask("Name") }
39
- flag(:path, :default => ".")
39
+ flag(:path)
40
40
  flag(:url) { |name, target|
41
41
  ask("URL", :default => "#{name}.#{target}")
42
42
  }
@@ -69,7 +69,7 @@ module VMC
69
69
  ask "Bind other services to application?", :default => false
70
70
  }
71
71
  def push(name = nil)
72
- path = File.expand_path(input(:path))
72
+ path = File.expand_path(input(:path) || ".")
73
73
 
74
74
  name ||= input(:name)
75
75
 
@@ -90,19 +90,20 @@ module VMC
90
90
  domain = client.target.sub(/^https?:\/\/api\.(.+)\/?/, '\1')
91
91
  app.urls = [input(:url, name, domain)]
92
92
 
93
- framework = input(:framework, ["other"] + detected.keys.sort, default)
94
- if framework == "other"
95
- forget(:framework)
93
+ if detected.empty?
96
94
  framework = input(:framework, frameworks.keys.sort, nil)
95
+ else
96
+ framework = input(:framework, ["other"] + detected.keys.sort, default)
97
+ if framework == "other"
98
+ forget(:framework)
99
+ framework = input(:framework, frameworks.keys.sort, nil)
100
+ end
97
101
  end
98
102
 
99
103
  framework_runtimes =
100
- frameworks[framework]["runtimes"].collect do |k|
101
- "#{k["name"]} (#{k["description"]})"
102
- end
104
+ frameworks[framework]["runtimes"].collect { |k| k["name"] }
103
105
 
104
- # TODO: include descriptions
105
- runtime = input(:runtime, framework_runtimes.sort).split.first
106
+ runtime = input(:runtime, framework_runtimes.sort)
106
107
 
107
108
  app.framework = framework
108
109
  app.runtime = runtime
@@ -220,7 +220,7 @@ module VMC
220
220
  end
221
221
 
222
222
  def passed_value(flag)
223
- if (val = options[flag]) && \
223
+ if (val = inputs[flag] || options[flag]) && \
224
224
  !val.is_a?(VMC::Interactive::InteractiveDefault)
225
225
  val
226
226
  end
@@ -1,3 +1,3 @@
1
1
  module VMC
2
- VERSION = "0.4.0.beta.3"
2
+ VERSION = "0.4.0.beta.5"
3
3
  end
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: 62196453
4
+ hash: 62196457
5
5
  prerelease: 6
6
6
  segments:
7
7
  - 0
8
8
  - 4
9
9
  - 0
10
10
  - beta
11
- - 3
12
- version: 0.4.0.beta.3
11
+ - 5
12
+ version: 0.4.0.beta.5
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-06-04 00:00:00 Z
20
+ date: 2012-06-06 00:00:00 Z
21
21
  dependencies:
22
22
  - !ruby/object:Gem::Dependency
23
23
  name: json_pure
@@ -281,14 +281,30 @@ dependencies:
281
281
  requirements:
282
282
  - - ~>
283
283
  - !ruby/object:Gem::Version
284
- hash: 31
284
+ hash: 23
285
285
  segments:
286
286
  - 0
287
- - 1
288
287
  - 2
289
- version: 0.1.2
288
+ - 0
289
+ version: 0.2.0
290
290
  type: :runtime
291
291
  version_requirements: *id016
292
+ - !ruby/object:Gem::Dependency
293
+ name: tunnel-vmc-plugin
294
+ prerelease: false
295
+ requirement: &id017 !ruby/object:Gem::Requirement
296
+ none: false
297
+ requirements:
298
+ - - ~>
299
+ - !ruby/object:Gem::Version
300
+ hash: 27
301
+ segments:
302
+ - 0
303
+ - 1
304
+ - 0
305
+ version: 0.1.0
306
+ type: :runtime
307
+ version_requirements: *id017
292
308
  description:
293
309
  email: support@vmware.com
294
310
  executables: