rhc 0.83.9 → 0.84.13

data/Rakefile

@@ -24,7 +24,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-chk', '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-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/)
@@ -34,6 +34,9 @@ spec = Gem::Specification.new do |s|
     end
     end
     s.add_dependency('parseconfig')
+    if RUBY_VERSION.to_f == 1.9
+      s.add_dependency('test-unit')
+    end
 end
 
 # Define a :package task that bundles the gem

data/bin/rhc-chk

@@ -28,9 +28,15 @@ require 'rbconfig'
 require 'yaml'
 require 'tempfile'
 
+if RUBY_VERSION.to_f == 1.9
+  require 'rubygems'
+  gem     'test-unit'
+end
+
 require 'test/unit'
 require 'test/unit/ui/console/testrunner'
 
+
 #
 # print help
 #
@@ -283,11 +289,18 @@ class Test3_SSH < Test::Unit::TestCase
     @@local_derived_ssh_pubkey = key_dump.to_s.strip.split(' ')[1]
 
     assert_not_nil @@local_derived_ssh_pubkey, error_for(:no_derive)
-
     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)
+    $remote_ssh_pubkeys = []
+    additional_ssh_keys = RHC::get_ssh_keys($libra_server, $rhlogin, $password, $http)
+    if additional_ssh_keys && additional_ssh_keys.kind_of?(Hash)
+      additional_ssh_keys.each do |name, sshkey|
+        $remote_ssh_pubkeys.push(sshkey['key'])
+      end
+    end
+
+    $remote_ssh_pubkeys.push($user_info["user_info"]["ssh_key"])
+    assert $remote_ssh_pubkeys.include?(@@local_derived_ssh_pubkey), error_for(:no_match_pub, @libra_kfile)
   end
 
   def test_02_ssh_public_key
@@ -299,11 +312,8 @@ class Test3_SSH < Test::Unit::TestCase
 
     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)
+    assert $remote_ssh_pubkeys.include?(@@local_ssh_pubkey), error_for(:no_match_pub, @libra_kfile)
   ensure
     fp.close if fp
   end
@@ -313,11 +323,11 @@ class Test3_SSH < Test::Unit::TestCase
   end
 
   def test_06_ssh_agent
-    loaded_keys = `ssh-add -L`.to_a
+    loaded_keys = `ssh-add -L`.lines.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
@@ -455,4 +465,4 @@ $messages = YAML.load <<-EOF
   :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
+  EOF

data/bin/rhc-create-domain

@@ -216,11 +216,15 @@ else
     system("ssh-keygen -t rsa -f '#{ssh_key_file_path}'")
 end
 
-ssh_key = File.open(ssh_pub_key_file_path).gets.chomp.split(' ')[1]
+ssh_keyfile_contents = File.open(ssh_pub_key_file_path).gets.chomp.split(' ')
+ssh_key = ssh_keyfile_contents[1]
+ssh_key_type = ssh_keyfile_contents[0]
 
 data = {'namespace' => opt['namespace'],
         'rhlogin' => opt['rhlogin'],
-        'ssh' => ssh_key}
+        'ssh' => ssh_key,
+        'key_type' => ssh_key_type}
+
 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."
@@ -295,4 +299,4 @@ EOF
 else
     RHC::print_response_err(response)
 end
-exit 1
+exit 1

data/bin/rhc-ctl-app

