rhc 0.90.6 → 0.90.7
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.
- data/Rakefile +9 -4
- data/ext/mkrf_conf.rb +0 -7
- data/lib/rhc-common.rb +1 -2
- metadata +31 -17
data/Rakefile
CHANGED
|
@@ -26,13 +26,18 @@ spec = Gem::Specification.new do |s|
|
|
|
26
26
|
s.files = FileList['lib/**/*.rb', 'lib/rhc', 'bin/*', 'conf/*'].to_a
|
|
27
27
|
s.files += %w(LICENSE COPYRIGHT README Rakefile)
|
|
28
28
|
s.executables = ['rhc', 'rhc-domain', 'rhc-app', 'rhc-sshkey', 'rhc-chk', 'rhc-create-app', 'rhc-create-domain', 'rhc-ctl-domain', 'rhc-ctl-app', 'rhc-snapshot', 'rhc-domain-info', 'rhc-user-info', 'rhc-tail-files', 'rhc-port-forward']
|
|
29
|
+
begin
|
|
30
|
+
# Use Ruby version to target F13, RHEL5, Windows and OSX (assume no Xcode)
|
|
31
|
+
if ENV['JSON_PURE'] or (RUBY_VERSION == "1.8.6" or RUBY_PLATFORM =~ /mswin/ or RUBY_PLATFORM =~ /darwin/)
|
|
32
|
+
s.add_dependency('json_pure')
|
|
33
|
+
else
|
|
34
|
+
s.add_dependency('json')
|
|
35
|
+
end
|
|
36
|
+
end
|
|
29
37
|
s.add_dependency('parseconfig')
|
|
30
38
|
s.add_dependency('rhc-rest', ">= 0.0.11")
|
|
31
39
|
|
|
32
|
-
|
|
33
|
-
# Adding install time dependencies for
|
|
34
|
-
# - test-unit (Ruby 1.9)
|
|
35
|
-
# - json_pure (Ruby (Ruby 1.8.6, Windows, Mac) / json (everything else)
|
|
40
|
+
# This should only affect 1.9 rubies, since it's already included in 1.8
|
|
36
41
|
# http://en.wikibooks.org/wiki/Ruby_Programming/RubyGems
|
|
37
42
|
s.extensions << 'ext/mkrf_conf.rb'
|
|
38
43
|
end
|
data/ext/mkrf_conf.rb
CHANGED
|
@@ -10,13 +10,6 @@ begin
|
|
|
10
10
|
if RUBY_VERSION > "1.9"
|
|
11
11
|
inst.install "test-unit"
|
|
12
12
|
end
|
|
13
|
-
|
|
14
|
-
if ENV['JSON_PURE'] or (RUBY_VERSION == "1.8.6" or RUBY_PLATFORM =~ /mswin/ or RUBY_PLATFORM =~ /darwin/)
|
|
15
|
-
inst.install('json_pure')
|
|
16
|
-
else
|
|
17
|
-
inst.install('json')
|
|
18
|
-
end
|
|
19
|
-
|
|
20
13
|
rescue
|
|
21
14
|
exit(1)
|
|
22
15
|
end
|
data/lib/rhc-common.rb
CHANGED
|
@@ -279,7 +279,6 @@ module RHC
|
|
|
279
279
|
req.set_form_data({'json_data' => json_data, 'password' => password})
|
|
280
280
|
http = http.new(url.host, url.port)
|
|
281
281
|
http.open_timeout = @mytimeout
|
|
282
|
-
http.read_timeout = @mytimeout
|
|
283
282
|
if url.scheme == "https"
|
|
284
283
|
http.use_ssl = true
|
|
285
284
|
http.verify_mode = OpenSSL::SSL::VERIFY_NONE
|
|
@@ -445,7 +444,7 @@ module RHC
|
|
|
445
444
|
rescue Rhc::Rest::ValidationException => e
|
|
446
445
|
print_response_err(Struct::FakeResponse.new(e.message,406))
|
|
447
446
|
rescue Rhc::Rest::ServerErrorException => e
|
|
448
|
-
if e.message =~ /^Failed to create application
|
|
447
|
+
if e.message =~ /^Failed to create application testscale due to:Scalable app cannot be of type/
|
|
449
448
|
puts "Can not create a scaling app of type #{app_type}, either disable scaling or choose another app type"
|
|
450
449
|
exit 1
|
|
451
450
|
else
|
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:
|
|
4
|
+
hash: 377
|
|
5
5
|
prerelease:
|
|
6
6
|
segments:
|
|
7
7
|
- 0
|
|
8
8
|
- 90
|
|
9
|
-
-
|
|
10
|
-
version: 0.90.
|
|
9
|
+
- 7
|
|
10
|
+
version: 0.90.7
|
|
11
11
|
platform: ruby
|
|
12
12
|
authors:
|
|
13
13
|
- Red Hat
|
|
@@ -15,10 +15,10 @@ autorequire:
|
|
|
15
15
|
bindir: bin
|
|
16
16
|
cert_chain: []
|
|
17
17
|
|
|
18
|
-
date: 2012-04-
|
|
18
|
+
date: 2012-04-18 00:00:00 Z
|
|
19
19
|
dependencies:
|
|
20
20
|
- !ruby/object:Gem::Dependency
|
|
21
|
-
name:
|
|
21
|
+
name: json_pure
|
|
22
22
|
prerelease: false
|
|
23
23
|
requirement: &id001 !ruby/object:Gem::Requirement
|
|
24
24
|
none: false
|
|
@@ -32,9 +32,23 @@ dependencies:
|
|
|
32
32
|
type: :runtime
|
|
33
33
|
version_requirements: *id001
|
|
34
34
|
- !ruby/object:Gem::Dependency
|
|
35
|
-
name:
|
|
35
|
+
name: parseconfig
|
|
36
36
|
prerelease: false
|
|
37
37
|
requirement: &id002 !ruby/object:Gem::Requirement
|
|
38
|
+
none: false
|
|
39
|
+
requirements:
|
|
40
|
+
- - ">="
|
|
41
|
+
- !ruby/object:Gem::Version
|
|
42
|
+
hash: 3
|
|
43
|
+
segments:
|
|
44
|
+
- 0
|
|
45
|
+
version: "0"
|
|
46
|
+
type: :runtime
|
|
47
|
+
version_requirements: *id002
|
|
48
|
+
- !ruby/object:Gem::Dependency
|
|
49
|
+
name: rhc-rest
|
|
50
|
+
prerelease: false
|
|
51
|
+
requirement: &id003 !ruby/object:Gem::Requirement
|
|
38
52
|
none: false
|
|
39
53
|
requirements:
|
|
40
54
|
- - ">="
|
|
@@ -46,7 +60,7 @@ dependencies:
|
|
|
46
60
|
- 11
|
|
47
61
|
version: 0.0.11
|
|
48
62
|
type: :runtime
|
|
49
|
-
version_requirements: *
|
|
63
|
+
version_requirements: *id003
|
|
50
64
|
description: The client tools for the OpenShift Express platform that allow for application management.
|
|
51
65
|
email: openshift@redhat.com
|
|
52
66
|
executables:
|
|
@@ -71,20 +85,20 @@ extra_rdoc_files: []
|
|
|
71
85
|
files:
|
|
72
86
|
- lib/rhc-common.rb
|
|
73
87
|
- lib/rhc
|
|
74
|
-
- bin/rhc-ctl-domain
|
|
75
|
-
- bin/rhc-port-forward
|
|
76
88
|
- bin/rhc-ctl-app
|
|
77
|
-
- bin/rhc-tail-files
|
|
78
|
-
- bin/rhc-user-info
|
|
79
|
-
- bin/rhc-snapshot
|
|
80
|
-
- bin/rhc-domain-info
|
|
81
|
-
- bin/rhc-chk
|
|
82
|
-
- bin/rhc-domain
|
|
83
|
-
- bin/rhc-create-app
|
|
84
|
-
- bin/rhc
|
|
85
89
|
- bin/rhc-app
|
|
90
|
+
- bin/rhc-create-app
|
|
91
|
+
- bin/rhc-domain
|
|
92
|
+
- bin/rhc-chk
|
|
86
93
|
- bin/rhc-create-domain
|
|
94
|
+
- bin/rhc-domain-info
|
|
95
|
+
- bin/rhc
|
|
96
|
+
- bin/rhc-user-info
|
|
87
97
|
- bin/rhc-sshkey
|
|
98
|
+
- bin/rhc-port-forward
|
|
99
|
+
- bin/rhc-snapshot
|
|
100
|
+
- bin/rhc-tail-files
|
|
101
|
+
- bin/rhc-ctl-domain
|
|
88
102
|
- conf/express.conf
|
|
89
103
|
- LICENSE
|
|
90
104
|
- COPYRIGHT
|