rhc 1.6.8 → 1.7.8

data/lib/rhc/rest.rb

@@ -19,7 +19,7 @@ module RHC
       attr_reader :code
       def initialize(message=nil, code=1)
         super(message)
-        @code = (Integer(code) rescue code)
+        @code = (Integer(code) rescue nil)
       end
     end
 
@@ -68,7 +68,7 @@ module RHC
     #Exceptions thrown in case of an HTTP 422 is received.
     class ValidationException < ClientErrorException
       attr_reader :field
-      def initialize(message, field=nil, error_code=nil)
+      def initialize(message, field=nil, error_code=1)
         super(message, error_code)
         @field = field
       end
@@ -113,6 +113,8 @@ module RHC
 
     class MultipleCartridgeCreationNotSupported < Exception; end
 
+    class InitialGitUrlNotSupported < Exception; end
+
     class SslCertificatesNotSupported < Exception; end
 
     class AuthorizationsNotSupported < Exception

data/lib/rhc/rest/alias.rb

@@ -1,5 +1,3 @@
-require 'rhc/rest/base'
-
 module RHC
   module Rest
     class Alias < Base

data/lib/rhc/rest/application.rb

@@ -106,10 +106,15 @@ module RHC
 
       def aliases
         debug "Getting all aliases for application #{name}"
-        if (client.api_version_negotiated >= 1.4)
-          rest_method "LIST_ALIASES"
-        else
-          attributes['aliases']
+        @aliases ||= begin
+          aliases = attributes['aliases']
+          if aliases.nil? or not aliases.is_a?(Array)
+            supports?('LIST_ALIASES') ? rest_method("LIST_ALIASES") : []
+          else
+            aliases.map do |a| 
+              Alias.new(a.is_a?(String) ? {'id' => a} : a, client)
+            end
+          end
         end
       end
 

data/lib/rhc/rest/authorization.rb

@@ -1,5 +1,3 @@
-require 'rhc/rest/base'
-
 module RHC
   module Rest
     class Authorization < Base

data/lib/rhc/rest/base.rb

@@ -35,7 +35,7 @@ module RHC
       end
 
       def supports?(sym)
-        links.has_key?(sym.to_s) || links.has_key?(sym.to_s.upcase)
+        !!(links[sym.to_s] || links[sym.to_s.upcase])
       end
 
       protected

data/lib/rhc/rest/client.rb

@@ -199,14 +199,6 @@ module RHC
       # See #api_version_negotiated
       CLIENT_API_VERSIONS = [1.1, 1.2, 1.3, 1.4]
 
-      # Set the http_proxy env variable, read by
-      # HTTPClient, being sure to add the http protocol
-      # if not specified already
-      proxy = ENV['http_proxy'] || ENV['HTTP_PROXY']
-      if proxy && proxy !~ /^(\w+):\/\// then
-        ENV['http_proxy'] = "http://#{proxy}"
-      end
-
       def initialize(*args)
         options = args[0].is_a?(Hash) && args[0] || {}
         @end_point, @debug, @preferred_api_versions =
@@ -237,6 +229,8 @@ module RHC
         self.headers.merge!(options.delete(:headers)) if options[:headers]
         self.options.merge!(options)
 
+        update_http_proxy_env
+
         debug "Connecting to #{@end_point}"
       end
 
@@ -266,7 +260,7 @@ module RHC
             auth = options[:auth] || self.auth
             response = nil
 
-            debug "Request #{args[0].to_s.upcase} #{args[1]}" if debug?
+            debug "Request #{args[0].to_s.upcase} #{args[1]}#{"?#{args[2].map{|a| a.join('=')}.join(' ')}" if args[2] && args[0] == 'GET'}" if debug?
             time = Benchmark.realtime{ response = client.request(*(args << true)) }
             debug "   code %s %4i ms" % [response.status, (time*1000).to_i] if debug? && response
 
