rhc 1.15.6 → 1.16.9

data/lib/rhc/rest/deployment.rb

@@ -0,0 +1,18 @@
+require 'rhc/rest/activation'
+
+module RHC
+  module Rest
+    class Deployment < Base
+      define_attr :id, :ref, :sha1, :artifact_url, :hot_deploy, :created_at, :force_clean_build, :activations
+
+      def activations
+        @activations ||=
+          attributes['activations'].map{|activation| Activation.new({:created_at => RHC::Helpers.datetime_rfc3339(activation)}, client)}.sort
+      end
+
+      def <=>(other)
+       other.created_at <=> created_at
+      end
+    end
+  end
+end

data/lib/rhc/rest/key.rb

@@ -3,6 +3,14 @@ module RHC
     class Key < Base
       define_attr :name, :type, :content
 
+      def is_ssh?
+        type != 'krb5-principal'
+      end
+
+      def is_kerberos?
+        type == 'krb5-principal'
+      end
+
       def update(type, content)
         debug "Updating key #{self.name}"
         rest_method "UPDATE", :type => type, :content => content
@@ -14,17 +22,21 @@ module RHC
       end
       alias :delete :destroy
 
+      def principal
+        content if is_kerberos?
+      end
+
       def fingerprint
         @fingerprint ||= begin
           public_key = Net::SSH::KeyFactory.load_data_public_key("#{type} #{content}")
           public_key.fingerprint
         rescue NotImplementedError, OpenSSL::PKey::PKeyError => e
           'Invalid key'
-        end
+        end if is_ssh?
       end
 
       def visible_to_ssh?
-        Net::SSH::Authentication::Agent.connect.identities.
+        is_ssh? and Net::SSH::Authentication::Agent.connect.identities.
           find{ |i| fingerprint == i.fingerprint }.present? rescue false
       end
     end

data/lib/rhc/rest/mock.rb

@@ -2,12 +2,31 @@ module RHC::Rest::Mock
 
   def self.start
     RHC::Helpers.warn "Running in mock mode"
+    require 'webmock'
+    WebMock.disable_net_connect!
+    MockRestClient.class_eval do
+      include WebMock::API
+      include Helpers
+      def user_agent_header
+      end
+      def user_auth
+        {:user => nil, :password => nil}
+      end
+    end
+    MockRestUser.class_eval do
+      def add_key(*args)
+        attributes['links'] ||= {}
+        links['ADD_KEY'] = {'href' => 'https://test.domain.com/broker/rest/user/keys', 'method' => 'POST'}
+        super
+      end
+    end
     MockRestClient.new.tap do |c|
       d = c.add_domain("test1")
       app = d.add_application('app1', 'carttype1')
       app.cartridges[0].display_name = "A display name"
       app.add_cartridge('mockcart2')
       app2 = d.add_application('app2', 'carttype2', true)
+      c.stub_add_key_error('test', 'this failed')
     end
   end
 
@@ -98,8 +117,12 @@ module RHC::Rest::Mock
     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})
+        with(:body => hash_including({:name => name, :type => 'ssh-rsa'})).
+        to_return({:status => code, :body => {:messages => [
+          {:text => message, :field => 'name', :severity => 'error'},
+          {:text => "A warning from the server", :field => nil, :severity => 'warning'},
+        ]
+        }.to_json})
     end
     def stub_create_domain(name)
       stub_api_request(:post, 'broker/rest/domains', mock_user_auth).
@@ -380,6 +403,11 @@ module RHC::Rest::Mock
        ['SET_UNSET_ENVIRONMENT_VARIABLES', "domains/#{domain_id}/apps/#{app_id}/event",                          'post'],
        ['DELETE',                          "broker/rest/domains/#{domain_id}/applications/#{app_id}",            'delete'],
       (['LIST_MEMBERS',                    "domains/#{domain_id}/apps/#{app_id}/members",                        'get'] if example_allows_members?),
+       ['UPDATE',                          "broker/rest/domain/#{domain_id}/application/#{app_id}",              'put'],
+       ['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']
       ].compact
     end
 
@@ -503,8 +531,8 @@ module RHC::Rest::Mock
         end
       end
       @domains = []
-      @user = MockRestUser.new(client, config.username)
-      @api = MockRestApi.new(client, config)
+      @user = MockRestUser.new(self, config.username)
+      @api = MockRestApi.new(self, config)
       @version = version
     end
 
