rhc 0.77.8 → 0.79.5

data/bin/rhc-chk

@@ -42,7 +42,8 @@ properly setup.  Often run to troubleshoot connection issues.
   -p|--password  password   Red Hat password (for RHN or OpenShift)
   -d|--debug                Print Debug info
   -h|--help                 Show Usage info
-  --config  path             Path of alternate config file
+  --config  path            Path of alternate config file
+  --timeout #               Timeout, in seconds, for connection
 
 USAGE
 exit 255
@@ -54,7 +55,8 @@ begin
         ["--help",  "-h", GetoptLong::NO_ARGUMENT],
         ["--rhlogin",  "-l", GetoptLong::REQUIRED_ARGUMENT],
         ["--password",  "-p", GetoptLong::REQUIRED_ARGUMENT],
-        ["--config", GetoptLong::REQUIRED_ARGUMENT]
+        ["--config", GetoptLong::REQUIRED_ARGUMENT],
+        ["--timeout", GetoptLong::REQUIRED_ARGUMENT]
     )
     opt = {}
     opts.each do |o, a|
@@ -79,6 +81,9 @@ end
 if opt["debug"]
     @debug = true
 end
+RHC::debug(@debug)
+
+RHC::timeout(opt["timeout"] ? opt["timeout"] : get_var('timeout'))
 
 opt["rhlogin"] = get_var('default_rhlogin') unless opt["rhlogin"]
 if !RHC::check_rhlogin(opt['rhlogin'])
@@ -205,8 +210,10 @@ else
     puts "      FIX: Perhaps you should regenerate your public key, or run rhc-create-domain with -a to alter the remote key"
 end
 
-puts "remote_ssh_pubkey: #{remote_ssh_pubkey}" if @debug
-puts "local_ssh_pubkey: #{local_ssh_pubkey}" if @debug
-puts "local_derived_ssh_pubkey: #{local_derived_ssh_pubkey}" if @debug
+if @debug
+    puts "remote_ssh_pubkey: #{remote_ssh_pubkey}"
+    puts "local_ssh_pubkey: #{local_ssh_pubkey}"
+    puts "local_derived_ssh_pubkey: #{local_derived_ssh_pubkey}"
+end
 
 exit 0

data/bin/rhc-create-app

@@ -41,6 +41,7 @@ Create an OpenShift Express app.
   -d|--debug                 Print Debug info
   -h|--help                  Show Usage info
   --config  path             Path of alternate config file
+  --timeout #                Timeout, in seconds, for connection
 
 USAGE
 exit 255
@@ -56,7 +57,8 @@ begin
         ["--app",   "-a", GetoptLong::REQUIRED_ARGUMENT],
         ["--repo",  "-r", GetoptLong::REQUIRED_ARGUMENT],
         ["--config", GetoptLong::REQUIRED_ARGUMENT],
-        ["--type",  "-t", GetoptLong::REQUIRED_ARGUMENT]
+        ["--type",  "-t", GetoptLong::REQUIRED_ARGUMENT],
+        ["--timeout", GetoptLong::REQUIRED_ARGUMENT]
     )
     opt = {}
     opts.each do |o, a|
@@ -84,6 +86,9 @@ end
 if opt["debug"]
     debug = true
 end
+RHC::debug(debug)
+
+RHC::timeout(opt["timeout"] ? opt["timeout"] : get_var('timeout'))
 
 opt["rhlogin"] = get_var('default_rhlogin') unless opt["rhlogin"]
 
@@ -168,11 +173,11 @@ response = RHC::http_post(@http, url, json_data, password)
 
 if response.code == '200'
     json_resp = JSON.parse(response.body)
-    RHC::print_response_success(json_resp, debug, true)
+    RHC::print_response_success(json_resp, true)
     json_data = JSON.parse(json_resp['data'])
     health_check_path = json_data['health_check_path']
 else
-    RHC::print_response_err(response, debug)
+    RHC::print_response_err(response)
 end
 
 #
@@ -199,7 +204,7 @@ end
 
 puts "Checking ~/.ssh/config"
 
