rhc 1.38.4 → 1.38.7

Sign up to get free protection for your applications and to get access to all the features.
data/README.md CHANGED
@@ -10,6 +10,10 @@ comments. For more information about OpenShift, visit https://openshift.redhat.
10
10
  or the OpenShift support page
11
11
  https://openshift.redhat.com/support.
12
12
 
13
+ RHC from rubygems.org is built on Ruby 1.8.7. RHC does have conditional
14
+ dependencies during build time, so it can be built on multiple versions of Ruby.
15
+ If you are running into any dependency issues when using RHC, please try to
16
+ build RHC locally using `gem build rhc.gemspec` to use the correct dependencies.
13
17
 
14
18
  ## Using RHC to create an application
15
19
 
@@ -329,7 +329,7 @@ module RHC
329
329
  else
330
330
  $terminal.color(item, *args)
331
331
  end
332
- else
332
+ else
333
333
  item
334
334
  end
335
335
  end
@@ -522,7 +522,15 @@ module RHC
522
522
 
523
523
  # split spaces but preserve sentences between quotes
524
524
  def split_path(s, keep_quotes=false)
525
- keep_quotes ? s.split(/\s(?=(?:[^"]|"[^"]*")*$)/) : CSV::parse_line(s, :col_sep => ' ')
525
+ #:nocov:
526
+ if keep_quotes
527
+ s.split(/\s(?=(?:[^"]|"[^"]*")*$)/)
528
+ elsif RUBY_VERSION.to_f < 1.9
529
+ CSV::parse_line(s, fs = ' ')
530
+ else #ruby 1.9 or newer
531
+ CSV::parse_line(s, :col_sep => ' ')
532
+ end
533
+ #:nocov:
526
534
  end
527
535
 
528
536
  def discover_windows_executables(&block)
@@ -28,7 +28,7 @@ describe RHC::Commands::Ssh do
28
28
  it { expect{ run }.to exit_with_code(0) }
29
29
  end
30
30
  end
31
-
31
+
32
32
  describe 'ssh without command including debugging' do
33
33
  let(:arguments) { ['app', 'ssh', 'app1', '--debug'] }
34
34
 
@@ -173,18 +173,17 @@ describe RHC::Commands::Ssh do
173
173
 
174
174
  describe 'app ssh custom ssh with spaces and arguments' do
175
175
  let(:arguments) { ['app', 'ssh', 'app1', '--ssh', '"/path/to /ssh" --with_custom_flag'] }
176
- context 'when custom ssh does not exist as a path' do
177
- before(:each) do
178
- @domain = rest_client.add_domain("mockdomain")
179
- @domain.add_application("app1", "mock_type")
180
- RHC::Commands::Ssh.any_instance.should_not_receive(:has_ssh?)
181
- File.should_receive(:exist?).at_least(1).and_return(true)
182
- File.should_receive(:executable?).at_least(1).and_return(true)
183
- subject.class.any_instance.stub(:discover_git_executable).and_return('git')
184
- Kernel.should_receive(:exec).with("/path/to /ssh", '--with_custom_flag', "fakeuuidfortestsapp1@127.0.0.1").once.times.and_return(0)
185
- end
186
- it { expect { run }.to exit_with_code(0) }
176
+
177
+ before(:each) do
178
+ @domain = rest_client.add_domain("mockdomain")
179
+ @domain.add_application("app1", "mock_type")
180
+ RHC::Commands::Ssh.any_instance.should_not_receive(:has_ssh?)
181
+ File.should_receive(:exist?).at_least(1).and_return(true)
182
+ File.should_receive(:executable?).at_least(1).and_return(true)
183
+ subject.class.any_instance.stub(:discover_git_executable).and_return('git')
184
+ Kernel.should_receive(:exec).with("/path/to /ssh", "--with_custom_flag", "fakeuuidfortestsapp1@127.0.0.1").once.times.and_return(0)
187
185
  end
186
+ it { expect { run }.to exit_with_code(0) }
188
187
  end
189
188
 
190
189
  describe 'ssh tests' do
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rhc
3
3
  version: !ruby/object:Gem::Version
4
- hash: 135
4
+ hash: 129
5
5
  prerelease:
6
6
  segments:
7
7
  - 1
8
8
  - 38
9
- - 4
10
- version: 1.38.4
9
+ - 7
10
+ version: 1.38.7
11
11
  platform: ruby
12
12
  authors:
13
13
  - Red Hat
@@ -15,28 +15,12 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2015-10-23 00:00:00 Z
18
+ date: 2016-08-01 00:00:00 Z
19
19
  dependencies:
20
- - !ruby/object:Gem::Dependency
21
- name: net-ssh
22
- prerelease: false
23
- requirement: &id001 !ruby/object:Gem::Requirement
24
- none: false
25
- requirements:
26
- - - <=
27
- - !ruby/object:Gem::Version
28
- hash: 47
29
- segments:
30
- - 2
31
- - 9
32
- - 2
33
- version: 2.9.2
34
- type: :runtime
35
- version_requirements: *id001
36
20
  - !ruby/object:Gem::Dependency
37
21
  name: net-scp
38
22
  prerelease: false
39
- requirement: &id002 !ruby/object:Gem::Requirement
23
+ requirement: &id001 !ruby/object:Gem::Requirement
40
24
  none: false
41
25
  requirements:
42
26
  - - ">="
@@ -48,11 +32,11 @@ dependencies:
48
32
  - 2
49
33
  version: 1.1.2
50
34
  type: :runtime
51
- version_requirements: *id002
35
+ version_requirements: *id001
52
36
  - !ruby/object:Gem::Dependency
53
37
  name: net-ssh-multi
54
38
  prerelease: false
55
- requirement: &id003 !ruby/object:Gem::Requirement
39
+ requirement: &id002 !ruby/object:Gem::Requirement
56
40
  none: false
57
41
  requirements:
58
42
  - - ">="
@@ -64,11 +48,11 @@ dependencies:
64
48
  - 0
65
49
  version: 1.2.0
66
50
  type: :runtime
67
- version_requirements: *id003
51
+ version_requirements: *id002
68
52
  - !ruby/object:Gem::Dependency
69
53
  name: archive-tar-minitar
70
54
  prerelease: false
71
- requirement: &id004 !ruby/object:Gem::Requirement
55
+ requirement: &id003 !ruby/object:Gem::Requirement
72
56
  none: false
73
57
  requirements:
74
58
  - - ">="
@@ -78,11 +62,11 @@ dependencies:
78
62
  - 0
79
63
  version: "0"
80
64
  type: :runtime
81
- version_requirements: *id004
65
+ version_requirements: *id003
82
66
  - !ruby/object:Gem::Dependency
83
67
  name: commander
84
68
  prerelease: false
85
- requirement: &id005 !ruby/object:Gem::Requirement
69
+ requirement: &id004 !ruby/object:Gem::Requirement
86
70
  none: false
87
71
  requirements:
88
72
  - - ">="
@@ -101,11 +85,11 @@ dependencies:
101
85
  - 0
102
86
  version: 4.3.0
103
87
  type: :runtime
104
- version_requirements: *id005
88
+ version_requirements: *id004
105
89
  - !ruby/object:Gem::Dependency
106
90
  name: highline
107
91
  prerelease: false
108
- requirement: &id006 !ruby/object:Gem::Requirement
92
+ requirement: &id005 !ruby/object:Gem::Requirement
109
93
  none: false
110
94
  requirements:
111
95
  - - ~>
@@ -117,11 +101,11 @@ dependencies:
117
101
  - 11
118
102
  version: 1.6.11
119
103
  type: :runtime
120
- version_requirements: *id006
104
+ version_requirements: *id005
121
105
  - !ruby/object:Gem::Dependency
122
106
  name: httpclient
123
107
  prerelease: false
124
- requirement: &id007 !ruby/object:Gem::Requirement
108
+ requirement: &id006 !ruby/object:Gem::Requirement
125
109
  none: false
126
110
  requirements:
127
111
  - - ">="
@@ -132,12 +116,20 @@ dependencies:
132
116
  - 4
133
117
  - 0
134
118
  version: 2.4.0
119
+ - - <
120
+ - !ruby/object:Gem::Version
121
+ hash: 19
122
+ segments:
123
+ - 2
124
+ - 7
125
+ - 0
126
+ version: 2.7.0
135
127
  type: :runtime
136
- version_requirements: *id007
128
+ version_requirements: *id006
137
129
  - !ruby/object:Gem::Dependency
138
130
  name: open4
139
131
  prerelease: false
140
- requirement: &id008 !ruby/object:Gem::Requirement
132
+ requirement: &id007 !ruby/object:Gem::Requirement
141
133
  none: false
142
134
  requirements:
143
135
  - - ">="
@@ -147,11 +139,11 @@ dependencies:
147
139
  - 0
148
140
  version: "0"
149
141
  type: :runtime
150
- version_requirements: *id008
142
+ version_requirements: *id007
151
143
  - !ruby/object:Gem::Dependency
152
144
  name: rake
153
145
  prerelease: false
154
- requirement: &id009 !ruby/object:Gem::Requirement
146
+ requirement: &id008 !ruby/object:Gem::Requirement
155
147
  none: false
156
148
  requirements:
157
149
  - - ">="
@@ -163,11 +155,11 @@ dependencies:
163
155
  - 7
164
156
  version: 0.8.7
165
157
  type: :development
166
- version_requirements: *id009
158
+ version_requirements: *id008
167
159
  - !ruby/object:Gem::Dependency
168
160
  name: webmock
169
161
  prerelease: false
170
- requirement: &id010 !ruby/object:Gem::Requirement
162
+ requirement: &id009 !ruby/object:Gem::Requirement
171
163
  none: false
172
164
  requirements:
173
165
  - - <
@@ -178,11 +170,11 @@ dependencies:
178
170
  - 12
179
171
  version: "1.12"
180
172
  type: :development
181
- version_requirements: *id010
173
+ version_requirements: *id009
182
174
  - !ruby/object:Gem::Dependency
183
175
  name: rspec
184
176
  prerelease: false
185
- requirement: &id011 !ruby/object:Gem::Requirement
177
+ requirement: &id010 !ruby/object:Gem::Requirement
186
178
  none: false
187
179
  requirements:
188
180
  - - ">="
@@ -201,11 +193,11 @@ dependencies:
201
193
  - 99
202
194
  version: "2.99"
203
195
  type: :development
204
- version_requirements: *id011
196
+ version_requirements: *id010
205
197
  - !ruby/object:Gem::Dependency
206
198
  name: fakefs
207
199
  prerelease: false
208
- requirement: &id012 !ruby/object:Gem::Requirement
200
+ requirement: &id011 !ruby/object:Gem::Requirement
209
201
  none: false
210
202
  requirements:
211
203
  - - ">="
@@ -224,11 +216,11 @@ dependencies:
224
216
  - 0
225
217
  version: 0.6.0
226
218
  type: :development
227
- version_requirements: *id012
219
+ version_requirements: *id011
228
220
  - !ruby/object:Gem::Dependency
229
221
  name: thor
230
222
  prerelease: false
231
- requirement: &id013 !ruby/object:Gem::Requirement
223
+ requirement: &id012 !ruby/object:Gem::Requirement
232
224
  none: false
233
225
  requirements:
234
226
  - - ">="
@@ -238,25 +230,27 @@ dependencies:
238
230
  - 0
239
231
  version: "0"
240
232
  type: :development
241
- version_requirements: *id013
233
+ version_requirements: *id012
242
234
  - !ruby/object:Gem::Dependency
243
235
  name: cucumber
244
236
  prerelease: false
245
- requirement: &id014 !ruby/object:Gem::Requirement
237
+ requirement: &id013 !ruby/object:Gem::Requirement
246
238
  none: false
247
239
  requirements:
248
- - - ">="
240
+ - - <=
249
241
  - !ruby/object:Gem::Version
250
- hash: 3
242
+ hash: 51
251
243
  segments:
252
- - 0
253
- version: "0"
244
+ - 1
245
+ - 3
246
+ - 20
247
+ version: 1.3.20
254
248
  type: :development
255
- version_requirements: *id014
249
+ version_requirements: *id013
256
250
  - !ruby/object:Gem::Dependency
257
251
  name: activesupport
258
252
  prerelease: false
259
- requirement: &id015 !ruby/object:Gem::Requirement
253
+ requirement: &id014 !ruby/object:Gem::Requirement
260
254
  none: false
261
255
  requirements:
262
256
  - - ~>
@@ -267,7 +261,7 @@ dependencies:
267
261
  - 0
268
262
  version: "3.0"
269
263
  type: :development
270
- version_requirements: *id015
264
+ version_requirements: *id014
271
265
  description: The client tools for the OpenShift platform that allow for application management.
272
266
  email: dev@lists.openshift.redhat.com
273
267
  executables: