rhc 1.2.7 → 1.3.8

data/lib/rhc/rest/user.rb

@@ -1,9 +1,9 @@
-require 'rhc/rest/base'
+require 'ostruct'
 
 module RHC
   module Rest
     class User < Base
-      attr_reader :login
+      define_attr :login, :plan_id, :max_gears, :consumed_gears
 
       def add_key(name, content, type)
         debug "Add key #{name} of type #{type} for user #{login}"
@@ -20,6 +20,10 @@ module RHC
         #TODO do a regex caomparison
         keys.detect { |key| key.name == name }
       end
+
+      def capabilities
+        @capabilities ||= OpenStruct.new attribute('capabilities')
+      end
     end
   end
 end

data/lib/rhc/{ssh_key_helpers.rb → ssh_helpers.rb}

@@ -18,9 +18,45 @@
 require 'net/ssh'
 require 'rhc/vendor/sshkey'
 
-
 module RHC
-  module SSHKeyHelpers
+  module SSHHelpers
+    # Public: Run ssh command on remote host
+    #
+    # host - The String of the remote hostname to ssh to.
+    # username - The String username of the remote user to ssh as.
+    # command - The String command to run on the remote host.
+    #
+    # Examples
+    #
+    #  ssh_ruby('myapp-t.rhcloud.com',
+    #            '109745632b514e9590aa802ec015b074',
+    #            'rhcsh tail -f $OPENSHIFT_LOG_DIR/*"')
+    #  # => true
+    #
+    # Returns true on success
+    def ssh_ruby(host, username, command)
+      debug "Opening Net::SSH connection to #{host}, #{username}, #{command}"
+      Net::SSH.start(host, username) do |session|
+        #:nocov:
+        session.open_channel do |channel|
+          channel.request_pty do |ch, success|
+            say "pty could not be obtained" unless success
+          end
+
+          channel.on_data do |ch, data|
+            puts data
+          end
+          channel.exec command
+        end
+        session.loop
+        #:nocov:
+      end
+    rescue Errno::ECONNREFUSED => e
+      raise RHC::SSHConnectionRefused.new(host, username)
+    rescue SocketError => e
+      raise RHC::ConnectionFailed, "The connection to #{host} failed: #{e.message}"
+    end
+
     # Public: Generate an SSH key and store it in ~/.ssh/id_rsa
     #
     # type - The String type RSA or DSS.
@@ -29,7 +65,7 @@ module RHC
     #
     # Examples
     #
-    #  generate_ssh_key_ruby()
+    #  generate_ssh_key_ruby
     #  # => /home/user/.ssh/id_rsa.pub
     #
     # Returns nil on failure or public key location as a String on success
@@ -37,22 +73,25 @@ module RHC
       key = RHC::Vendor::SSHKey.generate(:type => type,
                                          :bits => bits,
                                          :comment => comment)
-      ssh_dir = "#{RHC::Config.home_dir}/.ssh"
-      if File.exists?("#{ssh_dir}/id_rsa")
-        say "SSH key already exists: #{ssh_dir}/id_rsa.  Reusing..."
+      ssh_dir = RHC::Config.ssh_dir
+      priv_key = RHC::Config.ssh_priv_key_file_path
+      pub_key = RHC::Config.ssh_pub_key_file_path
+
+      if File.exists?(priv_key)
+        say "SSH key already exists: #{priv_key}.  Reusing..."
         return nil
       else
         unless File.exists?(ssh_dir)
           FileUtils.mkdir_p(ssh_dir)
           File.chmod(0700, ssh_dir)
         end
-        File.open("#{ssh_dir}/id_rsa", 'w') {|f| f.write(key.private_key)}
-        File.chmod(0600, "#{ssh_dir}/id_rsa")
-        File.open("#{ssh_dir}/id_rsa.pub", 'w') {|f| f.write(key.ssh_public_key)}
+        File.open(priv_key, 'w') {|f| f.write(key.private_key)}
+        File.chmod(0600, priv_key)
+        File.open(pub_key, 'w') {|f| f.write(key.ssh_public_key)}
 
-        ssh_add if exe?('ssh-add')
+        ssh_add
       end