@@ -611,7 +639,8 @@ module RHC::Rest::Mock
       @login = login
       @keys = [
         MockRestKey.new(client, 'mockkey1', 'ssh-rsa', 'AAAAB3NzaC1yc2EAAAADAQABAAABAQDNK8xT3O+kSltmCMsSqBfAgheB3YFJ9Y0ESJnFjFASVxH70AcCQAgdQSD/r31+atYShJdP7f0AMWiQUTw2tK434XSylnZWEyIR0V+j+cyOPdVQlns6D5gPOnOtweFF0o18YulwCOK8Q1H28GK8qyWhLe0FcMmxtKbbQgaVRvQdXZz4ThzutCJOyJm9xVb93+fatvwZW76oLLvfFJcJSOK2sgW7tJM2A83bm4mwixFDF7wO/+C9WA+PgPKJUIjvy1gZjBhRB+3b58vLOnYhPOgMNruJwzB+wJ3pg8tLJEjxSbHyyoi6OqMBs4BVV7LdzvwTDxEjcgtHVvaVNXgO5iRX'),
-        MockRestKey.new(client, 'mockkey2', 'ssh-dsa', 'AAAAB3NzaC1kc3MAAACBAPaaFj6Xjrjd8Dc4AAkJe0HigqaXMxj/87xHoV+nPgerHIceJWhPUWdW40lSASrgpAV9Eq4zzD+L19kgYdbMw0vSX5Cj3XtNOsow9MmMxFsYjTxCv4eSs/rLdGPaYZ5GVRPDu8tN42Bm8lj5o+ky3HzwW+mkQMZwcADQIgqtn6QhAAAAFQCirDfIMf/JoMOFf8CTnsTKWw/0zwAAAIAIQp6t2sLIp1d2TBfd/qLjOJA10rPADcnhBzWB/cd/oFJ8a/2nmxeSPR5Ov18T6itWqbKwvZw2UC0MrXoYbgcfVNP/ym1bCd9rB5hu1sg8WO4JIxA/47PZooT6PwTKVxHuENEzQyJL2o6ZJq+wuV0taLvm6IaM5TAZuEJ2p4TC/gAAAIBpLcVXZREa7XLY55nyidt/+UC+PxpjhPHOHbzL1OvWEaumN4wcJk/JZPppgXX9+WDkTm1SD891U0cXnGMTP0OZOHkOUHF2ZcfUe7p9kX4WjHs0OccoxV0Lny6MC4DjalJyaaEbijJHSUX3QlLcBOlPHJWpEpvWQ9P8AN4PokiGzA==')
+        MockRestKey.new(client, 'mockkey2', 'ssh-dsa', 'AAAAB3NzaC1kc3MAAACBAPaaFj6Xjrjd8Dc4AAkJe0HigqaXMxj/87xHoV+nPgerHIceJWhPUWdW40lSASrgpAV9Eq4zzD+L19kgYdbMw0vSX5Cj3XtNOsow9MmMxFsYjTxCv4eSs/rLdGPaYZ5GVRPDu8tN42Bm8lj5o+ky3HzwW+mkQMZwcADQIgqtn6QhAAAAFQCirDfIMf/JoMOFf8CTnsTKWw/0zwAAAIAIQp6t2sLIp1d2TBfd/qLjOJA10rPADcnhBzWB/cd/oFJ8a/2nmxeSPR5Ov18T6itWqbKwvZw2UC0MrXoYbgcfVNP/ym1bCd9rB5hu1sg8WO4JIxA/47PZooT6PwTKVxHuENEzQyJL2o6ZJq+wuV0taLvm6IaM5TAZuEJ2p4TC/gAAAIBpLcVXZREa7XLY55nyidt/+UC+PxpjhPHOHbzL1OvWEaumN4wcJk/JZPppgXX9+WDkTm1SD891U0cXnGMTP0OZOHkOUHF2ZcfUe7p9kX4WjHs0OccoxV0Lny6MC4DjalJyaaEbijJHSUX3QlLcBOlPHJWpEpvWQ9P8AN4PokiGzA=='),
+        MockRestKey.new(client, 'mockkey3', 'krb5-principal', 'mockuser@mockdomain')
       ]
     end
 
@@ -738,6 +767,8 @@ module RHC::Rest::Mock
       @aliases = []
       @environment_variables = environment_variables || []
       @gear_profile = gear_profile
+      @auto_deploy = true
+      @keep_deployments = 1
       if scale
         @scalable = true
       end
@@ -863,6 +894,34 @@ module RHC::Rest::Mock
       (@members ||= []) << member
       self
     end
