rhc 0.75.9 → 0.77.8

data/Rakefile

@@ -18,7 +18,7 @@ spec = Gem::Specification.new do |s|
     s.description = %q{The client tools for the OpenShift Express platform that allow for application management.}
     s.files = FileList['lib/**/*.rb', 'bin/*', 'conf/*'].to_a
     s.files += %w(LICENSE README Rakefile)
-    s.executables = ['rhc-create-app', 'rhc-create-domain', 'rhc-ctl-app', 'rhc-snapshot', 'rhc-user-info', 'rhc-tail-files']
+    s.executables = ['rhc-chk', 'rhc-create-app', 'rhc-create-domain', 'rhc-ctl-app', 'rhc-snapshot', 'rhc-user-info', 'rhc-tail-files']
     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/)

data/bin/rhc-chk

@@ -42,6 +42,7 @@ 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
 
 USAGE
 exit 255
@@ -52,7 +53,8 @@ begin
         ["--debug", "-d", GetoptLong::NO_ARGUMENT],
         ["--help",  "-h", GetoptLong::NO_ARGUMENT],
         ["--rhlogin",  "-l", GetoptLong::REQUIRED_ARGUMENT],
-        ["--password",  "-p", GetoptLong::REQUIRED_ARGUMENT]
+        ["--password",  "-p", GetoptLong::REQUIRED_ARGUMENT],
+        ["--config", GetoptLong::REQUIRED_ARGUMENT]
     )
     opt = {}
     opts.each do |o, a|
@@ -63,13 +65,13 @@ rescue Exception => e
     p_usage
 end
 
+# If provided a config path, check it
+check_cpath(opt)
+
 # Pull in configs from files
 @libra_server = get_var('libra_server')
 @debug = get_var('debug') == 'false' ? nil : get_var('debug')
 
-libra_kfile = "#{ENV['HOME']}/.ssh/libra_id_rsa"
-libra_kpfile = "#{ENV['HOME']}/.ssh/libra_id_rsa.pub"
-
 if opt["help"]
     p_usage
 end
@@ -170,33 +172,36 @@ end
 puts
 puts "TEST3: SSH Key check"
 remote_ssh_pubkey = @user_info["user_info"]["ssh_key"]
-if File.exists?("#{ENV['HOME']}/.ssh/libra_id_rsa")
-    puts "  OK: ~/.ssh/libra_id_rsa - Found"
-    key_dump = `ssh-keygen -f ~/.ssh/libra_id_rsa -y`
+libra_kfile = get_kfile(false)
+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: ~/.ssh/libra_id_rsa - Not Found!"
+    puts "  ERROR: #{libra_kfile} - Not Found!"
 end
 
-if File.exists?("#{ENV['HOME']}/.ssh/libra_id_rsa.pub")
-    puts "  OK: ~/.ssh/libra_id_rsa.pub Found"
-    fp = File.open("#{ENV['HOME']}/.ssh/libra_id_rsa.pub")
+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: ~/.ssh/libra_id_rsa.pub Not Found! (non fatal error)"
+    puts "  WARNING: #{libra_kpfile} Not Found! (non fatal error)"
 end
 
 if local_ssh_pubkey.to_s.strip == remote_ssh_pubkey.to_s.strip
-    puts "  OK: Remote and ~/.ssh/libra_id_rsa.pub - match"
+    puts "  OK: Remote and #{libra_kpfile} - match"
 else
-    puts "  WARNING: Remote and ~/.ssh/libra_id_rsa key do not match.  (have you changed machines or ssh keys?)"
+    puts "  WARNING: Remote and #{libra_kpfile} key do not match.  (have you changed machines or ssh keys?)"
 end
 
 if local_derived_ssh_pubkey.to_s.strip == remote_ssh_pubkey.to_s.strip
-    puts "  OK: local ~/.ssh/libra_id_rsa should auth with openshift"
+    puts "  OK: local #{libra_kfile} should auth with openshift"
 else
-    puts "  WARNING: local ~/.ssh/libra_id_rsa DOES NOT match remote pub key, ssh auth cannot continue"
+    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"
 end
 

data/bin/rhc-create-app

@@ -40,6 +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
+  --config  path             Path of alternate config file
 
 USAGE
 exit 255
@@ -54,6 +55,7 @@ begin
         ["--password",  "-p", GetoptLong::REQUIRED_ARGUMENT],
         ["--app",   "-a", GetoptLong::REQUIRED_ARGUMENT],
         ["--repo",  "-r", GetoptLong::REQUIRED_ARGUMENT],
