aruba 0.14.14 → 1.0.0.pre.alpha.1

data/bin/bootstrap

@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+
+set -e
+
+info_msg="\e[0;32m[INFO]\e[39;49m"
+error_msg="\e[0;31mFAILED\e[39;49m"
+
+# TODO: these are Unix specific
+TMPDIR="${TMPDIR:=/tmp}"
+logfile=`mktemp -t aruba_tests.XXXXXXXXXX`
+
+output_error_log() {
+  [[ -f "$logfile" ]] && ( cat "logfile" >&2; rm -f "$logfile")
+}
+
+check_for_binary() {
+  name="$1"
+
+  echo -ne "$info_msg Checking if $name installed? "
+  which "$name" >/dev/null 2>"$logfile" || ( echo -e "$error_msg\n\nCould not find \`$name\`. Please install $name or add it to PATH"; output_error_log; exit 1 )
+  echo OK
+}
+
+check_for_binary "ruby"
+# check_for_binary "bash"
+# check_for_binary "zsh"
+# check_for_binary "python"
+# check_for_binary "javac"
+
+echo -e "$info_msg rubygem \"bundler\" "
+gem install bundler
+
+echo -e "$info_msg \"bundle install\" "
+bundle install $*

data/bin/build

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+bundle exec rake rubygem:build

data/bin/release

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+bundle exec rake rubygem:release

data/bin/test

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+: ${RUN_IN_DOCKER:='0'}
+
+if [ "$RUN_IN_DOCKER" == '1' ]; then
+  bundle exec rake "docker:run[$*]"
+else
+  bundle exec rake test $*
+fi

data/cucumber.yml

@@ -5,7 +5,7 @@ require 'ffi'
 
 java_version = (RUBY_DESCRIPTION.match(/.*?on.*?(1\.[\d]\..*? )/))[1] if defined?(JRUBY_VERSION)
 
-std_opts          = "--color --exclude features/fixtures --require features --tags ~@unsupported-on"
+std_opts          = "--format pretty --color --exclude features/fixtures --require features --tags ~@unsupported-on"
 java_default_opts = "--tags ~@wip-jruby-java-1.6" if defined?(JRUBY_VERSION) && (java_version < '1.7.0')
 java_wip_opts     = "--tags @wip-jruby-java-1.6:3" if defined?(JRUBY_VERSION) && (java_version < '1.7.0')
 
@@ -17,8 +17,6 @@ ignore_opts <<  '--tags ~@unsupported-on-platform-windows' if FFI::Platform.wind
 ignore_opts <<  '--tags ~@unsupported-on-platform-unix'    if FFI::Platform.unix?
 ignore_opts <<  '--tags ~@unsupported-on-platform-mac'     if FFI::Platform.mac?
 ignore_opts <<  '--tags ~@unsupported-on-ruby-older-2'     if RUBY_VERSION < '2'
-ignore_opts <<  '--tags ~@unsupported-on-ruby-older-193'   if RUBY_VERSION < '1.9.3'
-ignore_opts <<  '--tags ~@unsupported-on-ruby-older-19'    if RUBY_VERSION < '1.9'
 ignore_opts <<  '--tags ~@requires-aruba-version-1'        if Aruba::VERSION < '1'
 ignore_opts = ignore_opts.join(' ')
 %>

data/docker-compose.yml

@@ -0,0 +1,26 @@
+# To build the base image (official Aruba base for this), run:
+#
+#   $ docker-compose build base
+#
+# To run the tests, run:
+#
+#   $ docker-compose run tests
+#
+
+version: '2'
+services:
+  base:
+    image: 'cucumber/aruba'
+    container_name: 'cucumber-aruba-1'
+    build:
+      context: .
+      dockerfile: Dockerfile
+      args:
+        http_proxy: "${http_proxy}"
+        https_proxy: "${https_proxy}"
+        HTTP_PROXY: "${HTTP_PROXY}"
+        HTTPS_PROXY: "${HTTPS_PROXY}"
+    working_dir: /home/guest/aruba
+    command: /bin/bash -l -c "bundle exec rake test"
+    volumes:
+      - .:/home/guest/aruba

data/fixtures/cli-app/README.md

@@ -31,7 +31,7 @@ cli
 
 ### Library
 
-You can use `script/console` to load your library.
+You can use `bin/console` to load your library.
 
 ### Fixture
 

data/fixtures/cli-app/features/support/aruba.rb

@@ -0,0 +1 @@
+require 'aruba/cucumber'

data/fixtures/cli-app/features/support/env.rb

@@ -1 +1 @@
-require 'aruba/cucumber'
+require_relative 'aruba'

data/fixtures/cli-app/lib/cli/app.rb

@@ -1,10 +1,6 @@
 require 'cli/app/version'
 
-if RUBY_VERSION < '1.9.3'
-  ::Dir.glob(::File.expand_path('../**/*.rb', __FILE__)).each { |f| require File.join(File.dirname(f), File.basename(f, '.rb')) }
-else
-  ::Dir.glob(File.expand_path('../**/*.rb', __FILE__)).each { |f| require_relative f }
-end
+::Dir.glob(File.expand_path('../**/*.rb', __FILE__)).each { |f| require_relative f }
 
 module Cli
   module App

data/fixtures/cli-app/spec/spec_helper.rb

@@ -1,10 +1,5 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
 require 'cli/app'
-require 'support/aruba'
 
-if RUBY_VERSION < '1.9.3'
-  ::Dir.glob(::File.expand_path('../support/**/*.rb', __FILE__)).each { |f| require File.join(File.dirname(f), File.basename(f, '.rb')) }
-else
-  ::Dir.glob(::File.expand_path('../support/**/*.rb', __FILE__)).each { |f| require_relative f }
-end
+::Dir.glob(::File.expand_path('../support/**/*.rb', __FILE__)).each { |f| require_relative f }

data/fixtures/empty-app/lib/cli/app.rb

@@ -1,5 +1,7 @@
 require 'cli/app/version'
 
+::Dir.glob(File.expand_path('../**/*.rb', __FILE__)).each { |f| require_relative f }
+
 module Cli
   module App
     # Your code goes here...

data/lib/aruba/api.rb

@@ -6,7 +6,7 @@ require 'aruba/extensions/string/strip'
 
 require 'aruba/platform'
 require 'aruba/api/core'
-require 'aruba/api/commands'
+require 'aruba/api/command'
 
 if Aruba::VERSION <= '1.0.0'
   require 'aruba/api/deprecated'
@@ -15,7 +15,7 @@ end
 require 'aruba/api/environment'
 require 'aruba/api/filesystem'
 require 'aruba/api/text'
-require 'aruba/api/bundler'
+require 'aruba/api/rvm'
 
 Aruba.platform.require_matching_files('../matchers/**/*.rb', __FILE__)
 
@@ -27,7 +27,7 @@ module Aruba
     include Aruba::Api::Commands
     include Aruba::Api::Environment
     include Aruba::Api::Filesystem
-    include Aruba::Api::Bundler
+    include Aruba::Api::Rvm
     include Aruba::Api::Deprecated
     include Aruba::Api::Text
   end

data/lib/aruba/api/{commands.rb → command.rb}

@@ -103,30 +103,6 @@ module Aruba
         self
       end
 
-      # Get stdout of all processes
-      #
-      # @return [String]
-      #   The stdout of all processes which have run before
-      def all_stdout
-        aruba.command_monitor.all_stdout
-      end
-
-      # Get stderr of all processes
-      #
-      # @return [String]
-      #   The stderr of all processes which have run before
-      def all_stderr
-        aruba.command_monitor.all_stderr
-      end
-
-      # Get stderr and stdout of all processes
-      #
-      # @return [String]
-      #   The stderr and stdout of all processes which have run before
-      def all_output
-        aruba.command_monitor.all_output
-      end
-
       # Find a started command
       #
       # @param [String, Command] commandline
@@ -173,9 +149,8 @@ module Aruba
           stop_signal       = opts[:stop_signal].nil? ? aruba.config.stop_signal : opts[:stop_signal]
           startup_wait_time = opts[:startup_wait_time].nil? ? aruba.config.startup_wait_time : opts[:startup_wait_time]
         else
-          if args.size > 0
-            Aruba.platform.deprecated(
-              "Please pass options to `#run_command` as named parameters/hash and don\'t use the old style, e.g. `#run_command('cmd', :exit_timeout => 5)`.")
+          if args.size > 1
+            Aruba.platform.deprecated("Please pass options to `#run` as named parameters/hash and don\'t use the old style, e.g. `#run_command('cmd', :exit_timeout => 5)`.")
           end
 
           exit_timeout      = args[0].nil? ? aruba.config.exit_timeout : args[0]
@@ -277,7 +252,7 @@ module Aruba
           opts = args.pop
           fail_on_error = opts.delete(:fail_on_error) == true ? true : false
         else
-          if args.size > 0
+          if args.size > 1
             # rubocop:disable Metrics/LineLength
             Aruba.platform.deprecated("Please pass options to `#run_command_and_stop` as named parameters/hash and don\'t use the old style with positional parameters, NEW: e.g. `#run_command_and_stop('cmd', :exit_timeout => 5)`.")
             # rubocop:enable Metrics/LineLength
@@ -305,9 +280,8 @@ module Aruba
           begin
             expect(command).to have_finished_in_time
             expect(command).to be_successfully_executed
-          rescue RSpec::Expectations::ExpectationNotMetError => e
+          rescue ::RSpec::Expectations::ExpectationNotMetError => e
             aruba.announcer.activate(aruba.config.activate_announcer_on_command_failure)
-            aruba.event_bus.notify Events::CommandStopped.new(command)
             raise e
           end
         end

data/lib/aruba/api/core.rb

@@ -3,6 +3,8 @@ require 'aruba/runtime'
 require 'aruba/errors'
 require 'aruba/setup'
 
+require 'aruba/config/jruby'
+
 # Aruba
 module Aruba
   # Api
@@ -23,21 +25,12 @@ module Aruba
       # This will only clean up aruba's working directory to remove all
       # artifacts of your tests. This does NOT clean up the current working
       # directory.
-      def setup_aruba(clobber = true)
-        Aruba::Setup.new(aruba).call(clobber)
+      def setup_aruba
+        Aruba::Setup.new(aruba).call
 
         self
       end
 
-      # Execute block in Aruba's current directory
-      #
-      # @yield
-      #   The block which should be run in current directory
-      def in_current_directory(&block)
-        create_directory '.' unless directory?('.')
-        cd('.', &block)
-      end
-
       # Switch to directory
       #
       # @param [String] dir
@@ -68,7 +61,7 @@ module Aruba
 
             Aruba.platform.chdir File.join(aruba.root_directory, aruba.current_directory)
 
-            result = with_environment(
+            result = Aruba.platform.with_environment(
               'OLDPWD' => old_dir,
               'PWD' => File.expand_path(File.join(aruba.root_directory, aruba.current_directory)),
               &block
@@ -139,17 +132,8 @@ module Aruba
         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].to_s
-          rest = if file_name.chars.to_a[2..-1].nil?
-                   nil
-                 else
-                   file_name.chars.to_a[2..-1].join
-                 end
-        else
-          prefix = file_name[0]
-          rest = file_name[2..-1]
-        end
+        prefix = file_name[0]
+        rest = file_name[2..-1]
 
         if aruba.config.fixtures_path_prefix == prefix
           path = File.join(*[aruba.fixtures_directory, rest].compact)
@@ -170,8 +154,7 @@ module Aruba
           path.to_s
         else
           directory = File.join(aruba.root_directory, aruba.current_directory)
-          directory = File.expand_path(dir_string, directory) if dir_string
-          File.expand_path(file_name, directory)
+          ArubaPath.new(File.join(*[directory, dir_string, file_name].compact)).expand_path.to_s
         end
       end
       # rubocop:enable Metrics/MethodLength

data/lib/aruba/api/deprecated.rb

@@ -13,13 +13,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 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
@@ -30,11 +25,7 @@ module Aruba
       # @return
       #   Current directory
       def current_directory
-        Aruba.platform.deprecated(
-          'The use of "current_directory" is deprecated.' \
-          ' Use "expand_path(".")" to get the current directory or "#cd" to run' \
-          ' code in the 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.current_directory.to_s
       end
@@ -42,15 +33,23 @@ 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
 
+      # @deprecated
+      # Execute block in current directory
+      #
+      # @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')
+
+        create_directory '.' unless directory?('.')
+        cd('.', &block)
+      end
+
       # @deprecated
       def detect_ruby(cmd)
         Aruba.platform.deprecated('The use of "#detect_ruby" is deprecated')
@@ -74,31 +73,21 @@ module Aruba
 
       # @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.' \
-          ' Use "last_command_started.stdout" instead'
-        )
+        Aruba.platform.deprecated('The use of "#_read_interactive" is deprecated. Please use "last_command_started.stdout" instead')
 
         last_command_started.stdout
       end
 
       # @deprecated
       def announce_or_puts(msg)
-        Aruba.platform.deprecated(
-          'The use of "#announce_or_puts" is deprecated.' \
-          ' 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)
@@ -109,20 +98,14 @@ module Aruba
 
       # @deprecated
       def _write_interactive(input)
-        Aruba.platform.deprecated(
-          'The use of "#_write_interactive" is deprecated.' \
-          ' Use "#last_command_started.write()" instead'
-        )
+        Aruba.platform.deprecated('The use of "#_write_interactive" is deprecated. Please use "#last_command_started.write()" instead')
 
         last_command_started.write(input)
       end
 
       # @deprecated
       def eot
-        Aruba.platform.deprecated(
-          'The use of "#eot" is deprecated.' \
-          ' Use "#close_input" instead.'
-        )
+        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
@@ -133,99 +116,27 @@ module Aruba
       #   The command to by run
       #
       # @see #cmd
-      # @deprecated
+      # @deprectated
       def run_interactive(cmd)
-        Aruba.platform.deprecated(
-          'The use of "#run_interactive" is deprecated.' \
-          ' Use "run_command" instead'
-        )
+        Aruba.platform.deprecated('The use of "#run_interactive" is deprecated. You can simply use "run" instead')
 
         run_command(cmd)
       end
 
-      # Run given command and stop it if timeout is reached
-      #
-      # @param [String] cmd
-      #   The command which should be executed
-      #
-      # @param [Hash] opts
-      #   Options
-      #
-      # @option [Integer] exit_timeout
-      #   If the timeout is reached the command will be killed
-      #
-      # @option [Integer] io_wait_timeout
-      #   Wait for IO to finish
-      #
-      # @option [Integer] startup_wait_time
-      #   Wait for a command to start
-      #
-      # @option [String] stop_signal
-      #   Use signal to stop command
-      #
-      # @yield [SpawnProcess]
-      #   Run block with process
-      #
-      # @see #run_command
-      # @deprecated
-      def run(*args)
-        Aruba.platform.deprecated(
-          'The use of "#run" is deprecated.' \
-          ' Use "run_command" instead'
-        )
-
-        run_command(*args)
-      end
-
-      # Run a command with aruba
-      #
-      # Checks for error during command execution and checks the output to detect
-      # an timeout error.
-      #
-      # @param [String] cmd
-      #   The command to be executed
-      #
-      # @param [Hash] options
-      #   Options for aruba
-      #
-      # @option [TrueClass,FalseClass] fail_on_error
-      #   Should aruba fail on error?
-      #
-      # @option [Integer] exit_timeout
-      #   Timeout for execution
-      #
-      # @option [Integer] io_wait_timeout
-      #   Timeout for IO - STDERR, STDOUT
-      #
-      def run_simple(*args)
-        Aruba.platform.deprecated(
-          'The use of "#run_simple" is deprecated.' \
-          ' Use "run_command_and_stop" instead'
-        )
-
-        run_command_and_stop(*args)
-      end
-
       # @deprecated
       # Create an empty file
       #
       # @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(file).to have_permissions(perms)" instead'
-        )
+        Aruba.platform.deprecated('The use of "#mod?" is deprecated. Use "expect().to have_permissions()" instead')
 
         expect(Array(file)).to Aruba::Matchers.all have_permissions(perms)
       end
@@ -236,20 +147,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
 
@@ -259,19 +164,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
 
@@ -285,11 +184,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(path).to be_an_existing_file" or' \
-          ' "expect(all_paths).to all match /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_all_commands
 
@@ -325,10 +220,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)" 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_all_commands
 
@@ -339,10 +231,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
@@ -359,17 +248,14 @@ 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_as(file)"'
-        )
+        Aruba.platform.deprecated('The use of "#check_binary_file_content" is deprecated. Use "expect(file).to have_same_file_content_like(file)"')
 
         stop_all_commands
 
         if expect_match
-          expect(file).to have_same_file_content_as reference_file
+          expect(file).to have_same_file_content_like reference_file
         else
-          expect(file).not_to have_same_file_content_as reference_file
+          expect(file).not_to have_same_file_content_like reference_file
         end
       end
 
@@ -382,10 +268,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_all_commands
 
@@ -402,10 +285,7 @@ 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')
 
         stop_all_commands
 
@@ -414,19 +294,15 @@ module Aruba
 
       # @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 "expect(last_command_started).to be_successfully_executed"' \
-          ' and "expect(command).to have_output /partial/" 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)
       end
 
+      # TODO: Remove this. Call more methods elsewhere instead. Reveals more intent.
       # @deprecated
-      def assert_exit_status_and_output(expect_to_pass, expected_output,
-                                        expect_exact_output)
+      def assert_exit_status_and_output(expect_to_pass, expected_output, expect_exact_output)
         assert_success(expect_to_pass)
         if expect_exact_output
           assert_exact_output(expected_output, all_output)
@@ -451,11 +327,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_all_commands
 
@@ -468,51 +340,38 @@ 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)
       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)
       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.' \
-          ' 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 "#in_current_directory { }" instead'
-        )
+        Aruba.platform.deprecated('The use of "in_current_dir" is deprecated. Use "#cd(\'.\') { }" instead')
 
-        in_current_directory(&block)
+        create_directory '.' unless directory?('.')
+        cd('.', &block)
       end
 
       # @deprecated
@@ -524,11 +383,7 @@ module Aruba
       # @yield
       #   The block of code which should be run with the changed 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
@@ -540,12 +395,9 @@ module Aruba
       # @deprecated
       # Restore original process environment
       def restore_env
-        Aruba.platform.deprecated(
-          'The use of "#restore_env" is deprecated.' \
-          ' If you use "set_environment_variable" there\'s no need to restore' \
-          ' the environment'
-        )
-
+        # 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')
+        #
         original_env.each do |key, value|
           if value
             ENV[key] = value
@@ -566,11 +418,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.' \
-          ' 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')
 
         aruba.announcer.announce(:environment, key, value)
         set_environment_variable key, value
@@ -581,19 +429,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.' \
-          ' Use "#chmod" instead'
-        )
+        Aruba.platform.deprecated('The use of "#filesystem_permissions" is deprecated. Please use "#chmod" instead')
 
         chmod(*args)
       end
@@ -607,10 +450,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.' \
-          ' Use "expect(path).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
 
@@ -630,9 +470,7 @@ module Aruba
 
       # @deprecated
       def _create_file(name, content, check_presence)
-        Aruba.platform.deprecated(
-          'The use of "#_create_file" is deprecated.'
-        )
+        Aruba.platform.deprecated('The use of "#_create_file" is deprecated. It will be removed soon')
 
         ArubaFileCreator.new.write(expand_path(name), content, check_presence)
 
@@ -641,9 +479,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.'
-        )
+        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)
 
@@ -659,17 +495,10 @@ module Aruba
       # @return
       #   The string stripped from escape sequences
       def unescape(string, keep_ansi = false)
-        Aruba.platform.deprecated(
-          'The use of "#unescape" is deprecated.' \
-          ' Use "#sanitize_text" intead'
-        )
+        Aruba.platform.deprecated('The use of "#unescape" is deprecated. Please use "#sanitize_text" intead')
 
         string = unescape_text(string)
-        if !keep_ansi ||
-           !aruba.config.keep_ansi ||
-           aruba.config.remove_ansi_escape_sequences
-          string = extract_text(string)
-        end
+        string = extract_text(string) if !keep_ansi || !aruba.config.keep_ansi || aruba.config.remove_ansi_escape_sequences
 
         string
       end
@@ -677,10 +506,7 @@ module Aruba
       # @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
@@ -691,58 +517,43 @@ 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
 
       # @deprecated
+      # rubocop:disable Metrics/CyclomaticComplexity
+      # rubocop:disable Metrics/MethodLength
       def check_for_deprecated_variables
         if defined? @aruba_exit_timeout
-          Aruba.platform.deprecated(
-            'The use of "@aruba_exit_timeout" is deprecated.' \
-            ' Use "#aruba.config.exit_timeout = <numeric>" instead'
-          )
+          Aruba.platform.deprecated('The use of "@aruba_exit_timeout" is deprecated. Use "#aruba.config.exit_timeout = <numeric>" instead')
           aruba.config.exit_timeout = @aruba_exit_timeout
         end
 
         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 defined? @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.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.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
+      # rubocop:enable Metrics/MethodLength
 
       # Last command started
       def last_command
-        Aruba.platform.deprecated(
-          'The use of "#last_command" is deprecated.' \
-          ' Use "#last_command_started"'
-        )
+        Aruba.platform.deprecated('The use of "#last_command" is deprecated. Use "#last_command_started"')
 
         process_monitor.last_command_started
       end
@@ -754,15 +565,10 @@ module Aruba
       # @return [TrueClass, FalseClass]
       #   If arg1 is exactly the same as arg2 return true, otherwise false
       def assert_exact_output(expected, actual)
-        Aruba.platform.deprecated(
-          'The use of "#assert_exact_output" is deprecated.' \
-          ' Use "expect(command).to have_output \'exact\'" instead.' \
-          ' There are also special matchers for "stdout" and "stderr"'
-        )
+        Aruba.platform.deprecated('The use of "#assert_exact_output" is deprecated. Use "expect(command).to have_output \'exact\'" instead. There are also special matchers for "stdout" and "stderr"')
 
-        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.force_encoding(expected.encoding)
+        expect(Aruba.platform.unescape(actual, aruba.config.keep_ansi)).to eq Aruba.platform.unescape(expected, aruba.config.keep_ansi)
       end
 
       # @deprecated
@@ -772,14 +578,10 @@ module Aruba
       # @return [TrueClass, FalseClass]
       #   If arg2 contains arg1 return true, otherwise false
       def assert_partial_output(expected, actual)
-        Aruba.platform.deprecated(
-          'The use of "#assert_partial_output" is deprecated.' \
-          ' Use "expect(actual).to include_output_string partial" instead.'
-        )
+        Aruba.platform.deprecated('The use of "#assert_partial_output" is deprecated. Use "expect(command).to have_output /partial/" instead. There are also special matchers for "stdout" and "stderr"')
 
-        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.force_encoding(expected.encoding)
+        expect(Aruba.platform.unescape(actual, aruba.config.keep_ansi)).to include(Aruba.platform.unescape(expected, aruba.config.keep_ansi))
       end
 
       # @deprecated
@@ -789,14 +591,10 @@ module Aruba
       # @return [TrueClass, FalseClass]
       #   If arg2 matches arg1 return true, otherwise false
       def assert_matching_output(expected, actual)
-        Aruba.platform.deprecated(
-          'The use of "#assert_matching_output" is deprecated.' \
-          ' Use "expect(actual).to match_output partial" instead.'
-        )
+        Aruba.platform.deprecated('The use of "#assert_matching_output" is deprecated. Use "expect(command).to have_output /partial/" instead. There are also special matchers for "stdout" and "stderr"')
 
-        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.force_encoding(expected.encoding)
+        expect(Aruba.platform.unescape(actual, aruba.config.keep_ansi)).to match(/#{Aruba.platform.unescape(expected, aruba.config.keep_ansi)}/m)
       end
 
       # @deprecated
@@ -806,14 +604,10 @@ module Aruba
       # @return [TrueClass, FalseClass]
       #   If arg2 does not match arg1 return true, otherwise false
       def assert_not_matching_output(expected, actual)
-        Aruba.platform.deprecated(
-          'The use of "#assert_not_matching_output" is deprecated.' \
-          ' Use "expect(actual).not_to match_output partial" instead.'
-        )
+        Aruba.platform.deprecated('The use of "#assert_not_matching_output" is deprecated. Use "expect(command).not_to have_output /partial/" instead. There are also special matchers for "stdout" and "stderr"')
 
-        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.force_encoding(expected.encoding)
+        expect(Aruba.platform.unescape(actual, aruba.config.keep_ansi)).not_to match(/#{Aruba.platform.unescape(expected, aruba.config.keep_ansi)}/m)
       end
 
       # @deprecated
@@ -823,18 +617,13 @@ module Aruba
       # @return [TrueClass, FalseClass]
       #   If arg2 does not match/include arg1 return true, otherwise false
       def assert_no_partial_output(unexpected, actual)
-        Aruba.platform.deprecated(
-          'The use of "#assert_no_partial_output" is deprecated.' \
-          ' Use "expect(actual).not_to include_output_string partial" instead.'
-        )
+        Aruba.platform.deprecated('The use of "#assert_no_partial_output" is deprecated. Use "expect(command).not_to have_output /partial/" instead. There are also special matchers for "stdout" and "stderr"')
 
-        actual.force_encoding(unexpected.encoding) if RUBY_VERSION >= "1.9"
+        actual.force_encoding(unexpected.encoding)
         if Regexp === unexpected
-          expect(Aruba.platform.unescape(actual, aruba.config.keep_ansi)).
-            not_to match unexpected
+          expect(Aruba.platform.unescape(actual, aruba.config.keep_ansi)).not_to match unexpected
         else
-          expect(Aruba.platform.unescape(actual, aruba.config.keep_ansi)).
-            not_to include(unexpected)
+          expect(Aruba.platform.unescape(actual, aruba.config.keep_ansi)).not_to include(unexpected)
         end
       end
 
@@ -845,13 +634,9 @@ module Aruba
       # @return [TrueClass, FalseClass]
       #   If output of interactive command includes arg1 return true, otherwise false
       def assert_partial_output_interactive(expected)
-        Aruba.platform.deprecated(
-          'The use of "#assert_partial_output_interactive" is deprecated.' \
-          ' Use "expect(last_command_started).to have_output an_output_string_including partial" instead.'
-        )
+        Aruba.platform.deprecated('The use of "#assert_partial_output_interactive" is deprecated. Use "expect(last_command_started).to have_output /partial/" instead. There are also special matchers for "stdout" and "stderr"')
 
-        Aruba.platform.unescape(last_command_started.stdout, aruba.config.keep_ansi).
-          include?(Aruba.platform.unescape(expected, aruba.config.keep_ansi))
+        Aruba.platform.unescape(last_command_started.stdout, aruba.config.keep_ansi).include?(Aruba.platform.unescape(expected, aruba.config.keep_ansi)) ? true : false
       end
 
       # @deprecated
@@ -861,13 +646,7 @@ module Aruba
       # @return [TrueClass, FalseClass]
       #   If exit status is 0 and arg1 is included in output return true, otherwise false
       def assert_passing_with(expected)
-        Aruba.platform.deprecated(
-          'The use of "#assert_passing_with" is deprecated.' \
-          ' Use "expect(last_command_started).to be_successfully_executed"' \
-          ' and expect(last_command_started).to have_output(/partial/)"' \
-          ' or something similar instead.' \
-          ' There are also special matchers for "stdout" and "stderr"'
-        )
+        Aruba.platform.deprecated('The use of "#assert_passing_with" is deprecated. Use "expect(all_commands).to all(be_successfully_executed).and include_an_object(have_output(/partial/))" or something similar instead. There are also special matchers for "stdout" and "stderr"')
 
         assert_success(true)
         assert_partial_output(expected, all_output)
@@ -878,16 +657,9 @@ module Aruba
       # Check if command failed and if arg1 is included in output
       #
       # @return [TrueClass, FalseClass]
-      #   If exit status is not equal 0 and arg1 is included in output return
-      #   true, otherwise false
+      #   If exit status is not equal 0 and arg1 is included in output return true, otherwise false
       def assert_failing_with(expected)
-        Aruba.platform.deprecated(
-          'The use of "#assert_passing_with" is deprecated.' \
-          ' Use "expect(last_command_started).not_to be_successfully_executed"' \
-          ' and "expect(last_command_started).to have_output(/partial/)"' \
-          ' or something similar instead.' \
-          ' There are also special matchers for "stdout" and "stderr"'
-        )
+        Aruba.platform.deprecated('The use of "#assert_passing_with" is deprecated. Use "expect(all_commands).not_to include_an_object(be_successfully_executed).and include_an_object(have_output(/partial/))" or something similar instead. There are also special matchers for "stdout" and "stderr"')
 
         assert_success(false)
         assert_partial_output(expected, all_output)
@@ -901,12 +673,7 @@ module Aruba
       #   If arg1 is true, return true if command was successful
       #   If arg1 is false, return true if command failed
       def assert_success(success)
-        Aruba.platform.deprecated(
-          'The use of "#assert_success" is deprecated.' \
-          ' Use "expect(last_command_started).to be_successfully_executed" or' \
-          ' with "not_to" or the negative form "have_failed_running"' \
-          ' (requires rspec >= 3.1)'
-        )
+        Aruba.platform.deprecated('The use of "#assert_success" is deprecated. Use "expect(last_command_started).to be_successfully_executed" or with "not_to" or the negative form "have_failed_running" (requires rspec >= 3.1)')
 
         if success
           expect(last_command_started).to be_successfully_executed
@@ -917,20 +684,14 @@ module Aruba
 
       # @deprecated
       def assert_exit_status(status)
-        Aruba.platform.deprecated(
-          'The use of "#assert_exit_status" is deprecated.' \
-          ' Use "expect(last_command_started).to have_exit_status(status)"'
-        )
+        Aruba.platform.deprecated('The use of "#assert_success" is deprecated. Use "expect(last_command_started).to have_exit_status(status)"')
 
         expect(last_command_started).to have_exit_status(status)
       end
 
       # @deprecated
       def assert_not_exit_status(status)
-        Aruba.platform.deprecated(
-          'The use of "#assert_not_exit_status" is deprecated.' \
-          ' Use "expect(last_command_started).not_to have_exit_status(status)"'
-        )
+        Aruba.platform.deprecated('The use of "#assert_success" is deprecated. Use "expect(last_command_started).not_to have_exit_status(status)"')
 
         expect(last_exit_status).not_to eq(status),
           append_output_to("Exit status was #{last_exit_status} which was not expected.")
@@ -938,23 +699,21 @@ module Aruba
 
       # @deprecated
       def append_output_to(message)
-        Aruba.platform.deprecated(
-          'The use of "#append_output_to" is deprecated'
-        )
+        Aruba.platform.deprecated('The use of "#append_output_to" is deprecated')
 
         "#{message} Output:\n\n#{all_output}\n"
       end
 
       # @deprecated
       def register_process(*args)
-        Aruba.platform.deprecated('The use of "#register_process" is deprecated')
+        # Aruba.platform.deprecated('The use of "#register_process" is deprecated')
 
         process_monitor.register_process(*args)
       end
 
       # @deprecated
       def get_process(wanted)
-        Aruba.platform.deprecated('The use of "#get_process" is deprecated')
+        # Aruba.platform.deprecated('The use of "#get_process" is deprecated')
 
         process_monitor.get_process(wanted)
       end
@@ -966,7 +725,7 @@ module Aruba
       # @param [String] cmd
       #   The command
       def output_from(cmd)
-        Aruba.platform.deprecated('The use of "#output_from" is deprecated')
+        # Aruba.platform.deprecated('The use of "#output_from" is deprecated')
 
         process_monitor.output_from(cmd)
       end
@@ -978,7 +737,7 @@ module Aruba
       # @param [String] cmd
       #   The command
       def stdout_from(cmd)
-        Aruba.platform.deprecated('The use of "#stdout_from" is deprecated')
+        # Aruba.platform.deprecated('The use of "#stdout_from" is deprecated')
 
         process_monitor.stdout_from(cmd)
       end
@@ -990,19 +749,55 @@ module Aruba
       # @param [String] cmd
       #   The command
       def stderr_from(cmd)
-        Aruba.platform.deprecated('The use of "#stderr_from" is deprecated')
+        # Aruba.platform.deprecated('The use of "#stderr_from" is deprecated')
 
         process_monitor.stderr_from(cmd)
       end
 
+      # @deprecated
+      #
+      # Get stdout of all processes
+      #
+      # @return [String]
+      #   The stdout of all process which have run before
+      def all_stdout
+        Aruba.platform.deprecated('The use of "#all_stdout" is deprecated. Use `all_commands.map { |c| c.stdout }.join("\n") instead. If you need to check for some output use "expect(all_commands).to have_output_on_stdout /output/" instead')
+
+        process_monitor.all_stdout
+      end
+
+      # @deprecated
+      #
+      # Get stderr of all processes
+      #
+      # @return [String]
+      #   The stderr of all process which have run before
+      def all_stderr
+        Aruba.platform.deprecated('The use of "#all_stderr" is deprecated. Use `all_commands.map { |c| c.stderr }.join("\n") instead. If you need to check for some output use "expect(all_commands).to have_output_on_stderr /output/" instead')
+
+        process_monitor.all_stderr
+      end
+
+      # @deprecated
+      #
+      # Get stderr and stdout of all processes
+      #
+      # @return [String]
+      #   The stderr and stdout of all process which have run before
+      def all_output
+        Aruba.platform.deprecated('The use of "#all_output" is deprecated. Use `all_commands.map { |c| c.output }.join("\n") instead. If you need to check for some output use "expect(all_commands).to have_output /output/" instead')
+
+        process_monitor.all_output
+      end
+
       # @deprecated
       #
       # Default exit timeout for running commands with aruba
+      #
+      # Overwrite this method if you want a different timeout or set
+      # `@aruba_timeout_seconds`.
       def exit_timeout
-        Aruba.platform.deprecated(
-          'The use of "#exit_timeout" is deprecated.' \
-          ' Use "aruba.config.exit_timeout" instead.'
-        )
+        Aruba.platform.deprecated('The use of "#exit_timeout" is deprecated. Use "aruba.config.exit_timeout" instead.')
 
         aruba.config.exit_timeout
       end
@@ -1014,10 +809,7 @@ module Aruba
       # Overwrite this method if you want a different timeout or set
       # `@aruba_io_wait_seconds
       def io_wait
-        Aruba.platform.deprecated(
-          'The use of "#io_wait" is deprecated.' \
-          ' Use "aruba.config.io_wait_timeout" instead'
-        )
+        Aruba.platform.deprecated('The use of "#io_wait" is deprecated. Use "aruba.config.io_wait_timeout" instead')
 
         aruba.config.io_wait_timeout
       end
@@ -1025,50 +817,35 @@ module Aruba
       # @deprecated
       # Only processes
       def only_processes
-        Aruba.platform.deprecated(
-          'The use of "#only_processes" is deprecated.' \
-          ' Use "#all_commands" instead'
-        )
+        Aruba.platform.deprecated('The use of "#only_processes" is deprecated. Use "#all_commands" instead')
 
         process_monitor.only_processes
       end
 
       # @deprecated
       def last_exit_status
-        Aruba.platform.deprecated(
-          'The use of "#last_exit_status" is deprecated.' \
-          ' Use "#last_command_(started|stopped).exit_status" instead'
-        )
+        Aruba.platform.deprecated('The use of "#last_exit_status" is deprecated. Use "#last_command_(started|stopped).exit_status" instead')
 
         process_monitor.last_exit_status
       end
 
       # @deprecated
       def stop_process(process)
-        Aruba.platform.deprecated(
-          'The use of "#stop_process" is deprecated.' \
-          ' Use "#last_command_(started|stopped).stop" instead'
-        )
+        # Aruba.platform.deprecated('The use of "#stop_process" is deprecated. Use "#last_command_(started|stopped).stop" instead')
 
         @last_exit_status = process_monitor.stop_process(process)
       end
 
       # @deprecated
       def terminate_process(process)
-        Aruba.platform.deprecated(
-          'The use of "#terminate_process" is deprecated.' \
-          ' Use "#last_command_(started|stopped).terminate" instead'
-        )
+        # Aruba.platform.deprecated('The use of "#terminate_process" is deprecated. Use "#last_command_(started|stopped).terminate" instead')
 
         process_monitor.terminate_process(process)
       end
 
       # @deprecated
       def stop_processes!
-        Aruba.platform.deprecated(
-          'The use of "#stop_processes!" is deprecated.' \
-          ' Use "#stop_all_commands" instead'
-        )
+        Aruba.platform.deprecated('The use of "#stop_processes!" is deprecated. Use "#stop_all_commands" instead')
 
         stop_all_commands
       end
@@ -1077,10 +854,7 @@ module Aruba
       #
       # Terminate all running processes
       def terminate_processes!
-        Aruba.platform.deprecated(
-          'The use of "#stop_processes!" is deprecated.' \
-          ' Use "all_commands.each(&:terminate)" instead'
-        )
+        Aruba.platform.deprecated('The use of "#stop_processes!" is deprecated. Use "all_commands.each(&:terminate)" instead')
 
         all_commands.each(&:terminate)
       end
@@ -1089,10 +863,7 @@ module Aruba
       #
       # Access to announcer
       def announcer
-        Aruba.platform.deprecated(
-          'The use of "#announcer" is deprecated.' \
-          ' Use "aruba.announcer" instead'
-        )
+        Aruba.platform.deprecated('The use of "#announcer" is deprecated. Use "aruba.announcer" instead')
 
         @announcer ||= Platforms::Announcer.new(
           self,
@@ -1106,32 +877,6 @@ module Aruba
         @announcer
       end
 
-      # @deprecated
-      # Use a clean rvm gemset
-      #
-      # Please make sure that you've got [rvm](http://rvm.io/) installed.
-      #
-      # @param [String] gemset
-      #   The name of the gemset to be used
-      def use_clean_gemset(gemset)
-        Aruba.platform.deprecated('The use of "#use_clean_gemset" is deprecated.')
-        run_simple(%{rvm gemset create "#{gemset}"}, true)
-        if all_stdout =~ /'#{gemset}' gemset created \((.*)\)\./
-          gem_home = Regexp.last_match[1]
-          set_environment_variable('GEM_HOME', gem_home)
-          set_environment_variable('GEM_PATH', gem_home)
-          set_environment_variable('BUNDLE_PATH', gem_home)
-
-          paths = (ENV['PATH'] || "").split(File::PATH_SEPARATOR)
-          paths.unshift(File.join(gem_home, 'bin'))
-          set_environment_variable('PATH', paths.uniq.join(File::PATH_SEPARATOR))
-
-          run_simple("gem install bundler", true)
-        else
-          raise "I didn't understand rvm's output: #{all_stdout}"
-        end
-      end
-
       # @private
       # @deprecated
       def process_monitor
@@ -1143,10 +888,7 @@ module Aruba
       # @private
       # @deprecated
       def processes
-        Aruba.platform.deprecated(
-          'The use of "#process_monitor" is deprecated.' \
-          ' Use "#all_commands" instead.'
-        )
+        Aruba.platform.deprecated('The use of "#process_monitor" is deprecated. Please use "#all_commands" instead.')
 
         aruba.command_monitor.send(:processes)
       end