-      "#{ssh_dir}/id_rsa.pub"
+      pub_key
     end
 
     def exe?(executable)
@@ -60,15 +99,6 @@ module RHC
         File.executable?(File.join(directory, executable.to_s))
       end
     end
-    
-    # Public: Format SSH key's core attributes (name, type, fingerprint)
-    # in a given ERB template
-    # 
-    # key - an object to be formatted
-    # template - ERB template
-    def format(key, template)
-      template.result(binding)
-    end
 
 
     # For Net::SSH versions (< 2.0.11) that does not have
@@ -88,15 +118,13 @@ module RHC
     rescue NoMethodError, NotImplementedError => e
       ssh_keygen_fallback key
       return nil
-      # :nocov: no reason to cover this case
     rescue OpenSSL::PKey::PKeyError, Net::SSH::Exception => e
       error e.message
       return nil
-      # :nocov:
     end
-    
+
     def fingerprint_for_default_key
-      fingerprint_for_local_key RHC::Config::ssh_pub_key_file_path
+      fingerprint_for_local_key RHC::Config.ssh_pub_key_file_path
     end
 
     # for an SSH public key specified by 'key', return a triple
@@ -114,15 +142,17 @@ module RHC
     end
     
     def ssh_key_triple_for_default_key
-      ssh_key_triple_for RHC::Config::ssh_pub_key_file_path
+      ssh_key_triple_for RHC::Config.ssh_pub_key_file_path
     end
 
     private
 
     def ssh_add
-      #:nocov:
-      `ssh-add 2&>1`
-      #:nocov:
+      if exe?('ssh-add')
+        #:nocov:
+        `ssh-add 2&>1`
+        #:nocov:
+      end
     end
   end
 end

data/lib/rhc/usage_templates/command_help.erb

@@ -11,9 +11,12 @@ Options for <%= @command.name %>
 <% end -%>
 
 Global Options
-<% for option in @global_options -%><% next if option[:hide] -%>
+<% for option in @global_options -%><% next if option[:hide] || @command.options.any?{ |o| (o[:switches] & option[:switches]).present? } -%>
   <%= "%-25s %s\n" % [option[:switches].join(', '), option[:description]] -%>
 <% end -%>
+
+See 'rhc help options' for a full list of command-line options.
+
 <% else -%>
 
 List of Actions

data/lib/rhc/usage_templates/help.erb

@@ -1,19 +1,32 @@
-Usage: <%= Array(program :name).first %> <resource> [<action>] [--help] [<args>]
+Usage: rhc [--help] [--version] [--debug] <command> [<args>]
+
 <%= Array(program :description).first %>
 
-List of Commands and Resources
-<% for name, command in @commands.sort -%>
-	<%- unless alias? name or name == "help" or name.include?(" ") or command.summary.nil? -%>  <%="%-18s %s\n" % [command.name, command.summary || command.description] %><%- end -%>
-<%- end -%>
+<%
+remaining = Hash[@commands.dup.select{ |name, command| not alias?(name) and not command.summary.blank? }]
+basic = remaining.slice!('setup', 'app create', 'apps', 'cartridge list', 'cartridge add', 'server')
+begin -%>
+Getting started:
+<% for name, command in basic -%>
+  <%="%-18s %s\n" % [command.name, command.summary || command.description] -%>
+<% end %>
+<% end unless basic.empty?
 
-Global Options
-<%- unless @options.nil? or @options.empty?  -%>
-<% for option in @options -%><% next if option[:hide] -%>
-  <%= "%-25s %s\n" % [option[:switches].join(', '), option[:description]] -%>
-<% end -%>
+debugging = remaining.slice!('app restart', 'app show', 'tail', 'port-forward', 'threaddump', 'snapshot', 'git-clone')
+begin -%>
+Working with apps:
+<% for name, command in debugging -%>
+  <%="%-18s %s\n" % [command.name, command.summary || command.description] -%>
+<% end
+end unless debugging.empty?
+%>
+Management commands:
+<% for name, command in remaining.sort -%>
+	<%- unless alias? name or name.include?(' ') or command.summary.nil? -%>  <%="%-18s %s\n" % [command.name, command.summary || command.description] %><%- end -%>
 <%- end -%>
 
-See '<%= Array(program :name).first %> help <resource>' for more specifics on each resource or command.
+See '<%= Array(program :name).first %> help <command>' for more information on a specific command.  See 'rhc help options' for a list of global command-line options and information about the config file.
+
 <% if program :help -%>
   <% for title, body in program(:help) %>
   <%= $terminal.color title.to_s.upcase, :bold %>:

data/lib/rhc/usage_templates/options_help.erb

@@ -0,0 +1,14 @@
+The following options can be passed to any command:
+
+<% for option in options -%>
+  <%= "%-25s %s\n" % [option[:switches].join(', '), option[:description]] -%>
+<% end -%>
+
+The following configuration options are stored in the <%= RHC::Helpers.system_path('.openshift/express.conf') %> file in your home directory.  Passing any of these options to 'rhc setup' will save that value to the file:
+
+  <%= "%-25s %s\n" % ["Option", "In Config"] -%>
+
+<% for key, value in RHC::Config::OPTIONS -%>
+<% next if value.nil? -%>
+  <%= "%-25s %s\n" % ["--#{key.to_s.gsub('_','-')}", value[0] || key] -%>
+<% end -%>

data/lib/rhc/wizard.rb

@@ -1,16 +1,15 @@
-require 'rhc-common'
 require 'rhc/helpers'
-require 'rhc/ssh_key_helpers'
+require 'rhc/ssh_helpers'
+require 'rhc/git_helpers'
 require 'highline/system_extensions'
-require 'net/ssh'
 require 'fileutils'
 require 'socket'
 
 module RHC
   class Wizard
     include HighLine::SystemExtensions
-    include RHC::Helpers
-    include RHC::SSHKeyHelpers
+
+    DEFAULT_MAX_LENGTH = 16
 
     STAGES = [:greeting_stage,
               :login_stage,
@@ -18,6 +17,7 @@ module RHC
               :config_ssh_key_stage,
               :upload_ssh_key_stage,
               :install_client_tools_stage,
+              :setup_test_stage,
               :config_namespace_stage,
               :show_app_info_stage,
               :finalize_stage]
@@ -25,15 +25,15 @@ module RHC
       STAGES
     end
 
-    def initialize(config, opts=nil)
+    attr_reader :rest_client
+
+    #
+    # Running the setup wizard may change the contents of opts and config if
+    # the create_config_stage completes successfully.
+    #
+    def initialize(config=RHC::Config.new, opts=Commander::Command::Options.new)
       @config = config
-      @config_path = config.config_path
-      if @libra_server.nil?
-        @libra_server = config['libra_server']
-        # if not set, set to default
-        @libra_server = @libra_server ?  @libra_server : "openshift.redhat.com"
-      end
-      @config.config_user opts.rhlogin if opts && opts.rhlogin
+      @options = opts
       @debug = opts.debug if opts
     end
 
@@ -47,16 +47,53 @@ module RHC
     # Returns nil on failure or true on success
     def run
       stages.each do |stage|
-        # FIXME: cleanup if we fail
         debug "Running #{stage}"
-        if (self.send stage).nil?
+        if self.send(stage).nil?
           return nil
         end
       end
       true
     end
 
+    protected
+      include RHC::Helpers
+      include RHC::SSHHelpers
+      include RHC::GitHelpers
+      attr_reader :config, :options
+      attr_accessor :auth, :user
+
+      def openshift_server
+        options.server || config['libra_server'] || "openshift.redhat.com"
+      end
+
+      def new_client_for_options
+        client_from_options({
+          :auth => auth,
+        })
+      end
+
+      def auth
+        @auth ||= RHC::Auth::Basic.new(options)
+      end
+
+      def username
+        auth.send(:username)
+      end
+      def password
+        auth.send(:password)
+      end
+
     private
+    
+    # cache SSH keys from the REST client
+    def ssh_keys
+      @ssh_keys ||= rest_client.sshkeys
+    end
+    
+    # clear SSH key cache
+    def clear_ssh_keys_cache
+      @ssh_keys = nil
+    end
 
     def greeting_stage
       info "OpenShift Client Tools (RHC) Setup Wizard"
@@ -69,67 +106,67 @@ module RHC
     end
 
     def login_stage
-      # get_password adds an extra untracked newline so set :bottom to -1
-      section(:top => 1, :bottom => -1) do
-        if @config.has_opts? && @config.opts_login
-          @username = @config.opts_login
-          say "Using #{@username}"
-        else
-          @username = ask("Login to #{@libra_server}: ") do |q|
-            q.default = RHC::Config.default_rhlogin
+      say "Using #{options.rhlogin} to login to #{openshift_server}" if options.rhlogin
+
+      self.rest_client = new_client_for_options
+
+      begin
+        rest_client.api
+      rescue RHC::Rest::CertificateVerificationFailed => e
+        debug "Certificate validation failed: #{e.reason}"
+        unless options.insecure
+          if RHC::Rest::SelfSignedCertificate === e
+            warn "The server's certificate is self-signed, which means that a secure connection can't be established to '#{openshift_server}'."
+          else
+            warn "The server's certificate could not be verified, which means that a secure connection can't be established to '#{openshift_server}'."
+          end
+          if openshift_online_server?
+            paragraph{ warn "This may mean that a server between you and OpenShift is capable of accessing information sent from this client.  If you wish to continue without checking the certificate, please pass the -k (or --insecure) option to this command." }
+            return
+          else
+            paragraph{ warn "You may bypass this check, but any data you send to the server could be intercepted by others." }
+            return unless agree "Connect without checking the certificate? (yes|no): "
+            options.insecure = true
+            self.rest_client = new_client_for_options
+            retry
           end
         end
-
-        @password = RHC::Config.password
-        @password = RHC::get_password if @password.nil?
       end
 
-      # instantiate a REST client that stages can use
-      end_point = "https://#{@libra_server}/broker/rest/api"
-      @rest_client = RHC::Rest::Client.new(end_point, @username, @password, @debug)
-      
-      # confirm that the REST client can connect
-      return false unless @rest_client.user
-
+      self.user = rest_client.user
       true
     end
 
     def create_config_stage
-      if !File.exists? @config_path
-        FileUtils.mkdir_p File.dirname(@config_path)
-        File.open(@config_path, 'w') do |file|
-          file.puts <<EOF
-# Default user login
-default_rhlogin='#{@username}'
-
-# Server API
-libra_server = '#{@libra_server}'
-EOF
-
+      paragraph do
+        if File.exists? config.path
+          backup = "#{@config.path}.bak"
+          FileUtils.cp(config.path, backup)
+          FileUtils.rm(config.path)
         end
 
-        paragraph do
-          say "Created local config file: " + @config_path
-          say "The #{File.basename(@config_path)} file contains user configuration, and can be transferred to different computers."
-        end
+        say "Saving configuration to #{system_path(config.path)} ... "
 
-        true
+        changed = Commander::Command::Options.new(options)
+        changed.rhlogin = username
+        changed.password = password
+
+        FileUtils.mkdir_p File.dirname(config.path)
+        config.save!(changed)
+        options.__replace__(changed)
+
+        success "done"
       end
 
-      # Read in @config_path now that it exists (was skipped before because it did
-      # not exist
-      RHC::Config.set_local_config(@config_path)
+      true
     end
 
     def config_ssh_key_stage
-      if RHC::Config.should_run_ssh_wizard?
-        paragraph do
-          say "No SSH keys were found. We will generate a pair of keys for you."
-        end
-        ssh_pub_key_file_path = generate_ssh_key_ruby()
-        paragraph do
-          say "    Created: #{ssh_pub_key_file_path}\n\n"
-        end
+      if config.should_run_ssh_wizard?
+        paragraph{ say "No SSH keys were found. We will generate a pair of keys for you." }
+
+        ssh_pub_key_file_path = generate_ssh_key_ruby
+        paragraph{ say "    Created: #{ssh_pub_key_file_path}" }
       end
       true
     end
@@ -137,60 +174,54 @@ EOF
     # return true if the account has the public key defined by
     # RHC::Config::ssh_pub_key_file_path
     def ssh_key_uploaded?
-      @ssh_keys ||= @rest_client.sshkeys
-      @ssh_keys.any? { |k| k.fingerprint == fingerprint_for_default_key }
+      ssh_keys.any? { |k| k.fingerprint == fingerprint_for_default_key }
     end
 
     def existing_keys_info