@@ -144,10 +144,6 @@ if opt['command'] and (opt['alias'] and !(opt['command'] =~ /-alias$/)) || ((opt
     p_usage
 end
 
-if opt["command"] == "threaddump"
-    print "NOTE: The threaddump command is only applicable to applications of type jbossas-7.0. The thread dump file will be available via 'rhc-tail-files -f app-name/jbossas-7.0/stdout.log'"  
-end
-
 password = opt['password']
 if !password
   password = RHC::get_password

data/bin/rhc-ctl-domain

@@ -0,0 +1,210 @@
+#!/usr/bin/env ruby
+# Copyright 2011 Red Hat, Inc.
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'rhc-common'
+
+#
+# print help
+#
+def p_usage
+
+  puts <<USAGE
+
+Usage: #{$0}
+Manage multiple keys for the registered rhcloud user.
+
+  rhc-ctl-domain -l <rhlogin> [-p <passwd>] (-a <key-name> [-k <ssh-pubkey>] | -r <key-name> | -u <key-name> [-k <ssh-pubkey>])
+
+  -l|--rhlogin         rhlogin      Red Hat login (RHN or OpenShift login with OpenShift Express access) (required)
+  -p|--password        password     RHLogin password (optional, will prompt)
+  -n|--namespace       namespace    Namespace for your application(s) (alphanumeric - max #{RHC::DEFAULT_MAX_LENGTH} chars) (required for destroying domain)
+  -a|--add-ssh-key     key-name     Add SSH key to the user account (key-name is the user-specified identifier for the key)
+  -r|--remove-ssh-key  key-name     Remove SSH key from the user account
+  -u|--update-ssh-key  key-name     Update SSH key for the user account
+  --destroy                         Destroys the domain and any added ssh keys
+  -k|--ssh             key-filepath SSH public key filepath 
+  --config             path         Path of alternate config file
+  -d|--debug                        Print Debug info
+  -h|--help                         Show Usage info
+
+USAGE
+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],
+        ["--namespace",  "-n", GetoptLong::REQUIRED_ARGUMENT],
+        ["--add-ssh-key", "-a", GetoptLong::REQUIRED_ARGUMENT],
+        ["--remove-ssh-key", "-r", GetoptLong::REQUIRED_ARGUMENT],
+        ["--update-ssh-key", "-u", GetoptLong::REQUIRED_ARGUMENT],
+        ["--destroy", GetoptLong::NO_ARGUMENT],
+        ["--ssh", "-k", GetoptLong::REQUIRED_ARGUMENT],
+        ["--config", GetoptLong::REQUIRED_ARGUMENT]
+    )
+    
+    command_list = ['add-ssh-key', 'remove-ssh-key', 'update-ssh-key', 'destroy']
+    command_count = 0
+    opt = {}
+    opts.each do |o, a|
+        opt[o[2..-1]] = a.to_s
+        
+        # check to see if there are multiple commands
+        if command_list.include?(o[2..-1])
+            command_count += 1
+        end
+    end
+rescue Exception => e
+  #puts e.message
+  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')
+opt['rhlogin'] = get_var('default_rhlogin') unless opt['rhlogin']
+
+if opt['help']
+    p_usage
+end
+
+if opt['debug']
+    debug = true
+end
+RHC::debug(debug)
+
+# Validate for no command or multiple commands being specified
+if command_count == 0
+    puts "Missing command! You must specify the operation to perform."
+    p_usage
+elsif command_count > 1
+    puts "Multiple commands specified! You can only perform one operation at a time."
+    p_usage
+end
+
+if opt['destroy'] && !RHC::check_namespace(opt['namespace'])
+    puts "Missing or invalid namespace! You must specify the namespace in order to destroy it."
+    p_usage
+end
+
+
+# This is taken care of by the command_count validation performed earlier
+#if !opt['rhlogin'] || !(opt['add-key'] || opt['remove-key'] || opt['update-key'] || opt['list-keys']) || \
+#   (opt['add-key'] && (opt['remove-key'] || opt['update-key'] || opt['list-keys'])) || \
+#   (opt['remove-key'] && (opt['add-key'] || opt['update-key'] || opt['list-keys'])) || \
+#   (opt['update-key'] && (opt['add-key'] || opt['remove-key'] || opt['list-keys'])) || \
+#   (opt['list-keys'] && (opt['add-key'] || opt['remove-key'] || opt['update-key']))
+#    p_usage
+#end
+
+if !RHC::check_rhlogin(opt['rhlogin']) || \
+   (opt['add-ssh-key'] && !RHC::check_key(opt['add-ssh-key'])) || \
+   (opt['remove-ssh-key'] && !RHC::check_key(opt['remove-ssh-key'])) || \
+   (opt['update-ssh-key'] && !RHC::check_key(opt['update-ssh-key']))
+    p_usage
+end
+
+password = opt['password']
+if !password
+  password = RHC::get_password
+end
+
+#
+# Read user public ssh key
+if opt['add-ssh-key'] || opt['update-ssh-key']
+  if opt['ssh']
+    if File.readable?(opt['ssh'])
+      begin
+        ssh_keyfile_contents = File.open(opt['ssh']).gets.chomp.split(' ')
+        ssh_key = ssh_keyfile_contents[1]
+        ssh_key_type = ssh_keyfile_contents[0]
+      rescue Exception => e
+        puts "Invalid public keyfile format! Please specify a valid user public keyfile."
+        exit 1
+      end
+    else
+      puts "Unable to read user public keyfile #{opt['ssh']}"
+      exit 1
+    end
+  else # create key
+    key_name = opt['add-ssh-key'] ? opt['add-ssh-key'] : opt['update-ssh-key']
+    puts "Generating ssh key pair for user '#{key_name}' in the dir '#{Dir.pwd}/'"
+    # Use system for interaction
+    system("ssh-keygen -t rsa -f '#{key_name}'")
+    ssh_pub_key_file = Dir.pwd + '/' + key_name + '.pub'
+    ssh_keyfile_contents = File.open(ssh_pub_key_file).gets.chomp.split(' ')
+    ssh_key = ssh_keyfile_contents[1]
+    ssh_key_type = ssh_keyfile_contents[0]
+  end
+end
+
+data = {}
+data[:rhlogin] = opt['rhlogin']
+if opt['add-ssh-key']
+  url = URI.parse("https://#{libra_server}/broker/ssh_keys")
+  data[:key_name] = opt['add-ssh-key']
+  data[:ssh] = ssh_key
+  data[:action] = 'add-key'
+  data[:key_type] = ssh_key_type
+elsif opt['remove-ssh-key']
+  url = URI.parse("https://#{libra_server}/broker/ssh_keys")
+  data[:key_name] = opt['remove-ssh-key']
+  data[:action] = 'remove-key'
+elsif opt['update-ssh-key']
+  url = URI.parse("https://#{libra_server}/broker/ssh_keys")
+  data[:key_name] = opt['update-ssh-key']
+  data[:ssh] = ssh_key
+  data[:action] = 'update-key'
+  data[:key_type] = ssh_key_type
+elsif opt['destroy']
+  url = URI.parse("https://#{libra_server}/broker/domain")
+  data[:delete] = true
+  data[:namespace] = opt['namespace']
+end
+
+RHC::print_post_data(data)
+json_data = RHC::generate_json(data)
+
+response = RHC::http_post(@http, url, json_data, password)
+
+if response.code == '200'
+  begin
+    json_resp = JSON.parse(response.body)
+    RHC::update_server_api_v(json_resp)
+    RHC::print_response_success(json_resp)
+    puts "Success"
+    exit 0
+  rescue JSON::ParserError
+    RHC::print_response_err(response)
+  end
+else
+  RHC::print_response_err(response)
+end
+puts "Failure"
+exit 1

data/bin/rhc-domain-info

@@ -0,0 +1,164 @@
+#!/usr/bin/env ruby
+# Copyright 2011 Red Hat, Inc.
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'rhc-common'
+
+#
+# print help
+#
+def p_usage
+    rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "required"
+    puts <<USAGE
+
+Usage: #{$0}
+Display information about a user
+
+  -l|--rhlogin   rhlogin    Red Hat login (RHN or OpenShift login with OpenShift Express access) (#{rhlogin})
+  -p|--password  password   RHLogin password (optional, will prompt)
+  -a|--apps                 List applications for rhlogin
+  -i|--info                 Show user info
+  -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
+end
+
+begin
+    opts = GetoptLong.new(
+        ["--debug", "-d", GetoptLong::NO_ARGUMENT],
+        ["--help",  "-h", GetoptLong::NO_ARGUMENT],
+        ["--apps",  "-a", GetoptLong::NO_ARGUMENT],
+        ["--info",  "-i", GetoptLong::NO_ARGUMENT],
+        ["--rhlogin",  "-l", GetoptLong::REQUIRED_ARGUMENT],
+        ["--config", GetoptLong::REQUIRED_ARGUMENT],
+        ["--password",  "-p", 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
+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')
+
+if opt["help"]
+    p_usage
+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'])
+    p_usage
+end
+
+password = opt['password']
+if !password
+  password = RHC::get_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, true)
+
+if opt['info']
+    ssh_keys = RHC::get_ssh_keys(libra_server, opt['rhlogin'], password, @http)
+
+    puts "User Info"
+    puts "========="
+    puts "Namespace: #{user_info['user_info']['namespace']}"
+    #puts "    UUID: #{user_info['user_info']['uuid']}"
+    puts "  RHLogin: #{user_info['user_info']['rhlogin']}"
+    puts "Primary SSH key: #{user_info['user_info']['ssh_key']}"
+    puts "Primary SSH key type: #{user_info['user_info']['ssh_type']}"  unless user_info['user_info']['ssh_type'].to_s.strip.length == 0
+
+    if ssh_keys && ssh_keys.kind_of?(Hash)
+      puts ""
+      puts "Additional SSH keys"
+      puts "==================="
+      ssh_keys.each do |name, keyval|
+        puts "Name: #{name}"
+        puts " Key: #{keyval['key']}"
+        puts "Type: #{keyval['type']}"
+        puts ""
+      end
+      puts "Use rhc-ctl-domain for managing additional ssh keys"
+    end
+    
+end
+
+if opt['apps']
+    puts "\n\n" if opt['info']
+
+    puts "Application Info"
+    puts "================"
+    unless user_info['app_info'].empty?
+      user_info['app_info'].each do |key, val|
+          puts key
+          puts "    Framework: #{val['framework']}"
+          puts "     Creation: #{val['creation_time']}"
+          puts "         UUID: #{val['uuid']}"
+          puts "      Git URL: ssh://#{val['uuid']}@#{key}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']}/~/git/#{key}.git/"
+          puts "   Public URL: http://#{key}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']}/"
+          if val['aliases'] && !val['aliases'].empty?
+            puts "      Aliases: #{val['aliases'].join(', ')}"
+          end
+          puts ""
+          puts " Embedded: "
+          if val['embedded'] && !val['embedded'].empty? 
+              val['embedded'].each do |embed_key, embed_val|
+                  if embed_val.has_key?('info') && !embed_val['info'].empty?
+                      puts "      #{embed_key} - #{embed_val['info']}"
+                  else
+                      puts "      #{embed_key}"
+                  end
+              end
+          else
+              puts "      None"
+          end
+          puts ""
+      end
+    else
+      puts "No applications found.  You can use rhc-create-app to create new applications."
+    end
+
+end
+
+exit 0

data/bin/rhc-port-forward

@@ -0,0 +1,146 @@
+#!/usr/bin/env ruby
+# Copyright 2011 Red Hat, Inc.
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'rhc-common'
+
+#
+# print help
+#
+def p_usage
+    rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "required"
+    puts <<USAGE
+
+Usage: #{$0}
+Forward remote ports to the workstation
+
+  -l|--rhlogin   rhlogin    Red Hat login (RHN or OpenShift login with OpenShift Express access) (#{rhlogin})
+  -a|--app                  Target application (required)
+  -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
+  --timeout #               Timeout, in seconds, for connection
+
+USAGE
+exit 255
+end
+
+begin
+    opts = GetoptLong.new(
+        ["--debug", "-d", GetoptLong::NO_ARGUMENT],
+        ["--help",  "-h", GetoptLong::NO_ARGUMENT],
+        ["--app",  "-a", GetoptLong::REQUIRED_ARGUMENT],
+        ["--rhlogin",  "-l", GetoptLong::REQUIRED_ARGUMENT],
+        ["--config", GetoptLong::REQUIRED_ARGUMENT],
+        ["--password",  "-p", 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
+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')
+
+if opt['help'] || !opt['app']
+    p_usage
+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'])
+    p_usage
+end
+
+password = opt['password']
+if !password
+  password = RHC::get_password
+end
+
+user_info = RHC::get_user_info(libra_server, opt['rhlogin'], password, @http, false)
+
+app_name = opt['app']
+
+unless user_info['app_info'][app_name]
+    puts
+    puts "Could not find app '#{app_name}'.  Please run rhc-user-info to get a list"
+    puts "of your current running applications"
+    puts
+    exit 101
+end
+
+app_uuid = user_info['app_info'][app_name]['uuid']
+namespace = user_info['user_info']['namespace']
+rhc_domain = user_info['user_info']['rhc_domain']
+
+puts "Checking available ports..."
+
+hosts_and_ports, hosts_and_ports_descriptions = RHC::list_ports(rhc_domain, namespace, app_name, app_uuid, debug)
+
+if hosts_and_ports.length == 0
+  puts
+  puts "No available ports to forward"
+  exit 102
+end
+
+puts
+
+hosts_and_ports_descriptions.each { |description| puts "Binding #{description}..." }
+
+ssh_cmd = "ssh -N "
+hosts_and_ports.each { |port| ssh_cmd << "-L #{port}:#{port} " }
+ssh_cmd << "#{app_uuid}@#{app_name}-#{namespace}.#{rhc_domain}"
+
+puts ssh_cmd if debug
+puts
+puts "Use ctl + c to stop"
+
+begin
+  exec ssh_cmd
+rescue SystemCallError
+  puts
+  puts "Error trying to forward ports.  You can try to forward manually by running:"
+  puts
+  puts ssh_cmd
+  puts
+  exit 1
+end
+
+# never
+exit 1

data/bin/rhc-user-info

@@ -21,127 +21,17 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require 'rhc-common'
 
-#
-# print help
-#
-def p_usage
-    rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "required"
-    puts <<USAGE
-
-Usage: #{$0}
-Display information about a user
-
-  -l|--rhlogin   rhlogin    Red Hat login (RHN or OpenShift login with OpenShift Express access) (#{rhlogin})
-  -p|--password  password   RHLogin password (optional, will prompt)
-  -a|--apps                 List applications for rhlogin
-  -i|--info                 Show user info
-  -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
-end
 
-begin
-    opts = GetoptLong.new(
-        ["--debug", "-d", GetoptLong::NO_ARGUMENT],
-        ["--help",  "-h", GetoptLong::NO_ARGUMENT],
-        ["--apps",  "-a", GetoptLong::NO_ARGUMENT],
-        ["--info",  "-i", GetoptLong::NO_ARGUMENT],
-        ["--rhlogin",  "-l", GetoptLong::REQUIRED_ARGUMENT],
-        ["--config", GetoptLong::REQUIRED_ARGUMENT],
-        ["--password",  "-p", 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
-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')
+# print deprecation warning
+puts "Warning: This command is deprecated. Please use rhc-domain-info instead."
+puts""
 
-if opt["help"]
-    p_usage
+args = ""
+ARGV.each do|a|
+  args += " #{a}"
 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'])
-    p_usage
-end
-
-password = opt['password']
-if !password
-  password = RHC::get_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, true)
-
-if opt['info']
-    puts "User Info"
-    puts "========="
-    puts "Namespace: #{user_info['user_info']['namespace']}"
-    #puts "    UUID: #{user_info['user_info']['uuid']}"
-    puts "   RHLogin: #{user_info['user_info']['rhlogin']}"
-    puts " ssh_key: #{user_info['user_info']['ssh_key']}"
-end
-
-if opt['apps']
-    puts "\n\n" if opt['info']
-
-    puts "Application Info"
-    puts "================"
-    unless user_info['app_info'].empty?
-      user_info['app_info'].each do |key, val|
-          puts key
-          puts "    Framework: #{val['framework']}"
-          puts "     Creation: #{val['creation_time']}"
-          puts "         UUID: #{val['uuid']}"
-          puts "      Git URL: ssh://#{val['uuid']}@#{key}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']}/~/git/#{key}.git/"
-          puts "   Public URL: http://#{key}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']}/"
-          if val['aliases'] && !val['aliases'].empty?
-            puts "      Aliases: #{val['aliases'].join(', ')}"
-          end
-          puts ""
-          puts " Embedded: "
-          if val['embedded'] && !val['embedded'].empty? 
-              val['embedded'].each do |embed_key, embed_val|
-                  if embed_val.has_key?('info') && !embed_val['info'].empty?
-                      puts "      #{embed_key} - #{embed_val['info']}"
-                  else
-                      puts "      #{embed_key}"
-                  end
-              end
-          else
-              puts "      None"
-          end
-          puts ""
-      end
-    else
-      puts "No applications found.  You can use rhc-create-app to create new applications."
-    end
-
-end
+system("rhc-domain-info #{args} 2>&1")
 
-exit 0
+exit 0

data/lib/rhc-common.rb

@@ -39,7 +39,7 @@ module RHC
   APP_NAME_MAX_LENGTH = 32
   MAX_RETRIES = 7
   DEFAULT_DELAY = 2
-  API = "1.1.1"
+  API = "1.1.2"
   PATTERN_VERSION=/\A\d+\.\d+\.\d+\z/
   @mytimeout = 10
   @mydebug = false
@@ -165,6 +165,10 @@ module RHC
     check_field(namespace, 'namespace', DEFAULT_MAX_LENGTH)
   end
 
+  def self.check_key(keyname)
+    check_field(keyname, 'keyname', DEFAULT_MAX_LENGTH)
+  end
+
   def self.check_field(field, type, max=0)
     if field
       if field =~ /[^0-9a-zA-Z]/
@@ -243,6 +247,40 @@ module RHC
     user_info
   end
 
+  def self.get_ssh_keys(libra_server, rhlogin, password, net_http)
+    data = {'rhlogin' => rhlogin, 'action' => 'list-keys'}
+    if @mydebug
+      data[:debug] = true
+    end
+    print_post_data(data)
+    json_data = generate_json(data)
+
+    url = URI.parse("https://#{libra_server}/broker/ssh_keys")
+    response = http_post(net_http, url, json_data, password)
+
+    unless response.code == '200'
+      if response.code == '401'
+        puts "Invalid user credentials"
+        exit 97
+      else
+        print_response_err(response)
+      end
+      exit 1
+    end
+    begin
+      json_resp = JSON.parse(response.body)
+    rescue JSON::ParserError
+      exit 1
+    end
+    update_server_api_v(json_resp)
+    begin
+      ssh_keys = (JSON.parse(json_resp['data'].to_s))['keys']
+    rescue JSON::ParserError
+      exit 1
+    end
+    ssh_keys
+  end
+
   def self.get_password
     password = nil
     begin
@@ -851,4 +889,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: 321
+  hash: 341
   prerelease: 
   segments: 
   - 0
-  - 83
-  - 9
-  version: 0.83.9
+  - 84
+  - 13
+  version: 0.84.13
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-19 00:00:00 Z
+date: 2012-01-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -51,10 +51,13 @@ executables:
 - 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
 extensions: []
 
 extra_rdoc_files: []
@@ -62,12 +65,15 @@ extra_rdoc_files: []
 files: 
 - lib/rhc-common.rb
 - bin/rhc-ctl-app
-- bin/rhc-tail-files
-- bin/rhc-user-info
-- bin/rhc-snapshot
-- bin/rhc-chk
 - bin/rhc-create-app
+- bin/rhc-chk
 - bin/rhc-create-domain
+- bin/rhc-domain-info
+- bin/rhc-user-info
+- bin/rhc-port-forward
+- bin/rhc-snapshot
+- bin/rhc-tail-files
+- bin/rhc-ctl-domain
 - conf/express.conf
 - LICENSE
 - README