+        ["--config", GetoptLong::REQUIRED_ARGUMENT],
         ["--type",  "-t", GetoptLong::REQUIRED_ARGUMENT]
     )
     opt = {}
@@ -65,6 +67,9 @@ rescue Exception => e
     p_usage
 end
 
+# If provided a config path, check it
+check_cpath(opt)
+
 # Pull in configs from files
 libra_server = get_var('libra_server')
 debug = get_var('debug') == 'false' ? nil : get_var('debug')
@@ -140,23 +145,6 @@ unless opt['nogit']
     end
 end
 
-#
-# Confirm libra_id_rsa exists
-#
-unless File.exists?("#{ssh_config_d}/libra_id_rsa")
-    puts
-    puts "Could not find #{ssh_config_d}/libra_id_rsa.  Unable to continue."
-    puts "Your SSH keys are created either by running ssh-keygen (password optional)"
-    puts "or by having the rhc-create-domain command do it for you.  If you created"
-    puts "them on your own (or want to use an existing keypair), be sure to paste"
-    puts "your public key into the dashboard page at http://www.openshift.com."
-    puts "The client tools expect libra_id_rsa[.pub] so in the event that you are"
-    puts "using existing keys, you can symlink libra_id_rsa -> id_rsa and"
-    puts "libra_id_rsa.pub -> id_rsa.pub"
-    puts "Also, make sure you never give out your secret key!"
-    exit 212
-end
-
 #
 # Create remote application space
 #
@@ -214,66 +202,69 @@ puts "Checking ~/.ssh/config"
 user_info = RHC::get_user_info(libra_server, opt['rhlogin'], password, @http, debug, false)
 
 fqdn = "#{opt['app']}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']}"
-
-found = false
-
-begin
-    File.open(ssh_config, "r") do |sline|
-        while(line = sline.gets)
-            if line.to_s.index("Host *.#{user_info['user_info']['rhc_domain']}") == 0
-                found = true
-                break
-            end
-        end
-    end
-rescue Errno::EACCES
-    puts "Could not read from #{ssh_config}"
-    puts "Reason: " + $!
-    puts
-    puts "Please correct this first.  Then run rerun."
-    puts
-    exit 213
-rescue Errno::ENOENT
-    puts "Could not find #{ssh_config}.  This is ok, continuing"
-end
-if found
-    puts "Found #{user_info['user_info']['rhc_domain']} in ~/.ssh/config... No need to adjust"
-else
-    puts "    Adding #{user_info['user_info']['rhc_domain']} to ~/.ssh/config"
-    begin
-        f = File.open(ssh_config, "a")
-        f.puts <<SSH
-
+ 
+ssh_key_file_name = File.basename(get_kfile())
+if (ssh_key_file_name != 'id_rsa')
+  found = false
+  
+  begin
+      File.open(ssh_config, "r") do |sline|
+          while(line = sline.gets)
+              if line.to_s.index("Host *.#{user_info['user_info']['rhc_domain']}") == 0
+                  found = true
+                  break
+              end
+          end
+      end
+  rescue Errno::EACCES
+      puts "Could not read from #{ssh_config}"
+      puts "Reason: " + $!
+      puts
+      puts "Please correct this first.  Then run rerun."
+      puts
+      exit 213
+  rescue Errno::ENOENT
+      puts "Could not find #{ssh_config}.  This is ok, continuing"
+  end
+  if found
+      puts "Found #{user_info['user_info']['rhc_domain']} in ~/.ssh/config... No need to adjust"
+  else
+      puts "    Adding #{user_info['user_info']['rhc_domain']} to ~/.ssh/config"
+      begin
+          f = File.open(ssh_config, "a")
+          f.puts <<SSH
+  
 # Added by rhc-create-app on #{`date`}
 Host *.#{user_info['user_info']['rhc_domain']}
-    IdentityFile ~/.ssh/libra_id_rsa
+    IdentityFile ~/.ssh/#{ssh_key_file_name}
     VerifyHostKeyDNS yes
     StrictHostKeyChecking no
     UserKnownHostsFile ~/.ssh/libra_known_hosts
 
 SSH
-        f.close
-     rescue Errno::EACCES
-        puts "Could not write to #{ssh_config}"
-        puts "Reason: " + $!
-        puts
-        puts "Please correct this first.  Then run rerun."
-        puts
-        exit 214
-    rescue Errno::ENOENT
-        # Make directory and config if they do not exist
-        puts "Could not find directory: " + $!
-        puts "creating"
-        FileUtils.mkdir_p ssh_config_d
-        file = File.open(ssh_config, 'w')
-        file.close
-        retry
-    end
+          f.close
+      rescue Errno::EACCES
+          puts "Could not write to #{ssh_config}"
+          puts "Reason: " + $!
+          puts
+          puts "Please correct this first.  Then run rerun."
+          puts
+          exit 214
+      rescue Errno::ENOENT
+          # Make directory and config if they do not exist
+          puts "Could not find directory: " + $!
+          puts "creating"
+          FileUtils.mkdir_p ssh_config_d
+          file = File.open(ssh_config, 'w')
+          file.close
+          retry
+      end
+  end
+  
+  File.chmod(0700, ssh_config_d)
+  File.chmod(0600, ssh_config)
 end
 
-File.chmod(0700, ssh_config_d)
-File.chmod(0600, ssh_config)
-
 #
 # Confirm that the host exists in DNS
 #

data/bin/rhc-create-domain

@@ -27,13 +27,14 @@ require 'rhc-common'
 # print help
 #
 def p_usage
+
     puts <<USAGE
 
 Usage: #{$0}
 Bind a registered rhcloud user to a domain in rhcloud.
 
-  NOTE: to change ssh key, please alter your ~/.ssh/libra_id_rsa and
-        ~/.ssh/libra_id_rsa.pub key, then re-run with --alter
+  NOTE: to change ssh key, alter your openshift <id_rsa> and
+        <id_rsa>.pub keys, then re-run with --alter
 
   -n|--namespace   namespace   Namespace for your application(s) (alphanumeric - max #{RHC::Maxdlen} chars) (required)
   -l|--rhlogin     rhlogin     Red Hat login (RHN or OpenShift login with OpenShift Express access) (required)
@@ -41,6 +42,7 @@ Bind a registered rhcloud user to a domain in rhcloud.
   -a|--alter                   Alter namespace (will change urls) and/or ssh key
   -d|--debug                   Print Debug info
   -h|--help                    Show Usage info
+  --config  path               Path of alternate config file
 
 USAGE
 exit 255
@@ -53,6 +55,7 @@ begin
         ["--rhlogin",  "-l", GetoptLong::REQUIRED_ARGUMENT],
         ["--password",  "-p", GetoptLong::REQUIRED_ARGUMENT],
         ["--namespace", "-n", GetoptLong::REQUIRED_ARGUMENT],
+        ["--config", GetoptLong::REQUIRED_ARGUMENT],
         ["--alter", "-a", GetoptLong::NO_ARGUMENT]
     )
     
@@ -62,16 +65,19 @@ begin
     end
 rescue Exception => e
   #puts e.message
-    p_usage
+  p_usage
 end
 
+# If provided a config path, check it
+check_cpath(opt)
+
 # Pull in configs from files
 libra_server = get_var('libra_server')
 debug = get_var('debug') == 'false' ? nil : get_var('debug')
 
 
-libra_kfile = "#{ENV['HOME']}/.ssh/libra_id_rsa"
-libra_kpfile = "#{ENV['HOME']}/.ssh/libra_id_rsa.pub"
+libra_kfile = get_kfile(false)
+libra_kpfile = get_kpfile(libra_kfile, opt['alter'])
 
 if opt["help"]
     p_usage
@@ -104,8 +110,8 @@ end
 #
 
 def add_rhlogin_config(rhlogin, uuid)
-    f = open(File.expand_path(@local_config_path), 'a')
-    unless @local_config.get_value('default_rhlogin')
+    f = open(File.expand_path(config_path), 'a')
+    unless config.get_value('default_rhlogin')
         f.puts("# Default rhlogin to use if none is specified")
         f.puts("default_rhlogin=#{rhlogin}")
         f.puts("")
@@ -115,7 +121,7 @@ end
 
 
 #
-# Check to see if a libra_id_rsa key exists, if not create it.
+# Check to see if a libra_kfile exists, if not create it.
 #
 
 if File.readable?(libra_kfile)
@@ -157,8 +163,7 @@ if response.code == '200'
             puts <<EOF
 Creation successful
 
-You may now create an application.  Please make note of your local config file
-in #{@local_config_path} which has been created and populated for you.
+You may now create an application.
 
 EOF
         else