+
+    def configure(options={})
+      options.each {|key,value| self.instance_variable_set("@#{key.to_s}", value)}
+    end
+
+    def auto_deploy
+      @auto_deploy || false
+    end
+
+    def keep_deployments
+      @keep_deployments
+    end
+
+    def deployments
+      base_time1 = Time.local(2000,1,1,1,0,0).strftime('%Y-%m-%dT%H:%M:%S%z')
+      base_time2 = Time.local(2000,1,1,2,0,0).strftime('%Y-%m-%dT%H:%M:%S%z')
+      base_time3 = Time.local(2000,1,1,3,0,0).strftime('%Y-%m-%dT%H:%M:%S%z')
+      base_time4 = Time.local(2000,1,1,4,0,0).strftime('%Y-%m-%dT%H:%M:%S%z')
+      base_time5 = Time.local(2000,1,1,5,0,0).strftime('%Y-%m-%dT%H:%M:%S%z')
+      base_time6 = Time.local(2000,1,1,6,0,0).strftime('%Y-%m-%dT%H:%M:%S%z')
+      [
+        MockRestDeployment.new(self, '0000001', 'master', '0000001', nil, false, base_time1, false, [base_time1]),
+        MockRestDeployment.new(self, '0000002', 'master', '0000002', nil, false, base_time2, false, [base_time2, base_time6]),
+        MockRestDeployment.new(self, '0000003', 'master', '0000003', nil, false, base_time3, false, [base_time3, base_time5]),
+        MockRestDeployment.new(self, '0000004', 'master', '0000004', nil, false, base_time4, false, [base_time4]),
+        MockRestDeployment.new(self, '0000005', 'master', '0000005', nil, false, base_time5, false, [base_time5]),
+      ]
+    end
   end
 
   class MockRestCartridge < RHC::Rest::Cartridge
@@ -935,5 +994,31 @@ module RHC::Rest::Mock
       @content = content
     end
   end
+
+  class MockRestDeployment < RHC::Rest::Deployment
+    def initialize(client, id, ref, sha1, artifact_url, hot_deploy, created_at, force_clean_build, activations)
+      super({}, client)
+      @id = id
+      @ref = ref
+      @sha1 = sha1
+      @artifact_url = artifact_url
+      @hot_deploy = hot_deploy
+      @created_at = created_at
+      @force_clean_build = force_clean_build
+      @activations = activations
+    end
+
+    def activations
+      @activations.map{|activation| MockRestActivation.new(client, RHC::Helpers.datetime_rfc3339(activation))}.sort
+    end
+  end
+
+
+  class MockRestActivation < RHC::Rest::Activation
+    def initialize(client, created_at)
+      super({}, client)
+      @created_at = created_at
+    end
+  end
 end
 

data/lib/rhc/ssh_helpers.rb

@@ -17,6 +17,7 @@
 
 require 'net/ssh'
 require 'rhc/vendor/sshkey'
+require 'httpclient'
 
 module RHC
   module SSHHelpers
@@ -34,11 +35,11 @@ module RHC
         out = nil
 
         Net::SSH::Multi.start(
-          :concurrent_connections => @opts[:limit], 
-          :on_error => lambda{ |server| $stderr.puts "Unable to connect to gear #{server}" }
+          :concurrent_connections => @opts[:limit],
+          :on_error => lambda{ |server| $stderr.puts RHC::Helpers.color("Unable to connect to gear #{server}", :red) }
         ) do |session|
-          
-          @over.each do |item| 
+
+          @over.each do |item|
             case item
             when RHC::Rest::GearGroup
               item.gears.each do |gear|
@@ -47,7 +48,7 @@ module RHC
             #when RHC::Rest::Gear
             #  session.use ssh_host_for(item), :properties => {:gear => item}
             #end
-            else 
+            else
               raise "Cannot establish an SSH session to this type"
             end
           end
@@ -59,7 +60,7 @@ module RHC
               }
             when @opts[:as] == :table
               out = []
