rhc 0.71.2 → 0.72.29

data/README

@@ -1,4 +1,4 @@
-Openshift Express (RHC)
+OpenShift Express (RHC)
 ========
 
 Please stop by #openshift on irc.freenode.net if you have any questions or
@@ -13,16 +13,16 @@ DEPENDENCIES: git
               openssh-clients
               ruby (1.8.7 or later)
               rubygems
-              json gem
+              json_pure gem (native json is fine too)
               parseconfig gem
 
 Step 1:  Create an rhc domain:
 
-$ ./rhc-create-domain -n desirednamespace -l rhlogin
+$ rhc-create-domain -n desirednamespace -l rhlogin
 
 Step 2: Create an rhc application:
 
-$ ./rhc-create-app -l rhlogin -a appname -r /path/to/new/git/repo -t <framework Ex: php-5.3.2>
+$ rhc-create-app -l rhlogin -a appname -r /path/to/new/git/repo -t <framework Ex: php-5.3>
 
 Once that's complete, follow the directions printed at the end of running
 rhc-create-app
@@ -38,4 +38,32 @@ $ edit index.php
 $ git commit -a -m "what I did"
 $ git push
 
-Then just reload your web page to see the changes
+Then just reload your web page to see the changes
+
+-----------
+OS X Notes:
+-----------
+
+git:
+OS X 10.6 comes w/ ssh and ruby, but not with git, unless you have
+Xcode 4.0.x installed (as a developer you should have Xcode anyway).
+Xcode, however, is not free (unless you are a registered Apple
+Developer) and costs around $5 from the Apple App Store.
+
+If you do not have Xcode, you can obtain a pre-packaged version
+of git from:
+
+    http://code.google.com/p/git-osx-installer/
+
+Installing git from MacPorts/HomeBrew/Fink/etc requires Xcode.
+
+Now obtain the client code, either via 'git clone' as above
+or via the rhc gem.
+
+json_pure gem:
+The client tools also make use of JSON as the data set for
+I/O, and therefore needs the json ruby gem. Unless you have
+Xcode installed, you will need to install json_pure, which
+is the 100% ruby version of the JSON gem. If you have Xcode,
+you can elect to install either json_pure or the native
+json gem.

data/Rakefile

@@ -10,7 +10,7 @@ task :default => [:package]
 # Create the gem specification for packaging
 spec = Gem::Specification.new do |s|
     s.name = %q{rhc}
-    s.version = /(Version: )(.*)/.match(File.read("../build/specs/rhc.spec"))[2]
+    s.version = /(Version: )(.*)/.match(File.read("client.spec"))[2]
     s.author = "Red Hat"
     s.email = %q{openshift@redhat.com}
     s.summary = %q{OpenShift Express Client Tools}

data/bin/rhc-create-app

@@ -24,16 +24,17 @@
 require 'rhc-common'
 
 def p_usage
-    rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "(required)"
-    type_keys = RHC::get_supported_cartridge_types(', ')
+    libra_server = get_var('libra_server')
+    rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "required"
+    type_keys = RHC::get_cartridge_list(nil, ', ', libra_server, @http, false)
     puts <<USAGE
 
 Usage: #{$0}