data/bin/rhc-ctl-app

@@ -41,6 +41,7 @@ Control an OpenShift express app
   -b|--bypass              Bypass warnings
   -d|--debug               Print Debug info
   -h|--help                Show Usage info
+  --config  path           Path of alternate config file
 
 USAGE
 exit 255
@@ -67,6 +68,7 @@ begin
         ["--embed",      "-e", GetoptLong::REQUIRED_ARGUMENT],
         ["--password",   "-p", GetoptLong::REQUIRED_ARGUMENT],
         ["--app",        "-a", GetoptLong::REQUIRED_ARGUMENT],
+        ["--config", GetoptLong::REQUIRED_ARGUMENT],
         ["--command",    "-c", GetoptLong::REQUIRED_ARGUMENT]
     )
     opt = {}
@@ -78,6 +80,9 @@ rescue Exception => e
     p_usage
 end
 
+# If provided a config path, check it
+check_cpath(opt)
+
 # Pull in configs from files
 libra_server = get_var('libra_server')
 debug = get_var('debug') == 'false' ? nil : get_var('debug')

data/bin/rhc-snapshot

@@ -40,6 +40,7 @@ Pull down application snapshot for a user
   -p|--password  password   RHLogin password (optional, will prompt)
   -d|--debug                Print Debug info
   -h|--help                 Show Usage info
+  --config  path            Path of alternate config file
 
 USAGE
 exit 255
@@ -53,6 +54,7 @@ begin
         ["--save",  "-s", GetoptLong::REQUIRED_ARGUMENT],
         ["--restore",  "-r", GetoptLong::REQUIRED_ARGUMENT],
         ["--rhlogin",  "-l", GetoptLong::REQUIRED_ARGUMENT],
+        ["--config", GetoptLong::REQUIRED_ARGUMENT],
         ["--password",  "-p", GetoptLong::REQUIRED_ARGUMENT]
     )
     opt = {}
@@ -64,13 +66,13 @@ rescue Exception => e
     p_usage
 end
 
+# If provided a config path, check it
+check_cpath(opt)
+
 # Pull in configs from files
 libra_server = get_var('libra_server')
 debug = get_var('debug') == 'false' ? nil : get_var('debug')
 
-libra_kfile = "#{ENV['HOME']}/.ssh/libra_id_rsa"
-libra_kpfile = "#{ENV['HOME']}/.ssh/libra_id_rsa.pub"
-
 if opt["help"] || !opt['app']
     p_usage
 end

data/bin/rhc-tail-files

@@ -41,6 +41,7 @@ Tail the logs of an application
   -p|--password  password   RHLogin password (optional, will prompt)
   -d|--debug                Print Debug info
   -h|--help                 Show Usage info
+  --config  path            Path of alternate config file
 
 USAGE
 exit 255
@@ -54,6 +55,7 @@ begin
         ["--opts",  "-o", GetoptLong::REQUIRED_ARGUMENT],
         ["--files",  "-f", GetoptLong::REQUIRED_ARGUMENT],
         ["--rhlogin",  "-l", GetoptLong::REQUIRED_ARGUMENT],
+        ["--config", GetoptLong::REQUIRED_ARGUMENT],
         ["--password",  "-p", GetoptLong::REQUIRED_ARGUMENT]
     )
     opt = {}
@@ -65,13 +67,13 @@ rescue Exception => e
     p_usage
 end
 
+# If provided a config path, check it
+check_cpath(opt)
+
 # Pull in configs from files
 libra_server = get_var('libra_server')
 debug = get_var('debug') == 'false' ? nil : get_var('debug')
 
-libra_kfile = "#{ENV['HOME']}/.ssh/libra_id_rsa"
-libra_kpfile = "#{ENV['HOME']}/.ssh/libra_id_rsa.pub"
-
 if opt['help'] || !opt['app']
     p_usage
 end
@@ -108,19 +110,26 @@ file_glob = "#{opt['files']}"
 app_uuid = user_info['app_info'][app]['uuid']
 namespace = user_info['user_info']['namespace']
 rhc_domain = user_info['user_info']['rhc_domain']
-ssh_cmd = "ssh #{app_uuid}@#{app}-#{namespace}.#{rhc_domain} 'tail#{opt['opts'] ? ' --opts ' + Base64::encode64(opt['opts']).chomp : ''} #{file_glob}'"
+
+# -t to force PTY and avoid daemons
+# Red Hat Openshift: https://bugzilla.redhat.com/show_bug.cgi?id=726646
+# OpenSSH https://bugzilla.mindrot.org/show_bug.cgi?id=396
+
+ssh_cmd = "ssh -t #{app_uuid}@#{app}-#{namespace}.#{rhc_domain} 'tail#{opt['opts'] ? ' --opts ' + Base64::encode64(opt['opts']).chomp : ''} #{file_glob}'"
 
 puts "Attempting to tail files: #{file_glob}"
 puts "Use ctl + c to stop"
 puts 
 puts ssh_cmd if debug
-system(ssh_cmd)
-if $?.exitstatus != 0 and $?.exitstatus != 255
-    puts
-    puts "Error in trying to tail files.  You can tail manually by running:"
-    puts
-    puts ssh_cmd
-    puts
-    exit 254
+begin
+  exec ssh_cmd
+rescue SystemCallError
+  puts
+  puts "Error in trying to tail files.  You can tail manually by running:"
+  puts
+  puts ssh_cmd
+  puts
+  exit 254
 end
-exit 0
+# this should never happen
+exit 1

data/bin/rhc-user-info

@@ -39,6 +39,7 @@ Display information about a user
   -i|--info                 Show user info
   -d|--debug                Print Debug info
   -h|--help                 Show Usage info
+  --config  path            Path of alternate config file
 
 USAGE
 exit 255
@@ -51,6 +52,7 @@ begin
         ["--apps",  "-a", GetoptLong::NO_ARGUMENT],
         ["--info",  "-i", GetoptLong::NO_ARGUMENT],
         ["--rhlogin",  "-l", GetoptLong::REQUIRED_ARGUMENT],
+        ["--config", GetoptLong::REQUIRED_ARGUMENT],
         ["--password",  "-p", GetoptLong::REQUIRED_ARGUMENT]
     )
     opt = {}
@@ -62,13 +64,13 @@ rescue Exception => e
     p_usage
 end
 
+# If provided a config path, check it
+check_cpath(opt)
+
 # Pull in configs from files
 libra_server = get_var('libra_server')
 debug = get_var('debug') == 'false' ? nil : get_var('debug')
 
-libra_kfile = "#{ENV['HOME']}/.ssh/libra_id_rsa"
-libra_kpfile = "#{ENV['HOME']}/.ssh/libra_id_rsa.pub"
-
 if opt["help"]
     p_usage
 end

data/conf/express.conf

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

data/lib/rhc-common.rb

@@ -102,10 +102,7 @@ module RHC
   # Invalid chars (") ($) (^) (<) (>) (|) (%) (/) (;) (:) (,) (\) (*) (=) (~)
   def self.check_rhlogin(rhlogin)
     if rhlogin