-              lambda { |ch, dest, data| 
+              lambda { |ch, dest, data|
                 label = label_for(ch)
                 data.chomp.each_line do |line|
                   row = out.find{ |row| row[0] == label } || (out << [label, []])[-1]
@@ -67,7 +68,7 @@ module RHC
                 end
               }
             when @opts[:as] == :gear
-              lambda { |ch, dest, data| (ch.connection.properties[:gear]['data'] ||= "") << data }              
+              lambda { |ch, dest, data| (ch.connection.properties[:gear]['data'] ||= "") << data }
             else
               width = 0
               lambda { |ch, dest, data|
@@ -111,7 +112,7 @@ module RHC
         end
 
         def label_for(channel)
-          channel.properties[:label] ||= 
+          channel.properties[:label] ||=
             begin
               group = channel.connection.properties[:group]
               "#{key_for(channel)} #{group.cartridges.map{ |c| c['name'] }.join('+')}"
@@ -123,12 +124,12 @@ module RHC
         end
 
         def requires_ssh_multi!
-          begin 
-            require 'net/ssh/multi' 
+          begin
+            require 'net/ssh/multi'
           rescue LoadError
             raise RHC::OperationNotSupportedException, "You must install Net::SSH::Multi to use the --gears option.  Most systems: 'gem install net-ssh-multi'"
           end
-        end          
+        end
     end
 
     def run_on_gears(command, gears, opts={}, &block)
@@ -153,6 +154,9 @@ module RHC
     # host - The String of the remote hostname to ssh to.
     # username - The String username of the remote user to ssh as.
     # command - The String command to run on the remote host.
+    # compression - Use compression in ssh, set to false if sending files.
+    # request_pty - Request for pty, set to false when pipe a file.
+    # block - Will yield this block and send the channel if provided.
     #
     # Examples
     #
@@ -162,29 +166,86 @@ module RHC
     #  # => true
     #
     # Returns true on success
-    def ssh_ruby(host, username, command)
+    def ssh_ruby(host, username, command, compression=false, request_pty=false, &block)
       debug "Opening Net::SSH connection to #{host}, #{username}, #{command}"
-      Net::SSH.start(host, username) do |session|
+      exit_status = 0
+      Net::SSH.start(host, username, :compression => compression) do |session|
         #:nocov:
-        session.open_channel do |channel|
-          channel.request_pty do |ch, success|
-            say "pty could not be obtained" unless success
+        channel = session.open_channel do |channel|
+          if request_pty
+            channel.request_pty do |ch, success|
+              say "pty could not be obtained" unless success
+            end
           end
-
-          channel.on_data do |ch, data|
-            puts data
+          channel.exec(command) do |ch, success|
+            channel.on_data do |ch, data|
+              print data
+            end
+            channel.on_extended_data do |ch, type, data|
+              print data
+            end
+            channel.on_close do |ch|
+              debug "Terminating ... "
+            end
+            channel.on_request("exit-status") do |ch, data|
+              exit_status = data.read_long
+            end
+            yield channel if block_given?
+            channel.eof!
           end
-          channel.exec command
         end
         session.loop
         #:nocov:
       end
+      raise RHC::SSHCommandFailed.new(exit_status) if exit_status != 0
     rescue Errno::ECONNREFUSED => e
+      debug_error e
       raise RHC::SSHConnectionRefused.new(host, username)
+    rescue Net::SSH::AuthenticationFailed => e
+      debug_error e
+      raise RHC::SSHAuthenticationFailed.new(host, username)
     rescue SocketError => e
+      debug_error e
       raise RHC::ConnectionFailed, "The connection to #{host} failed: #{e.message}"
     end
 
+
+    # Public: Run ssh command on remote host and pipe the specified
+    # file contents to the command input
+    #
+    # host - The String of the remote hostname to ssh to.
+    # username - The String username of the remote user to ssh as.
+    # command - The String command to run on the remote host.
+    # filename - The String path to file to send.
+    #
+    def ssh_send_file_ruby(host, username, command, filename)
+      filename = File.expand_path(filename)
+      ssh_ruby(host, username, command) do |channel|
+        File.open(filename, 'rb') do |file|
+          file.chunk(1024) do |chunk|
+            channel.send_data chunk
+          end
+        end
+      end
+    end
+
+    # Public: Run ssh command on remote host and pipe the specified
+    # url contents to the command input
+    #
+    # host - The String of the remote hostname to ssh to.
+    # username - The String username of the remote user to ssh as.
+    # command - The String command to run on the remote host.
+    # content_url - The url with the content to pipe to command.
+    #
+    def ssh_send_url_ruby(host, username, command, content_url)
+      content_url = URI.parse(URI.encode(content_url.to_s))
+      ssh_ruby(host, username, command) do |channel|
+        HTTPClient.new.get_content(content_url) do |chunk|
+          channel.send_data chunk
+        end
+      end
+    end
+
     # Public: Generate an SSH key and store it in ~/.ssh/id_rsa
     #
     # type - The String type RSA or DSS.
@@ -269,7 +330,7 @@ module RHC
         raise ::RHC::KeyFileAccessDeniedException.new("Access denied to '#{key}'.")
       end
     end
-    
+
     def ssh_key_triple_for_default_key
       ssh_key_triple_for(RHC::Config.ssh_pub_key_file_path)
     end

data/lib/rhc/wizard.rb

@@ -597,11 +597,11 @@ EOF
     def finalize_stage
       true
     end
-    
+
     protected
       def namespace_optional?
         false
-      end    
+      end
   end
 
   class DomainWizard < Wizard

data/spec/direct_execution_helper.rb

@@ -29,7 +29,11 @@ module RhcExecutionHelper
   end
 
   def a_web_cartridge
-    'php-5.3'
+    if ENV['RHC_TARGET'] == 'rhel' || !File.exist?("/etc/fedora-release")
+      'php-5.3'
+    else
+      'php-5.5'
+    end
   end
 
   def rhc(*args)
@@ -38,25 +42,32 @@ module RhcExecutionHelper
     if user = opts[:as]
       args << '--rhlogin'
       args << user.login
-      if user.respond_to? :token
+      if user.attributes.has_key? :token
         args << '--token'
-        args << user.token
-      elsif user.respond_to? :password
+        args << user.attributes[:token]
+      elsif user.attributes.has_key? :password
         args << '--password'
-        args << user.password
+        args << user.attributes[:password]
       end
     elsif !server_supports_sessions?
       args << '--password'
       args << ENV['TEST_PASSWORD']
     end
+    oldenv = if opts[:env]
+      old = ENV.to_hash
+      ENV.update(opts[:env])
+      old
+    end
     execute_command(args.unshift(rhc_executable), opts[:with])
+  ensure
+    ENV.replace(oldenv) if oldenv
   end
 
   def execute_command(args, stdin="", tty=true)
     stdin = stdin.join("\n") if stdin.is_a? Array
     stdout, stderr =
       if debug?
-        [debug, debug].map{ |t| RHC::Helpers::StringTee.new(t) } 
+        [debug, debug].map{ |t| RHC::Helpers::StringTee.new(t) }
       else
         [StringIO.new, StringIO.new]
       end
@@ -111,6 +122,7 @@ module RhcExecutionHelper
   def other_users
     $other_users ||= begin
       (ENV['TEST_OTHER_USERS'] || "other1:a,other2:b,other3:c,other4:d").split(',').map{ |s| s.split(':') }.inject({}) do |h, (u, p)|
+        register_user(u,p) unless ENV['REGISTER_USER'].nil?
         h[u] = base_client(u, p).user
         h[u].attributes[:password] = p
         h
@@ -123,36 +135,51 @@ module RhcExecutionHelper
     object.members.length.should == 1
   end
 
-  def has_an_application
+  def has_an_application(for_user=nil)
+    c = for_user ? for_user.client : client
     debug.puts "Creating or reusing an app" if debug?
-    apps = client.applications
+    apps = c.applications
     apps.first or begin
-      domain = has_a_domain
+      domain = has_a_domain(for_user)
       debug.puts "  creating a new application" if debug?
-      client.domains.first.add_application("test#{random}", :cartridges => [a_web_cartridge])
+      c.domains.first.add_application("test#{random}", :cartridges => [a_web_cartridge])
     end
   end
 
-  def has_a_domain
+  def has_a_domain(for_user=nil)
+    c = for_user ? for_user.client : client
     debug.puts "Creating or reusing a domain" if debug?
-    domain = client.domains.first or begin
+    domain = c.domains.first or begin
       debug.puts "  creating a new domain" if debug?
-      client.add_domain("test#{random}")
+      c.add_domain("test#{random}")
     end
   end
 
   def setup_args(opts={})
+    c = opts[:client] || client
     args = []
     args << 'yes' if (ENV['TEST_INSECURE'] == '1' || false)
-    args << ENV['TEST_USERNAME']
-    args << ENV['TEST_PASSWORD']
-    args << 'yes' if server_supports_sessions?
+    args << (opts[:login] || ENV['TEST_USERNAME'])
+    args << (opts[:password] || ENV['TEST_PASSWORD'])
+    args << 'yes' if server_supports_sessions?(c)
     args << 'yes' # generate a key, temp dir will never have one
-    args << ENV['TEST_USERNAME'] if (client.find_key('default').present? rescue false) # same key name as username
-    args << "d#{random}" if (client.domains.empty? rescue true)
+    args << (opts[:login] || ENV['TEST_USERNAME']) if (c.find_key('default').present? rescue false) # same key name as username
+    args << (opts[:domain_name] || "d#{random}") if (c.domains.empty? rescue true)
     args
   end
 
+  def has_local_ssh_key(user)
+    with_environment(user) do
+      r = rhc :setup, :with => setup_args(:login => user.login, :password => user.attributes[:password], :domain_name => "\n")
+      r.status.should == 0
+      user
+    end
+  end
+
+  def ssh_exec_for_env
+    @environment[:ssh_exec]
+  end
+
   def use_clean_config
     environment
     FileUtils.rm_rf(File.join(@environment[:dir], ".openshift"))
@@ -189,8 +216,22 @@ module RhcExecutionHelper
     @environment[:id]
   end
 
-  def server_supports_sessions?
-    @environment && client.supports_sessions?
+  def server_supports_sessions?(c=client)
+    @environment && c.supports_sessions?
+  end
+
+  def with_environment(user, &block)
+    previous = @environment
+    @environment, @client = nil
+    env = ENV.to_hash
+    ENV['TEST_RANDOM_USER'] = nil
+    ENV['TEST_USERNAME'] = user.login
+    ENV['TEST_PASSWORD'] = user.attributes[:password]
+    environment("custom_#{user.login}")
+    yield
+  ensure
+    @environment = previous
+    ENV.replace(env)
   end
 
   private
@@ -209,7 +250,7 @@ module RhcExecutionHelper
         update_env(e)
 
         dir = Dir.mktmpdir('rhc_features_test')
-        at_exit{ FileUtils.rm_rf(dir) }
+        at_exit{ FileUtils.rm_rf(dir) } unless ENV['RHC_DEBUG_DIRS']
         Dir.chdir(dir)
 
         @client = e[:client]
@@ -231,26 +272,52 @@ module RhcExecutionHelper
         ENV['TEST_USERNAME'] or raise "No TEST_USERNAME set"
         ENV['TEST_PASSWORD'] or raise "No TEST_PASSWORD set"
       end
+
+      register_user(ENV['TEST_USERNAME'],ENV['TEST_PASSWORD']) unless ENV['REGISTER_USER'].nil?
       ENV['GIT_SSH'] = config[:ssh_exec]
     end
+
+    def register_user(user,password)
+      if File.exists?("/etc/openshift/plugins.d/openshift-origin-auth-mongo.conf")
+        command = "bash -c 'unset GEM_HOME; unset GEM_PATH; oo-register-user -l admin -p admin --username #{user} --userpass #{password}'"
+        if Object.const_defined?('Bundler')
+          Bundler::with_clean_env do
+            system command
+          end
+        else
+          system command
+        end
+      elsif File.exists?("/etc/openshift/plugins.d/openshift-origin-auth-remote-user.conf")
+        system "/usr/bin/htpasswd -b /etc/openshift/htpasswd #{user} #{password}"
+      else
+        #ignore
+        print "Unknown auth plugin. Not registering user #{user}/#{password}."
+        print "Modify #{__FILE__}:239 if user registration is required."
+        cmd = nil
+      end
+    end
 end
 
 module Environments
   def self.get(id, &block)
     (@environments ||= {})[id] ||= begin
       dir = Dir.mktmpdir('rhc_features')
-      at_exit{ FileUtils.rm_rf(dir) }
+      at_exit{ FileUtils.rm_rf(dir) } unless ENV['RHC_DEBUG_DIRS']
       id = Random.rand(1000000)
-      ssh_exec = File.join(dir, "ssh_exec")
-      IO.write(ssh_exec, "#!/bin/sh\nssh -o StrictHostKeyChecking=no -i #{dir}/.ssh/id_rsa \"$@\"")
-      FileUtils.chmod("u+x", ssh_exec)
+      ssh_exec = create_ssh_exec(dir)
       yield if block_given?
       {:dir => dir, :id => id, :ssh_exec => ssh_exec}
     end
   end
+  def self.create_ssh_exec(dir, for_user=nil)
+    ssh_exec = File.join(dir, "ssh_exec#{for_user ? "_#{for_user}" : ""}")
+    IO.write(ssh_exec, "#!/bin/sh\nssh -o StrictHostKeyChecking=no -i #{dir}/.ssh/id_rsa \"$@\"")
+    FileUtils.chmod("u+x", ssh_exec)
+    ssh_exec
+  end
 end
 
 RSpec.configure do |config|
   config.include(RhcExecutionHelper)
   config.extend(RhcExecutionHelper)
-end
+end