@@ -598,6 +592,14 @@ module RHC
           keys = messages.group_by{ |m| m['field'] }.keys.compact.sort.map(&:to_sym) rescue []
           [messages_to_error(messages), keys]
         end
+
+        def update_http_proxy_env
+          # Set the http_proxy env variable, read by
+          # HTTPClient, being sure to add the http protocol
+          # if not specified already
+          proxy = ENV['http_proxy'] || ENV['HTTP_PROXY']
+          ENV['http_proxy'] = "http://#{proxy}" if proxy && proxy !~ /^(\w+):\/\//
+        end
     end
   end
 end

data/lib/rhc/rest/domain.rb

@@ -16,13 +16,17 @@ module RHC
         options.each{ |key, value| payload[key.to_sym] = value }
 
         cartridges = Array(payload.delete(:cartridge)).concat(Array(payload.delete(:cartridges))).compact.uniq
-        if (client.api_version_negotiated >= 1.3)
+        if client.api_version_negotiated >= 1.3
           payload[:cartridges] = cartridges
         else
           raise RHC::Rest::MultipleCartridgeCreationNotSupported, "The server only supports creating an application with a single web cartridge." if cartridges.length > 1
           payload[:cartridge] = cartridges.first
         end
 
+        if client.api_version_negotiated < 1.3 && payload[:initial_git_url]
+          raise RHC::Rest::InitialGitUrlNotSupported, "The server does not support creating applications from a source repository."
+        end
+
         options = {:timeout => options[:scale] && 0 || nil}
         rest_method "ADD_APPLICATION", payload, options
       end

data/lib/rhc/rest/gear_group.rb

@@ -1,5 +1,3 @@
-require 'rhc/rest/base'
-
 module RHC
   module Rest
     class GearGroup < Base

data/lib/rhc/rest/key.rb

@@ -1,5 +1,3 @@
-require 'rhc/rest/base'
-
 module RHC
   module Rest
     class Key < Base

data/lib/rhc/rest/mock.rb

@@ -1,5 +1,3 @@
-require "rhc/rest"
-
 module RHC::Rest::Mock
 
   def self.start
@@ -70,9 +68,9 @@ module RHC::Rest::Mock
     def stub_user(auth=mock_user_auth)
       stub_api_request(:get, 'broker/rest/user', auth).to_return(simple_user(username))
     end
-    def stub_create_default_key
+    def stub_add_key(name='default')
       stub_api_request(:post, 'broker/rest/user/keys', mock_user_auth).
-        with(:body => hash_including({:name => 'default', :type => 'ssh-rsa'})).
+        with(:body => hash_including({:name => name, :type => 'ssh-rsa'})).
         to_return({:status => 201, :body => {}.to_json})
     end
     def stub_update_key(name)
@@ -80,6 +78,11 @@ module RHC::Rest::Mock
         with(:body => hash_including({:type => 'ssh-rsa'})).
         to_return({:status => 200, :body => {}.to_json})
     end
+    def stub_add_key_error(name, message, code=422)
+      stub_api_request(:post, "broker/rest/user/keys", mock_user_auth).
+        with(:body => hash_including({:type => 'ssh-rsa'})).
+        to_return({:status => code, :body => {:messages => [{:text => message, :field => 'name', :severity => 'error'}]}.to_json})
+    end
     def stub_create_domain(name)
       stub_api_request(:post, 'broker/rest/domains', mock_user_auth).
         with(:body => hash_including({:id => name})).
@@ -117,7 +120,7 @@ module RHC::Rest::Mock
         to_return(new_authorization(params))
     end
     def stub_no_keys
-      stub_api_request(:get, 'broker/rest/user/keys', mock_user_auth).to_return(no_keys)
+      stub_api_request(:get, 'broker/rest/user/keys', mock_user_auth).to_return(empty_keys)
     end
     def stub_mock_ssh_keys(name='test')
       stub_api_request(:get, 'broker/rest/user/keys', mock_user_auth).
@@ -156,7 +159,7 @@ module RHC::Rest::Mock
         })
     end
     def stub_no_domains
-      stub_api_request(:get, 'broker/rest/domains', mock_user_auth).to_return(no_domains)
+      stub_api_request(:get, 'broker/rest/domains', mock_user_auth).to_return(empty_domains)
     end
     def stub_one_domain(name)
       stub_api_request(:get, 'broker/rest/domains', mock_user_auth).
@@ -218,10 +221,10 @@ module RHC::Rest::Mock
       EOM
     end
 
-    def no_keys
+    def empty_keys
       empty_response_list('keys')
     end
-    def no_domains
+    def empty_domains
       empty_response_list('domains')
     end
 
@@ -411,6 +414,20 @@ module RHC::Rest::Mock
       }
     end
 
+    def mock_alias_response(count=1)
+      aliases = count.times.inject([]) do |arr, i|
+         arr << {:id  => "www.alias#{i}.com"}
+      end
+
+      return {
+        :body   => {
+          :type => count == 1 ? 'alias' : 'aliases',
+          :data => aliases
+        }.to_json,
+        :status => 200
+      }
+    end
+    
     def mock_gear_groups_response()
       groups = [{}]
       type  = 'gear_groups'
@@ -428,7 +445,7 @@ module RHC::Rest::Mock
   class MockRestClient < RHC::Rest::Client
     include Helpers
 
-    def initialize(config=RHC::Config)
+    def initialize(config=RHC::Config, version=1.0)
       obj = self
       if RHC::Rest::Client.respond_to?(:stub)
         RHC::Rest::Client.stub(:new) { obj }
@@ -443,6 +460,7 @@ module RHC::Rest::Mock
       @domains = []
       @user = MockRestUser.new(client, config.username)
       @api = MockRestApi.new(client, config)
+      @version = version
     end
 
     def api
@@ -457,6 +475,10 @@ module RHC::Rest::Mock
       @domains
     end
 
+    def api_version_negotiated
+      @version
+    end
+
     def cartridges
       premium_embedded = MockRestCartridge.new(self, "premium_cart", "embedded")
       premium_embedded.usage_rate = 0.05
@@ -618,7 +640,7 @@ module RHC::Rest::Mock
       end
     end
 
-    def destroy 
+    def destroy
       puts @application.inspect
       puts self.inspect
       @application.aliases.delete self

data/lib/rhc/ssh_helpers.rb

@@ -127,7 +127,7 @@ module RHC
     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
@@ -144,7 +144,7 @@ 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

data/lib/rhc/usage_templates/command_help.erb

@@ -4,27 +4,34 @@ Usage: <%= Array(program :name).first %> <%= @command.name %> <%= @command.synta
 <% if @actions.blank? -%>
 <% unless @command.options.blank? or @command.options.all?{ |o| o[:hide] } -%>
 
-Options for <%= @command.name %>
-<% for option in @command.options -%><% next if option[:hide] -%>
-  <%= "%-25s %s\n" % [option[:switches].join(', '), option[:description]] -%>
-<% end -%>
+Options
+<%= table(
+	  @command.options.select do |opt| 
+	  	not opt[:hide]
+	  end.map do |opt| 
+	  	[opt[:switches].join(', '), opt[:description]] 
+	  end, 
+	  table_args('  ', 25)
+	).join("\n") %>
 <% end -%>
 
 Global Options
-<% 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.
+<%= table(
+	  @global_options.select do |opt| 
+	  	not (opt[:hide] || @command.options.any?{ |o| (o[:switches] & opt[:switches]).present? })
+	  end.map do |opt| 
+	  	[opt[:switches].join(', '), opt[:description]] 
+	  end, 
+	  table_args('  ', 25)
+	).join("\n") %>
 
+  See 'rhc help options' for a full list of global options.
 <% else -%>
 
 List of Actions