-      if rhlogin.length < 6
-        puts 'RHLogin must be at least 6 characters'
-        return false
-      elsif rhlogin =~ /["\$\^<>\|%\/;:,\\\*=~]/
+      if rhlogin =~ /["\$\^<>\|%\/;:,\\\*=~]/
         puts 'RHLogin may not contain any of these characters: (\") ($) (^) (<) (>) (|) (%) (/) (;) (:) (,) (\) (*) (=) (~)'
         return false
       end
@@ -334,6 +331,7 @@ end
 # Config paths... /etc/openshift/express.conf or $GEM/conf/express.conf -> ~/.openshift/express.conf
 #
 # semi-private: Just in case we rename again :)
+@opts_config_path = nil
 @conf_name = 'express.conf'
 _linux_cfg = '/etc/openshift/' + @conf_name
 _gem_cfg = File.join(File.expand_path(File.dirname(__FILE__) + "/../conf"), @conf_name)
@@ -344,7 +342,16 @@ _home_conf = File.expand_path('~/.openshift')
 FileUtils.mkdir_p _home_conf unless File.directory?(_home_conf)
 local_config_path = File.expand_path(@local_config_path)
 if !File.exists? local_config_path
-  FileUtils.touch local_config_path
+  file = File.open(local_config_path, 'w')
+  begin
+    file.puts <<EOF
+# SSH key file
+#ssh_key_file = 'libra_id_rsa'
+EOF
+
+  ensure
+    file.close
+  end
   puts ""
   puts "Created local config file: " + local_config_path
   puts "express.conf contains user configuration and can be transferred across clients."
@@ -369,12 +376,97 @@ else
   @http = Net::HTTP
 end
 
+
+#
+# Support funcs
+#
+def check_cpath(opts)
+  if !opts["config"].nil?
+    @opts_config_path = opts["config"]
+    if !File.readable?(File.expand_path(@opts_config_path))
+      puts "Could not open config file: #{@opts_config_path}"
+      exit 253
+    else
+      begin
+        @opts_config = ParseConfig.new(File.expand_path(@opts_config_path))
+      rescue Errno::EACCES => e
+        puts "Could not open config file (#{@opts_config_path}): #{e.message}"
+        exit 253
+      end
+    end
+  end
+end
+
+def config_path
+  return @opts_config_path ? @opts_config_path : @local_config_path
+end
+
+def config
+  return @opts_config ? @opts_config : @local_config
+end
+
 #
 # Check for local var in
+#   0) --config path file
 #   1) ~/.openshift/express.conf
 #   2) /etc/openshift/express.conf
 #   3) $GEM/../conf/express.conf
 #
 def get_var(var)
-  @local_config.get_value(var) ? @local_config.get_value(var) : @global_config.get_value(var)
+  v = nil
+  if !@opts_config.nil? && @opts_config.get_value(var)
+    v = @opts_config.get_value(var)
+  else
+    v = @local_config.get_value(var) ? @local_config.get_value(var) : @global_config.get_value(var)
+  end
+  v
+end
+
+def kfile_not_found
+  puts <<KFILE_NOT_FOUND
+Your SSH keys are created either by running ssh-keygen (password optional)
+or by having the rhc-create-domain command do it for you.  If you created
+them on your own (or want to use an existing keypair), be sure to paste
+your public key into the express console at http://www.openshift.com.
+The client tools use the value of 'ssh_key_file' in express.conf to find
+your key followed by the defaults of libra_id_rsa[.pub] and then
+id_rsa[.pub].
+KFILE_NOT_FOUND
+
+#exit 212
 end
+
+def get_kfile(check_exists=true)
+  ssh_key_file = get_var('ssh_key_file')
+  if ssh_key_file
+    if (File.basename(ssh_key_file) == ssh_key_file)
+      kfile = "#{ENV['HOME']}/.ssh/#{ssh_key_file}"
+    else
+      kfile = File.expand_path(ssh_key_file)
+    end
+  else
+    kfile = "#{ENV['HOME']}/.ssh/libra_id_rsa"
+  end
+  if check_exists && !File.exists?(kfile)
+    if ssh_key_file
+      puts "WARNING: Unable to find '#{kfile}' referenced in express.conf."
+      kfile_not_found
+    else
+      kfile = "#{ENV['HOME']}/.ssh/id_rsa"
+      if !File.exists?(kfile)
+        puts "WARNING: Unable to find ssh key file."
+        kfile_not_found
+      end
+    end
+  end
+  return kfile
+end
+
+def get_kpfile(kfile, check_exists=true)
+  kpfile = kfile + '.pub'
+  if check_exists && !File.exists?(kpfile)
+    puts "WARNING: Unable to find '#{kpfile}'"
+    kfile_not_found
+  end
+  return kpfile
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 289
-  prerelease: false
+  hash: 315
+  prerelease: 
   segments: 
   - 0
-  - 75
-  - 9
-  version: 0.75.9
+  - 77
+  - 8
+  version: 0.77.8
 platform: ruby
 authors: 
 - Red Hat
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-22 00:00:00 -05:00
-default_executable: 
+date: 2011-09-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -49,6 +48,7 @@ dependencies:
 description: The client tools for the OpenShift Express platform that allow for application management.
 email: openshift@redhat.com
 executables: 
+- rhc-chk
 - rhc-create-app
 - rhc-create-domain
 - rhc-ctl-app
@@ -61,18 +61,17 @@ extra_rdoc_files: []
 
 files: 
 - lib/rhc-common.rb
-- bin/rhc-chk
-- bin/rhc-create-domain
+- bin/rhc-ctl-app
 - bin/rhc-tail-files
 - bin/rhc-create-app
-- bin/rhc-ctl-app
-- bin/rhc-user-info
+- bin/rhc-chk
 - bin/rhc-snapshot
+- bin/rhc-create-domain
+- bin/rhc-user-info
 - conf/express.conf
 - LICENSE
 - README
 - Rakefile
-has_rdoc: true
 homepage: https://openshift.redhat.com/app/express
 licenses: []
 
@@ -102,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: OpenShift Express Client Tools