aruba 0.8.0.pre2 → 0.8.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e83fd7fad41f42abe34deb5bb411fbb81fa66c9
-  data.tar.gz: 07f63f05b26e8aa18418e24c5bd534455c7c211d
+  metadata.gz: 7c4368a692e80cba29cd8cd5d4c072883b8f0416
+  data.tar.gz: ee245882d6596cd1552dfb1acb5455f7d4cd9cbb
 SHA512:
-  metadata.gz: e0eb57b9b45ee66bb5892aebe9cd17258b8be187a08c84b7a28dca4706a9d07d7acf7e96cfb590cc97a29d16b21ded26d4749e0100ae318e83e3a0879925a37f
-  data.tar.gz: 68469343fc2860aa11982503680e88bccb673767360d29fd5f3eedc1ef7c772066230dcbf771e167058973f9b37d6d15419a95202a4a37ecef2c2075cc3ee6f1
+  metadata.gz: 949e77104c5fe1c9d45047f2351179816add7721326eb3a4b67701a36dec687aa38b6a3a54a7c84d163bb588b8b405704fa46322d5977df1aa57bf5ed1996658
+  data.tar.gz: 8aac02ac05dcd8ce10f4cb7303b146e930502e087b32b155e0f2a06ea1ee220b7bcbc82ed3cceeb2c62be57cb7de528a213e36b3f92623e6b58dadf8d551c5b8

data/.rubocop.yml

@@ -177,3 +177,6 @@ Style/TrivialAccessors:
 
 Style/RaiseArgs:
   Enabled: false
+
+Metrics/ParameterLists:
+  Enabled: false

data/aruba.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'aruba'
-  s.version     = '0.8.0.pre2'
+  s.version     = '0.8.0.pre3'
   s.authors     = ["Aslak Hellesøy", "David Chelimsky", "Mike Sassak", "Matt Wynne", "Jarl Friis", "Dennis Günnewig"]
   s.description = 'Extension for popular TDD and BDD frameworks like "Cucumber" and "RSpec" to make testing commandline applications meaningful, easy and fun.'
   s.summary     = "aruba-#{s.version}"
@@ -10,9 +10,9 @@ Gem::Specification.new do |s|
   s.email       = 'cukes@googlegroups.com'
   s.homepage    = 'http://github.com/cucumber/aruba'
 
-  s.add_runtime_dependency 'cucumber', '>= 1.3.19'
+  s.add_runtime_dependency 'cucumber', '~> 1.3.19'
   s.add_runtime_dependency 'childprocess', '~> 0.5.6'
-  s.add_runtime_dependency 'rspec-expectations', '~> 3.3'
+  s.add_runtime_dependency 'rspec-expectations', '>= 2.11'
   s.add_runtime_dependency 'contracts', '~> 0.9'
 
   s.add_development_dependency 'bundler', '~> 1.10.2'
@@ -21,14 +21,15 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.8.7'
   s.post_install_message = <<-EOS
 With aruba >= 1.0
-  * "ruby 1.8.7"-support is discontinued
-  * aruba requires "cucumber 2" for the feature steps. The rest of aruba should be usable by whatever testing framework you are using
-  * Overwriting methods for configuration is discontinued. You need to use `aruba.config.<variable>` or `Aruba.configure { |config| config.<variable>` instead
-  * "aruba/reporting" will be removed. Please use `@debug`-tag + `byebug`, `debugger`, `pry` to troubleshoot your feature tests
-  * Set environment variables will have only effect on `#run` and the like + `#with_environment { }`
+  * "ruby 1.8.7"-support is discontinued.
+  * aruba requires "cucumber 2" for the feature steps. The rest of aruba should be usable by whatever testing framework you are using.
+  * Overwriting methods for configuration is discontinued. You need to use `aruba.config.<variable>` or `Aruba.configure { |config| config.<variable>` instead.
+  * "aruba/reporting" will be removed. Please use `@debug`-tag + `byebug`, `debugger`, `pry` to troubleshoot your feature tests.
+  * Set environment variables will have only effect on `#run` and the like + `#with_environment { }`.
   * The process environment will be fully resetted between tests. Sharing state via ENV['VAR'] = 'shared state' between tests will not be possible anymore. Please make that obvious by using explicit steps or use the aruba API for that.
   * There will be a major cleanup for command execution. There will be only `run` and `run_simple` left. `run_interactive` is replaced by `run`.
-  * Setting the root directory of aruba via method overwrite or configuration - this should be your project root directory where the test suite is run
+  * Setting the root directory of aruba via method overwrite or configuration - this should be your project root directory where the test suite is run.
+  * The direct use of "InProcess", "DebugProcess" and "SpawnProcess" is not supported anymore. You need to use "Command" instead. But be careful, it has a different API.
 EOS
 
   s.files            = `git ls-files`.split("\n")

data/features/api/cd.feature

@@ -117,3 +117,57 @@ Feature: Change current working directory
     """
     When I run `rspec`
     Then the specs should all pass
+
+  Scenario: It changes the PWD- and OLDPWD-ENV-variable for a given block
+
+    If you need to run some code in a different directory, you can also use the
+    block-notation of `cd`.
+
+    Given a file named "spec/cd_spec.rb" with:
+    """
+    require 'spec_helper'
+
+    RSpec.describe 'cd to directory', :type => :aruba do
+      before(:each) do
+        create_directory 'new_dir.d'
+      end
+
+      before :each do
+        cd('new_dir.d/') do
+          @pwd    = ENV['PWD'] 
+          @oldpwd = ENV['OLDPWD'] 
+        end
+      end
+
+      it { expect(@pwd).to end_with 'new_dir.d' }
+      it { expect(@oldpwd).to end_with 'cli-app' }
+    end
+    """
+    When I run `rspec`
+    Then the specs should all pass
+
+  Scenario: Nested cd calls
+
+    If you need to run some code in a different directory, you can also use the
+    block-notation of `cd`.
+
+    Given a file named "spec/cd_spec.rb" with:
+    """
+    require 'spec_helper'
+
+    RSpec.describe 'cd to directory', :type => :aruba do
+      before(:each) do
+        create_directory 'new_dir.d/subdir.d'
+      end
+
+      before :each do
+        @pwd = cd('new_dir.d') do
+          cd('subdir.d') { run('pwd') }
+        end
+      end
+
+      it { expect(last_command.output.to_s).to include 'subdir.d'  }
+    end
+    """
+    When I run `rspec`
+    Then the specs should all pass

data/features/step_definitions/aruba_dev_steps.rb

@@ -18,7 +18,7 @@ When /^I set env variable "(\w+)" to "([^"]*)"$/ do |var, value|
 end
 
 Then /^aruba should fail with "([^"]*)"$/ do |error_message|
-  expect(@aruba_exception.message).to include(unescape(error_message))
+  expect(@aruba_exception.message).to include(Aruba::Platform.unescape(error_message))
 end
 
 Then /^the following step should fail with Spec::Expectations::ExpectationNotMetError:$/ do |multiline_step|

data/features/steps/commands/in_process.feature

@@ -1,4 +1,3 @@
-@announce
 Feature: Run commands in ruby process
 
   Running a lot of scenarios where each scenario uses Aruba
@@ -9,6 +8,23 @@ Feature: Run commands in ruby process
 
   Background:
     Given I use a fixture named "cli-app"
+    And a file named "features/support/cli_app.rb" with:
+    """
+    require 'cli/app/runner'
+    """
+    And a file named "features/support/in_proccess.rb" with:
+    """
+    require 'aruba/cucumber'
+
+    Before('@in-process') do
+      aruba.config.command_launcher = :in_process
+      aruba.config.main_class = Cli::App::Runner
+    end
+
+    After('@in-process') do
+      aruba.config.command_launcher = :spawn
+    end
+    """
 
   Scenario: Run custom code
     Given a file named "lib/cli/app/runner.rb" with:
@@ -31,27 +47,9 @@ Feature: Run commands in ruby process
       end
     end
     """
-    And a file named "features/support/cli_app.rb" with:
-    """
-    require 'cli/app/runner'
-    """
-    And a file named "features/support/in_proccess.rb" with:
-    """
-    require 'aruba/cucumber'
-    require 'aruba/processes/in_process'
-
-    Before('@in-process') do
-      Aruba.process = Aruba::Processes::InProcess
-      Aruba.process.main_class = Cli::App::Runner
-    end
-
-    After('@in-process') do
-      Aruba.process = Aruba::Processes::SpawnProcess
-    end
-    """
     And a file named "features/in_process.feature" with:
     """
-    Feature: Exit status
+    Feature: Run a command in process
       @in-process
       Scenario: Run command
         When I run `reverse.rb Hello World`
@@ -89,11 +87,93 @@ Feature: Run commands in ruby process
       end
     end
     """
-    And a file named "features/support/cli_app.rb" with:
+    And a file named "features/in_process.feature" with:
     """
-    require 'cli/app/runner'
+    Feature: Run a command in process
+      @in-process
+      Scenario: Run command in process
+        When I run `reverse.rb Hello World`
+        Then the output should contain:
+        \"\"\"
+        olleH dlroW
+        \"\"\"
+
+      Scenario: Run command
+        When I run `cli Hello World`
+        Then the output should contain:
+        \"\"\"
+        Hello World
+        \"\"\"
     """
-    And a file named "features/support/in_proccess.rb" with:
+    When I run `cucumber`
+    Then the features should all pass
+
+  Scenario: The current working directory is changed as well
+    Given a file named "lib/cli/app/runner.rb" with:
+    """
+    module Cli
+      module App
+        class Runner
+          def initialize(argv, stdin, stdout, stderr, kernel)
+            @argv   = argv
+            @stdin  = stdin
+            @stdout = stdout
+            @stderr = stderr
+            @kernel = kernel
+          end
+
+          def execute!
+            @stdout.puts("PWD-ENV is " + Dir.getwd)
+          end
+        end
+      end
+    end
+    """
+    And a file named "features/in_process.feature" with:
+    """
+    Feature: Run a command in process
+      @in-process
+      Scenario: Run command
+        When I run `pwd.rb`
+        Then the output should match %r<PWD-ENV.*tmp/aruba>
+    """
+    When I run `cucumber`
+    Then the features should all pass
+
+  Scenario: The PWD environment is changed to current working directory
+    Given a file named "lib/cli/app/runner.rb" with:
+    """
+    module Cli
+      module App
+        class Runner
+          def initialize(argv, stdin, stdout, stderr, kernel)
+            @argv   = argv
+            @stdin  = stdin
+            @stdout = stdout
+            @stderr = stderr
+            @kernel = kernel
+          end
+
+          def execute!
+            @stdout.puts("PWD-ENV is " + ENV['PWD'])
+          end
+        end
+      end
+    end
+    """
+    And a file named "features/in_process.feature" with:
+    """
+    Feature: Run a command in process
+      @in-process
+      Scenario: Run command
+        When I run `pwd.rb`
+        Then the output should match %r<PWD-ENV.*tmp/aruba>
+    """
+    When I run `cucumber`
+    Then the features should all pass
+
+  Scenario: Set runner via "Aruba.process ="-method (deprecated)
+    Given a file named "features/support/in_proccess.rb" with:
     """
     require 'aruba/cucumber'
     require 'aruba/processes/in_process'
@@ -107,23 +187,36 @@ Feature: Run commands in ruby process
       Aruba.process = Aruba::Processes::SpawnProcess
     end
     """
+    Given a file named "lib/cli/app/runner.rb" with:
+    """
+    module Cli
+      module App
+        class Runner
+          def initialize(argv, stdin, stdout, stderr, kernel)
+            @argv   = argv
+            @stdin  = stdin
+            @stdout = stdout
+            @stderr = stderr
+            @kernel = kernel
+          end
+
+          def execute!
+            @stdout.puts(@argv.map(&:reverse).join(' '))
+          end
+        end
+      end
+    end
+    """
     And a file named "features/in_process.feature" with:
     """
-    Feature: Exit status
+    Feature: Run a command in process
       @in-process
-      Scenario: Run command in process
+      Scenario: Run command
         When I run `reverse.rb Hello World`
         Then the output should contain:
         \"\"\"
         olleH dlroW
         \"\"\"
-
-      Scenario: Run command
-        When I run `cli Hello World`
-        Then the output should contain:
-        \"\"\"
-        Hello World
-        \"\"\"
     """
     When I run `cucumber`
     Then the features should all pass

data/lib/aruba/api/command.rb

@@ -2,16 +2,18 @@ require 'pathname'
 
 require 'aruba/platform'
 require 'aruba/process_monitor'
-require 'aruba/spawn_process'
+require 'aruba/command'
 
 require 'win32/file' if File::ALT_SEPARATOR
 
 module Aruba
   class << self
+    # @deprecated
     attr_accessor :process
   end
 
-  self.process = Aruba::Processes::SpawnProcess
+  # @deprecated
+  # self.process = Aruba::Processes::SpawnProcess
 end
 
 module Aruba
@@ -241,6 +243,8 @@ module Aruba
       #
       # @yield [SpawnProcess]
       #   Run block with process
+      #
+      # rubocop:disable Metrics/MethodLength
       def run(cmd, timeout = nil)
         timeout ||= exit_timeout
         @commands ||= []
@@ -252,7 +256,33 @@ module Aruba
         announcer.announce(:command, cmd)
         announcer.announce(:timeout, 'exit', aruba.config.exit_timeout)
 
-        process = Aruba.process.new(cmd, timeout, io_wait, expand_path('.'), aruba.environment.to_h)
+        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.')
+                 # rubocop:enable Metrics/LineLength
+                 Aruba.process
+               else
+                 aruba.config.command_launcher
+               end
+
+        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.')
+                       # rubocop:enable Metrics/LineLength
+                       Aruba.process.main_class
+                     else
+                       aruba.config.main_class
+                     end
+
+        command = Command.new(
+          cmd,
+          :mode              => mode,
+          :exit_timeout      => timeout,
+          :io_wait_timeout   => io_wait,
+          :working_directory => expand_path('.'),
+          :environment       => aruba.environment.to_h,
+          :main_class        => main_class
+        )
 
         if aruba.config.before? :cmd
           # rubocop:disable Metrics/LineLength
@@ -261,15 +291,16 @@ module Aruba
           aruba.config.before(:cmd, self, cmd)
         end
 
-        aruba.config.before(:command, self, process)
+        aruba.config.before(:command, self, command)
 
-        process_monitor.register_process(cmd, process)
-        process.run!
+        process_monitor.register_process(cmd, command)
+        command.run!
 
-        aruba.config.after(:command, self, process)
+        aruba.config.after(:command, self, command)
 
-        block_given? ? yield(process) : process
+        block_given? ? yield(command) : command
       end
+      # rubocop:enable Metrics/MethodLength
 
       # Default exit timeout for running commands with aruba
       #

data/lib/aruba/api/core.rb

@@ -7,6 +7,9 @@ require 'aruba/config/jruby'
 
 module Aruba
   module Api
+    # Core methods of aruba
+    #
+    # Those methods do not depend on any other API method of aruba
     module Core
       include ::RSpec::Matchers
 
@@ -42,18 +45,41 @@ module Aruba
       # @example Run code in directory
       #   result = cd('some-dir') { Dir.getwd }
       #
+      # rubocop:disable Metrics/MethodLength
       def cd(dir, &block)
-        fail ArgumentError, "#{expand_path(dir)} is not a directory or does not exist." unless directory?(dir)
-
         if block_given?
-          cwd = (aruba.current_directory.dup << dir)
-          return Aruba::Platform.chdir(cwd, &block)
+          begin
+            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_oldpwd = ENV['OLDPWD']
+            old_pwd    = ENV['PWD']
+
+            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)
+
+            result = block.call
+          ensure
+            aruba.current_directory.pop
+            Aruba::Platform.chdir old_dir
+            ENV['OLDPWD'] = old_oldpwd
+            ENV['PWD']    = old_pwd
+          end
+
+          return result
         end
 
+        fail ArgumentError, "#{expand_path(dir)} is not a directory or does not exist." unless Aruba::Platform.directory? expand_path(dir)
+
         aruba.current_directory << dir
 
         self
       end
+      # rubocop:enable Metrics/MethodLength
 
       # Expand file name
       #
@@ -86,6 +112,8 @@ module Aruba
       #   # => <path>/test/fixtures/file
       #   expand_path('%/file')
       #
+      # rubocop:disable Metrics/MethodLength
+      # rubocop:disable Metrics/CyclomaticComplexity
       def expand_path(file_name, dir_string = nil)
         # 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.)
@@ -103,12 +131,20 @@ module Aruba
 
         if aruba.config.fixtures_path_prefix == prefix
           File.join aruba.fixtures_directory, rest
-        else
+        elsif '~' == prefix
           with_environment do
-            Aruba::Platform.chdir(aruba.current_directory) { Aruba::Platform.expand_path(file_name, dir_string) }
+            path = File.join(ENV['HOME'], aruba.current_directory.relative_path_from(Pathname.new(aruba.config.working_directory)))
+
+            fail 'Expanding "~/" to "/" is not allowed' if path == '/'
+
+            Aruba::Platform.chdir(path) { Aruba::Platform.expand_path(file_name, dir_string) }
           end
+        else
+          Aruba::Platform.chdir(File.join(aruba.root_directory,aruba.current_directory)) { Aruba::Platform.expand_path(file_name, dir_string) }
         end
       end
+      # rubocop:enable Metrics/MethodLength
+      # rubocop:enable  Metrics/CyclomaticComplexity
 
       # Run block with environment
       #

data/lib/aruba/api/deprecated.rb

@@ -22,7 +22,7 @@ module Aruba
       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}))
 
-        File.join(*aruba.current_directory)
+        aruba.current_directory.to_s
       end
 
       # @deprecated

data/lib/aruba/aruba_path.rb

@@ -2,13 +2,21 @@ require 'pathname'
 require 'delegate'
 
 module Aruba
-  class ArubaPath < SimpleDelegator
+  class ArubaPath < Delegator
     def initialize(path)
-      if path.is_a? Array
-        __setobj__ Pathname.new(File.join(*path))
-      else
-        __setobj__ Pathname.new(path)
-      end
+      obj = [path.to_s].flatten
+
+      super obj
+
+      @delegate_sd_obj = obj
+    end
+
+    def __getobj__
+      ::Pathname.new(::File.join(*@delegate_sd_obj))
+    end
+
+    def __setobj__(obj)
+      @delegate_sd_obj = [obj.to_s].flatten
     end
 
     # Add directory/file to path
@@ -23,7 +31,7 @@ module Aruba
     #   puts path
     #   # => path/to/dir.d/subdir.d
     def push(p)
-      __setobj__(File.join(__getobj__, p))
+      @delegate_sd_obj << p
     end
     alias_method :<<, :push
 
@@ -35,16 +43,7 @@ module Aruba
     #   puts path
     #   # => path/to
     def pop
-      if RUBY_VERSION < '1.9'
-        dirs = []
-        __getobj__.each_filename { |f| dirs << f }
-      else
-        dirs = __getobj__.each_filename.to_a
-      end
-
-      dirs.pop
-
-      __setobj__ Pathname.new(File.join(*dirs))
+      @delegate_sd_obj.pop
     end
 
     if RUBY_VERSION < '1.9'
@@ -53,14 +52,30 @@ module Aruba
       end
 
       def relative?
-        !(%r{\A/} === __getobj__)
+        !(%r{\A/} === to_s)
       end
 
       def absolute?
-        (%r{\A/} === __getobj__)
+        (%r{\A/} === to_s)
       end
     end
 
+    # Path ends with string
+    #
+    # @param [String] string
+    #   The string to check
+    def end_with?(string)
+      to_s.end_with? string
+    end
+
+    # Path starts with string
+    #
+    # @param [String] string
+    #   The string to check
+    def start_with?(string)
+      to_s.start_with? string
+    end
+
     # Return string at index
     #
     # @param [Integer, Range] index

data/lib/aruba/basic_configuration.rb

@@ -32,7 +32,7 @@ module Aruba
         default  = opts[:default]
 
         fail ArgumentError, 'Either use block or default value' if block_given? && default
-        fail ArgumentError, 'Either use block or default value' if !block_given? && default.nil? && default.empty?
+        # fail ArgumentError, 'Either use block or default value' if !block_given? && default.nil? && default.to_s.empty?
         fail ArgumentError, 'contract-options is required' if contract.nil?
 
         # Add writer

data/lib/aruba/basic_configuration/option.rb

@@ -9,8 +9,8 @@ module Aruba
         name = opts[:name]
         value = opts[:value]
 
-        fail ArgumentError, '"name" is required' if name.nil?
-        fail ArgumentError, '"value" is required' if value.nil?
+        fail ArgumentError, '"name" is required' unless opts.key? :name
+        fail ArgumentError, '"value" is required' unless opts.key? :value
 
         @name          = name
         @value         = value

data/lib/aruba/command.rb

@@ -0,0 +1,27 @@
+require 'aruba/processes/spawn_process'
+require 'aruba/processes/in_process'
+require 'aruba/processes/debug_process'
+
+module Aruba
+  class Command < SimpleDelegator
+    def initialize(command, opts = {})
+      launchers = []
+      launchers << Processes::DebugProcess
+      launchers << Processes::InProcess
+      launchers << Processes::SpawnProcess
+
+      launcher = launchers.find { |l| l.match? opts[:mode] }
+
+      super launcher.new(
+        command,
+        opts.fetch(:exit_timeout),
+        opts.fetch(:io_wait_timeout),
+        opts.fetch(:working_directory),
+        opts.fetch(:environment),
+        opts.fetch(:main_class)
+      )
+    rescue KeyError => e
+      raise ArgumentError, e.message
+    end
+  end
+end

data/lib/aruba/config.rb

@@ -3,6 +3,8 @@ require 'aruba/basic_configuration'
 require 'aruba/config_wrapper'
 require 'aruba/hooks'
 require 'aruba/contracts/relative_path'
+require 'aruba/contracts/enum'
+require 'aruba/contracts/is_a'
 
 module Aruba
   # Aruba Configuration
@@ -22,8 +24,14 @@ module Aruba
     option_accessor :io_wait_timeout, :contract => { Num => Num }, :default => 0.1
     option_accessor :fixtures_directories, :contract => { Array => ArrayOf[String] }, :default => %w(features/fixtures spec/fixtures test/fixtures)
     option_accessor :command_runtime_environment, :contract => { Hash => Hash }, :default => ENV.to_hash
+    # rubocop:disable Metrics/LineLength
     option_accessor(:command_search_paths, :contract => { ArrayOf[String] => ArrayOf[String] }) { |config| [File.join(config.root_directory.value, 'bin')] }
+    # rubocop:enable Metrics/LineLength
     option_accessor :keep_ansi, :contract => { Bool => Bool }, :default => false
+    # rubocop:disable Metrics/LineLength
+    option_accessor :command_launcher, :contract => { Aruba::Contracts::Enum[:in_process, :spawn, :debug] => Aruba::Contracts::Enum[:in_process, :spawn, :debug] }, :default => :spawn
+    # rubocop:enable Metrics/LineLength
+    option_accessor :main_class, :contract => { Aruba::Contracts::IsA[Class] => Or[Aruba::Contracts::IsA[Class], Eq[nil]] }, :default => nil
   end
 end
 

data/lib/aruba/contracts/enum.rb

@@ -0,0 +1,21 @@
+require 'contracts'
+
+module Aruba
+  module Contracts
+    class Enum < ::Contracts::CallableClass
+      private
+
+      attr_reader :vals
+
+      public
+
+      def initialize(*vals)
+        @vals = vals
+      end
+
+      def valid?(val)
+        vals.include? val
+      end
+    end
+  end
+end

data/lib/aruba/contracts/is_a.rb

@@ -0,0 +1,21 @@
+require 'contracts'
+
+module Aruba
+  module Contracts
+    class IsA < ::Contracts::CallableClass
+      private
+
+      attr_reader :vals
+
+      public
+
+      def initialize(*vals)
+        @vals = vals
+      end
+
+      def valid?(val)
+        vals.any? { |v| val.is_a? v }
+      end
+    end
+  end
+end

data/lib/aruba/cucumber.rb

@@ -207,6 +207,10 @@ Then /^the output should match \/([^\/]*)\/$/ do |expected|
   assert_matching_output(expected, all_output)
 end
 
+Then /^the output should match %r<([^>]*)>$/ do |expected|
+  assert_matching_output(expected, all_output)
+end
+
 Then /^the output should match:$/ do |expected|
   assert_matching_output(expected, all_output)
 end

data/lib/aruba/cucumber/hooks.rb

@@ -90,13 +90,12 @@ Before('@announce') do
 end
 
 Before('@debug') do
-  require 'aruba/processes/debug_process'
-  Aruba.process = Aruba::Processes::DebugProcess
+  aruba.config.command_launcher = :debug
 end
 
-After('@debug') do
-  Aruba.process = Aruba::Processes::SpawnProcess
-end
+# After('@debug') do
+#   aruba.config.command_launcher = :spawn
+# end
 
 Before('@ansi') do
   @aruba_keep_ansi = true

data/lib/aruba/in_process.rb

@@ -1,9 +1,10 @@
 require 'aruba/processes/in_process'
+require 'aruba/platform'
 
 module Aruba
   class InProcess < Aruba::Processes::InProcess
     def initialize(*args)
-      warn('The use of "Aruba::InProcess" is deprecated. Use "Aruba::Processes::InProcess" instead.')
+      Aruba::Platform.deprecated('The use of "Aruba::InProcess" is deprecated. Use "Aruba::Processes::InProcess" instead.')
 
       super
     end

data/lib/aruba/matchers/command/be_successfully_executed.rb

@@ -1,3 +1,5 @@
+require 'rspec/expectations/version'
+
 require 'aruba/matchers/command/have_exit_status'
 require 'aruba/matchers/command/have_finished_in_time'
 
@@ -27,4 +29,6 @@ RSpec::Matchers.define :be_successfully_executed do
   end
 end
 
-RSpec::Matchers.define_negated_matcher :have_failed_running, :be_successfully_executed
+if RSpec::Expectations::Version::STRING >= '3.1'
+  RSpec::Matchers.define_negated_matcher :have_failed_running, :be_successfully_executed
+end

data/lib/aruba/matchers/command/have_finished_in_time.rb

@@ -1,3 +1,5 @@
+require 'rspec/expectations/version'
+
 # @!method run_too_long
 #   This matchers checks if <command> run too long. Say the timeout is 10
 #   seconds and it takes <command> to finish in 15. This matchers will succeed.
@@ -39,4 +41,6 @@ RSpec::Matchers.define :have_finished_in_time do
   end
 end
 
-RSpec::Matchers.define_negated_matcher :run_too_long, :have_finished_in_time
+if RSpec::Expectations::Version::STRING >= '3.1'
+  RSpec::Matchers.define_negated_matcher :run_too_long, :have_finished_in_time
+end

data/lib/aruba/matchers/directory/be_an_existing_directory.rb

@@ -1,3 +1,5 @@
+require 'rspec/expectations/version'
+
 # @!method be_an_existing_directory
 #   This matchers checks if <directory> exists in filesystem
 #
@@ -31,4 +33,6 @@ RSpec::Matchers.define :be_an_existing_directory do |_|
   end
 end
 
-RSpec::Matchers.alias_matcher :an_existing_directory, :be_an_existing_directory
+if RSpec::Expectations::Version::STRING >= '3.0'
+  RSpec::Matchers.alias_matcher :an_existing_directory, :be_an_existing_directory
+end

data/lib/aruba/matchers/directory/have_sub_directory.rb

@@ -1,3 +1,5 @@
+require 'rspec/expectations/version'
+
 # @!method have_sub_directory(sub_directory)
 #   This matchers checks if <directory> has given sub-directory
 #
@@ -46,4 +48,6 @@ RSpec::Matchers.define :have_sub_directory do |expected|
   end
 end
 
-RSpec::Matchers.alias_matcher :a_directory_having_sub_directory, :have_sub_directory
+if RSpec::Expectations::Version::STRING >= '3.0'
+  RSpec::Matchers.alias_matcher :a_directory_having_sub_directory, :have_sub_directory
+end

data/lib/aruba/matchers/file/be_an_existing_file.rb

@@ -1,3 +1,5 @@
+require 'rspec/expectations/version'
+
 # @!method be_an_existing_file
 #   This matchers checks if <file> exists in filesystem
 #
@@ -31,4 +33,6 @@ RSpec::Matchers.define :be_an_existing_file do |_|
   end
 end
 
-RSpec::Matchers.alias_matcher :an_existing_file, :be_an_existing_file
+if RSpec::Expectations::Version::STRING >= '3.0'
+  RSpec::Matchers.alias_matcher :an_existing_file, :be_an_existing_file
+end

data/lib/aruba/matchers/file/have_file_content.rb

@@ -1,3 +1,5 @@
+require 'rspec/expectations/version'
+
 # @!method have_file_content(content)
 #   This matchers checks if <file> has content. `content` can be a string,
 #   regexp or an RSpec matcher.
@@ -55,4 +57,6 @@ RSpec::Matchers.define :have_file_content do |expected|
   description { "have file content: #{description_of expected}" }
 end
 
-RSpec::Matchers.alias_matcher :a_file_having_content, :have_file_content
+if RSpec::Expectations::Version::STRING >= '3.0'
+  RSpec::Matchers.alias_matcher :a_file_having_content, :have_file_content
+end

data/lib/aruba/matchers/file/have_file_size.rb

@@ -1,3 +1,5 @@
+require 'rspec/expectations/version'
+
 # @!method have_file_size(size)
 #   This matchers checks if path has file size
 #
@@ -40,4 +42,6 @@ RSpec::Matchers.define :have_file_size do |expected|
   end
 end
 
-RSpec::Matchers.alias_matcher :a_file_of_size, :have_file_size
+if RSpec::Expectations::Version::STRING >= '3.0'
+  RSpec::Matchers.alias_matcher :a_file_of_size, :have_file_size
+end

data/lib/aruba/matchers/file/have_same_file_content.rb

@@ -1,3 +1,5 @@
+require 'rspec/expectations/version'
+
 require 'fileutils'
 
 # @!method have_same_file_content_like(file_name)
@@ -41,4 +43,6 @@ RSpec::Matchers.define :have_same_file_content_like do |expected|
   end
 end
 
-RSpec::Matchers.alias_matcher :a_file_with_same_content_like, :have_same_file_content_like
+if RSpec::Expectations::Version::STRING >= '3.0'
+  RSpec::Matchers.alias_matcher :a_file_with_same_content_like, :have_same_file_content_like
+end

data/lib/aruba/matchers/path/a_path_matching_pattern.rb

@@ -1,3 +1,5 @@
+require 'rspec/expectations/version'
+
 # @!method a_path_matching_pattern(/pattern/)
 #   This matchers checks if <path> matches pattern. `pattern` can be a string,
 #   regexp or an RSpec matcher.
@@ -18,4 +20,6 @@
 #     RSpec.describe do
 #       it { expect(files).to include a_path_matching_pattern /asdf/ }
 #     end
-RSpec::Matchers.alias_matcher :a_path_matching_pattern, :match
+if RSpec::Expectations::Version::STRING >= '3.0'
+  RSpec::Matchers.alias_matcher :a_path_matching_pattern, :match
+end

data/lib/aruba/matchers/path/be_an_absolute_path.rb

@@ -1,3 +1,5 @@
+require 'rspec/expectations/version'
+
 # @!method be_an_absolute_path
 #   This matchers checks if <path> exists in filesystem
 #
@@ -29,4 +31,6 @@ RSpec::Matchers.define :be_an_absolute_path do |_|
   end
 end
 
-RSpec::Matchers.alias_matcher :an_absolute_path, :be_an_absolute_path
+if RSpec::Expectations::Version::STRING >= '3.0'
+  RSpec::Matchers.alias_matcher :an_absolute_path, :be_an_absolute_path
+end

data/lib/aruba/matchers/path/be_an_existing_path.rb

@@ -1,3 +1,5 @@
+require 'rspec/expectations/version'
+
 # @!method be_an_existing_path
 #   This matchers checks if <path> exists in filesystem
 #
@@ -30,4 +32,6 @@ RSpec::Matchers.define :be_an_existing_path do |_|
   end
 end
 
-RSpec::Matchers.alias_matcher :an_existing_path, :be_an_existing_path
+if RSpec::Expectations::Version::STRING >= '3.0'
+  RSpec::Matchers.alias_matcher :an_existing_path, :be_an_existing_path
+end

data/lib/aruba/matchers/path/have_permissions.rb

@@ -1,3 +1,5 @@
+require 'rspec/expectations/version'
+
 # @!method have_permissions(permissions)
 #   This matchers checks if <file> or <directory> has <perm> permissions
 #
@@ -57,4 +59,6 @@ RSpec::Matchers.define :have_permissions do |expected|
   end
 end
 
-RSpec::Matchers.alias_matcher :a_path_having_permissions, :have_permissions
+if RSpec::Expectations::Version::STRING >= '3.0'
+  RSpec::Matchers.alias_matcher :a_path_having_permissions, :have_permissions
+end

data/lib/aruba/platform.rb

@@ -54,11 +54,28 @@ module Aruba
       FileUtils.rm_r(paths, options)
     end
 
+    def getwd
+      Dir.getwd
+    end
+
     # Change to directory
     def chdir(dir_name, &block)
       dir_name = ::File.expand_path(dir_name.to_s)
 
-      ::Dir.chdir(dir_name, &block)
+      begin
+        if RUBY_VERSION <= '1.9.3'
+          old_env = ENV.to_hash
+        else
+          old_env = ENV.to_h
+        end
+
+        ENV['OLDPWD'] = getwd
+        ENV['PWD'] = dir_name
+        ::Dir.chdir(dir_name, &block)
+      ensure
+        ENV.clear
+        ENV.update old_env
+      end
     end
 
     # Touch file, directory
@@ -224,6 +241,7 @@ module Aruba
       :relative_command?, \
       :executable_file?, \
       :unescape, \
+      :getwd, \
       :which, \
       :write_file
   end

data/lib/aruba/processes/basic_process.rb

@@ -6,10 +6,11 @@ module Aruba
     class BasicProcess
       attr_reader :exit_status, :environment
 
-      def initialize(cmd, exit_timeout, io_wait, working_directory, environment = ENV.to_hash)
+      def initialize(cmd, exit_timeout, io_wait, working_directory, environment = ENV.to_hash, main_class = nil)
         @cmd               = cmd
         @working_directory = working_directory
         @environment       = environment
+        @main_class        = main_class
         @exit_status       = nil
       end
 

data/lib/aruba/processes/debug_process.rb

@@ -2,20 +2,13 @@ require 'aruba/processes/spawn_process'
 
 module Aruba
   module Processes
-    # Create process
-    #
-    # @params [String] cmd
-    #   Command string
-    #
-    # @params [Integer] exit_timeout
-    #   The timeout until we expect the command to be finished
-    #
-    # @params [Integer] io_wait
-    #   The timeout until we expect the io to be finished
-    #
-    # @params [String] working_directory
-    #   The directory where the command will be executed
+    # Debug Process
     class DebugProcess < BasicProcess
+      # Use only if mode is :debug
+      def self.match?(mode)
+        mode == :debug || mode == DebugProcess
+      end
+
       # rubocop:disable Metrics/MethodLength
       # rubocop:disable Metrics/CyclomaticComplexity
       def run!

data/lib/aruba/processes/in_process.rb

@@ -5,6 +5,11 @@ require 'aruba/processes/basic_process'
 module Aruba
   module Processes
     class InProcess < BasicProcess
+      # Use only if mode is in_process
+      def self.match?(mode)
+        mode == :in_process || mode == InProcess
+      end
+
       attr_reader :exit_status
 
       class FakeKernel
@@ -20,10 +25,13 @@ module Aruba
       end
 
       class << self
+        # @deprecated
         attr_accessor :main_class
       end
 
-      def initialize(cmd, exit_timeout, io_wait, working_directory, environment = ENV.to_hash)
+      attr_reader :main_class
+
+      def initialize(cmd, exit_timeout, io_wait, working_directory, environment = ENV.to_hash, main_class = nil)
         @cmd               = cmd
         @argv              = arguments
         @stdin             = StringIO.new
@@ -35,13 +43,13 @@ module Aruba
       end
 
       def run!
-        raise "You need to call Aruba::InProcess.main_class = YourMainClass" unless self.class.main_class
+        fail "You need to call aruba.config.main_class = YourMainClass" unless main_class
 
         Dir.chdir @working_directory do
           before_run
 
-          with_environment do
-            self.class.main_class.new(@argv, @stdin, @stdout, @stderr, @kernel).execute!
+          in_environment 'PWD' => @working_directory do
+            main_class.new(@argv, @stdin, @stdout, @stderr, @kernel).execute!
           end
 
           after_run
@@ -83,12 +91,16 @@ module Aruba
 
       private
 
-      def with_environment(&block)
-        old_env = ENV.to_hash
+      def in_environment(env = {}, &block)
+        if RUBY_VERSION <= '1.9.3'
+          old_env = ENV.to_hash
+        else
+          old_env = ENV.to_h
+        end
 
-        ENV.update(environment)
+        ENV.update(environment).update(env)
 
-        block.call
+        block.call if block_given?
       ensure
         ENV.clear
         ENV.update old_env

data/lib/aruba/processes/spawn_process.rb

@@ -7,6 +7,11 @@ require 'aruba/processes/basic_process'
 module Aruba
   module Processes
     class SpawnProcess < BasicProcess
+      # Use as default launcher
+      def self.match?(mode)
+        true
+      end
+
       # Create process
       #
       # @params [String] cmd
@@ -20,7 +25,7 @@ module Aruba
       #
       # @params [String] working_directory
       #   The directory where the command will be executed
-      def initialize(cmd, exit_timeout, io_wait, working_directory, environment = ENV.to_hash)
+      def initialize(cmd, exit_timeout, io_wait, working_directory, environment = ENV.to_hash, main_class = nil)
         super
 
         @exit_timeout = exit_timeout

data/spec/aruba/api_spec.rb

@@ -726,6 +726,7 @@ describe Aruba::Api  do
           allow(runtime).to receive(:config).and_return config
           allow(runtime).to receive(:environment).and_return environment
           allow(runtime).to receive(:current_directory).and_return aruba.current_directory
+          allow(runtime).to receive(:root_directory).and_return aruba.root_directory
           allow(runtime).to receive(:fixtures_directory).and_return File.join(aruba.root_directory, aruba.current_directory, 'spec', 'fixtures')
         end
 

data/spec/aruba/aruba_path_spec.rb

@@ -37,9 +37,10 @@ RSpec.describe Aruba::ArubaPath do
   end
 
   describe '#pop' do
+    before(:each) { path << 'subdir' }
     before(:each) { path.pop }
 
-    it { expect(path.to_s).to eq 'path/to' }
+    it { expect(path.to_s).to eq 'path/to/dir' }
   end
 
   describe '#relative?' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aruba
 version: !ruby/object:Gem::Version
-  version: 0.8.0.pre2
+  version: 0.8.0.pre3
 platform: ruby
 authors:
 - Aslak Hellesøy
@@ -13,20 +13,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.19
 - !ruby/object:Gem::Dependency
@@ -47,16 +47,16 @@ dependencies:
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '2.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: contracts
   requirement: !ruby/object:Gem::Requirement
@@ -178,9 +178,12 @@ files:
 - lib/aruba/aruba_path.rb
 - lib/aruba/basic_configuration.rb
 - lib/aruba/basic_configuration/option.rb
+- lib/aruba/command.rb
 - lib/aruba/config.rb
 - lib/aruba/config/jruby.rb
 - lib/aruba/config_wrapper.rb
+- lib/aruba/contracts/enum.rb
+- lib/aruba/contracts/is_a.rb
 - lib/aruba/contracts/relative_path.rb
 - lib/aruba/creators/aruba_file_creator.rb
 - lib/aruba/creators/aruba_fixed_size_file_creator.rb
@@ -272,14 +275,15 @@ licenses:
 metadata: {}
 post_install_message: |
   With aruba >= 1.0
-    * "ruby 1.8.7"-support is discontinued
-    * aruba requires "cucumber 2" for the feature steps. The rest of aruba should be usable by whatever testing framework you are using
-    * Overwriting methods for configuration is discontinued. You need to use `aruba.config.<variable>` or `Aruba.configure { |config| config.<variable>` instead
-    * "aruba/reporting" will be removed. Please use `@debug`-tag + `byebug`, `debugger`, `pry` to troubleshoot your feature tests
-    * Set environment variables will have only effect on `#run` and the like + `#with_environment { }`
+    * "ruby 1.8.7"-support is discontinued.
+    * aruba requires "cucumber 2" for the feature steps. The rest of aruba should be usable by whatever testing framework you are using.
+    * Overwriting methods for configuration is discontinued. You need to use `aruba.config.<variable>` or `Aruba.configure { |config| config.<variable>` instead.
+    * "aruba/reporting" will be removed. Please use `@debug`-tag + `byebug`, `debugger`, `pry` to troubleshoot your feature tests.
+    * Set environment variables will have only effect on `#run` and the like + `#with_environment { }`.
     * The process environment will be fully resetted between tests. Sharing state via ENV['VAR'] = 'shared state' between tests will not be possible anymore. Please make that obvious by using explicit steps or use the aruba API for that.
     * There will be a major cleanup for command execution. There will be only `run` and `run_simple` left. `run_interactive` is replaced by `run`.
-    * Setting the root directory of aruba via method overwrite or configuration - this should be your project root directory where the test suite is run
+    * Setting the root directory of aruba via method overwrite or configuration - this should be your project root directory where the test suite is run.
+    * The direct use of "InProcess", "DebugProcess" and "SpawnProcess" is not supported anymore. You need to use "Command" instead. But be careful, it has a different API.
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -299,7 +303,7 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: aruba-0.8.0.pre2
+summary: aruba-0.8.0.pre3
 test_files:
 - features/api/cd.feature
 - features/api/command/run.feature