-<% for action in @actions -%>
-  <%= "%-18s %s\n" % [action[:name], action[:summary]] -%>
-<% end -%>
+<%= table(@actions.map{ |a| [a[:name], a[:summary]] }, table_args('  ', 13)).join("\n") %>
 <% if @command.default_action? -%>
 
 The default action for this resource is '<%= @command.default_action %>'
 <% end -%>
-<% end -%>
+<% end -%>

data/lib/rhc/usage_templates/command_syntax_help.erb

@@ -5,7 +5,5 @@ Pass '--help' to see the full list of options
 <% unless @actions.nil? or @actions.empty? -%>
 
 List of Actions
-<% for action in @actions -%>
-  <%= "%-18s %s\n" % [action[:name], action[:summary]] -%>
-<% end -%>
+<%= table(@actions.map{ |a| [a[:name], a[:summary]] }, table_args('  ', 18)).join("\n") %>
 <% end -%>

data/lib/rhc/usage_templates/help.erb

@@ -3,34 +3,33 @@ Usage: rhc [--help] [--version] [--debug] <command> [<args>]
 <%= Array(program :description).first %>
 
 <%
-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', 'account logout')
+remaining = Hash[commands.dup.select{ |name, command| not command.summary.blank? }]
+basic = remaining.slice!('setup', 'create-app', 'apps', 'cartridges', 'add-cartridge', 'server', 'logout')
+remaining.delete_if{ |name, command| alias?(name) }
 begin -%>
 Getting started:
-<% for name, command in basic -%>
-  <%="%-18s %s\n" % [command.name, command.summary || command.description] -%>
-<% end %>
-<% end unless basic.empty?
+<%= table(basic.map{ |arr| arr[1] = arr[1].summary || arr[1].description; arr }, table_args('  ', 18)).join("\n") %>
+<% end unless basic.empty? %>
+<%
 
 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?
-%>
+<%= table(debugging.map{ |arr| arr[1] = arr[1].summary || arr[1].description; arr }, table_args('  ', 18)).join("\n") %>
+<% 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 -%>
+<%= table(remaining.sort.select{ |arr| arr[1].root? and arr[1].summary.present? }.map do |arr| 
+		arr[1] = arr[1].summary || arr[1].description
+		arr 
+	end, table_args('  ', 18)).join("\n") %>
 
-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.
+  Some management commands have nested actions - run 'rhc help <command>' for more info.
 
+See '<%= Array(program :name).first %> help <command>' for more information on a specific command.  You can see a list of all commands with 'rhc help commands'. 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 %>:
 
     <%= body %>
   <% end -%>
-<% end -%>
+<% end -%>

data/lib/rhc/usage_templates/options_help.erb

@@ -1,14 +1,12 @@
 The following options can be passed to any command:
 
-<% for option in options -%>
-  <%= "%-25s %s\n" % [option[:switches].join(', '), option[:description]] -%>
-<% end -%>
+<%= table(options.map{ |option| [option[:switches].join(', '), option[:description]] }, table_args('  ', 26)).join("\n") %>
 
 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 -%>
+<%= table(
+	  RHC::Config::OPTIONS.select{ |key,value| not value.nil? }.map do |key,value| 
+		["--#{key.to_s.gsub('_','-')}", value[0] || key]
+	  end, 
+	  table_args('  ', 26).merge(:header => ['Option', 'In Config'])
+	).join("\n") -%>

data/lib/rhc/wizard.rb

@@ -1,5 +1,4 @@
 require 'rhc'
-require 'highline/system_extensions'
 require 'fileutils'
 require 'socket'
 
@@ -13,16 +12,26 @@ module RHC
 
     DEFAULT_MAX_LENGTH = 16
 
-    STAGES = [:greeting_stage,
-              :login_stage,
-              :create_config_stage,
-              :config_ssh_key_stage,
-              :upload_ssh_key_stage,
-              :install_client_tools_stage,
-              :setup_test_stage,
-              :config_namespace_stage,
-              :show_app_info_stage,
-              :finalize_stage]
+    CONFIG_STAGES = [
+      :login_stage,
+      :create_config_stage,
+    ]
+    KEY_STAGES = [
+      :config_ssh_key_stage,
+      :upload_ssh_key_stage,
+    ]
+    TEST_STAGES = [
+      :install_client_tools_stage,
+      :setup_test_stage,
+    ]
+    NAMESPACE_STAGES = [
+      :config_namespace_stage,
+    ]
+    APP_STAGES = [
+      :show_app_info_stage,
+    ]
+    STAGES = [:greeting_stage] + CONFIG_STAGES + KEY_STAGES + TEST_STAGES + NAMESPACE_STAGES + APP_STAGES + [:finalize_stage]
+
     def stages
       STAGES
     end
@@ -58,55 +67,64 @@ module RHC
     end
 
     protected
-      include RHC::Helpers
-      include RHC::SSHHelpers
-      include RHC::GitHelpers
-      include RHC::CartridgeHelpers
-      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
+    include RHC::Helpers
+    include RHC::SSHHelpers
+    include RHC::GitHelpers
+    include RHC::CartridgeHelpers
+    attr_reader :config, :options
+    attr_accessor :auth, :user
+    attr_writer :rest_client
 
-      def core_auth
-        @core_auth ||= RHC::Auth::Basic.new(options)
-      end
+    def debug?
+      @debug
+    end
 
-      def token_auth
-        RHC::Auth::Token.new(options, core_auth, token_store)
-      end
+    def hostname
+      Socket.gethostname
+    end
 
-      def auth(reset=false)
-        @auth = nil if reset
-        @auth ||= begin
-            if options.token
-              token_auth
-            else
-              core_auth
-            end
+    def openshift_server
+      options.server || config['libra_server'] || "openshift.redhat.com"
+    end
+
+    def new_client_for_options
+      client_from_options({
+        :auth => auth,
+      })
+    end
+
+    def core_auth
+      @core_auth ||= RHC::Auth::Basic.new(options)
+    end
+
+    def token_auth
+      RHC::Auth::Token.new(options, core_auth, token_store)
+    end
+
+    def auth(reset=false)
+      @auth = nil if reset
+      @auth ||= begin
+          if options.token
+            token_auth
+          else
+            core_auth
           end
-      end
+        end
+    end
 
-      def token_store
-        @token_store ||= RHC::Auth::TokenStore.new(config.home_conf_path)
-      end
+    def token_store
+      @token_store ||= RHC::Auth::TokenStore.new(config.home_conf_path)
+    end
 
-      def username
-        auth.username if auth.respond_to?(:username)
-      end
+    def username
+      options.rhlogin || (auth.username if auth.respond_to?(:username))
+    end
 
-      def print_dot
-        $terminal.instance_variable_get(:@output).print('.')
-      end
+    def print_dot
+      $terminal.instance_variable_get(:@output).print('.')
+    end
 
-    private
 
     # cache SSH keys from the REST client
     def ssh_keys
@@ -118,6 +136,29 @@ module RHC
       @ssh_keys = nil
     end
 
+    # return true if the account has the public key defined by
+    # RHC::Config::ssh_pub_key_file_path
+    def ssh_key_uploaded?
+      ssh_keys.present? && ssh_keys.any? { |k| k.fingerprint.present? && k.fingerprint == fingerprint_for_default_key }
+    end
+
+    def existing_keys_info
+      return unless ssh_keys
+      indent{ ssh_keys.each{ |key| paragraph{ display_key(key) } } }
+    end
+
+    def applications
+      @applications ||= rest_client.domains.map(&:applications).flatten
+    end
+
+    def namespace_optional?
+      true
+    end
+
+    #
+    # Stages
+    #
+
     def greeting_stage
       info "OpenShift Client Tools (RHC) Setup Wizard"
 
