rhc 0.84.13 → 0.84.15

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-domain', 'rhc-ctl-app', 'rhc-snapshot', 'rhc-domain-info', 'rhc-user-info', 'rhc-tail-files', 'rhc-port-forward']
+    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']
     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/)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 341
+  hash: 337
   prerelease: 
   segments: 
   - 0
   - 84
-  - 13
-  version: 0.84.13
+  - 15
+  version: 0.84.15
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-13 00:00:00 Z
+date: 2012-01-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -57,7 +57,6 @@ executables:
 - rhc-domain-info
 - rhc-user-info
 - rhc-tail-files
-- rhc-port-forward
 extensions: []
 
 extra_rdoc_files: []
@@ -70,7 +69,6 @@ files:
 - 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

data/bin/rhc-port-forward

@@ -1,146 +0,0 @@
-#!/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