rhc 1.30.3 → 1.31.5

data/autocomplete/rhc_bash

@@ -10,9 +10,9 @@ _rhc()
     if [[ "$cur" == -* ]]; then
       opts="--always-prefix --clean --config --debug --header --insecure --limit --mock --noprompt --password --raw --rhlogin --server --ssl-ca-file --ssl-client-cert-file --ssl-client-key-file --ssl-version --timeout --token"
     elif [ -z $cur ]; then
-      opts="account alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert app app-configure app-create app-delete app-deploy app-force-stop app-reload app-restart app-scale-down app-scale-up app-show app-start app-stop app-tidy apps authorization authorization-add authorization-delete authorization-delete-all authorization-list cartridge cartridge-add cartridge-list cartridge-reload cartridge-remove cartridge-restart cartridge-scale cartridge-show cartridge-start cartridge-status cartridge-stop cartridge-storage deployment deployment-activate deployment-list deployment-show domain domain-configure domain-create domain-delete domain-leave domain-list domain-rename domain-show env env-list env-set env-show env-unset git-clone help logout member member-add member-list member-remove member-update port-forward region region-list scp server server-add server-configure server-list server-remove server-show server-status server-use setup snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-list sshkey-remove sshkey-show tail team team-create team-delete team-leave team-list team-show threaddump"
+      opts="account alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert app app-configure app-create app-delete app-deploy app-enable-ha app-force-stop app-reload app-restart app-scale-down app-scale-up app-show app-start app-stop app-tidy apps authorization authorization-add authorization-delete authorization-delete-all authorization-list cartridge cartridge-add cartridge-list cartridge-reload cartridge-remove cartridge-restart cartridge-scale cartridge-show cartridge-start cartridge-status cartridge-stop cartridge-storage deployment deployment-activate deployment-list deployment-show domain domain-configure domain-create domain-delete domain-leave domain-list domain-rename domain-show env env-list env-set env-show env-unset git-clone help logout member member-add member-list member-remove member-update port-forward region region-list scp server server-add server-configure server-list server-remove server-show server-status server-use setup snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-list sshkey-remove sshkey-show tail team team-create team-delete team-leave team-list team-show threaddump"
     else
-      opts="account account-logout activate-deployment add-alias add-authorization add-cartridge add-member add-server add-sshkey alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert aliases app app-configure app-create app-delete app-deploy app-env app-force-stop app-reload app-restart app-scale-down app-scale-up app-scp app-show app-snapshot app-ssh app-start app-stop app-tidy apps authorization authorization-add authorization-delete authorization-delete-all authorization-list authorizations cartridge cartridge-add cartridge-list cartridge-reload cartridge-remove cartridge-restart cartridge-scale cartridge-show cartridge-start cartridge-status cartridge-stop cartridge-storage cartridges configure-app configure-domain configure-server create-app create-domain create-team delete-all-authorization delete-app delete-authorization delete-cert-alias delete-domain delete-team deploy deploy-app deployment deployment-activate deployment-list deployment-show deployments domain domain-configure domain-create domain-delete domain-leave domain-list domain-rename domain-show domains env env-add env-list env-remove env-set env-show env-unset envs force-stop-app git-clone help leave-domain leave-team list-alias list-authorization list-cartridge list-deployment list-domain list-env list-member list-region list-server list-sshkey list-team logout member member-add member-list member-remove member-update members port-forward region region-list regions reload-app reload-cartridge remove-alias remove-cartridge remove-member remove-server remove-sshkey rename-domain restart-app restart-cartridge restore-snapshot save-snapshot scale-cartridge scale-down-app scale-up-app scp server server-add server-configure server-list server-remove server-show server-status server-use servers set-env setup show-app show-cartridge show-deployment show-domain show-env show-server show-sshkey show-team snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-list sshkey-remove sshkey-show sshkeys start-app start-cartridge status-cartridge status-server stop-app stop-cartridge storage-cartridge tail team team-create team-delete team-leave team-list team-show teams threaddump tidy-app unset-env update-cert-alias update-member use-server"
+      opts="account account-logout activate-deployment add-alias add-authorization add-cartridge add-member add-server add-sshkey alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert aliases app app-configure app-create app-delete app-deploy app-enable-ha app-env app-force-stop app-reload app-restart app-scale-down app-scale-up app-scp app-show app-snapshot app-ssh app-start app-stop app-tidy apps authorization authorization-add authorization-delete authorization-delete-all authorization-list authorizations cartridge cartridge-add cartridge-list cartridge-reload cartridge-remove cartridge-restart cartridge-scale cartridge-show cartridge-start cartridge-status cartridge-stop cartridge-storage cartridges configure-app configure-domain configure-server create-app create-domain create-team delete-all-authorization delete-app delete-authorization delete-cert-alias delete-domain delete-team deploy deploy-app deployment deployment-activate deployment-list deployment-show deployments domain domain-configure domain-create domain-delete domain-leave domain-list domain-rename domain-show domains enable-ha-app env env-add env-list env-remove env-set env-show env-unset envs force-stop-app git-clone help leave-domain leave-team list-alias list-authorization list-cartridge list-deployment list-domain list-env list-member list-region list-server list-sshkey list-team logout member member-add member-list member-remove member-update members port-forward region region-list regions reload-app reload-cartridge remove-alias remove-cartridge remove-member remove-server remove-sshkey rename-domain restart-app restart-cartridge restore-snapshot save-snapshot scale-cartridge scale-down-app scale-up-app scp server server-add server-configure server-list server-remove server-show server-status server-use servers set-env setup show-app show-cartridge show-deployment show-domain show-env show-server show-sshkey show-team snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-list sshkey-remove sshkey-show sshkeys start-app start-cartridge status-cartridge status-server stop-app stop-cartridge storage-cartridge tail team team-create team-delete team-leave team-list team-show teams threaddump tidy-app unset-env update-cert-alias update-member use-server"
     fi
   else
     prev="${COMP_WORDS[@]:0:COMP_CWORD}"
@@ -200,7 +200,7 @@ _rhc()
         if [[ "$cur" == -* ]]; then
           opts=""
         else
-          opts="configure create delete deploy env force-stop reload restart scale-down scale-up show snapshot start stop tidy"
+          opts="configure create delete deploy enable-ha env force-stop reload restart scale-down scale-up show snapshot start stop tidy"
         fi
         ;;
 
@@ -236,6 +236,14 @@ _rhc()
         fi
         ;;
 
+      "rhc app enable-ha")
+        if [[ "$cur" == -* ]]; then
+          opts="--app --application-id --namespace"
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc app env")
         if [[ "$cur" == -* ]]; then
           opts="--app --application-id --confirm --env --namespace"
@@ -372,6 +380,14 @@ _rhc()
         fi
         ;;
 
+      "rhc app-enable-ha")
+        if [[ "$cur" == -* ]]; then
+          opts="--app --application-id --namespace"
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc app-env")
         if [[ "$cur" == -* ]]; then
           opts="--app --application-id --confirm --env --namespace"
@@ -1060,6 +1076,14 @@ _rhc()
         fi
         ;;
 
+      "rhc enable-ha-app")
+        if [[ "$cur" == -* ]]; then
+          opts="--app --application-id --namespace"
+        else
+          opts=""
+        fi
+        ;;
+
       "rhc env")
         if [[ "$cur" == -* ]]; then
           opts=""
@@ -1192,7 +1216,7 @@ _rhc()
         if [[ "$cur" == -* ]]; then
           opts=""
         else
-          opts="account account-logout activate-deployment add-alias add-authorization add-cartridge add-member add-server add-sshkey alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert aliases app app-configure app-create app-delete app-deploy app-env app-force-stop app-reload app-restart app-scale-down app-scale-up app-scp app-show app-snapshot app-ssh app-start app-stop app-tidy apps authorization authorization-add authorization-delete authorization-delete-all authorization-list authorizations cartridge cartridge-add cartridge-list cartridge-reload cartridge-remove cartridge-restart cartridge-scale cartridge-show cartridge-start cartridge-status cartridge-stop cartridge-storage cartridges configure-app configure-domain configure-server create-app create-domain create-team delete-all-authorization delete-app delete-authorization delete-cert-alias delete-domain delete-team deploy deploy-app deployment deployment-activate deployment-list deployment-show deployments domain domain-configure domain-create domain-delete domain-leave domain-list domain-rename domain-show domains env env-add env-list env-remove env-set env-show env-unset envs force-stop-app git-clone leave-domain leave-team list-alias list-authorization list-cartridge list-deployment list-domain list-env list-member list-region list-server list-sshkey list-team logout member member-add member-list member-remove member-update members port-forward region region-list regions reload-app reload-cartridge remove-alias remove-cartridge remove-member remove-server remove-sshkey rename-domain restart-app restart-cartridge restore-snapshot save-snapshot scale-cartridge scale-down-app scale-up-app scp server server-add server-configure server-list server-remove server-show server-status server-use servers set-env setup show-app show-cartridge show-deployment show-domain show-env show-server show-sshkey show-team snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-list sshkey-remove sshkey-show sshkeys start-app start-cartridge status-cartridge status-server stop-app stop-cartridge storage-cartridge tail team team-create team-delete team-leave team-list team-show teams threaddump tidy-app unset-env update-cert-alias update-member use-server"
+          opts="account account-logout activate-deployment add-alias add-authorization add-cartridge add-member add-server add-sshkey alias alias-add alias-delete-cert alias-list alias-remove alias-update-cert aliases app app-configure app-create app-delete app-deploy app-enable-ha app-env app-force-stop app-reload app-restart app-scale-down app-scale-up app-scp app-show app-snapshot app-ssh app-start app-stop app-tidy apps authorization authorization-add authorization-delete authorization-delete-all authorization-list authorizations cartridge cartridge-add cartridge-list cartridge-reload cartridge-remove cartridge-restart cartridge-scale cartridge-show cartridge-start cartridge-status cartridge-stop cartridge-storage cartridges configure-app configure-domain configure-server create-app create-domain create-team delete-all-authorization delete-app delete-authorization delete-cert-alias delete-domain delete-team deploy deploy-app deployment deployment-activate deployment-list deployment-show deployments domain domain-configure domain-create domain-delete domain-leave domain-list domain-rename domain-show domains enable-ha-app env env-add env-list env-remove env-set env-show env-unset envs force-stop-app git-clone leave-domain leave-team list-alias list-authorization list-cartridge list-deployment list-domain list-env list-member list-region list-server list-sshkey list-team logout member member-add member-list member-remove member-update members port-forward region region-list regions reload-app reload-cartridge remove-alias remove-cartridge remove-member remove-server remove-sshkey rename-domain restart-app restart-cartridge restore-snapshot save-snapshot scale-cartridge scale-down-app scale-up-app scp server server-add server-configure server-list server-remove server-show server-status server-use servers set-env setup show-app show-cartridge show-deployment show-domain show-env show-server show-sshkey show-team snapshot snapshot-restore snapshot-save ssh sshkey sshkey-add sshkey-list sshkey-remove sshkey-show sshkeys start-app start-cartridge status-cartridge status-server stop-app stop-cartridge storage-cartridge tail team team-create team-delete team-leave team-list team-show teams threaddump tidy-app unset-env update-cert-alias update-member use-server"
         fi
         ;;
 

data/lib/rhc/commands/app.rb

@@ -115,6 +115,11 @@ module RHC::Commands
         scaling = from_app.scalable if scaling.nil?
         region = from_app.region if region.nil?
 
