rhc 0.88.9 → 0.90.6

data/Rakefile

@@ -26,18 +26,15 @@ spec = Gem::Specification.new do |s|
     s.files = FileList['lib/**/*.rb', 'lib/rhc', 'bin/*', 'conf/*'].to_a
     s.files += %w(LICENSE COPYRIGHT README Rakefile)
     s.executables = ['rhc', 'rhc-domain', 'rhc-app', 'rhc-sshkey', '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/)
-        s.add_dependency('json_pure')
-    else
-        s.add_dependency('json')
-    end
-    end
     s.add_dependency('parseconfig')
-    if RUBY_VERSION.to_f == 1.9
-      s.add_dependency('test-unit')
-    end
+    s.add_dependency('rhc-rest', ">= 0.0.11")
+
+
+    # Adding install time dependencies for
+    #   - test-unit (Ruby 1.9)
+    #   - json_pure (Ruby (Ruby 1.8.6, Windows, Mac) / json (everything else)
+    # http://en.wikibooks.org/wiki/Ruby_Programming/RubyGems
+    s.extensions << 'ext/mkrf_conf.rb'
 end
 
 # Define a :package task that bundles the gem

data/bin/rhc

@@ -12,6 +12,7 @@ List of resources
   domain             Manage the namespace for the registered rhcloud user.
   app                Manage applications within the rhcloud account.
   sshkey             Manage multiple keys for the registered rhcloud user.
+  port-forward       Forward remote ports to the workstation
 
 See 'rhc <resource> --help' for more applicable commands and argumments on a specific resource.
 
@@ -40,6 +41,9 @@ when "app"
 when "sshkey"
   system("rhc-sshkey #{get_args} 2>&1")
   retcode = $?
+when "port-forward"
+  system("rhc-port-forward #{get_args} 2>&1")
+  retcode = $?
 when "-h", "--help", "help", nil
   p_usage
 else

data/bin/rhc-app

@@ -14,7 +14,7 @@ def p_usage
     puts <<USAGE
 
 Usage: rhc app (<command> | cartridge <cartridge-action> | --help) [<args>]
-Create and manage an OpenShift Express application.
+Create and manage an OpenShift application.
 
 List of commands
   create                         Bind a registered rhcloud user to a domain in rhcloud.
@@ -45,12 +45,13 @@ List of cartridge actions
   reload                         Reloads embedded application configuration
 
 List of arguments
-  -l|--rhlogin      rhlogin      Red Hat login (RHN or OpenShift login with OpenShift Express access) (#{rhlogin})
+  -l|--rhlogin      rhlogin      Red Hat login (RHN or OpenShift login) (#{rhlogin})
   -p|--password     password     RHLogin password (optional, will prompt)
   -a|--app          application  Application name  (alphanumeric - max #{RHC::APP_NAME_MAX_LENGTH} chars) (required)
   -t|--type         type         Type of app to create (#{type_keys}) (required for creating an application)
   -c|--cartridge    cartridge    The embedded cartrige to manage (required for the cartridge command)
   -g|--gear-size    size         The size of the gear for this app ([small|medium|large], defaults to small)
+  -s|--scaling                   Enable scaling for this app
   -r|--repo         path         Git Repo path (defaults to ./$app_name)
   -n|--nogit                     Only create remote space, don't pull it locally
   --no-dns                       Skip DNS check. Must be used in combination with --nogit
@@ -62,10 +63,7 @@ List of arguments
   --alias           alias        Specify server alias (when using add/remove-alias)
   --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)
-                                 and embed the Jenkins client into this application.  The default 
-                                 name will be 'jenkins' if not specified. Note that --no-dns is ignored
-                                 for the creation of the Jenkins application.
+  --enable-jenkins  [name]       Indicates to create a Jenkins application (if not already available) and embed the Jenkins client into this application.  The default name will be 'jenkins' if not specified. Note that --no-dns is ignored for the creation of the Jenkins application.
 USAGE
 exit 255
 end
@@ -109,7 +107,7 @@ def create_app
   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"
+    puts "An application named '#{$opt['app']}' in namespace '#{user_info['user_info']['domains'][0]['namespace']}' already exists"
     exit 255
   end
   
@@ -228,7 +226,7 @@ currently being created: '#{$opt['app']}'
   #
   # 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'], false, $opt['gear-size'])
+  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, $opt['gear-size'], $opt['scaling'])
   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', nil, false)
@@ -268,8 +266,8 @@ def show_app
         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']}/"
+        puts "      Git URL: ssh://#{val['uuid']}@#{key}-#{user_info['user_info']['domains'][0]['namespace']}.#{user_info['user_info']['rhc_domain']}/~/git/#{key}.git/"
+        puts "   Public URL: http://#{key}-#{user_info['user_info']['domains'][0]['namespace']}.#{user_info['user_info']['rhc_domain']}/"
         if val['aliases'] && !val['aliases'].empty?
           puts "      Aliases: #{val['aliases'].join(', ')}"
         end
@@ -368,7 +366,7 @@ def save_or_restore_snapshot(command)
   user_info = RHC::get_user_info($libra_server, $opt['rhlogin'], $password, @http, @mydebug, false)
   
   app = $opt['app']
-  $opt['filepath'] = "#{$opt['app']}.tar.gz" if command == 'save' and not $opt['filepath']
+  $opt['filepath'] = "#{$opt['app']}.tar.gz" unless $opt['filepath']
   
   unless user_info['app_info'][app]
       puts
@@ -379,7 +377,7 @@ def save_or_restore_snapshot(command)
   end
   
   app_uuid = user_info['app_info'][app]['uuid']
-  namespace = user_info['user_info']['namespace']
+  namespace = user_info['user_info']['domains'][0]['namespace']
   rhc_domain = user_info['user_info']['rhc_domain']
   if command == 'save'
     ssh_cmd = "ssh #{app_uuid}@#{app}-#{namespace}.#{rhc_domain} 'snapshot' > #{$opt['filepath']}"
@@ -400,7 +398,7 @@ def save_or_restore_snapshot(command)
         puts "Restoring from snapshot #{$opt['filepath']}"
       end
     else
-      puts "Archive not found: #{$opt['filepath']}"
+      puts "Archive not found: #{$opt['filepath']} - you may specify a path to the archive using the -f option"
       exit 255
     end
   end
@@ -442,7 +440,7 @@ def show_logs
   $opt['filepath'] = "#{$opt['app']}/logs/*" unless $opt['filepath']
   file_glob = "#{$opt['filepath']}"
   app_uuid = user_info['app_info'][app]['uuid']
-  namespace = user_info['user_info']['namespace']
+  namespace = user_info['user_info']['domains'][0]['namespace']
   rhc_domain = user_info['user_info']['rhc_domain']
   
   # -t to force PTY and avoid daemons
@@ -486,6 +484,7 @@ begin
         ["--repo",  "-r", GetoptLong::REQUIRED_ARGUMENT],
         ["--type",  "-t", GetoptLong::REQUIRED_ARGUMENT],
         ["--enable-jenkins", GetoptLong::OPTIONAL_ARGUMENT],
+        ["--scaling", "-s", GetoptLong::OPTIONAL_ARGUMENT],
         ["--config", GetoptLong::REQUIRED_ARGUMENT],
         ["--timeout", GetoptLong::REQUIRED_ARGUMENT]
     )

data/bin/rhc-chk

@@ -26,7 +26,7 @@ Usage: rhc domain status
 Run a simple check on local configs and credentials to confirm tools are
 properly setup.  Often run to troubleshoot connection issues.
 
-  -l|--rhlogin   rhlogin    Red Hat login (RHN or OpenShift login with OpenShift Express access) (#{rhlogin})
+  -l|--rhlogin   rhlogin    Red Hat login (RHN or OpenShift login) (#{rhlogin})
   -p|--password  password   Red Hat password (for RHN or OpenShift)
   -d|--debug                Print Debug info
   -h|--help                 Show Usage info
@@ -273,6 +273,7 @@ class Test3_SSH < Test::Unit::TestCase
   end
 
   def test_01_ssh_private_key
+    $remote_ssh_pubkeys = []
     check_permissions(@libra_kfile, /[4-7]00/) # Needs to at least be readable by user and nobody else
 
     # Derive the public key from the private key
@@ -282,11 +283,10 @@ class Test3_SSH < Test::Unit::TestCase
     assert_not_nil @@local_derived_ssh_pubkey, error_for(:no_derive)
     assert_not_nil $user_info, error_for(:no_account) 
 
-    $remote_ssh_pubkeys = []
     ssh_keys = RHC::get_ssh_keys($libra_server, $rhlogin, $password, $http)
     my_keys = [ssh_keys['ssh_key'], ssh_keys['keys'].values.map{|k| k['key']}].flatten
     my_keys.delete_if{|x| x.length == 0 }
-    $remote_ssh_pubkeys = my_keys
+    $remote_ssh_pubkeys = my_keys unless my_keys.nil?
 
     # Ensure that the user has ssh keys
     assert(!$remote_ssh_pubkeys.empty?, error_for(:no_remote_pub_keys ) )
@@ -328,7 +328,7 @@ class Test3_SSH < Test::Unit::TestCase
     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'])
+      host = sprintf("%s-%s",k,$user_info['user_info']['domains'][0]['namespace'])
       domain = $user_info['user_info']['rhc_domain']
       ssh_command = sprintf("ssh %s@%s.%s true &> /dev/null", uuid, host, domain)
       system(ssh_command)

data/bin/rhc-create-app

@@ -26,12 +26,13 @@ def p_usage
     puts <<USAGE
 
 Usage: #{$0}
-Create an OpenShift Express app.
+Create an OpenShift app.
 
   -a|--app   application     Application name  (alphanumeric - max #{RHC::APP_NAME_MAX_LENGTH} chars) (required)
   -t|--type  type            Type of app to create (#{type_keys}) (required)
   -g|--gear-size size        The size of the gear for this app ([small|medium|large], defaults to small)
-  -l|--rhlogin  rhlogin      Red Hat login (RHN or OpenShift login with OpenShift Express access) (#{rhlogin})
+  -s|--scaling               Enable scaling for this app
+  -l|--rhlogin  rhlogin      Red Hat login (RHN or OpenShift login) (#{rhlogin})
   -p|--password  password    RHLogin password  (optional, will prompt)
   -r|--repo  path            Git Repo path (defaults to ./$app_name)
   -n|--nogit                 Only create remote space, don't pull it locally
@@ -132,7 +133,7 @@ user_info = RHC::get_user_info(libra_server, opt['rhlogin'], password, @http, fa
 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"
+  puts "An application named '#{opt['app']}' in namespace '#{user_info['user_info']['domains'][0]['namespace']}' already exists"
   exit 255
 end
 
@@ -246,6 +247,12 @@ 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'], false, gear_size, opt['scaling'])
+
+if !main_app
+  puts "Create app failed"
+  exit 1
+end
+
 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', nil, false)

data/bin/rhc-create-domain

@@ -15,7 +15,7 @@ Bind a registered rhcloud user to a domain in rhcloud.
         <id_rsa>.pub keys, then re-run with --alter
 
   -n|--namespace   namespace   Namespace for your application(s) (alphanumeric - max #{RHC::DEFAULT_MAX_LENGTH} chars) (required)
-  -l|--rhlogin     rhlogin     Red Hat login (RHN or OpenShift login with OpenShift Express access) (#{rhlogin})
+  -l|--rhlogin     rhlogin     Red Hat login (RHN or OpenShift login) (#{rhlogin})
   -p|--password    password    RHLogin password (optional, will prompt)
   -a|--alter                   Alter namespace (will change urls) and/or ssh key
   -d|--debug                   Print Debug info
@@ -235,7 +235,7 @@ EOF
         else
             app_info = user_info['app_info']
             dns_success = true
-            if !app_info.empty? && opt['namespace'] != user_info['user_info']['namespace']
+            if !app_info.empty? && opt['namespace'] != user_info['user_info']['domains'][0]['namespace']
               #
               # Confirm that the host(s) exist in DNS
               #

data/bin/rhc-ctl-app

@@ -11,7 +11,7 @@ Usage: #{$0}
 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})
+  -l|--rhlogin rhlogin     Red Hat login (RHN or OpenShift login) (#{rhlogin})
   -p|--password password   RHLogin password  (optional, will prompt)
   -c|--command command     (start|stop|force-stop|restart|reload|status|destroy|tidy|add-alias|remove-alias|threaddump)
   -L|--embedded-list       List supported embedded cartridges

data/bin/rhc-ctl-domain

@@ -13,7 +13,7 @@ Manage multiple keys for the registered rhcloud user.
 
   rhc-ctl-domain [-l rhlogin] [-p password] [-d] [-h] [-n namespace] (-a key-name [-k ssh-pubkey] | -u key-name [-k ssh-pubkey] | -r key-name | --destroy)
 
-  -l|--rhlogin         rhlogin      Red Hat login (RHN or OpenShift login with OpenShift Express access) (#{rhlogin})
+  -l|--rhlogin         rhlogin      Red Hat login (RHN or OpenShift login) (#{rhlogin})
   -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)

data/bin/rhc-domain

@@ -19,7 +19,7 @@ List of commands
   destroy           Destroys the domain and any added ssh keys
 
 List of arguments
-  -l|--rhlogin      rhlogin      Red Hat login (RHN or OpenShift login with OpenShift Express access) (#{rhlogin})
+  -l|--rhlogin      rhlogin      Red Hat login (RHN or OpenShift login) (#{rhlogin})
   -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 creating or destroying domain)
   -d|--debug                     Print Debug info
@@ -73,9 +73,9 @@ def create_or_alter_domain(alter=false)
 
   # Check to see if a ssh_key_file_path exists, if not create it.
   if File.readable?(ssh_key_file_path)
-      puts "OpenShift Express key found at #{ssh_key_file_path}.  Reusing..."
+      puts "OpenShift key found at #{ssh_key_file_path}.  Reusing..."
   else
-      puts "Generating OpenShift Express ssh key to #{ssh_key_file_path}"
+      puts "Generating OpenShift ssh key to #{ssh_key_file_path}"
       # Use system for interaction
       system("ssh-keygen -t rsa -f '#{ssh_key_file_path}'")
   end
@@ -126,7 +126,7 @@ EOF
           else
               app_info = user_info['app_info']
               dns_success = true
-              if !app_info.empty? && $opt['namespace'] != user_info['user_info']['namespace']
+              if !app_info.empty? && $opt['namespace'] != user_info['user_info']['domains'][0]['namespace']
                 #
                 # Confirm that the host(s) exist in DNS
                 #
@@ -207,10 +207,21 @@ def show_domain_info()
   
   user_info = RHC::get_user_info($libra_server, $opt['rhlogin'], $password, @http, true)
   
+  domains = user_info['user_info']['domains']
+  num_domains = domains.length
+
   puts ""
   puts "User Info"
   puts "========="
-  puts "Namespace: #{user_info['user_info']['namespace']}"
+
+  if num_domains == 0
+    puts "Namespace: No namespaces found. You can use 'rhc domain create -n <namespace>' to create a namespace for your applications."
+  elsif num_domains == 1
+    puts "Namespace: #{domains[0]['namespace']}"
+  else
+    domains.each_index { |i| puts "Namespace(#{i}): #{domains[i]['namespace']}" }
+  end
+
   #puts "    UUID: #{user_info['user_info']['uuid']}"
   puts "  RHLogin: #{user_info['user_info']['rhlogin']}"
 
@@ -224,8 +235,8 @@ def show_domain_info()
         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']}/"
+        puts "      Git URL: ssh://#{val['uuid']}@#{key}-#{user_info['user_info']['domains'][0]['namespace']}.#{user_info['user_info']['rhc_domain']}/~/git/#{key}.git/"
+        puts "   Public URL: http://#{key}-#{user_info['user_info']['domains'][0]['namespace']}.#{user_info['user_info']['rhc_domain']}/"
         if val['aliases'] && !val['aliases'].empty?
           puts "      Aliases: #{val['aliases'].join(', ')}"
         end

data/bin/rhc-domain-info

@@ -11,7 +11,7 @@ def p_usage
 Usage: #{$0}
 Display information about a user
 
-  -l|--rhlogin   rhlogin    Red Hat login (RHN or OpenShift login with OpenShift Express access) (#{rhlogin})
+  -l|--rhlogin   rhlogin    Red Hat login (RHN or OpenShift login) (#{rhlogin})
   -p|--password  password   RHLogin password (optional, will prompt)
   -a|--apps                 List applications for rhlogin
   -i|--info                 Show user info
@@ -79,9 +79,18 @@ user_info = RHC::get_user_info(libra_server, opt['rhlogin'], password, @http, tr
 if opt['info']
     ssh_keys = RHC::get_ssh_keys(libra_server, opt['rhlogin'], password, @http)
 
+    domains = user_info['user_info']['domains']
+    num_domains = domains.length
+
     puts "User Info"
     puts "========="
-    puts "Namespace: #{user_info['user_info']['namespace']}"
+    if num_domains == 0
+      puts "Namespace: No namespaces found. You can use 'rhc domain create -n <namespace>' to create a namespace for your applications."
+    elsif num_domains == 1
+      puts "Namespace: #{domains[0]['namespace']}"
+    else
+      domains.each_index { |i| puts "Namespace(#{i}): #{domains[i]['namespace']}" }
+    end
     #puts "    UUID: #{user_info['user_info']['uuid']}"
     puts "  RHLogin: #{user_info['user_info']['rhlogin']}"
     puts "Primary SSH key: #{user_info['user_info']['ssh_key']}"
@@ -113,8 +122,8 @@ if opt['apps']
           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']}/"
+          puts "      Git URL: ssh://#{val['uuid']}@#{key}-#{user_info['user_info']['domains'][0]['namespace']}.#{user_info['user_info']['rhc_domain']}/~/git/#{key}.git/"
+          puts "   Public URL: http://#{key}-#{user_info['user_info']['domains'][0]['namespace']}.#{user_info['user_info']['rhc_domain']}/"
           if val['aliases'] && !val['aliases'].empty?
             puts "      Aliases: #{val['aliases'].join(', ')}"
           end

data/bin/rhc-port-forward

@@ -8,10 +8,10 @@ def p_usage
     rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "required"
     puts <<USAGE
 
-Usage: #{$0}
+Usage: rhc port-forward
 Forward remote ports to the workstation
 
-  -l|--rhlogin   rhlogin    Red Hat login (RHN or OpenShift login with OpenShift Express access) (#{rhlogin})
+  -l|--rhlogin   rhlogin    Red Hat login (RHN or OpenShift login) (#{rhlogin})
   -a|--app                  Target application (required)
   -p|--password  password   RHLogin password (optional, will prompt)
   -d|--debug                Print Debug info
@@ -84,7 +84,7 @@ unless user_info['app_info'][app_name]
 end
 
 app_uuid = user_info['app_info'][app_name]['uuid']
-namespace = user_info['user_info']['namespace']
+namespace = user_info['user_info']['domains'][0]['namespace']
 rhc_domain = user_info['user_info']['rhc_domain']
 
 puts "Checking available ports..."

data/bin/rhc-snapshot

@@ -11,7 +11,7 @@ def p_usage
 Usage: #{$0}
 Pull down application snapshot for a user
 
-  -l|--rhlogin   rhlogin    Red Hat login (RHN or OpenShift login with OpenShift Express access) (#{rhlogin})
+  -l|--rhlogin   rhlogin    Red Hat login (RHN or OpenShift login) (#{rhlogin})
   -a|--app                  Target application to snapshot (required)
   -r|--restore              Local path of the tarball to restore (restores git and application data folders found in archive)
   -s|--save                 Local path to save tarball (default: ./$APPNAME.tar.gz)
@@ -46,6 +46,11 @@ rescue Exception => e
     p_usage
 end
 
+# check for gnutar - gnu tar is called tar on linux and cygwin but gnutar on
+#                    BSD based systems like MacOS X
+TAR_BIN = 'tar'
+TAR_BIN = '/usr/bin/gnutar' if File.executable?('/usr/bin/gnutar')
+
 # If provided a config path, check it
 check_cpath(opt)
 
@@ -89,14 +94,14 @@ unless user_info['app_info'][app]
 end
 
 app_uuid = user_info['app_info'][app]['uuid']
-namespace = user_info['user_info']['namespace']
+namespace = user_info['user_info']['domains'][0]['namespace']
 rhc_domain = user_info['user_info']['rhc_domain']
 if opt['save']
   ssh_cmd = "ssh #{app_uuid}@#{app}-#{namespace}.#{rhc_domain} 'snapshot' > #{opt['save']}"
   puts "Pulling down a snapshot to #{opt['save']}"
 else
   if File.exists? opt['restore']
-    `tar --wildcards -tf #{opt['restore']} './*/#{app}'`
+    `#{TAR_BIN} --wildcards -tf #{opt['restore']} './*/#{app}'`
     if $?.exitstatus != 0
       puts "Archive at #{opt['restore']} does not contain the target application: ./*/#{app}"
       puts "If you created this archive rather than exported with rhc-snapshot, be sure"
@@ -104,7 +109,7 @@ else
       puts "i.e.: tar -czvf <app_name>.tar.gz ./<app_uuid>/"
       exit 255
     else
-      `tar --wildcards -tf #{opt['restore']} './*/git'`
+      `#{TAR_BIN} --wildcards -tf #{opt['restore']} './*/git'`
       include_git = $?.exitstatus == 0
       ssh_cmd = "cat #{opt['restore']} | ssh #{app_uuid}@#{app}-#{namespace}.#{rhc_domain} 'restore#{include_git ? ' INCLUDE_GIT' : ''}'"
       puts "Restoring from snapshot #{opt['restore']}"

data/bin/rhc-sshkey

@@ -18,7 +18,7 @@ List of commands
   remove                         Remove SSH key from the user account
 
 List of arguments
-  -l|--rhlogin      rhlogin      Red Hat login (RHN or OpenShift login with OpenShift Express access) (#{rhlogin})
+  -l|--rhlogin      rhlogin      Red Hat login (RHN or OpenShift login) (#{rhlogin})
   -p|--password     password     RHLogin password (optional, will prompt)
   -i|--identifier   key-name     User-specified identifier for the key
   -k|--ssh          key-filepath SSH public key filepath 

data/bin/rhc-tail-files

@@ -12,7 +12,7 @@ def p_usage
 Usage: #{$0}
 Tail the logs of an application
 
-  -l|--rhlogin   rhlogin    Red Hat login (RHN or OpenShift login with OpenShift Express access) (#{rhlogin})
+  -l|--rhlogin   rhlogin    Red Hat login (RHN or OpenShift login) (#{rhlogin})
   -a|--app                  Target application (required)
   -f|--files                File glob relative to app (default <application_name>/logs/*) (optional)
   -o|--opts                 Options to pass to the server-side (linux based) tail command (-f is implicit.  See the linux tail man page full list of options.) (Ex: --opts '-n 100')
@@ -91,7 +91,7 @@ end
 opt['files'] = "#{opt['app']}/logs/*" unless opt['files']
 file_glob = "#{opt['files']}"
 app_uuid = user_info['app_info'][app]['uuid']
-namespace = user_info['user_info']['namespace']
+namespace = user_info['user_info']['domains'][0]['namespace']
 rhc_domain = user_info['user_info']['rhc_domain']
 
 # -t to force PTY and avoid daemons

data/ext/mkrf_conf.rb

@@ -0,0 +1,26 @@
+require 'rubygems'
+require 'rubygems/command.rb'
+require 'rubygems/dependency_installer.rb' 
+begin
+  Gem::Command.build_args = ARGV
+rescue NoMethodError
+end 
+inst = Gem::DependencyInstaller.new
+begin
+  if RUBY_VERSION > "1.9"
+    inst.install "test-unit"
+  end
+
+  if ENV['JSON_PURE'] or (RUBY_VERSION == "1.8.6" or RUBY_PLATFORM =~ /mswin/ or RUBY_PLATFORM =~ /darwin/)
+    inst.install('json_pure')
+  else
+    inst.install('json')
+  end
+
+rescue
+  exit(1)
+end 
+
+f = File.open(File.join(File.dirname(__FILE__), "Rakefile"), "w")   # create dummy rakefile to indicate success
+f.write("task :default\n")
+f.close

data/lib/rhc

@@ -8,7 +8,7 @@ _rhc()
     cur="${COMP_WORDS[COMP_CWORD]}"
 
     if [ $COMP_CWORD -eq 1 ]; then
-        opts="domain app sshkey help"
+        opts="domain app sshkey port-forward help"
         COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
     elif [ $COMP_CWORD -eq 2 ]; then
         case "${COMP_WORDS[1]}" in
@@ -21,6 +21,9 @@ _rhc()
             sshkey)
                 opts="add update remove list"
                 ;;
+            port-forward)
+                opts="--debug --help --rhlogin --password --namespace --config --timeout --app"
+                ;;
             *)
                 opts=""
                 ;;

data/lib/rhc-common.rb

@@ -9,6 +9,7 @@ require 'open3'
 require 'parseconfig'
 require 'resolv'
 require 'uri'
+require 'rhc-rest'
 
 module RHC
 
@@ -278,6 +279,7 @@ module RHC
     req.set_form_data({'json_data' => json_data, 'password' => password})
     http = http.new(url.host, url.port)
     http.open_timeout = @mytimeout
+    http.read_timeout = @mytimeout
     if url.scheme == "https"
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE
@@ -305,7 +307,9 @@ module RHC
       puts "Re-run with -d for more information."
     end
     exit_code = 1
-    if response.content_type == 'application/json'
+    if response.class.inspect == "Struct::FakeResponse"
+      print_response_message(response.body)
+    elsif response.content_type == 'application/json'
       begin
         json_resp = JSON.parse(response.body)
         exit_code = print_json_body(json_resp)
@@ -320,14 +324,18 @@ module RHC
 
   def self.print_response_messages(json_resp)
     messages = json_resp['messages']
-    if (messages && !messages.empty?)
+    print_response_message(messages)
+  end
+
+  def self.print_response_message(message)
+    if (message && !message.empty?)
       puts ''
       puts 'MESSAGES:'
-      puts messages
+      puts message
       puts ''
     end
   end
-
+  
   def self.print_response_success(json_resp, print_result=false)
     if @mydebug
       print "Response from server:"
@@ -381,8 +389,17 @@ module RHC
   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, is_embedded_jenkins=false, gear_size='small',scale=false)
-    puts "Creating application: #{app_name}"
-    
+
+    # Need to have a fake HTTPResponse object for passing to print_reponse_err
+    Struct.new('FakeResponse',:body,:code,:content_type)
+
+    domains = user_info['user_info']['domains']
+    if domains.empty?
+      emessage = "Please create a domain with 'rhc domain create -n <namespace>' before creating applications."
+      print_response_err(Struct::FakeResponse.new(emessage,403))
+    end
+    namespace = domains[0]['namespace']
+    puts "Creating application: #{app_name} in #{namespace}"
     data = {:cartridge => app_type,
             :action => 'configure',
             :node_profile => gear_size,
@@ -397,22 +414,15 @@ module RHC
     #  We'll need to then get the new application using the existing
     #  API in order to access the rest of the logic in this function
     if scale
-      $LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__),'..','..','rhc-rest','lib'))
-      require 'rhc-rest'
-      # Need to have a fake HTTPResponse object for passing to print_reponse_err
-      Struct.new('FakeResponse',:body,:code,:content_type)
-
-      #  TODO: This logic should be checked by broker
-      unscalable = ['haproxy-1.4','jenkins-1.4','diy-0.1']
-      print_response_err(Struct::FakeResponse.new("Can not create a scaling app of type #{app_type}",403)) if unscalable.include?(app_type)
-
-      end_point = "https://#{libra_server}/broker/rest"
+      end_point = "https://#{libra_server}/broker/rest/api"
       client = Rhc::Rest::Client.new(end_point, rhlogin, password)
 
-      domain = client.find_domain(user_info['user_info']['namespace']).first
+      domain = client.find_domain(user_info['user_info']['domains'][0]['namespace']).first
+
+      namespace = domain.id
       # Catch errors
       begin
-        application = domain.add_application(app_name,app_type,scale)
+        application = domain.add_application(app_name,{:cartridge => app_type, :scale => true})
 
         # Variables that are needed for the rest of the function
         app_uuid = application.uuid
@@ -421,17 +431,26 @@ module RHC
         # Since health_check_path is not returned, we need to fudge it for now
         health_check_path =
           case app_type
-          when "php-5.3"
+          when /^php/
             "health_check.php"
-          when "perl-5.10"
+          when /^perl/
             "health_check.pl"
-          when "diy-0.1", "ruby-1.8", "jenkins-1.4", "python-2.6", "haproxy-1.4", "jbossas-7", "nodejs-0.6"
+          else
             "health"
           end
 
         puts "DEBUG: '#{app_name}' creation returned success." if @mydebug
+      rescue Rhc::Rest::ResourceAccessException => e
+        print_response_err(Struct::FakeResponse.new(e.message,e.code))
       rescue Rhc::Rest::ValidationException => e
         print_response_err(Struct::FakeResponse.new(e.message,406))
+      rescue Rhc::Rest::ServerErrorException => e 
+        if e.message =~ /^Failed to create application .* due to:Scalable app cannot be of type/ 
+          puts "Can not create a scaling app of type #{app_type}, either disable scaling or choose another app type"
+          exit 1
+        else
+          raise e 
+        end
       end
     else
       json_data = generate_json(data)
@@ -463,7 +482,6 @@ module RHC
       end
     end
 
-    namespace = user_info['user_info']['namespace']
     rhc_domain = user_info['user_info']['rhc_domain']
 
     fqdn = "#{app_name}-#{namespace}.#{rhc_domain}"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 365
+  hash: 379
   prerelease: 
   segments: 
   - 0
-  - 88
-  - 9
-  version: 0.88.9
+  - 90
+  - 6
+  version: 0.90.6
 platform: ruby
 authors: 
 - Red Hat
@@ -15,10 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-17 00:00:00 Z
+date: 2012-04-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json_pure
+  name: parseconfig
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -32,17 +32,19 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: parseconfig
+  name: rhc-rest
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 9
         segments: 
         - 0
-        version: "0"
+        - 0
+        - 11
+        version: 0.0.11
   type: :runtime
   version_requirements: *id002
 description: The client tools for the OpenShift Express platform that allow for application management.
@@ -62,32 +64,33 @@ executables:
 - rhc-user-info
 - rhc-tail-files
 - rhc-port-forward
-extensions: []
-
+extensions: 
+- ext/mkrf_conf.rb
 extra_rdoc_files: []
 
 files: 
 - lib/rhc-common.rb
 - lib/rhc
+- bin/rhc-ctl-domain
+- bin/rhc-port-forward
 - bin/rhc-ctl-app
-- bin/rhc-app
-- bin/rhc-create-app
-- bin/rhc-domain
-- bin/rhc-chk
-- bin/rhc-create-domain
+- bin/rhc-tail-files
+- bin/rhc-user-info
+- bin/rhc-snapshot
 - bin/rhc-domain-info
+- bin/rhc-chk
+- bin/rhc-domain
+- bin/rhc-create-app
 - bin/rhc
-- bin/rhc-user-info
+- bin/rhc-app
+- bin/rhc-create-domain
 - bin/rhc-sshkey
-- bin/rhc-port-forward
-- bin/rhc-snapshot
-- bin/rhc-tail-files
-- bin/rhc-ctl-domain
 - conf/express.conf
 - LICENSE
 - COPYRIGHT
 - README
 - Rakefile
+- ext/mkrf_conf.rb
 homepage: https://openshift.redhat.com/app/express
 licenses: []