-Create an Openshift Express app.
+Create an OpenShift Express app.
 
   -a|--app   application     Application name  (alphanumeric - max #{RHC::Maxdlen} chars) (required)
   -t|--type  type            Type of app to create (#{type_keys}) (required)
-  -l|--rhlogin  rhlogin      RHCloud rhlogin (#{rhlogin})
+  -l|--rhlogin  rhlogin      Red Hat login (RHN or OpenShift login with OpenShift Express access) (#{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
@@ -89,8 +90,9 @@ if !RHC::check_app(opt['app'])
     p_usage
 end
 
-type = RHC::get_cartridge(opt['type'])
+type = RHC::get_cartridge_type(opt['type'])
 if !type
+    puts 'Type is required'
     p_usage
 end
 
@@ -103,16 +105,6 @@ if !password
   password = RHC::get_password
 end
 
-#
-# Get UUID from file
-#
-
-uuid = get_var(opt["rhlogin"])
-unless uuid
-    puts "Could not find UUID for '#{opt["rhlogin"]}' in express.conf.  Be sure you have successfully ran rhc-create-domain before running rhc-create-app."
-    exit 99
-end
-
 opt["repo"] = opt["app"] unless opt["repo"]
 
 puts "
@@ -165,7 +157,7 @@ end
 # Create remote application space
 #
 
-puts "Creating remote application space: " + opt['app']
+puts "Attempting to create remote application space: " + opt['app']
 
 data = {:cartridge => opt['type'],
                 :action => 'configure',
@@ -179,7 +171,7 @@ json_data = JSON.generate(data)
 
 puts "Contacting https://#{libra_server}"
 
-url = URI.parse("https://#{libra_server}/app/broker/cartridge")
+url = URI.parse("https://#{libra_server}/broker/cartridge")
 response = RHC::http_post(@http, url, json_data, password)
 
 if response.code == '200'
@@ -198,11 +190,10 @@ at_exit do
                    {:cartridge => opt['type'],
                     :action => 'deconfigure',
                     :app_name => opt['app'],
-                    :rhlogin => opt['rhlogin'],
-                    :password => password
+                    :rhlogin => opt['rhlogin']
                     })
         puts "Cleaning up application"
-        url = URI.parse("https://#{libra_server}/app/broker/cartridge")
+        url = URI.parse("https://#{libra_server}/broker/cartridge")
         RHC::http_post(@http, url, json_data, password)
     end
 end
@@ -215,7 +206,7 @@ puts "Checking ~/.ssh/config"
 
 user_info = RHC::get_user_info(libra_server, opt['rhlogin'], password, @http, debug, false)
 
-my_url = "#{opt['app']}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']}"
+fqdn = "#{opt['app']}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']}"
 
 found = false
 
@@ -287,10 +278,10 @@ sleep 15
 # Now start checking for DNS
 loop = 0
 sleep_time = 2
-while loop < RHC::Maxretries && !RHC::hostexist?(my_url)
+while loop < RHC::Maxretries && !RHC::hostexist?(fqdn)
     sleep sleep_time
     loop+=1
-    puts "  retry # #{loop} - Waiting for DNS: #{my_url}"
+    puts "  retry # #{loop} - Waiting for DNS: #{fqdn}"
     sleep_time = RHC::delay(sleep_time)
 end
 
@@ -305,7 +296,12 @@ attempt = 0
 # Pull new repo locally
 #
 
-git_url = "ssh://#{uuid}@#{opt['app']}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']}/~/git/#{opt['app']}.git/"
+app_name = opt['app']
+namespace = user_info['user_info']['namespace']
+rhc_domain = user_info['user_info']['rhc_domain']
+app_uuid = user_info['app_info'][app_name]['uuid']
+
+git_url = "ssh://#{app_uuid}@#{app_name}-#{namespace}.#{rhc_domain}/~/git/#{app_name}.git/"
 
 unless opt['nogit']
     puts "Pulling new repo down"
@@ -352,11 +348,10 @@ while attempt < RHC::Maxretries
     page = 'health'
     if (type == :php)
       page = 'health_check.php'
-    end
-    if (type == :perl)
+    elsif (type == :perl)
       page = 'health_check.pl'
     end
-    url = URI.parse("http://#{my_url}/#{page}")
+    url = URI.parse("http://#{fqdn}/#{page}")
     begin
       response = @http.get_response(url)
     rescue Exception => e
@@ -367,14 +362,14 @@ while attempt < RHC::Maxretries
 
 Success!  Your application is now published here:
 
-      http://#{my_url}/
+      http://#{fqdn}/
 
 The remote repository is located here:
 
     #{git_url}
 
 To make changes to your application, commit to #{opt['repo']}/.
-Then run 'git push' to update your Openshift Express space
+Then run 'git push' to update your OpenShift Express space
 
 LOOKSGOOD
         exit 0

data/bin/rhc-create-domain

@@ -35,8 +35,8 @@ 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
 
-  -n|--namespace   namespace   Openshift Express namespace (alphanumeric - max #{RHC::Maxdlen} chars) (required)
-  -l|--rhlogin     rhlogin     Red Hat login (required)
+  -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)
   -p|--password    password    RHLogin password (optional, will prompt)
   -a|--alter                   Alter namespace (will change urls) and/or ssh key
   -d|--debug                   Print Debug info
@@ -110,10 +110,6 @@ def add_rhlogin_config(rhlogin, uuid)
         f.puts("default_rhlogin=#{rhlogin}")
         f.puts("")
     end
-    unless @local_config.get_value(rhlogin)
-        puts "Adding rhlogin to #{@local_config_path}"
-        f.puts("#{rhlogin}=#{uuid}")
-    end
     f.close
 end
 
@@ -123,9 +119,9 @@ end
 #
 
 if File.readable?(libra_kfile)
-    puts "Openshift Express key found at #{libra_kfile}.  Reusing..."
+    puts "OpenShift Express key found at #{libra_kfile}.  Reusing..."
 else
-    puts "Generating Openshift Express ssh key to #{libra_kfile}"
+    puts "Generating OpenShift Express ssh key to #{libra_kfile}"
     # Use system for interaction
     system("ssh-keygen -t rsa -f '#{libra_kfile}'")
 end
@@ -138,6 +134,8 @@ data = {'namespace' => opt['namespace'],
                 'ssh' => ssh_key}
 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."
+  user_info = RHC::get_user_info(libra_server, opt['rhlogin'], password, @http, debug, true, not_found_message)
 end
 if debug
   data['debug'] = "true"
@@ -145,7 +143,7 @@ end
 RHC::print_post_data(data, debug)
 json_data = JSON.generate(data)
 
-url = URI.parse("https://#{libra_server}/app/broker/domain")
+url = URI.parse("https://#{libra_server}/broker/domain")
 response = RHC::http_post(@http, url, json_data, password)
 
 if response.code == '200'
@@ -164,8 +162,40 @@ in #{@local_config_path} which has been created and populated for you.
 
 EOF
         else
-            puts "Alteration successful.  You can use rhc-user-info to view any url changes."
-            puts
+            app_info = user_info['app_info']
+            dns_success = true
+            if !app_info.empty? && opt['namespace'] != user_info['user_info']['namespace']
+              #
+              # Confirm that the host(s) exist in DNS
+              #
+              puts "Now your new domain name(s) are being populated worldwide (this might take a minute)..."
+              # Allow DNS to propogate
+              sleep 15
+              app_info.each_key do |appname|
+                  fqdn = "#{appname}-#{opt['namespace']}.#{user_info['user_info']['rhc_domain']}"
+                  
+                  # Now start checking for DNS
+                  loop = 0
+                  sleep_time = 2
+                  while loop < RHC::Maxretries && !RHC::hostexist?(fqdn)
+                      sleep sleep_time
+                      loop+=1
+                      puts "  retry # #{loop} - Waiting for DNS: #{fqdn}"
+                      sleep_time = RHC::delay(sleep_time)
+                  end
+                  
+                  if loop >= RHC::Maxretries
+                      puts "Host could not be found: #{fqdn}"
+                      dns_success = false
+                  end
+              end
+            end
+            if dns_success
+              puts "Alteration successful.  You can use rhc-user-info to view any url changes."
+            else
+              puts "Alteration successful but at least one of the urls is still updating in DNS.  You can use rhc-user-info to view any url changes."
+            end
+            puts ""
         end
         exit 0
     rescue JSON::ParserError

data/bin/rhc-ctl-app

@@ -24,14 +24,14 @@
 require 'rhc-common'
 
 def p_usage
-    rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "(required)"
+    rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "required"
     puts <<USAGE
 
 Usage: #{$0}
 Control an OpenShift express app
 
   -a|--app   application   Application name  (alphanumeric) (required)
-  -l|--rhlogin rhlogin     Red Hat login (#{rhlogin})
+  -l|--rhlogin rhlogin     Red Hat login (RHN or OpenShift login with OpenShift Express access) (#{rhlogin})
   -p|--password password   RHLogin password  (optional, will prompt)
   -c|--command command     (start|stop|restart|reload|status|destroy)
   -b|--bypass              Bypass warnings
@@ -146,7 +146,7 @@ json_data = JSON.generate(data)
 
 puts "Contacting https://#{libra_server}"
 
-url = URI.parse("https://#{libra_server}/app/broker/cartridge")
+url = URI.parse("https://#{libra_server}/broker/cartridge")
 response = RHC::http_post(@http, url, json_data, password)
 
 if response.code == '200'

data/bin/rhc-snapshot

@@ -27,13 +27,13 @@ require 'rhc-common'
 # print help
 #
 def p_usage
-    rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "(required)"
+    rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "required"
     puts <<USAGE
 
 Usage: #{$0}
 Pull down application snapshot for a user
 
-  -l|--rhlogin   rhlogin    RHCloud rhlogin (#{rhlogin})
+  -l|--rhlogin   rhlogin    Red Hat login (RHN or OpenShift login with OpenShift Express access) (#{rhlogin})
   -a|--app                  Target application to snapshot (required)
   -s|--save                 Local path to save tarball (default: ./$APPNAME.tar.gz)
   -p|--password  password   RHLogin password (optional, will prompt)
@@ -93,25 +93,28 @@ user_info = RHC::get_user_info(libra_server, opt['rhlogin'], password, @http, de
 app = opt['app']
 opt['save'] = "#{opt['app']}.tar.gz" unless opt['save']
 
-begin
-    framework = user_info['app_info'][app]['framework'].split('-')[0]
-rescue NoMethodError
+unless user_info['app_info'][app]
     puts
-    puts "Could not find app '#{opt['app']}'.  Please run rhc-user-info to get a list"
+    puts "Could not find app '#{app}'.  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]['uuid']
+namespace = user_info['user_info']['namespace']
+rhc_domain = user_info['user_info']['rhc_domain']
+ssh_cmd = "ssh #{app_uuid}@#{app}-#{namespace}.#{rhc_domain} 'snapshot #{app}' > #{opt['save']}"
+
 puts "Pulling down a snapshot to #{opt['save']}"
 puts 
-puts "ssh #{user_info['user_info']['uuid']}@#{app}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']} 'snapshot #{framework} #{app}' > #{opt['save']}" if debug
-git_pull = `ssh #{user_info['user_info']['uuid']}@#{app}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']} 'snapshot #{framework} #{app}' > #{opt['save']}`
+puts ssh_cmd if debug
+git_pull = `#{ssh_cmd}`
 if $?.exitstatus != 0
     puts
     puts "Error in trying to save snapshot.  You can try to save manually by running:"
     puts
-    puts "ssh #{user_info['user_info']['uuid']}@#{app}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']} 'snapshot #{framework} #{app}' > #{opt['save']}"
+    puts ssh_cmd
     puts
     exit 254
 end

data/bin/rhc-tail-files

@@ -27,13 +27,13 @@ require 'rhc-common'
 # print help
 #
 def p_usage
-    rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "(required)"
+    rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "required"
     puts <<USAGE
 
 Usage: #{$0}
 Tail the logs of an application
 
-  -l|--rhlogin   rhlogin    RHCloud rhlogin (#{rhlogin})
+  -l|--rhlogin   rhlogin    Red Hat login (RHN or OpenShift login with OpenShift Express access) (#{rhlogin})
   -a|--app                  Target application (required)
   -f|--files                File glob relative to app (default ./logs/*) (optional)
   -p|--password  password   RHLogin password (optional, will prompt)
@@ -92,9 +92,7 @@ user_info = RHC::get_user_info(libra_server, opt['rhlogin'], password, @http, de
 
 app = opt['app']
 
-begin
-    framework = user_info['app_info'][app]['framework'].split('-')[0]
-rescue NoMethodError
+unless user_info['app_info'][app]
     puts
     puts "Could not find app '#{opt['app']}'.  Please run rhc-user-info to get a list"
     puts "of your current running applications"
@@ -103,18 +101,22 @@ rescue NoMethodError
 end
 
 opt['files'] = "logs/*" unless opt['files']
-file_glob = "#{framework}/#{opt['app']}/#{opt['files']}"
+file_glob = "#{opt['app']}/#{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 #{file_glob}'"
 
 puts "Attempting to tail files: #{file_glob}"
 puts "Use ctl + c to stop"
 puts 
-puts "ssh #{user_info['user_info']['uuid']}@#{app}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']} 'tail #{file_glob}'" if debug
-system("ssh #{user_info['user_info']['uuid']}@#{app}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']} 'tail #{file_glob}'")
+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 #{user_info['user_info']['uuid']}@#{app}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']} 'tail #{file_glob}'`"
+    puts ssh_cmd
     puts
     exit 254
 end

data/bin/rhc-user-info

@@ -21,27 +21,19 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require "rubygems"
-require "uri"
-require "net/http"
-require "net/https"
-require "getoptlong"
-require "json"
-require 'parseconfig'
-require 'fileutils'
 require 'rhc-common'
 
 #
 # print help
 #
 def p_usage
-    rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "(required)"
+    rhlogin = get_var('default_rhlogin') ? "Default: #{get_var('default_rhlogin')}" : "required"
     puts <<USAGE
 
 Usage: #{$0}
 Display information about a user
 
-  -l|--rhlogin   rhlogin    RHCloud rhlogin (#{rhlogin})
+  -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
@@ -52,18 +44,6 @@ USAGE
 exit 255
 end
 
-def validate_email(email)
-    if email =~ /([^@]+)@([a-zA-Z0-9\.])+\.([a-zA-Z]{2,3})/
-        if $1 =~ /[^a-zA-Z0-9\.]/
-            return false
-        else
-            return true
-        end
-    else
-        return false
-    end
-end
-
 begin
     opts = GetoptLong.new(
         ["--debug", "-d", GetoptLong::NO_ARGUMENT],
@@ -111,17 +91,6 @@ end
 opt['apps'] = true if not opt['info'] and not opt['apps']
 user_info = RHC::get_user_info(libra_server, opt['rhlogin'], password, @http, debug, true)
 
-if user_info['user_info']['uuid'] != get_var(opt["rhlogin"])
-    puts "!! WARNING !! WARNING !! WARNING !! WARNING !!"
-    puts
-    puts "The UUID in your #{@conf_name} file is either missing or incorrect."
-    puts "Please ensure the below line exists in #{@local_config_path}"
-    puts
-    puts "#{opt['rhlogin']}=#{user_info['user_info']['uuid']}"
-    puts
-    puts "!! WARNING !! WARNING !! WARNING !! WARNING !!"
-end
-
 if opt['info']
     puts "User Info"
     puts "========="
@@ -140,7 +109,8 @@ if opt['apps']
         puts key
         puts "  Framework: #{val['framework']}"
         puts "   Creation: #{val['creation_time']}"
-        puts "    Git URL: ssh://#{user_info['user_info']['uuid']}@#{key}-#{user_info['user_info']['namespace']}.#{user_info['user_info']['rhc_domain']}/~/git/#{key}.git/"
+        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 ""
     end

data/lib/rhc-common.rb

@@ -37,41 +37,53 @@ module RHC
   Maxretries = 10
   Defaultdelay = 2
 
-  TYPES = {
-    'php-5.3.2' => :php,
-    'perl-5.10.1' => :perl,
-    'rack-1.1.0' => :rack,
-    'wsgi-3.2.1' => :wsgi,
-    'jbossas-7.0.0' => :jbossas
-  }
-  
-  SUPPORTED_TYPES = {
-    'php-5.3.2' => :php,
-    'rack-1.1.0' => :rack,
-    'wsgi-3.2.1' => :wsgi
-  }
-
   def self.delay(time, adj=Defaultdelay)
     (time*=adj).to_int
   end
   
-  def self.get_supported_cartridge_types(sep=', ')
-    return get_cartridge_types(SUPPORTED_TYPES)
+  def self.get_cartridges_tbl(libra_server, net_http, debug=true, print_result=nil)
+    puts "Contacting https://#{libra_server} to obtain list of cartridges..."
+    puts " (please excuse the delay)"
+    data = {'cart_types' => "standalone"}
+    if debug
+      data['debug'] = "true"
+    end
+    print_post_data(data, debug)
+    json_data = JSON.generate(data)
+
+    url = URI.parse("https://#{libra_server}/broker/cartlist")
+    response = http_post(net_http, url, json_data, "none")
+
+    unless response.code == '200'
+      print_response_err(response, debug)
+      return []
+    end
+    if print_result
+      print_response_success(response, debug)
+    end
+    begin
+      json_resp = JSON.parse(response.body)
+      carts = (JSON.parse(json_resp['result']))['carts']
+    rescue JSON::ParserError
+      exit 254
+    end
+    carts
   end
 
-  def self.get_cartridge_types(types=TYPES, sep=', ')
-    i = 1
-    type_keys = ''
-    types.each_key do |key|
-      type_keys += key
-      if i < types.size
-        type_keys += sep
-      end
-      i += 1
+  def self.get_cartridge_list(carts, sep, libra_server, net_http, debug=true, print_result=nil)
+    carts = get_cartridges_tbl(libra_server, net_http, debug, print_result) if carts.nil?
+    carts.join(sep)
+  end
+
+  def self.get_cartridge_type(type)
+    if type
+      type = type.split('-')[0]
+      return type.to_sym
     end
-    type_keys
+    nil
   end
 
+
   # Invalid chars (") ($) (^) (<) (>) (|) (%) (/) (;) (:) (,) (\) (*) (=) (~)
   def self.check_rhlogin(rhlogin)
     if rhlogin
@@ -114,19 +126,6 @@ module RHC
     true
   end
 
-  def self.get_cartridge(type)
-    if type
-      if !(RHC::TYPES.has_key?(type))
-        puts 'type must be ' << get_supported_cartridge_types(' or ')
-      else
-        return RHC::TYPES[type]
-      end
-    else
-      puts "Type is required"
-    end
-    nil
-  end
-
   def self.print_post_data(h, debug)
     if (debug)
       puts 'DEBUG: Submitting form:'
@@ -144,7 +143,7 @@ module RHC
     end
   end
 
-  def self.get_user_info(libra_server, rhlogin, password, net_http, debug, print_result)
+  def self.get_user_info(libra_server, rhlogin, password, net_http, debug, print_result, not_found_message=nil)
 
     puts "Contacting https://#{libra_server}"
     data = {'rhlogin' => rhlogin}
@@ -154,12 +153,16 @@ module RHC
     print_post_data(data, debug)
     json_data = JSON.generate(data)
 
-    url = URI.parse("https://#{libra_server}/app/broker/userinfo")
+    url = URI.parse("https://#{libra_server}/broker/userinfo")
     response = http_post(net_http, url, json_data, password)
 
     unless response.code == '200'
       if response.code == '404'
-        puts "A user with rhlogin '#{rhlogin}' does not have a registered domain.  Be sure to run rhc-create-domain before using the other rhc tools."
+        if not_found_message
+          puts not_found_message
+        else
+          puts "A user with rhlogin '#{rhlogin}' does not have a registered domain.  Be sure to run rhc-create-domain before using the other rhc tools."
+        end
         exit 99
       elsif response.code == '401'
         puts "Invalid user credentials"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 263
+  hash: 261
   prerelease: false
   segments: 
   - 0
-  - 71
-  - 2
-  version: 0.71.2
+  - 72
+  - 29
+  version: 0.72.29
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-31 00:00:00 -05:00
+date: 2011-06-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency