rhc 0.81.14 → 0.82.18

data/Rakefile

@@ -3,7 +3,13 @@
 require 'rubygems'
 require 'rake'
 require 'rake/clean'
-require 'rubygems/package_task'
+
+begin
+  require 'rubygems/package_task'
+rescue LoadError
+  require 'rake/gempackagetask'
+  rake_gempackage = true
+end
 
 task :default => [:package]
 
@@ -31,8 +37,14 @@ spec = Gem::Specification.new do |s|
 end
 
 # Define a :package task that bundles the gem
-Gem::PackageTask.new(spec) do |pkg, args|
-  pkg.need_tar = false
+if rake_gempackage
+  Rake::GemPackageTask.new(spec) do |pkg, args|
+    pkg.need_tar = false
+  end
+else
+  Gem::PackageTask.new(spec) do |pkg, args|
+    pkg.need_tar = false
+  end
 end
 
 # Add the 'pkg' directory to the clean task

data/bin/rhc-chk

@@ -25,14 +25,18 @@ require 'rhc-common'
 require 'net/http'
 require 'net/https'
 require 'rbconfig'
+require 'yaml'
+require 'tempfile'
 
+require 'test/unit'
+require 'test/unit/ui/console/testrunner'
 
 #
 # print help
 #
 def p_usage
-    rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "required"
-    puts <<USAGE
+  rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "required"
+  puts <<USAGE
 
 Usage: #{$0}
 Run a simple check on local configs and credentials to confirm tools are
@@ -50,177 +54,405 @@ exit 255
 end
 
 begin
-    opts = GetoptLong.new(
-        ["--debug", "-d", GetoptLong::NO_ARGUMENT],
-        ["--help",  "-h", GetoptLong::NO_ARGUMENT],
-        ["--rhlogin",  "-l", GetoptLong::REQUIRED_ARGUMENT],
-        ["--password",  "-p", GetoptLong::REQUIRED_ARGUMENT],
-        ["--config", GetoptLong::REQUIRED_ARGUMENT],
-        ["--timeout", GetoptLong::REQUIRED_ARGUMENT]
-    )
-    opt = {}
-    opts.each do |o, a|
-        opt[o[2..-1]] = a.to_s
-    end
+  opts = GetoptLong.new(
+    ["--debug", "-d", GetoptLong::NO_ARGUMENT],
+    ["--help",  "-h", GetoptLong::NO_ARGUMENT],
+    ["--rhlogin",  "-l", GetoptLong::REQUIRED_ARGUMENT],
+    ["--password",  "-p", GetoptLong::REQUIRED_ARGUMENT],
+    ["--config", GetoptLong::REQUIRED_ARGUMENT],
+    ["--timeout", GetoptLong::REQUIRED_ARGUMENT]
+  )
+  $opt = {}
+  opts.each do |o, a|
+    $opt[o[2..-1]] = a.to_s
+  end
 rescue Exception => e
   #puts e.message
-    p_usage
+  p_usage
+end
+
+if $opt["help"]
+  p_usage
 end
 
+
 # If provided a config path, check it
-check_cpath(opt)
+check_cpath($opt)
+
+# Need to store the config information so tests can use it
+#  since they are technically new objects
+$opts_config_path   = @opts_config_path 
+$local_config_path  = @local_config_path
+$opts_config        = @opts_config
+$local_config       = @local_config
+$global_config      = @global_config
 
 # Pull in configs from files
-@libra_server = get_var('libra_server')
-@debug = get_var('debug') == 'false' ? nil : get_var('debug')
+$libra_server = get_var('libra_server')
+$debug = get_var('debug') == 'false' ? nil : get_var('debug')
 
-if opt["help"]
-    p_usage
-end
 
-if opt["debug"]
-    @debug = true
+if $opt["debug"]
+  $debug = true
 end
-RHC::debug(@debug)
+RHC::debug($debug)
 
-RHC::timeout(opt["timeout"] ? opt["timeout"] : get_var('timeout'))
+RHC::timeout($opt["timeout"] ? $opt["timeout"] : get_var('timeout'))
 
-opt["rhlogin"] = get_var('default_rhlogin') unless opt["rhlogin"]
-if !RHC::check_rhlogin(opt['rhlogin'])
-    p_usage
+$opt["rhlogin"] = get_var('default_rhlogin') unless $opt["rhlogin"]
+if !RHC::check_rhlogin($opt['rhlogin'])
+  p_usage
 end
-@rhlogin = opt["rhlogin"]
+$rhlogin = $opt["rhlogin"]
 
-@password = opt['password']
-if !@password
-  @password = RHC::get_password
+$password = $opt['password']
+if !$password
+  $password = RHC::get_password
 end
 
 #
 # Generic Info
 #
-puts "Ruby Version: #{RUBY_VERSION}"
-puts "host_alias: #{Config::CONFIG['host_alias']}"
+$debuginfo = {
+  'environment' => {
+    'Ruby Version' => RUBY_VERSION,
+    "host_alias" => Config::CONFIG['host_alias']
+  },
+  'options' => {
+    "Command Line" => $opt,
+    "Opts" => $opts_config,
+    "Local" => $local_config,
+    "Global" => $global_config
+  }
+}
+
+# Don't actually log the password, but some information to help with troubleshooting
+if $opt['password']
+  $debuginfo['options']['Command Line']['password'] = {
+    "Length" => $opt['password'].length, 
+    "Starts with" => $opt['password'][0..0]
+  }
+end
 
 #
 # Check for proxy environment
 #
 if ENV['http_proxy']
-  host, port = ENV['http_proxy'].split(':')
-  @http = Net::HTTP::Proxy(host, port)
-  puts "Proxy being used: #{host}:#{port}"
+  if ENV['http_proxy']!~/^(\w+):\/\// then
+    ENV['http_proxy']="http://" + ENV['http_proxy']
+  end
+  proxy_uri=URI.parse(ENV['http_proxy'])
+  $http = Net::HTTP::Proxy(proxy_uri.host, proxy_uri.port, proxy_uri.user, proxy_uri.password)
+  $debuginfo['environment']['proxy'] = "#{proxy_uri.user}:#{proxy_uri.password}@#{proxy_uri.host}:#{proxy_uri.port}"
 else
-  @http = Net::HTTP
-  puts "Proxy being used: none"
+  $http = Net::HTTP
+  $debuginfo['environment']['proxy'] = "none"
 end
 
-def test_url_json(uri, data)
+#####################################
+#     Done setting up environment   #
+#####################################
+
+module TestBase
+  def initialize(*args)
+    super
+    $connectivity ||= false
+    # These need to be loaded for each test to be able to access them
+    @opts_config_path   = $opts_config_path 
+    @local_config_path  = $local_config_path
+    @opts_config        = $opts_config
+    @local_config       = $local_config
+    @global_config      = $global_config
+  end
+
+  def fetch_url_json(uri, data)
     json_data = RHC::generate_json(data)
-    url = URI.parse("https://#{@libra_server}#{uri}")
-    puts "  Contacting URL: https://#{@libra_server}#{uri}" if @debug
-    puts "  json_data: #{json_data}" if @debug
-    req = @http::Post.new(url.path)
-    req.set_form_data({'json_data' => json_data, 'password' => @password})
-    http = @http.new(url.host, url.port)
+    url = URI.parse("https://#{$libra_server}#{uri}")
+    req = $http::Post.new(url.path)
+    req.set_form_data({'json_data' => json_data, 'password' => $password})
+    http = $http.new(url.host, url.port)
     http.open_timeout = 10
     http.use_ssl = true
     http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    response = nil
+
+    response = http.start {|http| http.request(req)}
+    return response
+  ensure
+    $debuginfo['fetches'] ||= []
+    body = JSON.parse(response.body)
+    body['data'] = body['data'] ? JSON.parse(body['data']) : ''
+    $debuginfo['fetches'] << {url.to_s => {
+      'body' => body,
+      'header' => response.instance_variable_get(:@header)
+    }}
+  end
+
+  def continue_test
     begin
-        response = http.start {|http| http.request(req)}
-        puts "  Raw Response: #{response.body}" if @debug
-    rescue Exception => e
-        puts "  ERROR: #{e.message}"
+      yield
+    rescue Test::Unit::AssertionFailedError => e
+      self.send(:add_failure,e.message,e.backtrace)
     end
-    if response
-        puts "  Code: #{response.code}"
-        puts "  Message: #{response.message}"
-        if response.code == '200'
-        puts response.body
-            resp_json = JSON.parse(response.body)
-            return resp_json
-        elsif response.code == '404' && data['rhlogin']
-            puts "A user with rhlogin '#{data['rhlogin']}' does not have a registered domain."
-            exit 99
-        elsif response.code == '401'
-            puts "Invalid user credentials"
-            exit 97
-        else
-            puts "Exiting due to error!"
-            exit 1
-        end
+  end
+end
+
+#####################################################
+#                Tests start here                   #
+#####################################################
+#                                                   #                                                  
+#  Note: Tests and testcases are run alphabetically # 
+#                                                   #                                                  
+#####################################################
+
+def error_for(name,*args)
+  if name.kind_of? String
+    name = name.downcase.to_sym
+  end
+  sprintf($messages[name],*args)
+end
+
+class Test1_Connectivity < Test::Unit::TestCase
+  include TestBase
+  def teardown
+    # Set global variable in case we cannot connect to the server
+    if method_name == 'test_connectivity'
+      $connectivity = passed?
+    end
+  end
+
+  #
+  # Checking Connectivity / cart list
+  #
+  def test_connectivity
+    data = {'cart_type' => 'standalone'}
+
+    response = fetch_url_json("/broker/cartlist", data)
+    assert_equal 200, response.code.to_i, error_for(:no_connectivity, $libra_server)
+  end
+end
+
+class Test2_Authentication < Test::Unit::TestCase
+  include TestBase
+  #
+  # Checking Authentication
+  #
+  def test_authentication
+    assert $connectivity, error_for(:cant_connect)
+
+    data = {'rhlogin' => $rhlogin}
+    response = fetch_url_json("/broker/userinfo", data)
+    resp_json = JSON.parse(response.body)
+
+    case response.code.to_i
+    when 404
+      assert false, error_for(:_404, $rhlogin)     
+    when 401
+      assert false, error_for(:_401, $rhlogin)     
+    when 200
+      assert true
     else
-        puts "Unable to connect to: https://#{@libra_server}"
-        exit 1
+      assert false, error_for(:_other_http, resp_json['result'])
     end
+
+    $user_info = JSON.parse(resp_json['data'].to_s)
+  end
 end
 
 #
-# Checking Connectivity / cart list
+# Checking ssh key
 #
-puts
-puts "TEST1: Confirming connection to OpenShift"
-data = {'cart_type' => 'standalone'}
+class Test3_SSH < Test::Unit::TestCase
 
-resp_json = test_url_json("/broker/cartlist", data)
-puts "  Cart Info: #{resp_json["data"]}"
+  @@local_derived_ssh_pubkey = nil
+  @@local_ssh_pubkey = nil
 
+  include TestBase
 
-#
-# Checking Authentication
-#
-puts
-puts "TEST2: Authentication (RHN account) / user info"
-data = {'rhlogin' => @rhlogin}
+  def setup
+    @libra_kfile = get_kfile(false)
+    if @libra_kfile
+      @libra_kpfile = get_kpfile(@libra_kfile, false)
+    end
+  end
 
-resp_json = test_url_json("/broker/userinfo", data)
-@user_info = JSON.parse(resp_json['data'].to_s)
-puts "  rhlogin: #{@user_info["user_info"]["rhlogin"]}"
-puts "  namespace: #{@user_info["user_info"]["namespace"]}"
+  def test_01_ssh_private_key
+    check_permissions(@libra_kfile, /[4-7]00/) # Needs to at least be readable by user and nobody else
 
-#
-# Checking ssh key
-#
-puts
-puts "TEST3: SSH Key check"
-remote_ssh_pubkey = @user_info["user_info"]["ssh_key"]
-libra_kfile = get_kfile()
-libra_kpfile = get_kpfile(libra_kfile, false)
-
-if File.exists?(libra_kfile)
-    puts "  OK: #{libra_kfile} - Found"
-    key_dump = `ssh-keygen -f #{libra_kfile} -y`
-    local_derived_ssh_pubkey = key_dump.to_s.strip.split(' ')[1]
-else
-    puts "  ERROR: #{libra_kfile} - Not Found!"
-end
+    # Derive the public key from the private key
+    key_dump = `ssh-keygen -f #{@libra_kfile} -y`
+    @@local_derived_ssh_pubkey = key_dump.to_s.strip.split(' ')[1]
 
-if File.exists?(libra_kpfile)
-    puts "  OK: #{libra_kpfile} Found"
-    fp = File.open(libra_kpfile)
-    local_ssh_pubkey = fp.gets.split(' ')[1]
-    fp.close
-else
-    puts "  WARNING: #{libra_kpfile} Not Found! (non fatal error)"
-end
+    assert_not_nil @@local_derived_ssh_pubkey, error_for(:no_derive)
 
-if local_ssh_pubkey.to_s.strip == remote_ssh_pubkey.to_s.strip
-    puts "  OK: Remote and #{libra_kpfile} - match"
-else
-    puts "  WARNING: Remote and #{libra_kpfile} key do not match.  (have you changed machines or ssh keys?)"
+    assert_not_nil $user_info, error_for(:no_account) 
+    remote_ssh_pubkey = $user_info["user_info"]["ssh_key"]
+
+    assert_match @@local_derived_ssh_pubkey, remote_ssh_pubkey, error_for(:no_match_pub, @libra_kfile)
+  end
+
+  def test_02_ssh_public_key
+    check_permissions(@libra_kpfile, /.../) # Any permissions are OK
+
+    # Store the public key
+    fp = File.open(@libra_kpfile)
+    @@local_ssh_pubkey = fp.gets.split(' ')[1]
+
+    assert_not_nil @@local_ssh_pubkey, error_for(:no_pubkey, 'the remote key')
+
+    assert_not_nil $user_info, error_for(:no_account)
+    remote_ssh_pubkey = $user_info["user_info"]["ssh_key"]
+
+    # Test public key and remote key
+    assert_match @@local_ssh_pubkey, remote_ssh_pubkey, error_for(:no_match_pub,@libra_kpfile)
+  ensure
+    fp.close if fp
+  end
+
+  def test_05_ssh_config
+    check_permissions('~/.ssh/config',/600/)
+  end
+
+  def test_06_ssh_agent
+    loaded_keys = `ssh-add -L`.to_a
+    # Make sure we can load keys from ssh-agent
+    assert !loaded_keys.empty?, error_for(:no_keys_loaded)
+    loaded_keys.map!{|key| key.split(' ')[1]}
+
+    assert_not_nil @@local_ssh_pubkey, error_for(:no_pubkey, 'the keys in ssh-agent')
+    assert loaded_keys.include?(@@local_ssh_pubkey),error_for(:pubkey_not_loaded)
+  end
+
+  def test_07_ssh_connect
+    assert_not_nil $user_info, error_for(:no_account)
+    host_template = "%s@%s-%s.%s"
+    $user_info['app_info'].each do |k,v|
+      uuid = v['uuid']
+      host = sprintf("%s-%s",k,$user_info['user_info']['namespace'])
+      domain = $user_info['user_info']['rhc_domain']
+      ssh_command = sprintf("ssh %s@%s.%s true &> /dev/null", uuid, host, domain)
+      system(ssh_command)
+      continue_test{ assert_equal $?, 0, error_for(:cant_ssh, host) }
+    end
+  end
+
+  private
+  def check_permissions(file,permission)
+    file = File.expand_path(file)
+
+    assert File.exists?(file), error_for(:file_not_found,file)
+
+    perms = sprintf('%o',File.stat(file).mode)[-3..-1]
+
+    assert_match permission, perms, error_for(:bad_permissions,file,perms,permission.source)
+  end
 end
 
-if local_derived_ssh_pubkey.to_s.strip == remote_ssh_pubkey.to_s.strip
-    puts "  OK: local #{libra_kfile} should auth with openshift"
-else
-    puts "  WARNING: local #{libra_kpfile} DOES NOT match remote pub key, ssh auth cannot continue"
-    puts "      FIX: Perhaps you should regenerate your public key, or run rhc-create-domain with -a to alter the remote key"
+############################################################
+#     Below this line is the custom Test::Runner code      #
+# Modification should not be necessary to add/modify tests #
+############################################################
+
+class CheckRunner < Test::Unit::UI::Console::TestRunner
+  def initialize(*args)
+    super
+    @output_level = 1
+    puts $messages[:started]
+  end
+
+  def add_fault(fault)
+    @faults << fault
+    print(fault.single_character_display)
+    @already_outputted = true
+  end
+
+  def print_underlined(string)
+    string = "||  #{string}  ||"
+    line = "=" * string.length
+    puts
+    puts line
+    puts string
+    puts line
+  end
+
+  def render_message(message)
+    lines = message.to_a
+    message = [] 
+    @num ||= 0
+    message << "#{@num+=1}) #{lines.shift.strip}"
+    lines.each do |line|
+      # Break if we get the standard assert error information or a blank line
+      break if line.match(/^\<.*?> /) or line.match(/^\s*$/)
+      message << "\t#{line.strip}"
+    end
+    message.join("\n")
+  end
+
+  def finished(*args)
+    super
+    $debuginfo['errors'] = @faults
+
+    if @faults.empty?
+      print_underlined $messages[:passed]
+    else
+      print_underlined $messages[:failed]
+      @errors = []
+      # Need to separate the failures from the errors
+
+      @faults.each do |f|
+        case f
+        when Test::Unit::Failure
+          puts render_message(f.message)
+        when Test::Unit::Error
+          @errors << f
+        end
+      end
+
+      # Errors mean something in the test is broken, not just failed
+      unless @errors.empty?
+        @num = 0
+        print_underlined $messages[:error]
+        @errors.each do |e| 
+          lines = e.long_display.to_a[1..-1]
+          puts "#{@num+=1}) #{lines.shift}"
+          lines.each{|l| puts "\t#{l}"}
+        end 
+      end
+
+    end
+
+    if $debug
+      Tempfile.open(%w(rhc-chk. .log))do |file|
+        ObjectSpace.undefine_finalizer(file) # persist tempfile
+        file.write $debuginfo.to_yaml
+        puts
+        puts "Debugging information dumped to #{file.path}"
+      end
+    end
+  end
 end
 
-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}"
+Test::Unit::AutoRunner::RUNNERS[:console] = proc do |r|
+  CheckRunner
 end
 
-exit 0
+$messages = YAML.load <<-EOF
+---
+  :started: Analyzing system
+  :passed: Congratulations, your system has passed all tests
+  :failed: Your system did not pass all of the tests
+  :error: Something went wrong, and not all tests completed
+  :no_derive: "We were unable to derive your public SSH key and compare it to the remote\n FIX: ???"
+  :no_connectivity: "Cannot connect to server, therefore most tests will not work\n FIX: Ensure that you are able to connect to %s"
+  :no_account: You must have an account on the server in order to test SSH key matches
+  :cant_connect: You need to be able to connect to the server in order to test authentication
+  :no_match_pub: "Local %s does not match remote pub key, SSH auth will not work\n FIX: Perhaps you should regenerate your public key, or run rhc-create-domain with -a to alter the remote key"
+  :_404: "The user %s does not have an account on this server\n FIX: Please ensure that you've entered the correct username"
+  :no_pubkey: We were unable to read your public SSH key to compare to %s
+  :_401: "Invalid user credentials for %s\n FIX: Please ensure you used the correct password"
+  :file_not_found: File %s does not exist, cannot check permissions
+  :_other_http: "There was an error communicating with the server: %s"
+  :bad_permissions: "File %s has incorrect permissions %s\n FIX: Permissions should match %s"
+  :no_keys_loaded: Either ssh-agent is not running or you do not have any keys loaded 
+  :pubkey_not_loaded: Your public key is not loaded into a running ssh-agent
+  :cant_ssh: "Cannot SSH into your app: %s"
+  EOF

data/bin/rhc-create-app

@@ -40,7 +40,7 @@ Create an OpenShift Express app.
   -n|--nogit                 Only create remote space, don't pull it locally
   -d|--debug                 Print Debug info
   -h|--help                  Show Usage info
-  --no-dns                   Skip DNS check
+  --no-dns                   Skip DNS check. Must be used in combination with --nogit
   --config  path             Path of alternate config file
   --timeout #                Timeout, in seconds, for connection
   --enable-jenkins [name]    Indicates to create a Jenkins application (if not already available)
@@ -119,10 +119,16 @@ if !password
 end
 
 user_info = RHC::get_user_info(libra_server, opt['rhlogin'], password, @http, false)
+app_info = user_info['app_info']
+
+if app_info[opt['app']]
+  puts "An application named '#{opt['app']}' in namespace '#{user_info['user_info']['namespace']}' already exists"
+  exit 255
+end
+
 jenkins_app_name = nil
 has_jenkins = false
 if opt['enable-jenkins']
-  app_info = user_info['app_info']
   app_info.each do |app_name, app|
     if app['framework'] == 'jenkins-1.4'
       jenkins_app_name = app_name
@@ -181,12 +187,14 @@ end
 
 opt['repo'] = opt['app'] unless opt['repo']
 
-puts "
-Found a bug? Post to the forum and we'll get right on it.
-    IRC: #openshift on freenode
-    Forums: https://www.redhat.com/openshift/forums
-
-"
+if @mydebug
+  puts "
+  Found a bug? Post to the forum and we'll get right on it.
+      IRC: #openshift on freenode
+      Forums: https://www.redhat.com/openshift/forums
+  
+  "
+end
 
 #
 # Confirm local git repo exists
@@ -216,14 +224,7 @@ unless opt['nogit']
 end
 
 if jenkins_app_name && !has_jenkins
-  jenkins_no_git_message = "
-
-Note: There is a git repo for your Jenkins application '#{jenkins_app_name}'
-but it isn't being downloaded as part of this process.  In most cases
-it isn't needed but you can always clone it later.
-
-"
-  jenkins_app = RHC::create_app(libra_server, @http, user_info, jenkins_app_name, 'jenkins-1.4', opt['rhlogin'], password, nil, false, true, jenkins_no_git_message)
+  jenkins_app = RHC::create_app(libra_server, @http, user_info, jenkins_app_name, 'jenkins-1.4', opt['rhlogin'], password, nil, false, true, true)
   available = RHC::check_app_available(@http, jenkins_app[:app_name], jenkins_app[:fqdn], jenkins_app[:health_check_path], jenkins_app[:result], jenkins_app[:git_url], nil, true)
   if !available
     puts "Unable to access your new Jenkins application."
@@ -234,13 +235,10 @@ end
 #
 # Create remote application space
 #
-main_app = RHC::create_app(libra_server, @http, user_info, opt['app'], opt['type'], opt['rhlogin'], password, opt['repo'], opt['no-dns'], opt['nogit'])
+main_app = RHC::create_app(libra_server, @http, user_info, opt['app'], opt['type'], opt['rhlogin'], password, opt['repo'], opt['no-dns'], opt['nogit'], false)
 if jenkins_app_name
-  puts "
-Now embedding the jenkins client into '#{opt['app']}'...
-
-"
-  RHC::ctl_app(libra_server, @http, opt['app'], opt['rhlogin'], password, 'configure', true, 'jenkins-client-1.4')
+  puts "Now embedding the jenkins client into '#{opt['app']}'..."
+  RHC::ctl_app(libra_server, @http, opt['app'], opt['rhlogin'], password, 'configure', true, 'jenkins-client-1.4', nil, false)
 end
 
 unless opt['no-dns']
@@ -249,4 +247,4 @@ unless opt['no-dns']
     puts "Unable to access your new application."
     exit 1
   end
-end
+end

data/bin/rhc-ctl-app

@@ -35,7 +35,7 @@ Control an OpenShift express app
   -a|--app   application   Application name  (alphanumeric) (required)
   -l|--rhlogin rhlogin     Red Hat login (RHN or OpenShift login with OpenShift Express access) (#{rhlogin})
   -p|--password password   RHLogin password  (optional, will prompt)
-  -c|--command command     (start|stop|force-stop|restart|reload|status|destroy|add-alias|remove-alias)
+  -c|--command command     (start|stop|force-stop|restart|reload|status|destroy|tidy|add-alias|remove-alias)
   -L|--embedded-list       List supported embedded cartridges
   -e|--embed               (add|remove|stop|start|restart|status|reload)-$cartridge eg: add-mysql-5.1
   -b|--bypass              Bypass warnings
@@ -123,14 +123,14 @@ unless opt["embed"] or opt["command"]
 end
 
 if opt["command"]
-  unless opt["command"] =~ /^(start|stop|force-stop|restart|reload|status|destroy|add-alias|remove-alias)$/
-    puts "Invalid command '#{opt["command"]}' specified.  Valid commands are (start|stop|force-stop|restart|reload|status|destroy|add-alias|remove-alias)"
+  unless opt["command"] =~ /^(start|stop|force-stop|restart|reload|status|destroy|tidy|add-alias|remove-alias)$/
+    puts "Invalid command '#{opt["command"]}' specified.  Valid commands are (start|stop|force-stop|restart|reload|status|destroy|tidy|add-alias|remove-alias)"
     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|add-alias|remove-alias)"
+    puts "Invalid embed action '#{action}' specified.  Valid embed actions are (add|remove|start|stop|restart|status|reload)"
     p_usage
   end
 end
@@ -165,10 +165,15 @@ This is NOT reversible, all remote data for this application will be removed.
 WARNING
 
     print "Do you want to destroy this application (y/n): "
-    agree = gets.chomp
-    if agree != 'y'
-        puts "Destroy aborted"
-        exit 217
+    begin
+      agree = gets.chomp
+      if agree != 'y'
+          puts "\n"
+          exit 217
+      end
+    rescue Interrupt
+      puts "\n"
+      exit 217
     end
 end
 

data/lib/rhc-common.rb

@@ -42,6 +42,13 @@ module RHC
   @mydebug = false
   broker_version = "?.?.?"
   api_version = "?.?.?"
+
+  # reset lines
+  # \r moves the cursor to the beginning of line
+  # ANSI escape code to clear line from cursor to end of line
+  # "\e" is an alternative to "\033"
+  # cf. http://en.wikipedia.org/wiki/ANSI_escape_code
+  CLEAR_LINE = "\r" + "\e[0K"
   
   DEBUG_INGORE_KEYS = {
     'result' => nil,
@@ -276,7 +283,8 @@ module RHC
     end
     exit_code = 1
     if response.content_type == 'application/json'
-      puts "JSON response:"
+      print "JSON response:"
+      $stdout.flush
       begin
         json_resp = JSON.parse(response.body)
         exit_code = print_json_body(json_resp)
@@ -301,7 +309,8 @@ module RHC
 
   def self.print_response_success(json_resp, print_result=false)
     if @mydebug
-      puts "Response from server:"
+      print "Response from server:"
+      $stdout.flush
       print_json_body(json_resp, print_result)
     elsif print_result
       print_json_body(json_resp)
@@ -353,8 +362,8 @@ module RHC
       return resp.any?
   end
   
-  def self.create_app(libra_server, net_http, user_info, app_name, app_type, rhlogin, password, repo_dir=nil, no_dns=false, no_git=false, no_git_message=nil)
-    puts "Attempting to create remote application space: #{app_name}"
+  def self.create_app(libra_server, net_http, user_info, app_name, app_type, rhlogin, password, repo_dir=nil, no_dns=false, no_git=false, is_embedded_jenkins=false)
+    puts "Creating application: #{app_name}"
     
     data = {:cartridge => app_type,
             :action => 'configure',
@@ -412,11 +421,17 @@ module RHC
       while loop < MAX_RETRIES && !hostexist?(fqdn)
           sleep sleep_time
           loop+=1
-          puts "  retry # #{loop} - Waiting for DNS: #{fqdn}"
+          print CLEAR_LINE + "    retry # #{loop} - Waiting for DNS: #{fqdn}"
+          $stdout.flush
           sleep_time = delay(sleep_time)
       end
     end
     
+    # if we have executed print statements, then move to the next line
+    if loop > 0
+      puts
+    end
+    
     # If the hostname couldn't be resolved, print out the git URL
     # and exit cleanly.  This will help solve issues where DNS times
     # out in APAC, etc on resolution.
@@ -461,7 +476,7 @@ WARNING
     git_url = "ssh://#{app_uuid}@#{app_name}-#{namespace}.#{rhc_domain}/~/git/#{app_name}.git/"
     
     unless no_git
-        puts "Pulling new repo down"
+        puts "Pulling new repo down" if @mydebug
     
         puts "git clone --quiet #{git_url} #{repo_dir}" if @mydebug
         quiet = (@mydebug ? ' ' : '--quiet ')
@@ -472,8 +487,17 @@ WARNING
             exit 216
         end
     else
-      if no_git_message
-        puts no_git_message
+      if is_embedded_jenkins
+        # if this is a jenkins client application to be embedded, 
+        # then print this message only in debug mode
+        if @mydebug
+          puts "
+Note: There is a git repo for your Jenkins application '#{app_name}'
+but it isn't being downloaded as part of this process.  In most cases
+it isn't needed but you can always clone it later.
+
+"
+        end
       else         
         puts <<IMPORTANT
 
@@ -514,51 +538,43 @@ IMPORTANT
       #
       sleep_time = 2
       attempt = 0
-      puts "Confirming application '#{app_name}' is available"
+      puts "Confirming application '#{app_name}' is available" if @mydebug
       while attempt < MAX_RETRIES
           attempt += 1
-          puts "  Attempt # #{attempt}"
+          if @mydebug
+            puts "  Attempt # #{attempt}"
+          else
+            print CLEAR_LINE + "Confirming application '#{app_name}' is available:  Attempt # #{attempt}"
+          end
+          $stdout.flush
           url = URI.parse("http://#{fqdn}/#{health_check_path}")
+          
+          sleep(2.0)
           begin
             response = net_http.get_response(url)
           rescue Exception => e
             response = nil
           end
           if !response.nil? && response.code == "200" && response.body[0,1] == "1"
-            puts <<LOOKSGOOD
-
-Success!  Your application '#{app_name}' is now published here:
-
-      http://#{fqdn}/
-
-The remote repository is located here:
-
-    #{git_url}
-
-LOOKSGOOD
-            unless no_git
-      puts <<LOOKSGOOD
-To make changes to '#{app_name}', commit to #{repo_dir}/.
-LOOKSGOOD
-            else
-        puts <<LOOKSGOOD
+            puts CLEAR_LINE + "Confirming application '#{app_name}' is available:  Success!"
+            puts ""
+            puts "#{app_name} published:  http://#{fqdn}/"
+            puts "git url:  #{git_url}"
+
+            if @mydebug
+              unless no_git
+                puts "To make changes to '#{app_name}', commit to #{repo_dir}/."
+              else
+                puts <<LOOKSGOOD
 To make changes to '#{app_name}', you must first clone it with:
-
-    git clone #{git_url}
-
-LOOKSGOOD
-        puts <<LOOKSGOOD
-Then run 'git push' to update your OpenShift Express space.
+      git clone #{git_url}
 
 LOOKSGOOD
+                puts "Then run 'git push' to update your OpenShift Express space."
+              end
             end
             if result && !result.empty?
-        
-              puts <<LOOKSGOOD
-
-#{result}
-              
-LOOKSGOOD
+              puts "#{result}"
             end
             return true
           end
@@ -566,8 +582,7 @@ LOOKSGOOD
             puts "Server responded with #{response.code}"
             puts response.body unless response.code == '503'
           end
-          puts
-          puts "    sleeping #{sleep_time} seconds"
+          puts "    sleeping #{sleep_time} seconds" if @mydebug
           sleep sleep_time
           sleep_time = delay(sleep_time)
       end
@@ -584,7 +599,7 @@ LOOKSGOOD
     http_post(net_http, url, json_data, password)
   end
   
-  def self.ctl_app(libra_server, net_http, app_name, rhlogin, password, action, embedded=false, framework=nil, server_alias=nil)
+  def self.ctl_app(libra_server, net_http, app_name, rhlogin, password, action, embedded=false, framework=nil, server_alias=nil, print_result=true)
     data = {:action => action,
             :app_name => app_name,
             :rhlogin => rhlogin
@@ -610,8 +625,8 @@ LOOKSGOOD
     response = http_post(net_http, url, json_data, password)
     
     if response.code == '200'
-        json_resp = JSON.parse(response.body)
-        print_response_success(json_resp, true)
+      json_resp = JSON.parse(response.body)
+      print_response_success(json_resp, print_result || @mydebug)
     else
         print_response_err(response)
     end
@@ -662,8 +677,11 @@ end
 # Check for proxy environment
 #
 if ENV['http_proxy']
-  host, port = ENV['http_proxy'].split(':')
-  @http = Net::HTTP::Proxy(host, port)
+  if ENV['http_proxy']!~/^(\w+):\/\// then
+    ENV['http_proxy']="http://" + ENV['http_proxy']
+  end
+  proxy_uri=URI.parse(ENV['http_proxy'])
+  @http = Net::HTTP::Proxy(proxy_uri.host, proxy_uri.port, proxy_uri.user, proxy_uri.password)
 else
   @http = Net::HTTP
 end
@@ -761,4 +779,4 @@ def get_kpfile(kfile, check_exists=true)
     kfile_not_found
   end
   return kpfile
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 327
+  hash: 371
   prerelease: 
   segments: 
   - 0
-  - 81
-  - 14
-  version: 0.81.14
+  - 82
+  - 18
+  version: 0.82.18
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-10 00:00:00 Z
+date: 2011-12-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -61,13 +61,13 @@ extra_rdoc_files: []
 
 files: 
 - lib/rhc-common.rb
-- bin/rhc-ctl-app
-- bin/rhc-tail-files
 - bin/rhc-create-app
 - bin/rhc-chk
-- bin/rhc-snapshot
-- bin/rhc-create-domain
 - bin/rhc-user-info
+- bin/rhc-create-domain
+- bin/rhc-snapshot
+- bin/rhc-ctl-app
+- bin/rhc-tail-files
 - conf/express.conf
 - LICENSE
 - README
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: OpenShift Express Client Tools