rhc 0.90.6 → 0.90.7

data/Rakefile

@@ -26,13 +26,18 @@ spec = Gem::Specification.new do |s|
     s.files = FileList['lib/**/*.rb', 'lib/rhc', 'bin/*', 'conf/*'].to_a
     s.files += %w(LICENSE COPYRIGHT README Rakefile)
     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']
+    begin
+    # Use Ruby version to target F13, RHEL5, Windows and OSX (assume no Xcode)
+    if ENV['JSON_PURE'] or (RUBY_VERSION == "1.8.6" or RUBY_PLATFORM =~ /mswin/ or RUBY_PLATFORM =~ /darwin/)
+        s.add_dependency('json_pure')
+    else
+        s.add_dependency('json')
+    end
+    end
     s.add_dependency('parseconfig')
     s.add_dependency('rhc-rest', ">= 0.0.11")
 
-
-    # Adding install time dependencies for
-    #   - test-unit (Ruby 1.9)
-    #   - json_pure (Ruby (Ruby 1.8.6, Windows, Mac) / json (everything else)
+    # This should only affect 1.9 rubies, since it's already included in 1.8
     # http://en.wikibooks.org/wiki/Ruby_Programming/RubyGems
     s.extensions << 'ext/mkrf_conf.rb'
 end

data/ext/mkrf_conf.rb

@@ -10,13 +10,6 @@ begin
   if RUBY_VERSION > "1.9"
     inst.install "test-unit"
   end
-
-  if ENV['JSON_PURE'] or (RUBY_VERSION == "1.8.6" or RUBY_PLATFORM =~ /mswin/ or RUBY_PLATFORM =~ /darwin/)
-    inst.install('json_pure')
-  else
-    inst.install('json')
-  end
-
 rescue
   exit(1)
 end 

data/lib/rhc-common.rb

@@ -279,7 +279,6 @@ module RHC
     req.set_form_data({'json_data' => json_data, 'password' => password})
     http = http.new(url.host, url.port)
     http.open_timeout = @mytimeout
-    http.read_timeout = @mytimeout
     if url.scheme == "https"
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE
@@ -445,7 +444,7 @@ module RHC
       rescue Rhc::Rest::ValidationException => e
         print_response_err(Struct::FakeResponse.new(e.message,406))
       rescue Rhc::Rest::ServerErrorException => e 
-        if e.message =~ /^Failed to create application .* due to:Scalable app cannot be of type/ 
+        if e.message =~ /^Failed to create application testscale due to:Scalable app cannot be of type/ 
           puts "Can not create a scaling app of type #{app_type}, either disable scaling or choose another app type"
           exit 1
         else

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 379
+  hash: 377
   prerelease: 
   segments: 
   - 0
   - 90
-  - 6
-  version: 0.90.6
+  - 7
+  version: 0.90.7
 platform: ruby
 authors: 
 - Red Hat
@@ -15,10 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-16 00:00:00 Z
+date: 2012-04-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: parseconfig
+  name: json_pure
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -32,9 +32,23 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rhc-rest
+  name: parseconfig
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rhc-rest
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -46,7 +60,7 @@ dependencies:
         - 11
         version: 0.0.11
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 description: The client tools for the OpenShift Express platform that allow for application management.
 email: openshift@redhat.com
 executables: 
@@ -71,20 +85,20 @@ extra_rdoc_files: []
 files: 
 - lib/rhc-common.rb
 - lib/rhc
-- bin/rhc-ctl-domain
-- bin/rhc-port-forward
 - bin/rhc-ctl-app
-- bin/rhc-tail-files
-- bin/rhc-user-info
-- bin/rhc-snapshot
-- bin/rhc-domain-info
-- bin/rhc-chk
-- bin/rhc-domain
-- bin/rhc-create-app
-- bin/rhc
 - bin/rhc-app
+- bin/rhc-create-app
+- bin/rhc-domain
+- bin/rhc-chk
 - bin/rhc-create-domain
+- bin/rhc-domain-info
+- bin/rhc
+- bin/rhc-user-info
 - bin/rhc-sshkey
+- bin/rhc-port-forward
+- bin/rhc-snapshot
+- bin/rhc-tail-files
+- bin/rhc-ctl-domain
 - conf/express.conf
 - LICENSE
 - COPYRIGHT