vmc-IronFoundry 0.3.18 → 0.3.21

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. data/README.md +5 -1
  2. data/lib/cli/commands/user.rb +5 -1
  3. data/lib/cli/console_helper.rb +14 -4
  4. data/lib/cli/frameworks.rb +1 -1
  5. data/lib/cli/version.rb +1 -1
  6. metadata +108 -31
data/README.md CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  The VMware Cloud CLI. This is the command line interface to VMware's Application Platform
4
4
 
5
- _Copyright 2010-2011, VMware, Inc. Licensed under the
5
+ _Copyright 2010-2012, VMware, Inc. Licensed under the
6
6
  MIT license, please see the LICENSE file. All rights reserved._
7
7
 
8
8
  Usage: vmc [options] command [<args>] [command_options]
@@ -100,3 +100,7 @@ MIT license, please see the LICENSE file. All rights reserved._
100
100
  vmc login
101
101
  bundle package
102
102
  vmc push
103
+
104
+ ## File a Bug
105
+
106
+ To file a bug against Cloud Foundry Open Source and its components, sign up and use our bug tracking system: [http://cloudfoundry.atlassian.net](http://cloudfoundry.atlassian.net)
data/lib/cli/commands/user.rb CHANGED
@@ -1,3 +1,5 @@
1
+ require "cfoundry"
2
+
1
3
  module VMC::Cli::Command
2
4
 
3
5
  class User < Base
@@ -56,7 +58,9 @@ module VMC::Cli::Command
56
58
  private
57
59
 
58
60
  def login_and_save_token(email, password)
59
- token = client.login(email, password)
61
+ cfoundry = CFoundry::Client.new(client.target)
62
+ cfoundry.trace = VMC::Cli::Config.trace if VMC::Cli::Config.trace
63
+ token = cfoundry.login(:username => email, :password => password)
60
64
  VMC::Cli::Config.store_token(token, @options[:token_file])
61
65
  end
62
66
 
data/lib/cli/console_helper.rb CHANGED
@@ -32,9 +32,20 @@ module VMC::Cli
32
32
 
33
33
  def start_local_console(port, appname)
34
34
  auth_info = console_credentials(appname)
35
- display "Connecting to '#{appname}' console: ", false
35
+ banner = "Connecting to '#{appname}' console: "
36
+ display banner, false
37
+ t = Thread.new do
38
+ count = 0
39
+ while count < 90 do
40
+ display '.', false
41
+ sleep 1
42
+ count += 1
43
+ end
44
+ end
36
45
  prompt = console_login(auth_info, port)
37
- display "OK".green
46
+ Thread.kill(t)
47
+ clear(80)
48
+ display "#{banner}#{'OK'.green}"
38
49
  display "\n"
39
50
  initialize_readline
40
51
  run_console prompt
@@ -47,7 +58,7 @@ module VMC::Cli
47
58
  @telnet_client = telnet_client(port)
48
59
  prompt = nil
49
60
  err_msg = "Login attempt timed out."
50
- 5.times do
61
+ 3.times do
51
62
  begin
52
63
  results = @telnet_client.login("Name"=>auth_info["username"],
53
64
  "Password"=>auth_info["password"])
@@ -67,7 +78,6 @@ module VMC::Cli
67
78
  sleep 5
68
79
  @telnet_client = telnet_client(port)
69
80
  end
70
- display ".", false
71
81
  end
72
82
  unless prompt
73
83
  close_console
data/lib/cli/frameworks.rb CHANGED
@@ -87,7 +87,7 @@ module VMC::Cli
87
87
  next if matched_file
88
88
  File.open(fname, 'r') do |f|
89
89
  str = f.read # This might want to be limited
90
- matched_file = fname if (str && str.match(/^\s*require[\s\(]*['"]sinatra['"]/))
90
+ matched_file = fname if (str && str.match(/^\s*require[\s\(]*['"]sinatra(\/base)?['"]/))
91
91
  end
92
92
  end
93
93
  if matched_file
data/lib/cli/version.rb CHANGED
@@ -2,6 +2,6 @@ module VMC
2
2
  module Cli
3
3
  # This version number is used as the RubyGem release version.
4
4
  # The internal VMC version number is VMC::VERSION.
5
- VERSION = '0.3.18'
5
+ VERSION = '0.3.21'
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,19 +1,20 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vmc-IronFoundry
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.18
4
+ version: 0.3.21
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
8
- - VMware / Iron Foundry
8
+ - VMware
9
+ - Iron Foundry
9
10
  autorequire:
10
11
  bindir: bin
11
12
  cert_chain: []
12
- date: 2012-06-01 00:00:00.000000000 Z
13
+ date: 2012-09-20 00:00:00.000000000 Z
13
14
  dependencies:
14
15
  - !ruby/object:Gem::Dependency
15
16
  name: json_pure
16
- requirement: &22424532 !ruby/object:Gem::Requirement
17
+ requirement: !ruby/object:Gem::Requirement
17
18
  none: false
18
19
  requirements:
19
20
  - - ! '>='
@@ -24,10 +25,18 @@ dependencies:
24
25
  version: 1.7.0
25
26
  type: :runtime
26
27
  prerelease: false
27
- version_requirements: *22424532
28
+ version_requirements: !ruby/object:Gem::Requirement
29
+ none: false
30
+ requirements:
31
+ - - ! '>='
32
+ - !ruby/object:Gem::Version
33
+ version: 1.5.1
34
+ - - <
35
+ - !ruby/object:Gem::Version
36
+ version: 1.7.0
28
37
  - !ruby/object:Gem::Dependency
29
38
  name: rubyzip
30
- requirement: &22424004 !ruby/object:Gem::Requirement
39
+ requirement: !ruby/object:Gem::Requirement
31
40
  none: false
32
41
  requirements:
33
42
  - - ~>
@@ -35,10 +44,15 @@ dependencies:
35
44
  version: 0.9.4
36
45
  type: :runtime
37
46
  prerelease: false
38
- version_requirements: *22424004
47
+ version_requirements: !ruby/object:Gem::Requirement
48
+ none: false
49
+ requirements:
50
+ - - ~>
51
+ - !ruby/object:Gem::Version
52
+ version: 0.9.4
39
53
  - !ruby/object:Gem::Dependency
40
54
  name: rest-client
41
- requirement: &22423608 !ruby/object:Gem::Requirement
55
+ requirement: !ruby/object:Gem::Requirement
42
56
  none: false
43
57
  requirements:
44
58
  - - ! '>='
@@ -49,10 +63,18 @@ dependencies:
49
63
  version: 1.7.0
50
64
  type: :runtime
51
65
  prerelease: false
52
- version_requirements: *22423608
66
+ version_requirements: !ruby/object:Gem::Requirement
67
+ none: false
68
+ requirements:
69
+ - - ! '>='
70
+ - !ruby/object:Gem::Version
71
+ version: 1.6.1
72
+ - - <
73
+ - !ruby/object:Gem::Version
74
+ version: 1.7.0
53
75
  - !ruby/object:Gem::Dependency
54
76
  name: terminal-table
55
- requirement: &22371264 !ruby/object:Gem::Requirement
77
+ requirement: !ruby/object:Gem::Requirement
56
78
  none: false
57
79
  requirements:
58
80
  - - ~>
@@ -60,10 +82,15 @@ dependencies:
60
82
  version: 1.4.2
61
83
  type: :runtime
62
84
  prerelease: false
63
- version_requirements: *22371264
85
+ version_requirements: !ruby/object:Gem::Requirement
86
+ none: false
87
+ requirements:
88
+ - - ~>
89
+ - !ruby/object:Gem::Version
90
+ version: 1.4.2
64
91
  - !ruby/object:Gem::Dependency
65
92
  name: interact
66
- requirement: &22370856 !ruby/object:Gem::Requirement
93
+ requirement: !ruby/object:Gem::Requirement
67
94
  none: false
68
95
  requirements:
69
96
  - - ~>
@@ -71,10 +98,15 @@ dependencies:
71
98
  version: 0.4.0
72
99
  type: :runtime
73
100
  prerelease: false
74
- version_requirements: *22370856
101
+ version_requirements: !ruby/object:Gem::Requirement
102
+ none: false
103
+ requirements:
104
+ - - ~>
105
+ - !ruby/object:Gem::Version
106
+ version: 0.4.0
75
107
  - !ruby/object:Gem::Dependency
76
108
  name: addressable
77
- requirement: &22370352 !ruby/object:Gem::Requirement
109
+ requirement: !ruby/object:Gem::Requirement
78
110
  none: false
79
111
  requirements:
80
112
  - - ~>
@@ -82,10 +114,15 @@ dependencies:
82
114
  version: 2.2.6
83
115
  type: :runtime
84
116
  prerelease: false
85
- version_requirements: *22370352
117
+ version_requirements: !ruby/object:Gem::Requirement
118
+ none: false
119
+ requirements:
120
+ - - ~>
121
+ - !ruby/object:Gem::Version
122
+ version: 2.2.6
86
123
  - !ruby/object:Gem::Dependency
87
124
  name: uuidtools
88
- requirement: &22369776 !ruby/object:Gem::Requirement
125
+ requirement: !ruby/object:Gem::Requirement
89
126
  none: false
90
127
  requirements:
91
128
  - - ~>
@@ -93,21 +130,47 @@ dependencies:
93
130
  version: 2.1.0
94
131
  type: :runtime
95
132
  prerelease: false
96
- version_requirements: *22369776
133
+ version_requirements: !ruby/object:Gem::Requirement
134
+ none: false
135
+ requirements:
136
+ - - ~>
137
+ - !ruby/object:Gem::Version
138
+ version: 2.1.0
97
139
  - !ruby/object:Gem::Dependency
98
140
  name: rb-readline
99
- requirement: &22369392 !ruby/object:Gem::Requirement
141
+ requirement: !ruby/object:Gem::Requirement
142
+ none: false
143
+ requirements:
144
+ - - ~>
145
+ - !ruby/object:Gem::Version
146
+ version: 0.4.2
147
+ type: :runtime
148
+ prerelease: false
149
+ version_requirements: !ruby/object:Gem::Requirement
100
150
  none: false
101
151
  requirements:
102
152
  - - ~>
103
153
  - !ruby/object:Gem::Version
104
154
  version: 0.4.2
155
+ - !ruby/object:Gem::Dependency
156
+ name: cfoundry-IronFoundry
157
+ requirement: !ruby/object:Gem::Requirement
158
+ none: false
159
+ requirements:
160
+ - - ~>
161
+ - !ruby/object:Gem::Version
162
+ version: 0.3.34
105
163
  type: :runtime
106
164
  prerelease: false
107
- version_requirements: *22369392
165
+ version_requirements: !ruby/object:Gem::Requirement
166
+ none: false
167
+ requirements:
168
+ - - ~>
169
+ - !ruby/object:Gem::Version
170
+ version: 0.3.34
108
171
  - !ruby/object:Gem::Dependency
109
172
  name: rake
110
- requirement: &22369068 !ruby/object:Gem::Requirement
173
+ requirement: !ruby/object:Gem::Requirement
111
174
  none: false
112
175
  requirements:
113
176
  - - ! '>='
@@ -115,10 +178,15 @@ dependencies:
115
178
  version: '0'
116
179
  type: :development
117
180
  prerelease: false
118
- version_requirements: *22369068
181
+ version_requirements: !ruby/object:Gem::Requirement
182
+ none: false
183
+ requirements:
184
+ - - ! '>='
185
+ - !ruby/object:Gem::Version
186
+ version: '0'
119
187
  - !ruby/object:Gem::Dependency
120
188
  name: rspec
121
- requirement: &22368528 !ruby/object:Gem::Requirement
189
+ requirement: !ruby/object:Gem::Requirement
122
190
  none: false
123
191
  requirements:
124
192
  - - ~>
@@ -126,10 +194,15 @@ dependencies:
126
194
  version: 1.3.0
127
195
  type: :development
128
196
  prerelease: false
129
- version_requirements: *22368528
197
+ version_requirements: !ruby/object:Gem::Requirement
198
+ none: false
199
+ requirements:
200
+ - - ~>
201
+ - !ruby/object:Gem::Version
202
+ version: 1.3.0
130
203
  - !ruby/object:Gem::Dependency
131
204
  name: webmock
132
- requirement: &22368048 !ruby/object:Gem::Requirement
205
+ requirement: !ruby/object:Gem::Requirement
133
206
  none: false
134
207
  requirements:
135
208
  - - ~>
@@ -137,9 +210,14 @@ dependencies:
137
210
  version: 1.5.0
138
211
  type: :development
139
212
  prerelease: false
140
- version_requirements: *22368048
141
- description: Client library and CLI that provides access to the VMware Cloud Application
142
- Platform.
213
+ version_requirements: !ruby/object:Gem::Requirement
214
+ none: false
215
+ requirements:
216
+ - - ~>
217
+ - !ruby/object:Gem::Version
218
+ version: 1.5.0
219
+ description: ! "\n Client library and CLI that provides access to the VMware Cloud
220
+ Application Platform.\n "
143
221
  email: help@ironfoundry.org
144
222
  executables:
145
223
  - vmc
@@ -189,8 +267,7 @@ files:
189
267
  - caldecott_helper/Gemfile
190
268
  - caldecott_helper/Gemfile.lock
191
269
  - caldecott_helper/server.rb
192
- - !binary |-
193
- YmluL3ZtYw==
270
+ - bin/vmc
194
271
  homepage: http://www.ironfoundry.org
195
272
  licenses: []
196
273
  post_install_message:
@@ -210,8 +287,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
210
287
  - !ruby/object:Gem::Version
211
288
  version: '0'
212
289
  requirements: []
213
- rubyforge_project:
214
- rubygems_version: 1.8.16
290
+ rubyforge_project: vmc-IronFoundry
291
+ rubygems_version: 1.8.23
215
292
  signing_key:
216
293
  specification_version: 3
217
294
  summary: Client library and CLI that provides access to the VMware Cloud Application