aruba 0.8.1 → 0.9.0.pre

data/lib/aruba/announcer.rb

@@ -80,7 +80,7 @@ module Aruba
       output_format :command, '$ %s'
       output_format :environment, '$ export %s=%s"'
       output_format :modified_environment, '$ export %s=%s"'
-      output_format :full_environment, proc { |h| environment_table(h) }
+      output_format :full_environment, proc { |h| Aruba.platform.simple_table(h) }
       output_format :timeout, '# %s-timeout: %s seconds'
 
       # rubocop:disable Metrics/LineLength
@@ -120,19 +120,6 @@ module Aruba
       self
     end
 
-    def environment_table(h)
-      name_size = h.keys.max_by(&:length).length
-      value_size = h.values.max_by(&:length).length
-
-      result = []
-
-      h.each do |k,v|
-        result << format('%s => %s', k + ' ' * (name_size - k.to_s.size), v + ' ' * (value_size - v.to_s.size))
-      end
-
-      result
-    end
-
     public
 
     # Reset announcer

data/lib/aruba/api.rb

@@ -16,7 +16,7 @@ require 'aruba/api/environment'
 require 'aruba/api/filesystem'
 require 'aruba/api/rvm'
 
-Aruba::Platform.require_matching_files('../matchers/**/*.rb', __FILE__)
+Aruba.platform.require_matching_files('../matchers/**/*.rb', __FILE__)
 
 module Aruba
   module Api
@@ -31,11 +31,11 @@ module Aruba
     def announcer
       @announcer ||= Announcer.new(
         self,
-        :stdout => @announce_stdout,
-        :stderr => @announce_stderr,
-        :dir    => @announce_dir,
-        :cmd    => @announce_cmd,
-        :env    => @announce_env
+        :stdout => defined?(@announce_stdout),
+        :stderr => defined?(@announce_stderr),
+        :dir    => defined?(@announce_dir),
+        :cmd    => defined?(@announce_cmd),
+        :env    => defined?(@announce_env)
       )
 
       @announcer

data/lib/aruba/api/command.rb

@@ -19,6 +19,25 @@ end
 module Aruba
   module Api
     module Commands
+      # Unescape text
+      #
+      # '\n' => "\n"
+      # '\e' => "\e"
+      # '\033' => "\e"
+      # '\"' => '"'
+      def unescape_text(text)
+        text.gsub('\n', "\n").gsub('\"', '"').gsub('\e', "\e").gsub('\033', "\e").gsub('\016', "\016").gsub('\017', "\017").gsub('\t', "\t")
+      end
+
+      # Remove ansi characters from text
+      def extract_text(text)
+        if Aruba::VERSION < '1'
+          text.gsub(/(?:\e|\033)\[\d+(?>(;\d+)*)m/, '')
+        else
+          text.gsub(/(?:\e|\033)\[\d+(?>(;\d+)*)m/, '').gsub(/\\\[|\\\]/, '').gsub(/\007|\016|\017/, '')
+        end
+      end
+
       # Resolve path for command using the PATH-environment variable
       #
       # @param [#to_s] program
@@ -32,7 +51,7 @@ module Aruba
           # ENV is set within this block
           path = ENV['PATH'] if path.nil?
 
-          Aruba::Platform.which(program, path)
+          Aruba.platform.which(program, path)
         end
       end
 
@@ -102,7 +121,14 @@ module Aruba
       #   If arg1 is exactly the same as arg2 return true, otherwise false
       def assert_exact_output(expected, actual)
         actual.force_encoding(expected.encoding) if RUBY_VERSION >= "1.9"
-        expect(Aruba::Platform.unescape(actual, aruba.config.keep_ansi)).to eq Aruba::Platform.unescape(expected, aruba.config.keep_ansi)
+
+        actual = unescape_text(actual)
+        actual = extract_text(actual) if !aruba.config.keep_ansi || aruba.config.remove_ansi_escape_sequences
+
+        expected = unescape_text(expected)
+        expected = extract_text(expected) if !aruba.config.keep_ansi || aruba.config.remove_ansi_escape_sequences
+
+        expect(actual).to eq expected
       end
 
       # Partial compare arg1 and arg2
@@ -111,7 +137,14 @@ module Aruba
       #   If arg2 contains arg1 return true, otherwise false
       def assert_partial_output(expected, actual)
         actual.force_encoding(expected.encoding) if RUBY_VERSION >= "1.9"
-        expect(Aruba::Platform.unescape(actual, aruba.config.keep_ansi)).to include(Aruba::Platform.unescape(expected, aruba.config.keep_ansi))
+
+        actual = unescape_text(actual)
+        actual = extract_text(actual) if !aruba.config.keep_ansi || aruba.config.remove_ansi_escape_sequences
+
+        expected = unescape_text(expected)
+        expected = extract_text(expected) if !aruba.config.keep_ansi || aruba.config.remove_ansi_escape_sequences
+
+        expect(actual).to include expected
       end
 
       # Regex Compare arg1 and arg2
@@ -120,7 +153,14 @@ module Aruba
       #   If arg2 matches arg1 return true, otherwise false
       def assert_matching_output(expected, actual)
         actual.force_encoding(expected.encoding) if RUBY_VERSION >= "1.9"
-        expect(Aruba::Platform.unescape(actual, aruba.config.keep_ansi)).to match(/#{Aruba::Platform.unescape(expected, aruba.config.keep_ansi)}/m)
+
+        actual = unescape_text(actual)
+        actual = extract_text(actual) if !aruba.config.keep_ansi || aruba.config.remove_ansi_escape_sequences
+
+        expected = unescape_text(expected)
+        expected = extract_text(expected) if !aruba.config.keep_ansi || aruba.config.remove_ansi_escape_sequences
+
+        expect(actual).to match Regexp.new(expected, Regexp::MULTILINE)
       end
 
       # Negative regex compare arg1 and arg2
@@ -129,28 +169,50 @@ module Aruba
       #   If arg2 does not match arg1 return true, otherwise false
       def assert_not_matching_output(expected, actual)
         actual.force_encoding(expected.encoding) if RUBY_VERSION >= "1.9"
-        expect(Aruba::Platform.unescape(actual, aruba.config.keep_ansi)).not_to match(/#{Aruba::Platform.unescape(expected, aruba.config.keep_ansi)}/m)
+
+        actual = unescape_text(actual)
+        actual = extract_text(actual) if !aruba.config.keep_ansi || aruba.config.remove_ansi_escape_sequences
+
+        expected = unescape_text(expected)
+        expected = extract_text(expected) if !aruba.config.keep_ansi || aruba.config.remove_ansi_escape_sequences
+
+        expect(actual).not_to match Regexp.new(expected, Regexp::MULTILINE)
       end
 
       # Negative partial compare arg1 and arg2
       #
       # @return [TrueClass, FalseClass]
       #   If arg2 does not match/include arg1 return true, otherwise false
+      # rubocop:disable Metrics/CyclomaticComplexity
       def assert_no_partial_output(unexpected, actual)
         actual.force_encoding(unexpected.encoding) if RUBY_VERSION >= "1.9"
+
+        actual = unescape_text(actual)
+        actual = extract_text(actual) if !aruba.config.keep_ansi || aruba.config.remove_ansi_escape_sequences
+
         if Regexp === unexpected
-          expect(Aruba::Platform.unescape(actual, aruba.config.keep_ansi)).not_to match unexpected
+          expect(actual).not_to match unexpected
         else
-          expect(Aruba::Platform.unescape(actual, aruba.config.keep_ansi)).not_to include(unexpected)
+          unexpected = unescape_text(unexpected)
+          unexpected = extract_text(unexpected) if !aruba.config.keep_ansi || aruba.config.remove_ansi_escape_sequences
+
+          expect(actual).not_to include(unexpected)
         end
       end
+      # rubocop:enable Metrics/CyclomaticComplexity
 
       # Partial compare output of interactive command and arg1
       #
       # @return [TrueClass, FalseClass]
       #   If output of interactive command includes arg1 return true, otherwise false
       def assert_partial_output_interactive(expected)
-        Aruba::Platform.unescape(last_command.stdout, aruba.config.keep_ansi).include?(Aruba::Platform.unescape(expected, aruba.config.keep_ansi)) ? true : false
+        actual = unescape_text(last_command.stdout)
+        actual = extract_text(actual) if !aruba.config.keep_ansi || aruba.config.remove_ansi_escape_sequences
+
+        expected = unescape_text(expected)
+        expected = extract_text(expected) if !aruba.config.keep_ansi || aruba.config.remove_ansi_escape_sequences
+
+        actual.include?(expected) ? true : false
       end
 
       # Check if command succeeded and if arg1 is included in output
@@ -255,7 +317,7 @@ module Aruba
         @commands ||= []
         @commands << cmd
 
-        cmd = Aruba::Platform.detect_ruby(cmd)
+        cmd = Aruba.platform.detect_ruby(cmd)
 
         announcer.announce(:directory, Dir.pwd)
         announcer.announce(:command, cmd)
@@ -264,7 +326,7 @@ module Aruba
 
         mode = if Aruba.process
                  # rubocop:disable Metrics/LineLength
-                 Aruba::Platform.deprecated('The use of "Aruba.process = <process>" and "Aruba.process.main_class" is deprecated. Use "Aruba.configure { |config| config.command_launcher = :in_process|:debug|:spawn }" and "Aruba.configure { |config| config.main_class = <klass> }" instead.')
+                 Aruba.platform.deprecated('The use of "Aruba.process = <process>" and "Aruba.process.main_class" is deprecated. Use "Aruba.configure { |config| config.command_launcher = :in_process|:debug|:spawn }" and "Aruba.configure { |config| config.main_class = <klass> }" instead.')
                  # rubocop:enable Metrics/LineLength
                  Aruba.process
                else
@@ -273,7 +335,7 @@ module Aruba
 
         main_class = if Aruba.process.respond_to?(:main_class) && Aruba.process.main_class
                        # rubocop:disable Metrics/LineLength
-                       Aruba::Platform.deprecated('The use of "Aruba.process = <process>" and "Aruba.process.main_class" is deprecated. Use "Aruba.configure { |config| config.command_launcher = :in_process|:debug|:spawn }" and "Aruba.configure { |config| config.main_class = <klass> }" instead.')
+                       Aruba.platform.deprecated('The use of "Aruba.process = <process>" and "Aruba.process.main_class" is deprecated. Use "Aruba.configure { |config| config.command_launcher = :in_process|:debug|:spawn }" and "Aruba.configure { |config| config.main_class = <klass> }" instead.')
                        # rubocop:enable Metrics/LineLength
                        Aruba.process.main_class
                      else
@@ -291,7 +353,7 @@ module Aruba
 
         if aruba.config.before? :cmd
           # rubocop:disable Metrics/LineLength
-          Aruba::Platform.deprecated('The use of "before"-hook" ":cmd" is deprecated. Use ":command" instead. Please be aware that this hook gets the command passed in not the cmdline itself. To get the commandline use "#cmd.commandline"')
+          Aruba.platform.deprecated('The use of "before"-hook" ":cmd" is deprecated. Use ":command" instead. Please be aware that this hook gets the command passed in not the cmdline itself. To get the commandline use "#cmd.commandline"')
           # rubocop:enable Metrics/LineLength
           aruba.config.before(:cmd, self, cmd)
         end

data/lib/aruba/api/core.rb

@@ -4,6 +4,7 @@ require 'aruba/runtime'
 require 'aruba/errors'
 
 require 'aruba/config/jruby'
+require 'aruba/aruba_logger'
 
 module Aruba
   module Api
@@ -24,9 +25,9 @@ module Aruba
       # artifacts of your tests. This does NOT clean up the current working
       # directory.
       def setup_aruba
-        Aruba::Platform.rm File.join(Aruba.config.root_directory, Aruba.config.working_directory), :force => true
-        Aruba::Platform.mkdir File.join(Aruba.config.root_directory, Aruba.config.working_directory)
-        Aruba::Platform.chdir Aruba.config.root_directory
+        Aruba.platform.rm File.join(Aruba.config.root_directory, Aruba.config.working_directory), :force => true
+        Aruba.platform.mkdir File.join(Aruba.config.root_directory, Aruba.config.working_directory)
+        Aruba.platform.chdir Aruba.config.root_directory
 
         self
       end
@@ -49,23 +50,23 @@ module Aruba
       def cd(dir, &block)
         if block_given?
           begin
-            fail ArgumentError, "#{expand_path(dir)} is not a directory or does not exist." unless Aruba::Platform.directory? expand_path(dir)
+            fail ArgumentError, "#{expand_path(dir)} is not a directory or does not exist." unless Aruba.platform.directory? expand_path(dir)
 
             aruba.current_directory << dir
 
-            old_dir    = Aruba::Platform.getwd
+            old_dir    = Aruba.platform.getwd
             old_oldpwd = ENV['OLDPWD']
             old_pwd    = ENV['PWD']
 
-            ENV['OLDPWD'] = Aruba::Platform.getwd
+            ENV['OLDPWD'] = Aruba.platform.getwd
             ENV['PWD'] = File.join(aruba.root_directory, aruba.current_directory).sub(%r{/$}, '')
 
-            Aruba::Platform.chdir File.join(aruba.root_directory, aruba.current_directory)
+            Aruba.platform.chdir File.join(aruba.root_directory, aruba.current_directory)
 
             result = block.call
           ensure
             aruba.current_directory.pop
-            Aruba::Platform.chdir old_dir
+            Aruba.platform.chdir old_dir
             ENV['OLDPWD'] = old_oldpwd
             ENV['PWD']    = old_pwd
           end
@@ -73,7 +74,7 @@ module Aruba
           return result
         end
 
-        fail ArgumentError, "#{expand_path(dir)} is not a directory or does not exist." unless Aruba::Platform.directory? expand_path(dir)
+        fail ArgumentError, "#{expand_path(dir)} is not a directory or does not exist." unless Aruba.platform.directory? expand_path(dir)
 
         aruba.current_directory << dir
 
@@ -115,12 +116,18 @@ module Aruba
       # rubocop:disable Metrics/MethodLength
       # rubocop:disable Metrics/CyclomaticComplexity
       def expand_path(file_name, dir_string = nil)
+        check_for_deprecated_variables if Aruba::VERSION < '1'
+
         # rubocop:disable Metrics/LineLength
         message = %(Filename "#{file_name}" needs to be a string. It cannot be nil or empty either.  Please use `expand_path('.')` if you want the current directory to be expanded.)
         # rubocop:enable Metrics/LineLength
 
         fail ArgumentError, message unless file_name.is_a?(String) && !file_name.empty?
 
+        # rubocop:disable Metrics/LineLength
+        aruba.logger.warn %(`aruba`'s working directory does not exist. Maybe you forgot to run `setup_aruba` before using it's API. This warning will be an error from 1.0.0) unless Aruba.platform.directory? File.join(aruba.config.root_directory, aruba.config.working_directory)
+        # rubocop:enable Metrics/LineLength
+
         if RUBY_VERSION < '1.9'
           prefix = file_name.chars.to_a[0]
           rest = file_name.chars.to_a[1..-1].join('')
@@ -157,9 +164,9 @@ module Aruba
       #   The block of code which should be run with the modified environment variables
       def with_environment(env = {}, &block)
         if RUBY_VERSION <= '1.9.3'
-          old_env = ENV.to_hash
+          old_env = ENV.to_hash.dup
         else
-          old_env = ENV.to_h
+          old_env = ENV.to_h.dup
         end
 
         old_aruba_env = aruba.environment.to_h

data/lib/aruba/api/deprecated.rb

@@ -8,8 +8,8 @@ module Aruba
       # @return [Array]
       #   The directory path: Each subdirectory is a member of an array
       def dirs
-        Aruba::Platform.deprecated('The use of "@dirs" is deprecated. Use "Aruba.configure { |c| c.current_directory = \'path/to/dir\' }" instead to set the "current_directory') if defined? @dirs
-        Aruba::Platform.deprecated('The use of "dirs" deprecated. Use "Aruba.configure { |c| c.current_directory = \'path/to/dir\' }" instead to set the "current_directory and "expand_path(".")" to get the current directory or use "#cd(\'.\') { # your code }" to run code in the current directory')
+        Aruba.platform.deprecated('The use of "@dirs" is deprecated. Use "Aruba.configure { |c| c.current_directory = \'path/to/dir\' }" instead to set the "current_directory') if defined? @dirs
+        Aruba.platform.deprecated('The use of "dirs" deprecated. Use "Aruba.configure { |c| c.current_directory = \'path/to/dir\' }" instead to set the "current_directory and "expand_path(".")" to get the current directory or use "#cd(\'.\') { # your code }" to run code in the current directory')
 
         @dirs ||= aruba.current_directory
       end
@@ -20,7 +20,7 @@ module Aruba
       # @return
       #   Current directory
       def current_directory
-        Aruba::Platform.deprecated(%(The use of "current_directory" deprecated. Use "expand_path(".")" to get the current directory or "#cd" to run code in the current directory. #{caller.first}))
+        Aruba.platform.deprecated(%(The use of "current_directory" deprecated. Use "expand_path(".")" to get the current directory or "#cd" to run code in the current directory. #{caller.first}))
 
         aruba.current_directory.to_s
       end
@@ -28,7 +28,7 @@ module Aruba
       # @deprecated
       # Clean the current directory
       def clean_current_directory
-        Aruba::Platform.deprecated('The use of "clean_current_directory" is deprecated. Either use "#setup_aruba" or `#remove(\'.\') to clean up aruba\'s working directory before your tests are run')
+        Aruba.platform.deprecated('The use of "clean_current_directory" is deprecated. Either use "#setup_aruba" or `#remove(\'.\') to clean up aruba\'s working directory before your tests are run')
 
         setup_aruba
       end
@@ -39,7 +39,7 @@ module Aruba
       # @yield
       #   The block which should be run in current directory
       def in_current_directory(&block)
-        Aruba::Platform.deprecated('The use of "in_current_directory" deprecated. Use "#cd(\'.\') { # your code }" instead. But be aware, `cd` requires a previously created directory')
+        Aruba.platform.deprecated('The use of "in_current_directory" deprecated. Use "#cd(\'.\') { # your code }" instead. But be aware, `cd` requires a previously created directory')
 
         create_directory '.' unless directory?('.')
         cd('.', &block)
@@ -47,42 +47,42 @@ module Aruba
 
       # @deprecated
       def detect_ruby(cmd)
-        Aruba::Platform.deprecated('The use of "#detect_ruby" is deprecated. Use "Aruba::Platform.detect_ruby" instead')
+        Aruba.platform.deprecated('The use of "#detect_ruby" is deprecated')
 
-        Aruba::Platform.detect_ruby cmd
+        Aruba.platform.detect_ruby cmd
       end
 
       # @deprecated
       def current_ruby
-        Aruba::Platform.deprecated('The use of "#current_ruby" is deprecated. Use "Aruba::Platform.current_ruby" instead')
+        Aruba.platform.deprecated('The use of "#current_ruby" is deprecated')
 
-        Aruba::Platform.current_ruby cmd
+        Aruba.platform.current_ruby cmd
       end
 
       # @deprecated
       def _ensure_newline(str)
-        Aruba::Platform.deprecated('The use of "#_ensure_newline" is deprecated. Use "Aruba::Platform.ensure_newline" instead')
+        Aruba.platform.deprecated('The use of "#_ensure_newline" is deprecated')
 
-        Aruba::Platform.ensure_newline cmd
+        Aruba.platform.ensure_newline cmd
       end
 
       # @deprecated
       def absolute_path(*args)
-        Aruba::Platform.deprecated('The use of "absolute_path" is deprecated. Use "expand_path" instead. But be aware that "expand_path" uses a different implementation')
+        Aruba.platform.deprecated('The use of "absolute_path" is deprecated. Use "expand_path" instead. But be aware that "expand_path" uses a different implementation')
 
         File.expand_path File.join(*args), aruba.current_directory
       end
 
       # @deprecated
       def _read_interactive
-        Aruba::Platform.deprecated('The use of "#_read_interactive" is deprecated. Please use "last_command.stdout" instead')
+        Aruba.platform.deprecated('The use of "#_read_interactive" is deprecated. Please use "last_command.stdout" instead')
 
         last_command.stdout
       end
 
       # @deprecated
       def announce_or_puts(msg)
-        Aruba::Platform.deprecated('The use of "#announce_or_puts" is deprecated. Please use "#announcer.mode = :kernel" or "#announcer.mode = :puts" instead')
+        Aruba.platform.deprecated('The use of "#announce_or_puts" is deprecated. Please use "#announcer.mode = :kernel" or "#announcer.mode = :puts" instead')
 
         if(@puts)
           Kernel.puts(msg)
@@ -93,14 +93,14 @@ module Aruba
 
       # @deprecated
       def _write_interactive(input)
-        Aruba::Platform.deprecated('The use of "#_write_interactive" is deprecated. Please use "#last_command.write()" instead')
+        Aruba.platform.deprecated('The use of "#_write_interactive" is deprecated. Please use "#last_command.write()" instead')
 
         last_command.write(input)
       end
 
       # @deprecated
       def eot
-        Aruba::Platform.deprecated(%{\e[35m    The \"#eot\"-method is deprecated. It will be deleted with the next major version. Please use \"#close_input\"-method instead.\e[0m})
+        Aruba.platform.deprecated(%{\e[35m    The \"#eot\"-method is deprecated. It will be deleted with the next major version. Please use \"#close_input\"-method instead.\e[0m})
 
         close_input
       end
@@ -113,7 +113,7 @@ module Aruba
       # @see #cmd
       # @deprectated
       def run_interactive(cmd)
-        Aruba::Platform.deprecated('The use of "#run_interactive" is deprecated. You can simply use "run" instead')
+        Aruba.platform.deprecated('The use of "#run_interactive" is deprecated. You can simply use "run" instead')
 
         run(cmd)
       end
@@ -124,14 +124,14 @@ module Aruba
       # @param [String] file_name
       #   The name of the file
       def touch_file(*args)
-        Aruba::Platform.deprecated('The use of "#touch_file" is deprecated. Use "#touch" instead')
+        Aruba.platform.deprecated('The use of "#touch_file" is deprecated. Use "#touch" instead')
 
         touch(*args)
       end
 
       # @deprecated
       def mod?(file, perms, &block)
-        Aruba::Platform.deprecated('The use of "#mod?" is deprecated. Use "expect().to have_permissions()" instead')
+        Aruba.platform.deprecated('The use of "#mod?" is deprecated. Use "expect().to have_permissions()" instead')
 
         expect(Array(file)).to all have_permissions(perms)
       end
@@ -142,14 +142,14 @@ module Aruba
       # @param [String] file_name
       #    The file which should be deleted in current directory
       def remove_file(*args)
-        Aruba::Platform.deprecated('The use of "#remove_file" is deprecated. Use "#remove" instead')
+        Aruba.platform.deprecated('The use of "#remove_file" is deprecated. Use "#remove" instead')
 
         remove(*args)
       end
 
       # @deprecated
       def create_dir(*args)
-        Aruba::Platform.deprecated('The use of "#create_dir" is deprecated. Use "#create_directory" instead')
+        Aruba.platform.deprecated('The use of "#create_dir" is deprecated. Use "#create_directory" instead')
         create_directory(*args)
       end
 
@@ -159,13 +159,13 @@ module Aruba
       # @param [String] directory_name
       #   The name of the directory which should be removed
       def remove_directory(*args)
-        Aruba::Platform.deprecated('The use of "remove_directory" is deprecated. Use "remove" instead')
+        Aruba.platform.deprecated('The use of "remove_directory" is deprecated. Use "remove" instead')
         remove(*args)
       end
 
       # @deprecated
       def remove_dir(*args)
-        Aruba::Platform.deprecated('The use of "remove_dir" is deprecated. Use "remove" instead')
+        Aruba.platform.deprecated('The use of "remove_dir" is deprecated. Use "remove" instead')
         remove(*args)
       end
 
@@ -179,7 +179,7 @@ module Aruba
       # @param [true,false] expect_presence
       #   Should the given paths be present (true) or absent (false)
       def check_file_presence(paths, expect_presence = true)
-        Aruba::Platform.deprecated('The use of "check_file_presence" is deprecated. Use "expect().to be_existing_file or expect(all_paths).to match_path_pattern() instead" ')
+        Aruba.platform.deprecated('The use of "check_file_presence" is deprecated. Use "expect().to be_an_existing_file" or "expect(all_paths).to all match /pattern/" instead')
 
         stop_processes!
 
@@ -215,7 +215,7 @@ module Aruba
       #   check_file_size(paths_and_sizes)
       #
       def check_file_size(paths_and_sizes)
-        Aruba::Platform.deprecated('The use of "#check_file_size" is deprecated. Use "expect(file).to have_file_size(size)", "expect(all_files).to all have_file_size(1)", "expect(all_files).to include a_file_with_size(1)" instead')
+        Aruba.platform.deprecated('The use of "#check_file_size" is deprecated. Use "expect(file).to have_file_size(size)", "expect(all_files).to all have_file_size(1)", "expect(all_files).to include a_file_with_size(1)" instead')
         stop_processes!
 
         paths_and_sizes.each do |path, size|
@@ -225,7 +225,7 @@ module Aruba
 
       # @deprecated
       def check_exact_file_content(file, exact_content, expect_match = true)
-        Aruba::Platform.deprecated('The use of "#check_exact_file_content" is deprecated. Use "expect(file).to have_file_content(content)" with a string')
+        Aruba.platform.deprecated('The use of "#check_exact_file_content" is deprecated. Use "expect(file).to have_file_content(content)" with a string')
 
         check_file_content(file, exact_content, expect_match)
       end
@@ -242,7 +242,7 @@ module Aruba
       # @param [true, false] expect_match
       #   Must the content be in the file or not
       def check_binary_file_content(file, reference_file, expect_match = true)
-        Aruba::Platform.deprecated('The use of "#check_binary_file_content" is deprecated. Use "expect(file).to have_same_file_content_like(file)"')
+        Aruba.platform.deprecated('The use of "#check_binary_file_content" is deprecated. Use "expect(file).to have_same_file_content_like(file)"')
 
         stop_processes!
 
@@ -262,7 +262,7 @@ module Aruba
       # @param [true, false] expect_presence
       #   Should the directory be there or should the directory not be there
       def check_directory_presence(paths, expect_presence)
-        Aruba::Platform.deprecated('The use of "#check_directory_presence" is deprecated. Use "expect(directory).to be_an_existing_directory"')
+        Aruba.platform.deprecated('The use of "#check_directory_presence" is deprecated. Use "expect(directory).to be_an_existing_directory"')
 
         stop_processes!
 
@@ -279,15 +279,15 @@ module Aruba
 
       # @deprecated
       def prep_for_fs_check(&block)
-        Aruba::Platform.deprecated('The use of "prep_for_fs_check" is deprecated. Use apropriate methods and the new rspec matchers instead')
+        Aruba.platform.deprecated('The use of "prep_for_fs_check" is deprecated. Use apropriate methods and the new rspec matchers instead')
 
         process_monitor.stop_processes!
-        cd('') { block.call }
+        cd('.') { block.call }
       end
 
       # @deprecated
       def assert_exit_status_and_partial_output(expect_to_pass, expected)
-        Aruba::Platform.deprecated('The use of "assert_exit_status_and_partial_output" is deprecated. Use "#assert_access" and "#assert_partial_output" instead')
+        Aruba.platform.deprecated('The use of "assert_exit_status_and_partial_output" is deprecated. Use "#assert_access" and "#assert_partial_output" instead')
 
         assert_success(expect_to_pass)
         assert_partial_output(expected, all_output)
@@ -320,7 +320,7 @@ module Aruba
       # @param [true, false] expect_match
       #   Must the content be in the file or not
       def check_file_content(file, content, expect_match = true)
-        Aruba::Platform.deprecated('The use of "#check_file_content" is deprecated. Use "expect(file).to have_file_content(content)" instead. For eq match use string, for partial match use /regex/')
+        Aruba.platform.deprecated('The use of "#check_file_content" is deprecated. Use "expect(file).to have_file_content(content)" instead. For eq match use string, for partial match use /regex/')
 
         stop_processes!
 
@@ -333,35 +333,35 @@ module Aruba
 
       # @deprecated
       def _mkdir(dir_name)
-        Aruba::Platform.deprecated('The use of "#_mkdir" is deprecated')
+        Aruba.platform.deprecated('The use of "#_mkdir" is deprecated')
 
-        Aruba::Platform.mkdir(dir_name)
+        Aruba.platform.mkdir(dir_name)
       end
 
       # @deprecated
       def _rm(dir_name)
-        Aruba::Platform.deprecated('The use of "#_rm_rf" is deprecated')
+        Aruba.platform.deprecated('The use of "#_rm_rf" is deprecated')
 
-        Aruba::Platform.rm(dir_name)
+        Aruba.platform.rm(dir_name)
       end
 
       # @deprecated
       def current_dir(*args, &block)
-        Aruba::Platform.deprecated('The use of "#current_dir" is deprecated. Use "#current_directory" instead')
+        Aruba.platform.deprecated('The use of "#current_dir" is deprecated. Use "#current_directory" instead')
 
         current_directory(*args, &block)
       end
 
       # @deprecated
       def clean_current_dir(*args, &block)
-        Aruba::Platform.deprecated('The use of "clean_current_dir" is deprecated. Either use "#setup_aruba" or `#remove(\'.\') to clean up aruba\'s working directory before your tests are run')
+        Aruba.platform.deprecated('The use of "clean_current_dir" is deprecated. Either use "#setup_aruba" or `#remove(\'.\') to clean up aruba\'s working directory before your tests are run')
 
         setup_aruba
       end
 
       # @deprecated
       def in_current_dir(&block)
-        Aruba::Platform.deprecated('The use of "in_current_dir" is deprecated. Use "#cd(\'.\') { }" instead')
+        Aruba.platform.deprecated('The use of "in_current_dir" is deprecated. Use "#cd(\'.\') { }" instead')
 
         create_directory '.' unless directory?('.')
         cd('.', &block)
@@ -376,7 +376,7 @@ module Aruba
       # @yield
       #   The block of code which should be run with the modified environment variables
       def with_env(env = {}, &block)
-        Aruba::Platform.deprecated('The use of "#with_env" is deprecated. Use "#with_environment {}" instead. But be careful this uses a different implementation')
+        Aruba.platform.deprecated('The use of "#with_env" is deprecated. Use "#with_environment {}" instead. But be careful this uses a different implementation')
 
         env.each do |k,v|
           set_env k, v
@@ -389,7 +389,7 @@ module Aruba
       # Restore original process environment
       def restore_env
         # No output because we need to reset env on each scenario/spec run
-        # Aruba::Platform.deprecated('The use of "#restore_env" is deprecated. If you use "set_environment_variable" there\'s no need to restore the environment')
+        # Aruba.platform.deprecated('The use of "#restore_env" is deprecated. If you use "set_environment_variable" there\'s no need to restore the environment')
 
         original_env.each do |key, value|
           if value
@@ -409,7 +409,7 @@ module Aruba
       # @param [String] value
       #   The value of the environment variable. Needs to be a string.
       def set_env(key, value)
-        Aruba::Platform.deprecated('The use of "#set_env" is deprecated. Please use "set_environment_variable" instead. But be careful, this method uses a different kind of implementation')
+        Aruba.platform.deprecated('The use of "#set_env" is deprecated. Please use "set_environment_variable" instead. But be careful, this method uses a different kind of implementation')
 
         announcer.announce(:environment, key, value)
         original_env[key] = ENV.delete(key) unless original_env.key? key
@@ -418,14 +418,14 @@ module Aruba
 
       # @deprecated
       def original_env
-        # Aruba::Platform.deprecated('The use of "#original_env" is deprecated.')
+        # Aruba.platform.deprecated('The use of "#original_env" is deprecated')
 
         @original_env ||= {}
       end
 
       # @deprecated
       def filesystem_permissions(*args)
-        Aruba::Platform.deprecated('The use of "#filesystem_permissions" is deprecated. Please use "#chmod" instead.')
+        Aruba.platform.deprecated('The use of "#filesystem_permissions" is deprecated. Please use "#chmod" instead')
 
         chmod(*args)
       end
@@ -439,7 +439,7 @@ module Aruba
       # @param [Boolean] expected_result
       #   Are the permissions expected to be mode or are they expected not to be mode?
       def check_filesystem_permissions(*args)
-        Aruba::Platform.deprecated('The use of "#check_filesystem_permissions" is deprecated. Please use "expect().to have_permissions perms" instead.')
+        Aruba.platform.deprecated('The use of "#check_filesystem_permissions" is deprecated. Please use "expect().to have_permissions perms" instead')
 
         args = args.flatten
 
@@ -459,7 +459,7 @@ module Aruba
 
       # @deprecated
       def _create_file(name, content, check_presence)
-        Aruba::Platform.deprecated('The use of "#_create_file" is deprecated. It will be removed soon.')
+        Aruba.platform.deprecated('The use of "#_create_file" is deprecated. It will be removed soon')
 
         ArubaFileCreator.new.write(expand_path(name), content, check_presence)
 
@@ -468,7 +468,7 @@ module Aruba
 
       # @deprecated
       def _create_fixed_size_file(file_name, file_size, check_presence)
-        Aruba::Platform.deprecated('The use of "#_create_fixed_size_file" is deprecated. It will be removed soon.')
+        Aruba.platform.deprecated('The use of "#_create_fixed_size_file" is deprecated. It will be removed soon')
 
         ArubaFixedSizeFileCreator.new.write(expand_path(name), size, check_presence)
 
@@ -483,16 +483,19 @@ module Aruba
       #
       # @return
       #   The string stripped from escape sequences
-      def unescape(string)
-        Aruba::Platform.deprecated('The use of "#unescape" is deprecated. Use "Aruba::Platform.unescape" instead')
+      def unescape(string, keep_ansi = false)
+        Aruba.platform.deprecated('The use of "#unescape" is deprecated. Please use "#unescape_text" and "#extract_text" intead')
 
-        Aruba::Platform.unescape(string, aruba.config.keep_ansi)
+        string = unescape_text(string)
+        string = extract_text(string) if !keep_ansi || !aruba.config.keep_ansi || aruba.config.remove_ansi_escape_sequences
+
+        string
       end
 
       # @deprecated
       # The root directory of aruba
       def root_directory
-        Aruba::Platform.deprecated('The use of "#root_directory" is deprecated. Use "aruba.root_directory" instead')
+        Aruba.platform.deprecated('The use of "#root_directory" is deprecated. Use "aruba.root_directory" instead')
 
         aruba.root_directory
       end
@@ -502,7 +505,7 @@ module Aruba
       # @return [String]
       #   The directory to where your fixtures are stored
       def fixtures_directory
-        Aruba::Platform.deprecated('The use of "#fixtures_directory" is deprecated. Use "aruba.fixtures_directory" instead')
+        Aruba.platform.deprecated('The use of "#fixtures_directory" is deprecated. Use "aruba.fixtures_directory" instead')
 
         aruba.fixtures_directory
       end
@@ -512,33 +515,18 @@ module Aruba
       # rubocop:disable Metrics/MethodLength
       def check_for_deprecated_variables
         if defined? @aruba_io_wait_seconds
-          Aruba::Platform.deprecated('The use of "@aruba_io_wait_seconds" is deprecated. Use "#aruba.config.io_wait_timeout = <numeric>" instead')
+          Aruba.platform.deprecated('The use of "@aruba_io_wait_seconds" is deprecated. Use "#aruba.config.io_wait_timeout = <numeric>" instead')
           aruba.config.io_wait_timeout = @aruba_io_wait_seconds
         end
 
-        if root_directory != aruba.config.root_directory
-          Aruba::Platform.deprecated('Overwriting of methods for configuration is deprecated. Use "#aruba.config.root_directory = <string>" instead')
-          aruba.config.root_directory = root_directory
-        end
-
-        if current_directory != aruba.config.current_directory
-          Aruba::Platform.deprecated('Overwriting of methods for configuration is deprecated. Use "#aruba.config.current_directory = <string>" instead')
-          aruba.config.current_directory = current_directory
-        end
-
         if defined? @keep_ansi
-          Aruba::Platform.deprecated('The use of "@aruba_keep_ansi" is deprecated. Use "#aruba.config.keep_ansi = <true|false>" instead')
-          aruba.config.keep_ansi = @keep_ansi
+          Aruba.platform.deprecated('The use of "@aruba_keep_ansi" is deprecated. Use "#aruba.config.remove_ansi_escape_sequences = <true|false>" instead. Be aware that it uses an inverted logic')
+          aruba.config.remove_ansi_escape_sequences = false
         end
 
         if defined? @aruba_root_directory
-          Aruba::Platform.deprecated('The use of "@aruba_root_directory" is deprecated. Use "#aruba.config.root_directory = <string>" instead')
-          aruba.config.keep_ansi = @aruba_root_directory
-        end
-
-        if root_directory != aruba.config.root_directory
-          Aruba::Platform.deprecated('Overwriting of methods for configuration of "root_directory" is deprecated.')
-          aruba.config.root_directory = root_directory
+          Aruba.platform.deprecated('The use of "@aruba_root_directory" is deprecated. Use "#aruba.config.root_directory = <string>" instead')
+          aruba.config.root_directory = @aruba_root_directory.to_s
         end
       end
       # rubocop:enable Metrics/CyclomaticComplexity