@@ -129,7 +170,8 @@ module RHC
     end
 
     def login_stage
-      if options.token
+      if token_for_user
+        options.token = token_for_user
         say "Using an existing token for #{options.rhlogin} to login to #{openshift_server}"
       elsif options.rhlogin
         say "Using #{options.rhlogin} to login to #{openshift_server}"
@@ -161,6 +203,7 @@ module RHC
       end
 
       self.user = rest_client.user
+      options.rhlogin = self.user.login unless username
 
       if rest_client.supports_sessions? && !options.token && options.create_token != false
         paragraph do
@@ -215,122 +258,106 @@ module RHC
       true
     end
 
-    # return true if the account has the public key defined by
-    # RHC::Config::ssh_pub_key_file_path
-    def ssh_key_uploaded?
-      ssh_keys.any? { |k| k.fingerprint == fingerprint_for_default_key }
-    end
+    def upload_ssh_key_stage
+      return true if ssh_key_uploaded?
 
-    def existing_keys_info
-      return unless ssh_keys
-      indent{ ssh_keys.each{ |key| paragraph{ display_key(key) } } }
-    end
+      upload = paragraph do
+        agree "Your public SSH key must be uploaded to the OpenShift server to access code.  Upload now? (yes|no) "
+      end
 
-    def get_preferred_key_name
-      key_name = 'default'
+      if upload
+        if ssh_keys.empty?
+          paragraph do
+            info "Since you do not have any keys associated with your OpenShift account, "\
+                "your new key will be uploaded as the 'default' key."
+            upload_ssh_key('default')
+          end
+        else
+          paragraph { existing_keys_info }
+
+          key_fingerprint = fingerprint_for_default_key
+          unless key_fingerprint
+            paragraph do
+              warn "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 false
+          end
 
-      if ssh_keys.empty?
-        paragraph do
-          info "Since you do not have any keys associated with your OpenShift account, "\
-              "your new key will be uploaded as the 'default' key."
+          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
+          ask_for_key_name
         end
       else
         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
-            warn "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
+          info "You can upload your SSH key at a later time using the 'rhc sshkey' command"
         end
+      end
 
-        userkey = username ? username.gsub(/@.*/, '') : ''
-        pubkey_base_name = "#{userkey}#{hostname.gsub(/\..*\z/,'')}".gsub(/[^A-Za-z0-9]/,'').slice(0,16)
-        default_name = find_unique_key_name(
-          :keys => ssh_keys,
-          :base => pubkey_base_name,
-          :max_length => DEFAULT_MAX_LENGTH
-        )
+      true
+    end
 
-        paragraph do
-          key_name = ask("Provide a name for this key: ") do |q|
+    def ask_for_key_name(default_name=get_preferred_key_name)
+      key_name = nil
+      paragraph do
+        begin
+          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.'
+            q.responses[:ask_on_error] = ''
           end
-        end
+        end while !upload_ssh_key(key_name)
       end
+    end
 
-      key_name
+    def get_preferred_key_name
+      userkey = username ? username.gsub(/@.*/, '') : ''
+      pubkey_base_name = "#{userkey}#{hostname.gsub(/\..*\z/,'')}".gsub(/[^A-Za-z0-9]/,'').slice(0,16)
+      find_unique_key_name(pubkey_base_name)
     end
-    
+
     # 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
-      base = opts[:base] || 'default'
-      max  = opts[:max_length] || DEFAULT_MAX_LENGTH
+    def find_unique_key_name(base='default')
+      max = DEFAULT_MAX_LENGTH
       key_name_suffix = 1
       candidate = base
       while ssh_keys.detect { |k| k.name == candidate }
-        candidate = base.slice(0, max - key_name_suffix.to_s.length) +
-          key_name_suffix.to_s
+        candidate = base.slice(0, max - key_name_suffix.to_s.length) + key_name_suffix.to_s
         key_name_suffix += 1
       end
       candidate
     end
 
-    def upload_ssh_key
-      key_name = get_preferred_key_name
-      return false unless key_name
+    def upload_ssh_key(key_name)
+      return false unless key_name.present?
 
       type, content, comment = ssh_key_triple_for_default_key
-      indent do
-        say table([['Type:', type], ['Fingerprint:', fingerprint_for_default_key]])
-      end
 
-      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 ... "
+      if ssh_keys.present? && ssh_keys.any? { |k| k.name == key_name }
+        clear_ssh_keys_cache
+        paragraph do
+          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
+          success "done"
         end
-        success "done"
-      end
-
-      true
-    end
-
-    def upload_ssh_key_stage
-      return true if ssh_key_uploaded?
-
-      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
-          info "You can upload your SSH key at a later time using the 'rhc sshkey' command"
+        clear_ssh_keys_cache
+        begin
+          rest_client.add_key(key_name, content, type)
+          paragraph{ say "Uploading key '#{key_name}' ... #{color('done', :green)}" }
+        rescue RHC::Rest::ValidationException => e
+          error e.message || "Unknown error during key upload."
+          return false
         end
       end
 
       true
-    end
+    end    
+
 
     ##
     # Alert the user that they should manually install tools if they are not
@@ -397,7 +424,7 @@ module RHC
           paragraph do
             say table(standalone_cartridges.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
         end
         paragraph do
@@ -440,12 +467,7 @@ module RHC
     end
 
     def all_test_methods
-      private_methods.select {|m| m.to_s.start_with? 'test_'}
-    end
-
-    # cached list of applications needed for test stage
-    def applications
-      @applications ||= rest_client.domains.map(&:applications).flatten
+      (protected_methods + private_methods).select {|m| m.to_s.start_with? 'test_'}
     end
 
     ###
@@ -491,13 +513,14 @@ module RHC
 
     def config_namespace(namespace)
       # skip if string is empty
-      if namespace.nil? or namespace.chomp.length == 0
+      if namespace_optional? and (namespace.nil? or namespace.chomp.blank?)
         paragraph{ info "You may create a namespace later through 'rhc domain create'" }
         return true
       end
 
       begin
         domain = rest_client.add_domain(namespace)
+        options.namespace = namespace
 
         success "Your domain name '#{domain.id}' has been successfully created"
       rescue RHC::Rest::ValidationException => e
@@ -513,9 +536,7 @@ module RHC
       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):'
+          namespace = ask "Please enter a namespace (letters and numbers only)#{namespace_optional? ? " |<none>|" : ""}: " do |q|
             q.responses[:ask_on_error] = ''
           end
         end while !config_namespace(namespace)
@@ -557,21 +578,9 @@ We recommend these free applications:
 
 EOF
     end
-
-    def debug?
-      @debug
-    end
-
-    def hostname
-      Socket.gethostname
-    end
-
-    protected
-      attr_writer :rest_client
   end
 
   class RerunWizard < Wizard
-
     def finalize_stage
       section :top => 1 do
         success "Your client tools are now configured."
@@ -580,11 +589,36 @@ EOF
     end
   end
 
+  class EmbeddedWizard < Wizard
+    def stages
+      super - APP_STAGES - KEY_STAGES - [:setup_test_stage]
+    end
+
+    def finalize_stage
+      true
+    end
+  end
+
+  class DomainWizard < Wizard
+    def initialize(*args)
+      client = args.length == 3 ? args.pop : nil
+      super *args
+      self.rest_client = client || new_client_for_options
+    end
+
+    def stages
+      [:config_namespace_stage]
+    end
+
+    protected
+      def namespace_optional?
+        false
+      end
+  end
+
   class SSHWizard < Wizard
-    STAGES = [:config_ssh_key_stage,
-              :upload_ssh_key_stage]
     def stages
-      STAGES
+      KEY_STAGES
     end
 
     def initialize(rest_client, config, options)