-user_info = RHC::get_user_info(libra_server, opt['rhlogin'], password, @http, debug, false)
+user_info = RHC::get_user_info(libra_server, opt['rhlogin'], password, @http, false)
 
 fqdn = "#{opt['app']}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']}"
  

data/bin/rhc-create-domain

@@ -43,6 +43,7 @@ Bind a registered rhcloud user to a domain in rhcloud.
   -d|--debug                   Print Debug info
   -h|--help                    Show Usage info
   --config  path               Path of alternate config file
+  --timeout #                  Timeout, in seconds, for connection
 
 USAGE
 exit 255
@@ -56,7 +57,8 @@ begin
         ["--password",  "-p", GetoptLong::REQUIRED_ARGUMENT],
         ["--namespace", "-n", GetoptLong::REQUIRED_ARGUMENT],
         ["--config", GetoptLong::REQUIRED_ARGUMENT],
-        ["--alter", "-a", GetoptLong::NO_ARGUMENT]
+        ["--alter", "-a", GetoptLong::NO_ARGUMENT],
+        ["--timeout", GetoptLong::REQUIRED_ARGUMENT]
     )
     
     opt = {}
@@ -86,6 +88,9 @@ end
 if opt["debug"]
     debug = true
 end
+RHC::debug(debug)
+
+RHC::timeout(opt["timeout"] ? opt["timeout"] : get_var('timeout'))
 
 if !RHC::check_namespace(opt['namespace'])
     p_usage
@@ -141,12 +146,12 @@ data = {'namespace' => opt['namespace'],
 if (opt['alter'])
   data['alter'] = "true"
   not_found_message = "A user with rhlogin '#{opt['rhlogin']}' does not have a registered domain.  Be sure to run rhc-create-domain without -a|--alter first."
-  user_info = RHC::get_user_info(libra_server, opt['rhlogin'], password, @http, debug, true, not_found_message)
+  user_info = RHC::get_user_info(libra_server, opt['rhlogin'], password, @http, true, not_found_message)
 end
 if debug
   data['debug'] = "true"
 end
-RHC::print_post_data(data, debug)
+RHC::print_post_data(data)
 json_data = RHC::generate_json(data)
 
 url = URI.parse("https://#{libra_server}/broker/domain")
@@ -155,7 +160,7 @@ response = RHC::http_post(@http, url, json_data, password)
 if response.code == '200'
     begin
         json_resp = JSON.parse(response.body)
-        RHC::print_response_success(json_resp, debug)
+        RHC::print_response_success(json_resp)
         json_rhlogininfo = JSON.parse(json_resp['data'])
         add_rhlogin_config(json_rhlogininfo['rhlogin'], json_rhlogininfo['uuid'])
     
@@ -204,9 +209,9 @@ EOF
         end
         exit 0
     rescue JSON::ParserError
-        RHC::print_response_err(response, debug)
+        RHC::print_response_err(response)
     end
 else
-    RHC::print_response_err(response, debug)
+    RHC::print_response_err(response)
 end
 exit 254

data/bin/rhc-ctl-app

@@ -37,11 +37,12 @@ Control an OpenShift express app
   -p|--password password   RHLogin password  (optional, will prompt)
   -c|--command command     (start|stop|restart|reload|status|destroy)
   -L|--embedded-list       List supported embedded cartridges
-  -e|--embed               (add-$cartridge|remove-$cartridge) eg: add-mysql-5.1
+  -e|--embed               (add|remove|stop|start|restart|status|reload)-$cartridge eg: add-mysql-5.1
   -b|--bypass              Bypass warnings
   -d|--debug               Print Debug info
   -h|--help                Show Usage info
   --config  path           Path of alternate config file
+  --timeout #              Timeout, in seconds, for connection
 
 USAGE
 exit 255
@@ -69,7 +70,8 @@ begin
         ["--password",   "-p", GetoptLong::REQUIRED_ARGUMENT],
         ["--app",        "-a", GetoptLong::REQUIRED_ARGUMENT],
         ["--config", GetoptLong::REQUIRED_ARGUMENT],
-        ["--command",    "-c", GetoptLong::REQUIRED_ARGUMENT]
+        ["--command",    "-c", GetoptLong::REQUIRED_ARGUMENT],
+        ["--timeout", GetoptLong::REQUIRED_ARGUMENT]
     )
     opt = {}
     opts.each do |o, a|
@@ -99,6 +101,9 @@ end
 if opt["debug"]
     debug = true
 end
+RHC::debug(debug)
+
+RHC::timeout(opt["timeout"] ? opt["timeout"] : get_var('timeout'))
 
 opt["rhlogin"] = get_var('default_rhlogin') unless opt["rhlogin"]
 
@@ -110,11 +115,24 @@ if !RHC::check_app(opt['app'])
     p_usage
 end
 
-unless opt["embed"] or (opt["command"] and opt["command"] =~ /(start|stop|restart|reload|status|destroy)/)
+unless opt["embed"] or opt["command"]
     puts "Command or embed is required"
     p_usage
 end
 
+if opt["command"]
+  unless opt["command"] =~ /^(start|stop|restart|reload|status|destroy)$/
+    puts "Invalid command '#{opt["command"]}' specified.  Valid commands are (start|stop|restart|reload|status|destroy)"
+    p_usage
+  end
+elsif opt["embed"]
+  action = opt['embed'].split('-')[0]
+  unless action =~ /^(add|remove|start|stop|restart|status|reload)$/
+    puts "Invalid embed action '#{action}' specified.  Valid embed actions are (add|remove|start|stop|restart|status|reload)"
+    p_usage
+  end
+end
+
 unless opt['rhlogin'] && opt['app'] && (opt['command'] || opt['embed'])
     p_usage
 end
@@ -187,7 +205,7 @@ response = RHC::http_post(@http, url, json_data, password)
 
 if response.code == '200'
     json_resp = JSON.parse(response.body)
-    RHC::print_response_success(json_resp, debug, true)
+    RHC::print_response_success(json_resp, true)
 else
-    RHC::print_response_err(response, debug)
+    RHC::print_response_err(response)
 end

data/bin/rhc-snapshot

@@ -41,6 +41,7 @@ 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
 
 USAGE
 exit 255
@@ -55,7 +56,8 @@ begin
         ["--restore",  "-r", GetoptLong::REQUIRED_ARGUMENT],
         ["--rhlogin",  "-l", GetoptLong::REQUIRED_ARGUMENT],
         ["--config", GetoptLong::REQUIRED_ARGUMENT],
-        ["--password",  "-p", GetoptLong::REQUIRED_ARGUMENT]
+        ["--password",  "-p", GetoptLong::REQUIRED_ARGUMENT],
+        ["--timeout", GetoptLong::REQUIRED_ARGUMENT]
     )
     opt = {}
     opts.each do |o, a|
@@ -80,6 +82,9 @@ end
 if opt["debug"]
     debug = true
 end
+RHC::debug(debug)
+
+RHC::timeout(opt["timeout"] ? opt["timeout"] : get_var('timeout'))
 
 opt["rhlogin"] = get_var('default_rhlogin') unless opt["rhlogin"]
 

data/bin/rhc-tail-files

@@ -42,6 +42,7 @@ 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
 
 USAGE
 exit 255
@@ -56,7 +57,8 @@ begin
         ["--files",  "-f", GetoptLong::REQUIRED_ARGUMENT],
         ["--rhlogin",  "-l", GetoptLong::REQUIRED_ARGUMENT],
         ["--config", GetoptLong::REQUIRED_ARGUMENT],
-        ["--password",  "-p", GetoptLong::REQUIRED_ARGUMENT]
+        ["--password",  "-p", GetoptLong::REQUIRED_ARGUMENT],
+        ["--timeout", GetoptLong::REQUIRED_ARGUMENT]
     )
     opt = {}
     opts.each do |o, a|
@@ -81,6 +83,9 @@ end
 if opt['debug']
     debug = true
 end
+RHC::debug(debug)
+
+RHC::timeout(opt["timeout"] ? opt["timeout"] : get_var('timeout'))
 
 opt['rhlogin'] = get_var('default_rhlogin') unless opt['rhlogin']
 
@@ -93,7 +98,7 @@ if !password
   password = RHC::get_password
 end
 
-user_info = RHC::get_user_info(libra_server, opt['rhlogin'], password, @http, debug, false)
+user_info = RHC::get_user_info(libra_server, opt['rhlogin'], password, @http, false)
 
 app = opt['app']
 

data/bin/rhc-user-info

@@ -40,6 +40,7 @@ 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
 
 USAGE
 exit 255
@@ -53,7 +54,8 @@ begin
         ["--info",  "-i", GetoptLong::NO_ARGUMENT],
         ["--rhlogin",  "-l", GetoptLong::REQUIRED_ARGUMENT],
         ["--config", GetoptLong::REQUIRED_ARGUMENT],
-        ["--password",  "-p", GetoptLong::REQUIRED_ARGUMENT]
+        ["--password",  "-p", GetoptLong::REQUIRED_ARGUMENT],
+        ["--timeout", GetoptLong::REQUIRED_ARGUMENT]
     )
     opt = {}
     opts.each do |o, a|
@@ -78,6 +80,9 @@ end
 if opt["debug"]
     debug = true
 end
+RHC::debug(debug)
+
+RHC::timeout(opt["timeout"] ? opt["timeout"] : get_var('timeout'))
 
 opt["rhlogin"] = get_var('default_rhlogin') unless opt["rhlogin"]
 
@@ -91,7 +96,7 @@ if !password
 end
 
 opt['apps'] = true if not opt['info'] and not opt['apps']
-user_info = RHC::get_user_info(libra_server, opt['rhlogin'], password, @http, debug, true)
+user_info = RHC::get_user_info(libra_server, opt['rhlogin'], password, @http, true)
 
 if opt['info']
     puts "User Info"

data/conf/express.conf

@@ -2,4 +2,7 @@
 libra_server = 'openshift.redhat.com'
 
 # Logging
-debug = false
+debug = 'false'
+
+# Timeout
+#timeout = '10'

data/lib/rhc-common.rb

@@ -37,9 +37,25 @@ module RHC
   Maxretries = 7
   Defaultdelay = 2
   API = "1.1.1"
+  @mytimeout = 10
+  @mydebug = false
   broker_version = "?.?.?"
   api_version = "?.?.?"
 
+  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 254
+      end
+    end
+  end
+
+  def self.debug(bool)
+    @mydebug = bool
+  end
+
   def self.update_server_api_v(dict)
     if !dict['broker'].nil? && (dict['broker'] =~ /\A\d+\.\d+\.\d+\z/)
       broker_version = dict['broker']
@@ -59,21 +75,21 @@ module RHC
       json
   end
 
-  def self.get_cartridges_list(libra_server, net_http, cart_type="standalone", debug=true, print_result=nil)
+  def self.get_cartridges_list(libra_server, net_http, cart_type="standalone", print_result=nil)
     puts "Contacting https://#{libra_server} to obtain list of cartridges..."
     puts " (please excuse the delay)"
     data = {'cart_type' => cart_type}
-    if debug
+    if @mydebug
       data['debug'] = "true"
     end
-    print_post_data(data, debug)
+    print_post_data(data)
     json_data = generate_json(data)
 
     url = URI.parse("https://#{libra_server}/broker/cartlist")
     response = http_post(net_http, url, json_data, "none")
 
     unless response.code == '200'
-      print_response_err(response, debug)
+      print_response_err(response)
       return []
     end
     begin
@@ -83,7 +99,7 @@ module RHC
     end
     update_server_api_v(json_resp)
     if print_result
-      print_response_success(json_resp, debug)
+      print_response_success(json_resp)
     end
     begin
       carts = (JSON.parse(json_resp['data']))['carts']
@@ -93,8 +109,8 @@ module RHC
     carts
   end
 