+        if region.present? && !rest_client.allows_region_selection?
+          region = nil
+          warn 'Server does not allow selecting regions.  Region is being ignored.'
+        end
+
         cartridges = from_app.cartridges.reject{|c| c.tags.include?('web_proxy')}.collect do |cartridge|
           {
             :name => (cartridge.name if !cartridge.custom?), 
@@ -356,6 +361,16 @@ module RHC::Commands
       0
     end
 
+    summary "Make the application highly available"
+    syntax "<app> [--namespace NAME]"
+    takes_application :argument => true
+    def enable_ha(app)
+      app_action :enable_ha
+
+      results { say "#{app} is now highly available" }
+      0
+    end
+
     summary "Show information about an application"
     description <<-DESC
       Display the properties of an application, including its URL, the SSH

data/lib/rhc/commands/git_clone.rb

@@ -23,7 +23,7 @@ module RHC::Commands
 
         0
       else
-        error "You do not have git installed. In order to fully interact with OpenShift you will need to install and configure a git client."
+        error "You do not have git installed. In order to fully interact with OpenShift you will need to install and configure a git client.#{RHC::Helpers.windows? ? ' We recommend this free application: Git for Windows - a basic git command line and GUI client http://msysgit.github.io/.' : ''}"
         2
       end
     end

data/lib/rhc/commands/ssh.rb

@@ -39,7 +39,7 @@ module RHC::Commands
 
         debug "Using user specified SSH: #{options.ssh}" if options.ssh
 
-        command_line = [ ssh.split, ('-vvv' if debug?), rest_app.ssh_string.to_s, command ].flatten.compact
+        command_line = [RHC::Helpers.split_path(ssh), ('-vvv' if debug?), rest_app.ssh_string.to_s, command].flatten.compact
 
         debug "Invoking Kernel.exec with #{command_line.inspect}"
         Kernel.send(:exec, *command_line)

data/lib/rhc/exceptions.rb

@@ -313,4 +313,10 @@ module RHC
       super message, 1
     end
   end
+
+  class HighAvailabilityNotSupportedException < Exception
+    def initialize(message="The server does not support high availability")
+      super message, 135
+    end
+  end
 end

data/lib/rhc/git_helpers.rb

@@ -7,18 +7,41 @@ module RHC
       "git"
     end
 
-    def git_version
-      @git_version ||= `#{git_cmd} --version 2>&1`.strip #:nocov:
+    def git_version(cmd=discover_git_executable)
+      `"#{cmd}" --version 2>&1`.strip
     end
 
     def has_git?
-      @has_git ||= begin
-          @git_version = nil
-          git_version
-          $?.success?
-        rescue
-          false
+      discover_git_executable.present?
+    end
+
+    # try my best to discover a git executable
+    def discover_git_executable
+      @git_executable ||= begin
+        guessing_locations = [git_cmd]
+
+        #:nocov:
+        if RHC::Helpers.windows?
+          guessing_locations << 
+            discover_windows_executables do |base|
+              [ 
+                "git.exe",
+                "#{base}\\Git\\bin\\git.exe", 
+                "#{base}\\git.exe", 
+              ]
+            end
         end
+
+        # make sure commands can be executed and finally pick the first one
+        guessing_locations.flatten.uniq.select do |cmd| 
+          ((File.exist?(cmd) && File.executable?(cmd)) || exe?(cmd)) && 
+          (begin
+            git_version(cmd)
+            $?.success?
+          rescue ; false ; end)
+        end.collect{|cmd| cmd =~ / / ? '"' + cmd + '"' : cmd}.first
+        #:nocov:
+      end
     end
 
     def git_clone_deploy_hooks(repo_dir)
@@ -50,18 +73,18 @@ module RHC
       dir
     end
 
+    # :nocov: These all call external binaries so test them in cucumber
     def git_remote_add(remote_name, remote_url)
-      cmd = "#{git_cmd} remote add upstream \"#{remote_url}\""
+      cmd = "#{discover_git_executable} remote add upstream \"#{remote_url}\""
       debug "Running #{cmd} 2>&1"
       output = %x[#{cmd} 2>&1]
       raise RHC::GitException, "Error while adding upstream remote - #{output}" unless output.empty?
     end
 
-    # :nocov: These all call external binaries so test them in cucumber
     def git_config_get(key)
       return nil unless has_git?
       
-      config_get_cmd = "#{git_cmd} config --get #{key}"
+      config_get_cmd = "#{discover_git_executable} config --get #{key}"
       value = %x[#{config_get_cmd}].strip
       debug "Git config '#{config_get_cmd}' returned '#{value}'"
       value = nil if $?.exitstatus != 0 or value.empty?
@@ -70,8 +93,8 @@ module RHC
     end
 
     def git_config_set(key, value)
-      unset_cmd = "#{git_cmd} config --unset-all #{key}"
-      config_cmd = "#{git_cmd} config --add #{key} #{value}"
+      unset_cmd = "#{discover_git_executable} config --unset-all #{key}"
+      config_cmd = "#{discover_git_executable} config --add #{key} #{value}"
       debug "Adding #{key} = #{value} to git config"
       commands = [unset_cmd, config_cmd]
       commands.each do |cmd|
@@ -85,7 +108,7 @@ module RHC
     def git_clone_repo(git_url, repo_dir)
       # quote the repo to avoid input injection risk
       destination = (repo_dir ? " \"#{repo_dir}\"" : "")
-      cmd = "#{git_cmd} clone #{git_url}#{destination}"
+      cmd = "#{discover_git_executable} clone #{git_url}#{destination}"
       debug "Running #{cmd}"
 
       status, stdout, stderr = run_with_tee(cmd)

data/lib/rhc/helpers.rb

@@ -4,7 +4,7 @@ require 'rhc/config'
 require 'rhc/output_helpers'
 require 'rhc/server_helpers'
 require 'rbconfig'
-
+require 'csv'
 require 'resolv'
 
 OptionParser.accept(URI) {|s,| URI.parse(s) if s}
@@ -517,6 +517,68 @@ module RHC
       s.is_a?(String) ? !!(s =~ /^(true|t|yes|y|1)$/i) : s
     end
 
+    # split spaces but preserve sentences between quotes
+    def split_path(s, keep_quotes=false)
+      keep_quotes ? s.split(/\s(?=(?:[^"]|"[^"]*")*$)/) : CSV::parse_line(s, :col_sep => ' ')
+    end
+
+    def discover_windows_executables(&block)
+      #:nocov:
+      if RHC::Helpers.windows?
+
+        base_path = []
+        guessing_locations = []
+
+        # Look for the base path int the ProgramFiles env var...
+        if program_files = ENV['ProgramFiles']; program_files.present? && File.exists?(program_files)
+          base_path << program_files
+        end
+
+        # ... and in win32ole drives (drive root or Program Files)
+        begin
+          require 'win32ole'
+          WIN32OLE.new("Scripting.FileSystemObject").tap do |file_system|
+            file_system.Drives.each do |drive|
+              base_path << [
+                "#{drive.DriveLetter}:\\Program Files (x86)",
+                "#{drive.DriveLetter}:\\Program Files",
+                "#{drive.DriveLetter}:\\Progra~1",
+                "#{drive.DriveLetter}:"
+              ]
+            end
+          end
+        rescue
+        end
+
+        # executables array from block
+        executable_groups = []
+        base_path.flatten.uniq.each do |base|
+          executable_groups << yield(base)
+        end
+
+        # give proper priorities
+        unless executable_groups.empty?
+          length = executable_groups.first.length
+          for i in 1..length do
+            executable_groups.each do |group|
+              guessing_locations << group[i - 1]
+            end
+          end
+        end
+
+        guessing_locations.flatten.uniq.select {|cmd| File.exist?(cmd) && File.executable?(cmd)}
+      else
+        []
+      end
+      #:nocov:
+    end
+
+    def exe?(executable)
+      ENV['PATH'].split(File::PATH_SEPARATOR).any? do |directory|
+        File.executable?(File.join(directory, executable.to_s))
+      end
+    end
+
     BOUND_WARNING = self.method(:warn).to_proc
   end
 end

data/lib/rhc/rest/application.rb

@@ -110,6 +110,11 @@ module RHC
         rest_method 'TIDY', :event => "tidy"
       end
 
+      def enable_ha
+        raise RHC::HighAvailabilityNotSupportedException.new unless supports? "MAKE_HA"
+        rest_method 'MAKE_HA', :event => "make-ha"
+      end
+
       def scale_up
         rest_method 'SCALE_UP', :event => "scale-up"
       end

data/lib/rhc/rest/client.rb

@@ -285,6 +285,16 @@ module RHC
         api.supports? :LIST_REGIONS
       end
 
+      #
+      # allows_region_selection? determines if the broker will allow a client
+      # to specify the region for an app
+      # @returns  true if allowed; nil otherwise
+      #
+      def allows_region_selection?
+        supported_regions = regions rescue []
+        supported_regions.any? { |region| region.allow_selection == true }
+      end
+
       def authorizations
         raise AuthorizationsNotSupported unless supports_sessions?
         api.rest_method 'LIST_AUTHORIZATIONS'

data/lib/rhc/rest/mock.rb

@@ -426,7 +426,8 @@ module RHC::Rest::Mock
        ['LIST_DEPLOYMENTS',                "broker/rest/domain/#{domain_id}/application/#{app_id}/deployments",  'get' ],
        ['UPDATE_DEPLOYMENTS',              "broker/rest/domain/#{domain_id}/application/#{app_id}/deployments",  'post' ],
        ['ACTIVATE',                        "broker/rest/domain/#{domain_id}/application/#{app_id}/events",       'post'],
-       ['DEPLOY',                          "broker/rest/domain/#{domain_id}/application/#{app_id}/deployments",  'post']
+       ['DEPLOY',                          "broker/rest/domain/#{domain_id}/application/#{app_id}/deployments",  'post'],
+       ['MAKE_HA',                         "broker/rest/application/#{app_id}/events",                           'make-ha']
       ].compact
     end
 
@@ -764,15 +765,16 @@ module RHC::Rest::Mock
       @applications = nil
     end
 
-    def add_application(name, type=nil, scale=nil, gear_profile='default', git_url=nil)
+    def add_application(name, type=nil, scale=nil, gear_profile='default', git_url=nil, region=nil)
       if type.is_a?(Hash)
         scale = type[:scale]
         gear_profile = type[:gear_profile]
         git_url = type[:initial_git_url]
         tags = type[:tags]
+        region = type[:region]
         type = Array(type[:cartridges] || type[:cartridge])
       end
-      a = MockRestApplication.new(client, name, type, self, scale, gear_profile, git_url)
+      a = MockRestApplication.new(client, name, type, self, scale, gear_profile, git_url, nil, region)
       builder = @applications.find{ |app| app.cartridges.map(&:name).any?{ |s| s =~ /^jenkins-[\d\.]+$/ } }
       a.building_app = builder.name if builder
       @applications << a
@@ -847,11 +849,13 @@ module RHC::Rest::Mock
 
   class MockRestApplication < RHC::Rest::Application
     include Helpers
+    attr_writer :region
+
     def fakeuuid
       "fakeuuidfortests#{@name}"
     end
 
-    def initialize(client, name, type, domain, scale=nil, gear_profile='default', initial_git_url=nil, environment_variables=nil)
+    def initialize(client, name, type, domain, scale=nil, gear_profile='default', initial_git_url=nil, environment_variables=nil, region=nil)
       super({}, client)
       @name = name
       @domain = domain
@@ -870,7 +874,7 @@ module RHC::Rest::Mock
       if scale
         @scalable = true
       end
-      @region = nil
+      @region = region
       self.attributes = {:links => mock_response_links(mock_app_links('mock_domain_0', 'mock_app_0')), :messages => []}
       self.gear_count = 5
       types = Array(type)
@@ -954,6 +958,14 @@ module RHC::Rest::Mock
       @app
     end
 
+    def enable_ha
+      if supports? "MAKE_HA"
+        @app
+      else
+        raise RHC::HighAvailabilityNotSupportedException.new
+      end
+    end
+
     def scale_up
       @app
     end

data/lib/rhc/ssh_helpers.rb

@@ -21,7 +21,6 @@ require 'httpclient'
 
 module RHC
   module SSHHelpers
-
     class MultipleGearTask
       def initialize(command, over, opts={})
         requires_ssh_multi!
@@ -373,12 +372,6 @@ module RHC
       pub_key
     end
 
-    def exe?(executable)
-      ENV['PATH'].split(File::PATH_SEPARATOR).any? do |directory|
-        File.executable?(File.join(directory, executable.to_s))
-      end
-    end
-
     # For Net::SSH versions (< 2.0.11) that does not have
     # Net::SSH::KeyFactory.load_public_key, we drop to shell to get
     # the key's fingerprint
@@ -426,18 +419,51 @@ module RHC
     end
 
     # check the version of SSH that is installed
-    def ssh_version
-      @ssh_version ||= `ssh -V 2>&1`.strip
+    def ssh_version(cmd=discover_ssh_executable)
+      `"#{cmd}" -V 2>&1`.strip
     end
 
     # return whether or not SSH is installed
     def has_ssh?
-      @has_ssh ||= begin
-        @ssh_version = nil
-        ssh_version
-        $?.success?
-      rescue
-        false
+      discover_ssh_executable.present?
+    end
+
+    # try my best to discover a ssh executable
+    def discover_ssh_executable
+      @ssh_executable ||= begin
+        guessing_locations = ['ssh']
+
+        #:nocov:
+        if RHC::Helpers.windows?
+          # looks for ssh.exe from msysgit or plink.exe from PuTTY, either on path or specific locations
+          guessing_locations << 
+            discover_windows_executables do |base|
+              [ 
+                'ssh.exe', 
+                "#{base}\\Git\\bin\\ssh.exe", 
+                "#{base}\\ssh.exe", 
+                'plink.exe',
+                "#{base}\\PuTTY\\plink.exe",
+                "#{base}\\plink.exe",
+                'putty.exe',
+                "#{base}\\PuTTY\\putty.exe",
+                "#{base}\\putty.exe" 
+              ]
+            end
+        end
+        #:nocov:
+
+        # make sure commands can be executed and finally pick the first one
+        guessing_locations.flatten.uniq.select do |cmd| 
+          (check_ssh_executable!(cmd).present? rescue false) && 
+          (begin
+            # putty -V exit as 1
+            cmd =~ /plink\.exe/i || cmd =~ /putty\.exe/i || (begin 
+              ssh_version(cmd)
+              $?.success?
+            end)
+          rescue ; false ; end)
+        end.collect{|cmd| cmd =~ / / ? '"' + cmd + '"' : cmd}.first
       end
     end
 
@@ -445,13 +471,14 @@ module RHC
     # if none was supplied, return installed ssh, if any.
     def check_ssh_executable!(path)
       if not path
-        raise RHC::InvalidSSHExecutableException.new("No system SSH available. Please use the --ssh option to specify the path to your SSH executable, or install SSH.") unless has_ssh?
-        'ssh'
+        discover_ssh_executable.tap do |ssh_cmd|
+          raise RHC::InvalidSSHExecutableException.new("No system SSH available. Please use the --ssh option to specify the path to your SSH executable, or install SSH.#{windows? ? ' We recommend this free application: Git for Windows - a basic git command line and GUI client http://msysgit.github.io/.' : ''}") unless ssh_cmd or has_ssh?
+        end
       else
         bin_path = path.split(' ').first
-        raise RHC::InvalidSSHExecutableException.new("SSH executable '#{bin_path}' does not exist.") unless File.exist?(bin_path) or exe?(bin_path)
-        raise RHC::InvalidSSHExecutableException.new("SSH executable '#{bin_path}' is not executable.") unless File.executable?(bin_path) or exe?(bin_path)
-        path
+        raise RHC::InvalidSSHExecutableException.new("SSH executable '#{bin_path}' does not exist.") unless File.exist?(bin_path) or File.exist?(path) or exe?(bin_path)
+        raise RHC::InvalidSSHExecutableException.new("SSH executable '#{bin_path}' is not executable.") unless File.executable?(path) or File.executable?(bin_path) or exe?(bin_path)
+        path =~ / / ? '"' + path + '"' : path
       end
     end
 

data/lib/rhc/wizard.rb

@@ -182,7 +182,7 @@ module RHC
     end
 
     def server_stage
-      paragraph do 
+      paragraph do
         unless options.__explicit__[:server]
           say "If you have your own OpenShift server, you can specify it now. Just hit enter to use#{openshift_online_server? ? ' the server for OpenShift Online' : ''}: #{openshift_server}."
           options.server = ask "Enter the server hostname: " do |q|
@@ -236,7 +236,7 @@ module RHC
       elsif rest_client.supports_sessions? && !options.token
         paragraph do
           info "OpenShift can create and store a token on disk which allows to you to access the server without using your password. The key is stored in your home directory and should be kept secret.  You can delete the key at any time by running 'rhc logout'."
-          if agree "Generate a token now? (yes|no) "
+          if options.create_token or agree "Generate a token now? (yes|no) "
             say "Generating an authorization token for this client ... "
             token = rest_client.new_session
             options.token = token.token
@@ -287,8 +287,8 @@ module RHC
         if write_servers_yml
           say "Saving server configuration to #{system_path(servers.path)} ... "
           servers.backup
-          servers.add_or_update(options.server, 
-            :login                    => options.rhlogin, 
+          servers.add_or_update(options.server,
+            :login                    => options.rhlogin,
             :use_authorization_tokens => options.use_authorization_tokens,
             :insecure                 => options.insecure,
             :timeout                  => options.timeout,
@@ -605,7 +605,7 @@ module RHC
     end
 
     def generic_unix_install_check
-      paragraph do 
+      paragraph do
         say "Checking for git ... "
 
         if has_git?
@@ -623,21 +623,18 @@ module RHC
     end
 
     def windows_install
-      # 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
-      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.
+      unless discover_ssh_executable.present? && discover_git_executable.present?
+        warn <<EOF
 
-Documentation for installing other tools you will need for OpenShift can be found at https://www.openshift.com/developers/install-the-client-tools
+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://www.openshift.com/developers/install-the-client-tools
 
 We recommend these free applications:
 
-  * Git for Windows - a basic git command line and GUI client https://github.com/msysgit/msysgit/wiki/InstallMSysGit
+  * Git for Windows - a basic git command line and GUI client http://msysgit.github.io/
   * TortoiseGit - git client that integrates into the file explorer http://code.google.com/p/tortoisegit/
-
+ 
 EOF
+      end
     end
   end
 

data/spec/rhc/commands/app_spec.rb

@@ -163,6 +163,7 @@ describe RHC::Commands::App do
       let!(:config){ base_config }
       before{ RHC::Config.any_instance.stub(:has_local_config?).and_return(false) }
       before{ described_class.any_instance.stub(:interactive?).and_return(true) }
+      before{ described_class.any_instance.stub(:discover_git_executable).and_return('git') }
       before{ rest_client.domains.clear }
       before{ rest_client.sshkeys.delete_if {|k| !k.is_ssh? } }
       let(:arguments) { ['app', 'create', 'app1', 'mock_standalone_cart-1'] }
@@ -406,6 +407,7 @@ describe RHC::Commands::App do
       @domain = rest_client.add_domain("mockdomain")
       @instance.stub(:git_clone_application) { raise RHC::GitException }
       @instance.stub(:check_sshkeys!)
+      @instance.stub(:discover_git_executable).and_return('git')
     end
 
     context 'when run with error in git clone' do
@@ -428,6 +430,7 @@ describe RHC::Commands::App do
         RHC::Helpers.stub(:windows?) { true }
         @instance.stub(:run_nslookup) { true }
         @instance.stub(:run_ping) { true }
+        @instance.stub(:has_git?) { true }
       end
       it "should print out git warning" do
         run_output.should match(" We were unable to clone your application's git repo")
@@ -439,6 +442,7 @@ describe RHC::Commands::App do
         RHC::Helpers.stub(:windows?) { true }
         @instance.stub(:run_nslookup) { true }
         @instance.stub(:run_ping) { false }
+        @instance.stub(:has_git?) { true }
       end
       it "should print out windows warning" do
         run_output.should match("This may also be related to an issue with Winsock on Windows")
@@ -473,26 +477,66 @@ describe RHC::Commands::App do
     before(:each) do
       FakeFS.deactivate!
       @domain = rest_client.add_domain("mockdomain")
-      @app = @domain.add_application("app1", "mock_standalone_cart-1")
+      @app = @domain.add_application("app1", :cartridge=>"mock_standalone_cart-1")
       @app.add_alias('myfoo.com')
       @cart1 = @app.add_cartridge('mock_cart-1')
       @cart2 = @app.add_cartridge('mock_cart-2')
       @cart2.gear_profile = 'medium'
       @instance.stub(:save_snapshot)
       @instance.stub(:restore_snapshot)
+      @app.stub(:region){'aRegion'}
+      rest_client.api.stub(:supports?).with(:LIST_REGIONS){true} 
     end
 
-    context 'when run' do
+    context 'when run and the broker allows region selection' do
+      before do
+        rest_client.stub(:regions) do
+          region = double()
+          region.stub(:allow_selection){true}
+          [region]
+        end
+      end
+
       let(:arguments) { ['app', 'create', 'clone', '--from-app', 'app1', '--no-git'] }
       it { expect { run }.to exit_with_code(0) }
       it "should clone successfully" do
         run_output.should match(/Cartridges:\s+mock_standalone_cart-1, mock_cart-1, mock_cart-2/)
         run_output.should match(/Gear Size:\s+Copied from 'app1'/)
         run_output.should match(/Setting deployment configuration/)
+        run_output.should match(/Region:\s+aRegion\s+\(copied from 'app1'/)
         run_output.should match(/done/)
       end
     end
 
+    context 'when source app has a region and the broker does not allow region selection' do
+
+      context 'and region flag is not specified' do
+        let(:arguments) { ['app', 'create', 'app2', '--from-app', 'app1', '--no-git'] }
+        it "should clone successfully" do
+          expect { run }.to exit_with_code(0)
+          run_output.should match(/Server does not allow selecting regions.  Region is being ignored./)
+          run_output.should match(/Cartridges:\s+mock_standalone_cart-1, mock_cart-1, mock_cart-2/)
+          run_output.should match(/Gear Size:\s+Copied from 'app1'/)
+          run_output.should_not match(/Region:\s+aRegion\s+\(copied from 'app1'/)
+          run_output.should match(/Setting deployment configuration/)
+          run_output.should match(/done/)
+        end
+      end
+
+      context 'and region flag is specified' do
+        let(:arguments) { ['app', 'create', 'app2', '--from-app', 'app1', '--region','foo','--no-git'] }
+        it "should clone successfully" do
+          run_output.should match(/Server does not allow selecting regions.  Region is being ignored./)
+          run_output.should match(/Cartridges:\s+mock_standalone_cart-1, mock_cart-1, mock_cart-2/)
+          run_output.should match(/Gear Size:\s+Copied from 'app1'/)
+          run_output.should_not match(/Region:\s+aRegion\s+\(copied from 'app1'/)
+          run_output.should match(/Setting deployment configuration/)
+          run_output.should match(/done/)
+          expect { run }.to exit_with_code(0)
+        end
+      end
+    end
+
     context 'when cloning a scalable app as not scalable' do
       before do
         @scaled = @domain.add_application("scaled", "mock_standalone_cart-1", true)
@@ -848,6 +892,29 @@ describe RHC::Commands::App do
       it { run_output.should match('cleaned') }
       it { expect{ run }.to exit_with_code(0) }
     end
+
+    context 'app enable-ha' do
+      let(:arguments) { ['app', 'enable-ha', 'app1'] }
+      it { run_output.should match('is now highly available') }
+      it { expect{ run }.to exit_with_code(0) }
+    end
+
+  end
+
+  describe 'app enable-ha' do
+    before do
+      @domain = rest_client.add_domain("mockdomain")
+      @app = @domain.add_application("app1", "mock_type")
+      @app.add_cartridge('mock_cart-1')
+      @app.links.delete 'MAKE_HA'
+    end
+
+    let(:arguments) { ['app', 'enable-ha', 'app1'] }
+
+    it "should raise ha not supported exception" do
+      run_output.should match(/The server does not support high availability/)
+      expect{ run }.to exit_with_code(135)
+    end
   end
 
   describe "#create_app" do

data/spec/rhc/commands/git_clone_spec.rb

@@ -34,7 +34,7 @@ describe RHC::Commands::GitClone do
 
     context 'when run without git installed' do
       before do
-        @instance.stub(:has_git?) { false }
+        @instance.stub(:discover_git_executable){ nil }
       end
       it "should print out git warning" do
         run_output.should match("You do not have git installed")
@@ -49,6 +49,7 @@ describe RHC::Commands::GitClone do
             say "Cloned"
             true
           end
+          @instance.stub(:discover_git_executable){ 'git' }
         end
 
         it { expect { run }.to exit_with_code(0) }
@@ -65,7 +66,35 @@ describe RHC::Commands::GitClone do
           let(:arguments) { ['git-clone', 'app2'] }
           it { run_output.should match("Added remote upstream pointing to git://test") }
         end
+      end
+
+      context "reports success successfully on windows" do
+        before do
+          RHC::Helpers.stub(:windows?) do ; true; end
+          RHC::Helpers.stub(:jruby?) do ; false ; end
+          RHC::Helpers.stub(:linux?) do ; false ; end
+          @instance.stub(:git_clone_repo) do |git_url, repo_dir|
+            Dir::mkdir(repo_dir)
+            say "Cloned"
+            true
+          end
+          @instance.stub(:discover_git_executable){ 'git.exe' }
+        end
+
+        it { expect { run }.to exit_with_code(0) }
+        it { run_output.should match("Cloned") }
 
+        context 'when app has an initial git url' do
+          before do
+            @app2 = @domain.add_application("app2", "mock_unique_standalone_cart", nil, "default", "git://test")
+            @instance.stub(:git_remote_add) do |remote_name, remote_url|
+              say "Added remote #{remote_name} pointing to #{remote_url}"
+              true
+            end
+          end
+          let(:arguments) { ['git-clone', 'app2'] }
+          it { run_output.should match("Added remote upstream pointing to git://test") }
+        end
       end
 
       context "testing git_clone_deploy_hooks" do
@@ -78,6 +107,7 @@ describe RHC::Commands::GitClone do
             say "Copied" if File.exists?("#{repo_dir}/.git/hooks/pre_commit")
             true
           end
+          @instance.stub(:discover_git_executable){ 'git' }
 
           # Get around the FakeFS bug (defunkt/fakefs#177) by
           # stubbing the #cp call to inject a expected fs entry
@@ -92,7 +122,10 @@ describe RHC::Commands::GitClone do
       end
 
       context "reports failure" do
-        before{ @instance.stub(:git_clone_repo).and_raise(RHC::GitException) }
+        before do 
+          @instance.stub(:git_clone_repo).and_raise(RHC::GitException) 
+          @instance.stub(:discover_git_executable){ 'git' }
+        end
 
         it { expect { run }.to exit_with_code(216) }
         it { run_output.should match("Git returned an error") }

data/spec/rhc/commands/scp_spec.rb

@@ -35,6 +35,7 @@ describe RHC::Commands::Scp do
         @domain = rest_client.add_domain("mockdomain")
         @domain.add_application("app1", "mock_type")
         File.should_receive(:exist?).with("file.txt").once.and_return(false)
+        File.should_receive(:exist?).with("git").at_least(1).and_return(true)
       end
       it { run_output.should match("Local file, file_path, or directory could not be found.") }
     end
@@ -48,6 +49,7 @@ describe RHC::Commands::Scp do
         @domain = rest_client.add_domain("mockdomain")
         @domain.add_application("app1", "mock_type")
         File.should_receive(:exist?).with("file.txt").once.and_return(true)
+        File.should_receive(:exist?).with("git").at_least(1).and_return(true)
         Net::SCP.should_receive("upload!".to_sym).with("127.0.0.1", "fakeuuidfortestsapp1","file.txt","app-root/data").and_raise(Errno::ECONNREFUSED)
       end
       it { run_output.should match("The server fakeuuidfortestsapp1 refused a connection with user 127.0.0.1.  The application may be unavailable.") }
@@ -58,6 +60,7 @@ describe RHC::Commands::Scp do
         @domain = rest_client.add_domain("mockdomain")
         @domain.add_application("app1", "mock_type")
         File.should_receive(:exist?).with("file.txt").once.and_return(true)
+        File.should_receive(:exist?).with("git").at_least(1).and_return(true)
         Net::SCP.should_receive("upload!".to_sym).with("127.0.0.1", "fakeuuidfortestsapp1","file.txt","app-root/data").and_raise(SocketError)
       end
       it { run_output.should match("The connection to 127.0.0.1 failed: SocketError") }
@@ -69,6 +72,7 @@ describe RHC::Commands::Scp do
         @domain = rest_client.add_domain("mockdomain")
         @domain.add_application("app1", "mock_type")
         File.should_receive(:exist?).with("file.txt").once.and_return(true)
+        File.should_receive(:exist?).with("git").at_least(1).and_return(true)
         Net::SCP.should_receive("upload!".to_sym).with("127.0.0.1", "fakeuuidfortestsapp1","file.txt","app-root/data").and_raise(Net::SSH::AuthenticationFailed)
       end
       it { run_output.should match("Authentication to server 127.0.0.1 with user fakeuuidfortestsapp1 failed") }
@@ -79,6 +83,7 @@ describe RHC::Commands::Scp do
         @domain = rest_client.add_domain("mockdomain")
         @domain.add_application("app1", "mock_type")
         File.should_receive(:exist?).with("file.txt").once.and_return(true)
+        File.should_receive(:exist?).with("git").at_least(1).and_return(true)
         Net::SCP.should_receive("upload!".to_sym).with("127.0.0.1", "fakeuuidfortestsapp1","file.txt","app-root/data").and_raise(Net::SCP::Error.new("SCP error message"))
       end
       it { run_output.should match("An unknown error occurred: SCP error message") }

data/spec/rhc/commands/setup_spec.rb

@@ -41,6 +41,7 @@ describe RHC::Commands::Setup do
   it{ command_for('setup', '--clean').options.clean.should be_true }
 
   it{ command_for('setup').options.server.should == 'openshift.redhat.com' }
+  it{ command_for('setup').options.create_token.should be_nil }
   it{ command_for('setup', '--server', 'foo.com').options.server.should == 'foo.com' }
   it{ command_for('setup', '--no-create-token').options.create_token.should == false }
   it{ command_for('setup', '--create-token').options.create_token.should == true }
@@ -51,7 +52,7 @@ describe RHC::Commands::Setup do
   end
   context "when config has use_authorization_tokens=true" do
     let!(:config){ base_config{ |c, d| d.add('use_authorization_tokens', 'true') } }
-    it{ command_for('setup').options.use_authorization_tokens.should == true }
+    it{ command_for('setup').options.use_authorization_tokens.should be_true }
   end
 
 =begin  context 'when libra_server is set' do

data/spec/rhc/commands/snapshot_spec.rb

@@ -40,7 +40,6 @@ describe RHC::Commands::Snapshot do
 
     context 'when failing to save a snapshot' do
       before do
-        subject.class.any_instance.should_receive(:has_ssh?).and_return(true)
         subject.class.any_instance.should_receive(:exec).with("ssh #{@ssh_uri.user}@#{@ssh_uri.host} 'snapshot' > #{@app.name}.tar.gz").and_return([1, 'some save failures'])
       end
       it { expect { run }.to exit_with_code(130) }
@@ -54,6 +53,8 @@ describe RHC::Commands::Snapshot do
         RHC::Helpers.stub(:linux?) do ; false ; end
         ssh = double(Net::SSH)
         Net::SSH.should_receive(:start).with(@ssh_uri.host, @ssh_uri.user).and_yield(ssh)
+        subject.class.any_instance.stub(:discover_ssh_executable){ 'ssh' }
+        subject.class.any_instance.stub(:discover_git_executable){ 'git' }
         ssh.should_receive(:exec!).with("snapshot").and_yield(nil, :stdout, 'foo').and_yield(nil, :stderr, 'foo')
       end
       it { expect { run }.to exit_with_code(0) }
@@ -67,6 +68,8 @@ describe RHC::Commands::Snapshot do
         RHC::Helpers.stub(:linux?) do ; false ; end
         ssh = double(Net::SSH)
         Net::SSH.should_receive(:start).with(@ssh_uri.host, @ssh_uri.user).and_raise(Timeout::Error)
+        subject.class.any_instance.stub(:discover_ssh_executable){ 'ssh' }
+        subject.class.any_instance.stub(:discover_git_executable){ 'git' }
       end
       it { expect { run }.to exit_with_code(130) }
     end
@@ -112,7 +115,6 @@ describe RHC::Commands::Snapshot do
       before do
         File.stub(:exists?).and_return(true)
         RHC::TarGz.stub(:contains).and_return(true)
-        subject.class.any_instance.should_receive(:has_ssh?).and_return(true)
         subject.class.any_instance.should_receive(:exec).with("cat '#{@app.name}.tar.gz' | ssh #{@ssh_uri.user}@#{@ssh_uri.host} 'restore INCLUDE_GIT'").and_return([1, 'some restore failures'])
       end
       it { expect { run }.to exit_with_code(130) }
@@ -134,6 +136,8 @@ describe RHC::Commands::Snapshot do
         channel.should_receive(:on_extended_data).and_yield(nil, nil, 'foo')
         channel.should_receive(:on_close).and_yield(nil)
         lines = ''
+        subject.class.any_instance.stub(:discover_ssh_executable){ 'ssh' }
+        subject.class.any_instance.stub(:discover_git_executable){ 'git' }
         File.open(File.expand_path('../../assets/targz_sample.tar.gz', __FILE__), 'rb') do |file|
           file.chunk(1024) do |chunk|
             lines << chunk
@@ -153,6 +157,8 @@ describe RHC::Commands::Snapshot do
         RHC::Helpers.stub(:linux?) do ; false ; end
         ssh = double(Net::SSH)
         Net::SSH.should_receive(:start).with(@ssh_uri.host, @ssh_uri.user).and_raise(Timeout::Error)
+        subject.class.any_instance.stub(:discover_ssh_executable){ 'ssh' }
+        subject.class.any_instance.stub(:discover_git_executable){ 'git' }
       end
       it { expect { run }.to exit_with_code(130) }
     end

data/spec/rhc/commands/ssh_spec.rb

@@ -120,7 +120,7 @@ describe RHC::Commands::Ssh do
       before(:each) do
         @domain = rest_client.add_domain("mockdomain")
         @domain.add_application("app1", "mock_type")
-        RHC::Commands::Ssh.any_instance.should_receive(:has_ssh?).and_return(false)
+        subject.class.any_instance.stub(:discover_ssh_executable).and_return(nil)
       end
       it { run_output.should match("No system SSH available. Please use the --ssh option to specify the path to your SSH executable, or install SSH.") }
       it { expect { run }.to exit_with_code(1) }
@@ -135,7 +135,9 @@ describe RHC::Commands::Ssh do
         @domain = rest_client.add_domain("mockdomain")
         @domain.add_application("app1", "mock_type")
         RHC::Commands::Ssh.any_instance.should_not_receive(:has_ssh?)
-        File.should_receive(:exist?).with("path_to_ssh").once.and_return(false)
+        File.should_receive(:exist?).with("path_to_ssh").at_least(1).and_return(false)
+        File.should_receive(:executable?).with(/.*path_to_ssh/).at_least(1).and_return(false)
+        subject.class.any_instance.stub(:discover_git_executable).and_return('git')
       end
       it { run_output.should match("SSH executable 'path_to_ssh' does not exist.") }
       it { expect { run }.to exit_with_code(1) }
@@ -148,6 +150,7 @@ describe RHC::Commands::Ssh do
         RHC::Commands::Ssh.any_instance.should_not_receive(:has_ssh?)
         File.should_receive(:exist?).with("path_to_ssh").once.and_return(true)
         File.should_receive(:executable?).with(/.*path_to_ssh/).at_least(1).and_return(false)
+        subject.class.any_instance.stub(:discover_git_executable).and_return('git')
       end
       it { run_output.should match("SSH executable 'path_to_ssh' is not executable.") }
       it { expect { run }.to exit_with_code(1) }
@@ -161,6 +164,7 @@ describe RHC::Commands::Ssh do
         File.should_receive(:exist?).with("path_to_ssh").once.and_return(true)
         File.should_receive(:executable?).with("path_to_ssh").once.and_return(true)
         Kernel.should_receive(:exec).with("path_to_ssh", "fakeuuidfortestsapp1@127.0.0.1").once.times.and_return(0)
+        subject.class.any_instance.stub(:discover_git_executable).and_return('git')
       end
       it { run_output.should match("Connecting to fakeuuidfortestsapp") }
       it { expect { run }.to exit_with_code(0) }
@@ -172,6 +176,7 @@ describe RHC::Commands::Ssh do
 
     context 'has_ssh?' do
       before{ RHC::Commands::Ssh.any_instance.stub(:ssh_version){ raise "Fake Exception" } }
+      before{ RHC::Commands::Ssh.any_instance.stub(:discover_ssh_executable){ nil } }
       its(:has_ssh?) { should be_false }
     end
   end

data/spec/rhc/wizard_spec.rb

@@ -87,7 +87,7 @@ describe RHC::Wizard do
       subject.should_receive(:applications).and_return([app])
       Net::SSH.should_receive(:start).with("foo.com", "uuid", {:timeout => 60}).and_return(ssh)
       subject.send(:test_ssh_connectivity).should be_true
-    end    
+    end
     it "should handle a failed connection" do
       subject.should_receive(:ssh_key_uploaded?).and_return(true)
       subject.should_receive(:applications).and_return([app])
@@ -100,7 +100,7 @@ describe RHC::Wizard do
       subject.should_receive(:debug_error).with(interrupt)
       Net::SSH.should_receive(:start).and_raise(interrupt)
       expect{ subject.send(:test_ssh_connectivity) }.to raise_error(RuntimeError, /Connection attempt to foo.com was interrupted/)
-    end    
+    end
   end
 
   describe "#core_auth" do
@@ -121,79 +121,79 @@ describe RHC::Wizard do
     let(:auth){ subject.send(:auth) }
     let(:user_obj){ double(:login => user) }
 
-    subject{ described_class.new(config, options) }
+    let(:wizard){RHC::Wizard.new(config, options) }
 
     def expect_client_test(with_sessions=false)
-      subject.should_receive(:new_client_for_options).ordered.and_return(rest_client)
+      wizard.should_receive(:new_client_for_options).ordered.and_return(rest_client)
       rest_client.should_receive(:api).ordered
       rest_client.should_receive(:user).ordered.and_return(user_obj)
       rest_client.should_receive(:supports_sessions?).ordered.and_return(with_sessions)
     end
     def expect_raise_from_api(error)
-      subject.should_receive(:new_client_for_options).ordered.and_return(rest_client)
+      wizard.should_receive(:new_client_for_options).ordered.and_return(rest_client)
       rest_client.should_receive(:api).ordered.and_raise(error)
     end
 
     it "should prompt for user and password" do
       expect_client_test
-      subject.send(:login_stage).should be_true
-      subject.send(:options).rhlogin.should == user
+      wizard.send(:login_stage).should be_true
+      wizard.send(:options).rhlogin.should == user
     end
 
     context "with token" do
       let(:token){ 'a_test_value' }
       let(:default_options){ {:token => token, :rhlogin => user} }
-      before{ subject.should_receive(:say).with(/Using an existing token for #{user} to login to /).ordered }
+      before{ wizard.should_receive(:say).with(/Using an existing token for #{user} to login to /).ordered }
 
       it "should continue without prompt" do
         expect_client_test
-        subject.send(:login_stage).should be_true
+        wizard.send(:login_stage).should be_true
       end
     end
 
     context "with credentials" do
       let(:server){ mock_uri }
       let(:default_options){ {:rhlogin => user, :password => password, :server => server} }
-      before{ subject.should_receive(:say).with(/Using #{user} to login to /).ordered }
+      before{ wizard.should_receive(:say).with(/Using #{user} to login to /).ordered }
 
       it "should warn about a self signed cert error" do
         expect_raise_from_api(RHC::Rest::SelfSignedCertificate.new('reason', 'message'))
-        subject.should_receive(:warn).with(/server's certificate is self-signed/).ordered
-        subject.should_receive(:openshift_online_server?).ordered.and_return(true)
-        subject.should_receive(:warn).with(/server between you and OpenShift/).ordered
+        wizard.should_receive(:warn).with(/server's certificate is self-signed/).ordered
+        wizard.should_receive(:openshift_online_server?).ordered.and_return(true)
+        wizard.should_receive(:warn).with(/server between you and OpenShift/).ordered
 
-        subject.send(:login_stage).should be_nil
+        wizard.send(:login_stage).should be_nil
       end
 
       it "should warn about a cert error for Online" do
         expect_raise_from_api(RHC::Rest::CertificateVerificationFailed.new('reason', 'message'))
-        subject.should_receive(:warn).with(/server's certificate could not be verified/).ordered
-        subject.should_receive(:openshift_online_server?).ordered.and_return(true)
-        subject.should_receive(:warn).with(/server between you and OpenShift/).ordered
+        wizard.should_receive(:warn).with(/server's certificate could not be verified/).ordered
+        wizard.should_receive(:openshift_online_server?).ordered.and_return(true)
+        wizard.should_receive(:warn).with(/server between you and OpenShift/).ordered
 
-        subject.send(:login_stage).should be_nil
+        wizard.send(:login_stage).should be_nil
       end
 
       it "should warn about a cert error for custom server and continue" do
         expect_raise_from_api(RHC::Rest::CertificateVerificationFailed.new('reason', 'message'))
-        subject.should_receive(:warn).with(/server's certificate could not be verified/).ordered
-        subject.should_receive(:openshift_online_server?).ordered.and_return(false)
-        subject.should_receive(:warn).with(/bypass this check/).ordered
-        subject.should_receive(:agree).with(/Connect without checking/).ordered.and_return(true)
+        wizard.should_receive(:warn).with(/server's certificate could not be verified/).ordered
+        wizard.should_receive(:openshift_online_server?).ordered.and_return(false)
+        wizard.should_receive(:warn).with(/bypass this check/).ordered
+        wizard.should_receive(:agree).with(/Connect without checking/).ordered.and_return(true)
         expect_client_test
 
-        subject.send(:login_stage).should be_true
+        wizard.send(:login_stage).should be_true
         options.insecure.should be_true
       end
 
       it "should warn about a cert error for custom server and be cancelled" do
         expect_raise_from_api(RHC::Rest::CertificateVerificationFailed.new('reason', 'message'))
-        subject.should_receive(:warn).with(/server's certificate could not be verified/).ordered
-        subject.should_receive(:openshift_online_server?).ordered.and_return(false)
-        subject.should_receive(:warn).with(/bypass this check/).ordered
-        subject.should_receive(:agree).with(/Connect without checking/).ordered.and_return(false)
+        wizard.should_receive(:warn).with(/server's certificate could not be verified/).ordered
+        wizard.should_receive(:openshift_online_server?).ordered.and_return(false)
+        wizard.should_receive(:warn).with(/bypass this check/).ordered
+        wizard.should_receive(:agree).with(/Connect without checking/).ordered.and_return(false)
 
-        subject.send(:login_stage).should be_nil
+        wizard.send(:login_stage).should be_nil
         options.insecure.should be_false
       end
 
@@ -206,10 +206,10 @@ describe RHC::Wizard do
         it "should check for an existing token" do
           store.should_receive(:get).and_return(nil)
 
-          subject.should_receive(:info).with(/OpenShift can create and store a token on disk/).ordered
-          subject.should_receive(:agree).with(/Generate a token now?/).ordered.and_return(false)
+          wizard.should_receive(:info).with(/OpenShift can create and store a token on disk/).ordered
+          wizard.should_receive(:agree).with(/Generate a token now?/).ordered.and_return(false)
 
-          subject.send(:login_stage).should be_true
+          wizard.send(:login_stage).should be_true
           options.token.should be_nil
         end
       end
@@ -223,42 +223,79 @@ describe RHC::Wizard do
 
         it "should not generate a token if the user does not request it" do
           store.should_not_receive(:get)
-          subject.should_receive(:info).with(/OpenShift can create and store a token on disk/).ordered
-          subject.should_receive(:agree).with(/Generate a token now?/).ordered.and_return(false)
+          wizard.should_receive(:info).with(/OpenShift can create and store a token on disk/).ordered
+          wizard.should_receive(:agree).with(/Generate a token now?/).ordered.and_return(false)
 
-          subject.send(:login_stage).should be_true
+          wizard.send(:login_stage).should be_true
           options.token.should be_nil
         end
 
+        context "when the option to create tokens is passed" do
+
+          shared_examples "a wizard creating tokens without prompts" do
+            it "should create the token without prompting" do
+              store.should_not_receive(:get)
+              wizard.should_receive(:info).with(/OpenShift can create and store a token on disk/).ordered
+              wizard.should_receive(:agree).never
+              wizard.should_receive(:say).with(/Generating an authorization token for this client /).ordered
+              rest_client.should_receive(:new_session).ordered.and_return(auth_token)
+              store.should_receive(:put).with(user, server, token).ordered.and_return(true)
+              wizard.should_receive(:new_client_for_options).ordered.and_return(rest_client)
+              rest_client.should_receive(:user).ordered.and_return(true)
+              wizard.should_receive(:success).with(/lasts 1 minute/).ordered
+
+              wizard.send(:login_stage).should be_true
+              options.token.should == token
+            end
+          end
+
+          describe '--create-token' do
+            it_behaves_like 'a wizard creating tokens without prompts' do
+              let(:default_options){ {:rhlogin => user, :password => password, :server => server, :create_token => true} }
+            end
+          end
+
+          describe '--use-authorization-tokens' do
+            before { store.should_receive(:get) }
+
+            it_behaves_like 'a wizard creating tokens without prompts' do
+              #create token would normally be set in rhc/commands/server if not specified
+              #and running from the command line
+              let(:default_options){ {:rhlogin => user, :password => password, :server => server, :use_authorization_tokens => true, :create_token =>true} }
+            end
+          end
+        end
+
         it "should generate a token if the user requests it" do
           store.should_not_receive(:get)
-          subject.should_receive(:info).with(/OpenShift can create and store a token on disk/).ordered
-          subject.should_receive(:agree).with(/Generate a token now?/).ordered.and_return(true)
-          subject.should_receive(:say).with(/Generating an authorization token for this client /).ordered
+          wizard.should_receive(:info).with(/OpenShift can create and store a token on disk/).ordered
+          wizard.should_receive(:agree).with(/Generate a token now?/).ordered.and_return(true)
+          wizard.should_receive(:say).with(/Generating an authorization token for this client /).ordered
           rest_client.should_receive(:new_session).ordered.and_return(auth_token)
           store.should_receive(:put).with(user, server, token).ordered.and_return(true)
-          subject.should_receive(:new_client_for_options).ordered.and_return(rest_client)
+          wizard.should_receive(:new_client_for_options).ordered.and_return(rest_client)
           rest_client.should_receive(:user).ordered.and_return(true)
-          subject.should_receive(:success).with(/lasts 1 minute/).ordered
+          wizard.should_receive(:success).with(/lasts 1 minute/).ordered
 
-          subject.send(:login_stage).should be_true
+          wizard.send(:login_stage).should be_true
           options.token.should == token
         end
       end
 
+
       context "when the user doesn't want to use tokens" do
         let(:default_options){ {:rhlogin => user, :password => password, :server => server, :use_authorization_tokens => false, :create_token => false} }
         before do
-          subject.should_receive(:new_client_for_options).ordered.and_return(rest_client)
+          wizard.should_receive(:new_client_for_options).ordered.and_return(rest_client)
           rest_client.should_receive(:api).ordered
           rest_client.should_receive(:user).ordered.and_return(user_obj)
         end
 
         it "should skip token generation" do
-          subject.should_receive(:say).with(/Skipping token generation/)
-          subject.should_receive(:agree).never
+          wizard.should_receive(:say).with(/Skipping token generation/)
+          wizard.should_receive(:agree).never
 
-          subject.send(:login_stage).should be_true
+          wizard.send(:login_stage).should be_true
           options.token.should be_nil
         end
       end
@@ -407,7 +444,7 @@ describe RHC::Wizard do
 
       context "when a multiple keys exist but is not the same" do
         before{ setup_mock_ssh(true) }
-        before do 
+        before do
           stub_one_key('a_key')
           stub_add_key_error('invalid```--', 'Invalid key name')
           stub_add_key('another_key')

data/spec/spec_helper.rb

@@ -3,7 +3,10 @@ require 'webmock/rspec'
 require 'fakefs/safe'
 require 'rbconfig'
 
-require 'pry' if ENV['PRY']
+if ENV['PRY']
+  require 'pry' 
+  require 'pry-debugger'
+end
 
 # Environment reset
 ENV['http_proxy'] = nil

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhc
 version: !ruby/object:Gem::Version 
-  hash: 105
+  hash: 97
   prerelease: 
   segments: 
   - 1
-  - 30
-  - 3
-  version: 1.30.3
+  - 31
+  - 5
+  version: 1.31.5
 platform: ruby
 authors: 
 - Red Hat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-10-15 00:00:00 Z
+date: 2014-11-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh
@@ -207,6 +207,14 @@ dependencies:
         - 0
         - 4
         version: "0.4"
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        - 0
+        version: 0.6.0
   type: :development
   version_requirements: *id012
 - !ruby/object:Gem::Dependency