-      return unless @ssh_keys
-      # TODO: This ERB format is shared with RHC::Commands::Sshkey; should be refactored
-      @ssh_keys.inject("Current Keys: \n") do |result, key|
-        erb = ::RHC::Helpers.ssh_key_display_format
-        result += format(key, erb)
-      end
+      return unless ssh_keys
+      indent{ ssh_keys.each{ |key| paragraph{ display_key(key) } } }
     end
 
     def get_preferred_key_name
-      paragraph do
-        say "You can enter a name for your key, or leave it blank to use the default name. " \
-            "Using the same name as an existing key will overwrite the old key."
-      end
       key_name = 'default'
 
-      if @ssh_keys.empty?
+      if ssh_keys.empty?
         paragraph do
-          say <<-DEFAULT_KEY_UPLOAD_MSG
-Since you do not have any keys associated with your OpenShift account,
-your new key will be uploaded as the 'default' key
-          DEFAULT_KEY_UPLOAD_MSG
+          info "Since you do not have any keys associated with your OpenShift account, "\
+              "your new key will be uploaded as the 'default' key."
         end
       else
-        section(:top => 1) { say existing_keys_info }
+        paragraph do
+          say "You can enter a name for your key, or leave it blank to use the default name. " \
+              "Using the same name as an existing key will overwrite the old key."
+        end
+
+        paragraph { existing_keys_info }
 
         key_fingerprint = fingerprint_for_default_key
         unless key_fingerprint
           paragraph do
-            say <<-CONFIG_KEY_INVALID
-Your ssh public key at #{RHC::Config.ssh_pub_key_file_path} is invalid or unreadable.
-The setup can not continue until you manually remove or fix both of your
-public and private keys id_rsa keys.
-            CONFIG_KEY_INVALID
+            say "Your ssh public key at #{system_path(RHC::Config.ssh_pub_key_file_path)} is invalid or unreadable. "\
+                "Setup can not continue until you manually remove or fix your "\
+                "public and private keys id_rsa keys."
           end
           return nil
         end
+
         hostname = Socket.gethostname.gsub(/\..*\z/,'')
-        username = @username ? @username.gsub(/@.*/, '') : ''
-        pubkey_base_name = "#{username}#{hostname}".gsub(/[^A-Za-z0-9]/,'').slice(0,16)
-        pubkey_default_name = find_unique_key_name(
-          :keys => @ssh_keys,
+        userkey = username ? username.gsub(/@.*/, '') : ''
+        pubkey_base_name = "#{userkey}#{hostname}".gsub(/[^A-Za-z0-9]/,'').slice(0,16)
+        default_name = find_unique_key_name(
+          :keys => ssh_keys,
           :base => pubkey_base_name,
-          :max_length => RHC::DEFAULT_MAX_LENGTH
+          :max_length => DEFAULT_MAX_LENGTH
         )
-        
+
         paragraph do
-          key_name =  ask("Provide a name for this key: ") do |q|
-            q.default = pubkey_default_name
-            q.validate = lambda { |p| RHC::check_key(p) }
+          key_name = ask("Provide a name for this key: ") do |q|
+            q.default = default_name
+            q.validate = /^[0-9a-zA-Z]*$/
+            q.responses[:not_valid]    = 'Your key name must be letters and numbers only.'
           end
         end
       end
@@ -201,12 +232,12 @@ public and private keys id_rsa keys.
     # given the base name and the maximum length,
     # find a name that does not clash with what is in opts[:keys]
     def find_unique_key_name(opts)
-      keys = opts[:keys] || @ssh_keys
+      keys = opts[:keys] || ssh_keys
       base = opts[:base] || 'default'
-      max  = opts[:max_length] || RHC::DEFAULT_MAX_LENGTH # in rhc-common.rb
+      max  = opts[:max_length] || DEFAULT_MAX_LENGTH
       key_name_suffix = 1
       candidate = base
-      while @ssh_keys.detect { |k| k.name == candidate }
+      while ssh_keys.detect { |k| k.name == candidate }
         candidate = base.slice(0, max - key_name_suffix.to_s.length) +
           key_name_suffix.to_s
         key_name_suffix += 1
@@ -219,35 +250,42 @@ public and private keys id_rsa keys.
       return false unless key_name
 
       type, content, comment = ssh_key_triple_for_default_key
-      say "type: %s\ncontent: %s\nfingerprint: %s" % [type, content, fingerprint_for_default_key]
+      indent do
+        say table([['Type:', type], ['Fingerprint:', fingerprint_for_default_key]])
+      end
 
-      if !@ssh_keys.empty? && @ssh_keys.any? { |k| k.name == key_name }
-        say "Key with the name #{key_name} already exists. Updating... "
-        key = @rest_client.find_key(key_name)
-        key.update(type, content)
-      else
-        say "Uploading key '#{key_name}' from #{RHC::Config::ssh_pub_key_file_path}"
-        @rest_client.add_key key_name, content, type
+      paragraph do
+        if !ssh_keys.empty? && ssh_keys.any? { |k| k.name == key_name }
+          clear_ssh_keys_cache
+          say "Key with the name #{key_name} already exists. Updating ... "
+          key = rest_client.find_key(key_name)
+          key.update(type, content)
+        else
+          clear_ssh_keys_cache
+          say "Uploading key '#{key_name}' from #{system_path(RHC::Config::ssh_pub_key_file_path)} ... "
+          rest_client.add_key key_name, content, type
+        end
+        success "done"
       end
-      
+
       true
     end
 
     def upload_ssh_key_stage
       return true if ssh_key_uploaded?
 
-      upload = false
-      section do
-        upload = agree "Your public ssh key must be uploaded to the OpenShift server.  Would you like us to upload it for you? (yes/no) "
+      upload = paragraph do
+        agree "Your public SSH key must be uploaded to the OpenShift server to access code.  Upload now? (yes|no) "
       end
 
       if upload
         upload_ssh_key
       else
         paragraph do
-          say "You can upload your ssh key at a later time using the 'rhc sshkey' command"
+          info "You can upload your SSH key at a later time using the 'rhc sshkey' command"
         end
       end
+
       true
     end
 
@@ -266,9 +304,6 @@ public and private keys id_rsa keys.
       if windows?
         windows_install
       else
-        paragraph do
-          say "We will now check to see if you have the necessary client tools installed."
-        end
         generic_unix_install_check
       end
       true
@@ -276,14 +311,22 @@ public and private keys id_rsa keys.
 
     def config_namespace_stage
       paragraph do
-        say "Checking for your namespace ... "
-        domains = @rest_client.domains
+        say "Checking your namespace ... "
+        domains = rest_client.domains
         if domains.length == 0
-          say "not found"
+          warn "none"
+
+          paragraph do
+            say "Your namespace is unique to your account and is the suffix of the " \
+                "public URLs we assign to your applications. You may configure your " \
+                "namespace here or leave it blank and use 'rhc domain create' to " \
+                "create a namespace later.  You will not be able to create " \
+                "applications without first creating a namespace."
+          end
+
           ask_for_namespace
         else
-          say "found namespace:"
-          domains.each { |d| say "    #{d.id}" }
+          success domains.map(&:id).join(', ')
         end
       end
 
@@ -293,39 +336,99 @@ public and private keys id_rsa keys.
     def show_app_info_stage
       section do
         say "Checking for applications ... "
-      end
-      
-      apps = @rest_client.domains.inject([]) do |list, domain|
-        list += domain.applications
-      end
-      
-      if !apps.nil? and !apps.empty?
-        section(:bottom => 1) do
-          say "found"
-          apps.each do |app|
-            if app.app_url.nil? && app.u
-              say "    * #{app.name} - no public url (you need to add a namespace)"
-            else
-              say "    * #{app.name} - #{app.app_url}"
+
+        if !applications.nil? and !applications.empty?
+          success "found #{applications.length}"
+
+          paragraph do
+            indent do
+              say table(applications.map do |app|
+                [app.name, app.app_url]
+              end)
             end
           end
+        else
+          info "none"
+
+          paragraph{ say "Run 'rhc app create' to create your first application." }
+          paragraph do
+            application_types = rest_client.find_cartridges :type => "standalone"
+            say table(application_types.sort {|a,b| a.display_name <=> b.display_name }.map do |cart|
+              [' ', cart.display_name, "rhc app create <app name> #{cart.name}"]
+            end).join("\n")
+          end
         end
-      else
-        section(:bottom => 1) { say "none found" }
         paragraph do
-          say "Run 'rhc app create' to create your first application.\n\n"
-          say "Below is a list of the types of application you can create: \n"
-
-          application_types = @rest_client.find_cartridges :type => "standalone"
-          application_types.sort {|a,b| a.name <=> b.name }.each do |cart|
-            say "    * #{cart.name} - rhc app create <app name> #{cart.name}"
+          indent do
+            say "You are using #{color(self.user.consumed_gears.to_s, :green)} of #{color(self.user.max_gears.to_s, :green)} total gears" if user.max_gears.is_a? Fixnum
+            say "The following gear sizes are available to you: #{self.user.capabilities.gear_sizes.join(', ')}" if user.capabilities.gear_sizes.present?
           end
         end
       end
+      true
+    end
+
+    # Perform basic tests to ensure that setup is sane
+    # search for private methods starting with "test_" and execute them
+    # in alphabetical order
+    # NOTE: The order itself is not important--the tests should be independent.
+    # However, the hash order is unpredictable in Ruby 1.8, and is preserved in
+    # 1.9. There are two similar tests that can fail under the same conditions,
+    # and this makes the spec results inconsistent between 1.8 and 1.9.
+    # Thus, we force an order with #sort to ensure spec passage on both.
+    def setup_test_stage
+      say "Checking common problems "
+      tests = private_methods.select {|m| m.to_s.start_with? 'test_'}
+      tests.sort.each do |test|
+        send(test)
+      end.tap do |pass|
+        success(' done') if pass
+      end
 
       true
     end
 
+    # cached list of applications needed for test stage
+    def applications
+      @applications ||= rest_client.domains.map(&:applications).flatten
+    end
+
+    ###
+    # tests for specific user errors
+
+    def test_private_key_mode
+      pub_key_file = RHC::Config.ssh_pub_key_file_path
+      private_key_file = RHC::Config.ssh_priv_key_file_path
+      if File.exist?(private_key_file)
+        report_result (File.exist?(private_key_file) and File.stat(private_key_file).mode.to_s(8) =~ /[4-7]00$/),
+          "#{private_key_file} should not be accessible by anyone but the current user"
+      else
+        #:nocov:
+        true
+        #:nocov:
+      end
+    end
+
+    # test connectivity an app
+    def test_ssh_connectivity
+      unless ssh_key_uploaded?
+        return true
+      end
+      
+      applications.take(1).each do |app|
+        begin
+          ssh = Net::SSH.start(app.host, app.uuid, :timeout => 60)
+          return true
+        rescue => e
+          report_result(ssh, "An SSH connection could not be established to #{app.host}. Your SSH configuration may not be correct, or the application may not be responding. #{e.message} (#{e.class})", false)
+          return false
+        ensure
+          ssh.close if ssh
+        end
+      end
+    end
+
+    ###
     def finalize_stage
       paragraph do
         say "The OpenShift client tools have been configured on your computer.  " \
@@ -338,59 +441,51 @@ public and private keys id_rsa keys.
 
     def config_namespace(namespace)
       # skip if string is empty
-      paragraph do
-        if namespace.nil? or namespace.chomp.length == 0
-          say "Skipping! You may create a namespace using 'rhc domain create'"
-          return true
-        end
+      if namespace.nil? or namespace.chomp.length == 0
+        paragraph{ info "You may create a namespace later through 'rhc domain create'" }
+        return true
+      end
 
-        begin
-          domain = @rest_client.add_domain(namespace)
+      begin
+        domain = rest_client.add_domain(namespace)
 
-          say "Your domain name '#{domain.id}' has been successfully created"
-        rescue RHC::Rest::ValidationException => e
-          say e.message
-          return false
-        end
+        success "Your domain name '#{domain.id}' has been successfully created"
+      rescue RHC::Rest::ValidationException => e
+        error e.message || "Unknown error during namespace creation."
+        return false
       end
       true
     end
 
     def ask_for_namespace
-      paragraph do
-        say "Your namespace is unique to your account and is the suffix of the " \
-            "public URLs we assign to your applications. You may configure your " \
-            "namespace here or leave it blank and use 'rhc domain create' to " \
-            "create a namespace later.  You will not be able to create " \
-            "applications without first creating a namespace."
-      end
-
       # Ask for a namespace at least once, configure the namespace if a valid,
       # non-blank string is provided.
-      namespace  = nil
-      first_pass = true
-      while first_pass or !config_namespace namespace do
-        first_pass = false
-        paragraph do
-          namespace = ask "Please enter a namespace or leave this blank if you wish to skip this step:" do |q|
-            q.validate  = lambda{ |p| RHC::check_namespace p }
-            q.responses[:not_valid]    = 'The namespace value must contain only letters and/or numbers (A-Za-z0-9):'
+      namespace = nil
+      paragraph do
+        begin
+          namespace = ask "Please enter a namespace (letters and numbers only) |<none>|: " do |q|
+            #q.validate  = lambda{ |p| RHC::check_namespace p }
+            #q.responses[:not_valid]    = 'The namespace value must contain only letters and/or numbers (A-Za-z0-9):'
             q.responses[:ask_on_error] = ''
           end
-        end
+        end while !config_namespace(namespace)
       end
     end
 
-    def generic_unix_install_check(show_action=true)
-      section(:top => 1) { say "Checking for git ... " } if show_action
-      if has_git?
-        section(:bottom => 1) { say "found" }
-      else
-        section(:bottom => 1) { say "needs to be installed" }
-        paragraph do
-          say "Automated installation of client tools is not supported for " \
-              "your platform. You will need to manually install git for full " \
-              "OpenShift functionality."
+    def generic_unix_install_check
+      paragraph do 
+        say "Checking for git ... "
+
+        if has_git?
+          success("found #{git_version}") rescue success('found')
+        else
+          warn "needs to be installed"
+
+          paragraph do
+            say "Automated installation of client tools is not supported for " \
+                "your platform. You will need to manually install git for full " \
+                "OpenShift functionality."
+          end
         end
       end
     end
@@ -399,10 +494,11 @@ public and private keys id_rsa keys.
       # Finding windows executables is hard since they can get installed
       # in non standard directories.  Punt on this for now and simply
       # print out urls and some instructions
-      say <<EOF
+      warn <<EOF
+
 In order to fully interact with OpenShift you will need to install and configure a git client if you have not already done so.
 
-Documentation for installing other tools you will need for OpenShift can be found at https://#{@libra_server}/app/getting_started#install_client_tools
+Documentation for installing other tools you will need for OpenShift can be found at https://openshift.redhat.com/community/developers/install-the-client-tools
 
 We recommend these free applications:
 
@@ -412,45 +508,19 @@ We recommend these free applications:
 EOF
     end
 
-    def git_version_exec
-      `git --version 2>&1`
-    end
-
-    def has_git?
-      git_version_exec
-      $?.success?
-    rescue
-      false
-    end
-    
     def debug?
       @debug
     end
+
+    protected
+      attr_writer :rest_client
   end
 
   class RerunWizard < Wizard
-    def initialize(config, login=nil)
-      super(config, login)
-    end
-
-    def create_config_stage
-      if File.exists? @config_path
-        backup = "#{@config_path}.bak"
-        paragraph do
-          say "Configuration file #{@config_path} already exists, " \
-              "backing up to #{backup}"
-        end
-        FileUtils.cp(@config_path, backup)
-        FileUtils.rm(@config_path)
-      end
-      super
-      true
-    end
 
     def finalize_stage
-      paragraph do
-        say "Thank you for setting up your system.  You can rerun this at any time " \
-            "by calling 'rhc setup'."
+      section :top => 1 do
+        success "Your client tools are now configured."
       end
       true
     end
@@ -463,9 +533,9 @@ EOF
       STAGES
     end
 
-    def initialize(rest_client)
-      @rest_client = rest_client
-      super RHC::Config
+    def initialize(rest_client, config, options)
+      self.rest_client = rest_client
+      super config, options
     end
   end
 end