-  def self.get_cartridge_listing(carts, sep, libra_server, net_http, cart_type="standalone", debug=true, print_result=nil)
-    carts = get_cartridges_list(libra_server, net_http, cart_type, debug, print_result) if carts.nil?
+  def self.get_cartridge_listing(carts, sep, libra_server, net_http, cart_type="standalone", print_result=nil)
+    carts = get_cartridges_list(libra_server, net_http, cart_type, print_result) if carts.nil?
     carts.join(sep)
   end
 
@@ -138,8 +154,8 @@ module RHC
     true
   end
 
-  def self.print_post_data(h, debug)
-    if (debug)
+  def self.print_post_data(h)
+    if (@mydebug)
       puts 'Submitting form:'
       h.each do |k,v|
         if k.to_s != 'password'
@@ -155,14 +171,14 @@ module RHC
     end
   end
 
-  def self.get_user_info(libra_server, rhlogin, password, net_http, debug, print_result, not_found_message=nil)
+  def self.get_user_info(libra_server, rhlogin, password, net_http, print_result, not_found_message=nil)
 
     puts "Contacting https://#{libra_server}"
     data = {'rhlogin' => rhlogin}
-    if debug
+    if @mydebug
       data['debug'] = "true"
     end
-    print_post_data(data, debug)
+    print_post_data(data)
     json_data = generate_json(data)
 
     url = URI.parse("https://#{libra_server}/broker/userinfo")
@@ -180,7 +196,7 @@ module RHC
         puts "Invalid user credentials"
         exit 97
       else
-        print_response_err(response, debug)
+        print_response_err(response)
       end
       exit 254
     end
@@ -191,7 +207,7 @@ module RHC
     end
     update_server_api_v(json_resp)
     if print_result
-      print_response_success(json_resp, debug)
+      print_response_success(json_resp)
     end
     begin
       user_info = JSON.parse(json_resp['data'].to_s)
@@ -219,7 +235,7 @@ module RHC
 
     req.set_form_data({'json_data' => json_data, 'password' => password})
     http = http.new(url.host, url.port)
-    http.open_timeout = 10
+    http.open_timeout = @mytimeout
     if url.scheme == "https"
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE
@@ -241,9 +257,9 @@ module RHC
     end
   end
 
-  def self.print_response_err(response, debug)
+  def self.print_response_err(response)
     puts "Problem reported from server. Response code was #{response.code}."
-    if (!debug)
+    if (!@mydebug)
       puts "Re-run with -d for more information."
     end
     exit_code = 254
@@ -251,11 +267,11 @@ module RHC
       puts "JSON response:"
       begin
         json_resp = JSON.parse(response.body)
-        exit_code = print_json_body(json_resp, debug)
+        exit_code = print_json_body(json_resp)
       rescue JSON::ParserError
         exit_code = 254
       end
-    elsif debug
+    elsif @mydebug
       puts "HTTP response from server is #{response.body}"
     end
     exit exit_code.nil? ? 666 : exit_code
@@ -271,21 +287,21 @@ module RHC
     end
   end
 
-  def self.print_response_success(json_resp, debug, always_print_result=false)
-    if debug
+  def self.print_response_success(json_resp, always_print_result=false)
+    if @mydebug
       puts "Response from server:"
-      print_json_body(json_resp, debug)
+      print_json_body(json_resp)
     elsif always_print_result
-      print_json_body(json_resp, debug)
+      print_json_body(json_resp)
     else
       print_response_messages(json_resp)
     end
   end
 
-  def self.print_json_body(json_resp, debug)
+  def self.print_json_body(json_resp)
     print_response_messages(json_resp)
     exit_code = json_resp['exit_code']
-    if debug
+    if @mydebug
       if json_resp['debug']
         puts ''
         puts 'DEBUG:'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 315
+  hash: 297
   prerelease: 
   segments: 
   - 0
-  - 77
-  - 8
-  version: 0.77.8
+  - 79
+  - 5
+  version: 0.79.5
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-28 00:00:00 Z
+date: 2011-10-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure