rhc 0.90.7 → 0.91.11

data/bin/rhc-domain

@@ -4,7 +4,7 @@ require 'rhc-common'
 #
 # print help
 #
-def p_usage
+def p_usage(exit_code = 255)
     rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "required"
     puts <<USAGE
 
@@ -25,10 +25,10 @@ List of arguments
   -d|--debug                     Print Debug info
   -h|--help                      Show Usage info
   --config          path         Path of alternate config file
-  --timeout         #            Timeout, in seconds, for connection
+  --timeout         #            Timeout, in seconds, for the session
 
 USAGE
-exit 255
+exit exit_code
 end
 
 
@@ -57,8 +57,9 @@ def validate_args(val_namespace=true, val_timeout=true)
   debug = $opt["debug"] ? true : false
   RHC::debug(debug)
   
-  RHC::timeout($opt["timeout"] ? $opt["timeout"] : get_var('timeout')) if val_timeout
-  
+  RHC::timeout($opt["timeout"], get_var('timeout')) if val_timeout
+  RHC::connect_timeout($opt["timeout"], get_var('timeout')) if val_timeout
+
   $password = $opt['password'] ? $opt['password'] : RHC::get_password
 end
 
@@ -299,10 +300,16 @@ begin
     if ARGV[0].to_s.strip.length == 0
       opts = []
     else
-      puts "Missing or invalid command!" unless ARGV[0] =~ /^(help|-h|--help)$/
-      # just exit at this point
-      # printing the usage description will be handled in the rescue
-      exit 255
+      opts = GetoptLong.new(
+        ["--help",  "-h", GetoptLong::NO_ARGUMENT]
+      )
+
+      unless ARGV[0] =~ /^(help|-h|--help)$/
+        puts "Missing or invalid command!" 
+        # just exit at this point
+        # printing the usage description will be handled in the rescue
+        exit 255
+      end
     end
   end
 
@@ -314,7 +321,7 @@ rescue Exception => e
   p_usage
 end
 
-p_usage if $opt["help"]
+p_usage 0 if $opt["help"]
 
 case argv_c[0]
 when "create"

data/bin/rhc-domain-info

@@ -4,7 +4,7 @@ require 'rhc-common'
 #
 # print help
 #
-def p_usage
+def p_usage(error_code = 255)
     rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "required"
     puts <<USAGE
 
@@ -18,10 +18,10 @@ Display information about a user
   -d|--debug                Print Debug info
   -h|--help                 Show Usage info
   --config  path            Path of alternate config file
-  --timeout #               Timeout, in seconds, for connection
+  --timeout #               Timeout, in seconds, for the session
 
 USAGE
-exit 255
+exit error_code
 end
 
 begin
@@ -51,16 +51,16 @@ check_cpath(opt)
 libra_server = get_var('libra_server')
 debug = get_var('debug') == 'false' ? nil : get_var('debug')
 
-if opt["help"] || 0 != ARGV.length
-    p_usage
-end
+p_usage 0 if opt["help"] 
+
+p_usage if 0 != ARGV.length
+
+debug = true if opt["debug"]
 
-if opt["debug"]
-    debug = true
-end
 RHC::debug(debug)
 
-RHC::timeout(opt["timeout"] ? opt["timeout"] : get_var('timeout'))
+RHC::timeout(opt["timeout"], get_var('timeout'))
+RHC::connect_timeout(opt["timeout"], get_var('timeout'))
 
 opt["rhlogin"] = get_var('default_rhlogin') unless opt["rhlogin"]
 

data/bin/rhc-port-forward

@@ -4,7 +4,7 @@ require 'rhc-common'
 #
 # print help
 #
-def p_usage
+def p_usage(exit_code = 255)
     rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "required"
     puts <<USAGE
 
@@ -17,10 +17,10 @@ Forward remote ports to the workstation
   -d|--debug                Print Debug info
   -h|--help                 Show Usage info
   --config  path            Path of alternate config file
-  --timeout #               Timeout, in seconds, for connection
+  --timeout #               Timeout, in seconds, for the session
 
 USAGE
-exit 255
+exit exit_code
 end
 
 begin
@@ -49,16 +49,16 @@ check_cpath(opt)
 libra_server = get_var('libra_server')
 debug = get_var('debug') == 'false' ? nil : get_var('debug')
 
-if opt['help'] || !opt['app'] || 0 != ARGV.length
-    p_usage
-end
+p_usage 0 if opt['help']
+
+p_usage if !opt['app'] || 0 != ARGV.length
+
+debug = true if opt['debug']
 
-if opt['debug']
-    debug = true
-end
 RHC::debug(debug)
 
-RHC::timeout(opt["timeout"] ? opt["timeout"] : get_var('timeout'))
+RHC::timeout(opt["timeout"], get_var('timeout'))
+RHC::connect_timeout(opt["timeout"], get_var('timeout'))
 
 opt['rhlogin'] = get_var('default_rhlogin') unless opt['rhlogin']
 

data/bin/rhc-snapshot

@@ -4,7 +4,7 @@ require 'rhc-common'
 #
 # print help
 #
-def p_usage
+def p_usage(exit_code = 255)
     rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "required"
     puts <<USAGE
 
@@ -19,10 +19,10 @@ Pull down application snapshot for a user
   -d|--debug                Print Debug info
   -h|--help                 Show Usage info
   --config  path            Path of alternate config file
-  --timeout #               Timeout, in seconds, for connection
+  --timeout #               Timeout, in seconds, for the session
 
 USAGE
-exit 255
+exit exit_code
 end
 
 begin
@@ -58,16 +58,16 @@ check_cpath(opt)
 libra_server = get_var('libra_server')
 debug = get_var('debug') == 'false' ? nil : get_var('debug')
 
-if opt["help"] || !opt['app'] || 0 != ARGV.length
-    p_usage
-end
+p_usage 0 if opt["help"]
+
+p_usage if !opt['app'] || 0 != ARGV.length
+
+debug = true if opt["debug"]
 
-if opt["debug"]
-    debug = true
-end
 RHC::debug(debug)
 
-RHC::timeout(opt["timeout"] ? opt["timeout"] : get_var('timeout'))
+RHC::timeout(opt["timeout"], get_var('timeout'))
+RHC::connect_timeout(opt["timeout"], get_var('timeout'))
 
 opt["rhlogin"] = get_var('default_rhlogin') unless opt["rhlogin"]
 

data/bin/rhc-sshkey

@@ -4,7 +4,7 @@ require 'rhc-common'
 #
 # print help
 #
-def p_usage
+def p_usage(exit_code = 255)
     rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "required"
     puts <<USAGE
 
@@ -25,10 +25,10 @@ List of arguments
   -d|--debug                     Print Debug info
   -h|--help                      Show Usage info
   --config          path         Path of alternate config file
-  --timeout         #            Timeout, in seconds, for connection
+  --timeout         #            Timeout, in seconds, for the session
 
 USAGE
-exit 255
+exit exit_code
 end
 
 
@@ -48,7 +48,8 @@ def validate_args(val_id=true)
   
   p_usage if val_id && !RHC::check_key($opt['identifier'])
   
-  RHC::timeout($opt["timeout"] ? $opt["timeout"] : get_var('timeout'))
+  RHC::timeout($opt["timeout"], get_var('timeout'))
+  RHC::connect_timeout($opt["timeout"], get_var('timeout'))
   $password = $opt['password'] ? $opt['password'] : RHC::get_password
 end
 
@@ -163,7 +164,7 @@ end
 
 begin
   argv_c = ARGV.clone
-  
+
   if ARGV[0] =~ /^(add|update)$/
     ARGV.shift
     opts = GetoptLong.new(
@@ -198,12 +199,17 @@ begin
         ["--timeout", GetoptLong::REQUIRED_ARGUMENT]
     )
   else
-    puts "Missing or invalid command!" unless ARGV[0] =~ /^(help|-h|--help)$/
-    # just exit at this point
-    # printing the usage description will be handled in the rescue
-    exit 255
+    opts = GetoptLong.new(
+      ["--help",  "-h", GetoptLong::NO_ARGUMENT]
+    )
+    unless ARGV[0] =~ /^(help|-h|--help)$/
+      puts "Missing or invalid command!"
+      # just exit at this point
+      # printing the usage description will be handled in the rescue
+      exit 255
+    end
   end
-    
+
   $opt = {}
   opts.each do |o, a|
     $opt[o[2..-1]] = a.to_s
@@ -213,7 +219,7 @@ rescue Exception => e
   p_usage
 end
 
-p_usage if $opt["help"]
+p_usage 0 if $opt["help"]
 
 case argv_c[0]
 when "add", "update"
@@ -223,7 +229,7 @@ when "remove"
 when "list", nil
   show_key_list
 when "-h", "--help", "help", nil
-  p_usage
+  p_usage 0
 else
   puts "Invalid command!"
   p_usage

data/bin/rhc-tail-files

@@ -5,7 +5,7 @@ require 'base64'
 #
 # print help
 #
-def p_usage
+def p_usage(exit_code = 255)
     rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "required"
     puts <<USAGE
 
@@ -20,10 +20,10 @@ Tail the logs of an application
   -d|--debug                Print Debug info
   -h|--help                 Show Usage info
   --config  path            Path of alternate config file
-  --timeout #               Timeout, in seconds, for connection
+  --timeout #               Timeout, in seconds, for the session
 
 USAGE
-exit 255
+exit exit_code
 end
 
 begin
@@ -54,16 +54,16 @@ check_cpath(opt)
 libra_server = get_var('libra_server')
 debug = get_var('debug') == 'false' ? nil : get_var('debug')
 
-if opt['help'] || !opt['app'] || 0 != ARGV.length
-    p_usage
-end
+p_usage 0 if opt['help']
+
+p_usage if !opt['app'] || 0 != ARGV.length
+
+debug = true if opt['debug']
 
-if opt['debug']
-    debug = true
-end
 RHC::debug(debug)
 
-RHC::timeout(opt["timeout"] ? opt["timeout"] : get_var('timeout'))
+RHC::timeout(opt["timeout"], get_var('timeout'))
+RHC::connect_timeout(opt["timeout"], get_var('timeout'))
 
 opt['rhlogin'] = get_var('default_rhlogin') unless opt['rhlogin']
 

data/bin/rhc-user-info

@@ -10,8 +10,6 @@ ARGV.each do|a|
 end
 
 system("rhc-domain-info #{args} 2>&1")
-retcode = $?
+retcode = $?.exitstatus
 
-exit 1 if retcode != 0
-
-exit 0
+exit retcode

data/ext/mkrf_conf.rb

@@ -1,19 +1,58 @@
-require 'rubygems'
-require 'rubygems/command.rb'
-require 'rubygems/dependency_installer.rb' 
-begin
-  Gem::Command.build_args = ARGV
-rescue NoMethodError
-end 
-inst = Gem::DependencyInstaller.new
-begin
-  if RUBY_VERSION > "1.9"
-    inst.install "test-unit"
+## Add some testing for when we are building a rpm and when we're not
+msg = ''
+
+unless ENV['RHC_RPMBUILD']
+  require 'rubygems'
+  require 'rubygems/command.rb'
+  require 'rubygems/dependency_installer.rb' 
+  require 'rubygems/uninstaller.rb'
+  begin
+    Gem::Command.build_args = ARGV
+  rescue NoMethodError
+  end 
+  inst = Gem::DependencyInstaller.new
+  begin
+    if RUBY_VERSION > "1.9"
+      inst.install "test-unit"
+    end
+
+    # Attempt native json installation (unless JSON_PURE is specified)
+    #   - fall back to json_pure if it fails
+    #   - Known failure conditions
+    #     - Ubuntu: using ruby and not ruby-dev
+    begin
+      throw if ENV['JSON_PURE']
+      inst.install('json')
+    rescue
+      inst.install('json_pure')
+    end
+
+  rescue
+    exit(1)
+  end 
+
+  # Remove rhc-rest if it's installed
+  begin
+    Gem::Uninstaller.new('rhc-rest').uninstall
+
+    # This only gets printed if verbose is specified 
+    #   TODO: Need to figure out how to get it always shown
+    msg = <<-MSG
+      ===================================================
+        rhc-rest is no longer needed as an external gem
+          - If it is installed, it will be removed
+          - Its libraries are now included in rhc
+            - Any applications requiring rhc-rest will 
+              still function as expected
+      ===================================================
+    MSG
+  rescue Gem::LoadError,Gem::InstallError
+    # This means that rhc-rest was not installed, not a problem
   end
-rescue
-  exit(1)
-end 
+end
 
 f = File.open(File.join(File.dirname(__FILE__), "Rakefile"), "w")   # create dummy rakefile to indicate success
-f.write("task :default\n")
+f.write("task :default do\n")
+f.write("\tputs '%s'\n" % msg) if msg
+f.write("end\n")
 f.close

data/lib/rhc-common.rb

@@ -19,7 +19,8 @@ module RHC
   DEFAULT_DELAY = 2
   API = "1.1.3"
   PATTERN_VERSION=/\A\d+\.\d+\.\d+\z/
-  @mytimeout = 10
+  @read_timeout = 120
+  @connect_timeout = 20
   @mydebug = false
   @@api_version = "?.?.?"
 
@@ -39,12 +40,28 @@ module RHC
     'api' => nil
   }
 
-  def self.timeout(val)
-    if val
-      @mytimeout = val.to_i
-      unless @mytimeout > 0 
-        puts 'Timeout must be specified as a number greater than 0'
-        exit 1
+  def self.timeout(*vals)
+    vals.each do |val|
+      if val
+        unless val.to_i > 0
+          puts 'Timeout must be specified as a number greater than 0'
+          exit 1
+        end
+        @read_timeout = [val.to_i, @read_timeout].max
+        return @read_timeout
+      end
+    end
+  end
+
+  def self.connect_timeout(*vals)
+    vals.each do |val|
+      if val
+        unless val.to_i > 0
+          puts 'Timeout must be specified as a number greater than 0'
+          exit 1
+        end
+        @connect_timeout = [val.to_i, @connect_timeout].max
+        return @connect_timeout
       end
     end
   end
@@ -278,7 +295,8 @@ module RHC
     puts "Contacting #{url.scheme}://#{url.host}" if @mydebug
     req.set_form_data({'json_data' => json_data, 'password' => password})
     http = http.new(url.host, url.port)
-    http.open_timeout = @mytimeout
+    http.open_timeout = @connect_timeout
+    http.read_timeout = @read_timeout
     if url.scheme == "https"
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE
@@ -444,7 +462,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 testscale due to:Scalable app cannot be of type/ 
+        if e.message =~ /^Failed to create application .* 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