aruba 0.11.2 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 640c6d6d67827e65e671ee40fea3fd3bd8b40138
-  data.tar.gz: a726ab79cf1c258322423cccbcb8ab325a5af0d6
+  metadata.gz: a03bef8bda8e7603e1f838f59617c33ed241a6c5
+  data.tar.gz: 2400a8a46277213356de308fc2be9bff799de045
 SHA512:
-  metadata.gz: 6c061409af3d9b559ba62ad74c7dba3af505dfd87224b246a0ec4d7f11a1d82631e827ae0755eb93bbec0e0c6c12099ff634d3a90938edabf1029f4a0a572ec4
-  data.tar.gz: e05cb84b2085d874698c2aaf34b6d91f94005d421e5d22cefddfd3b65b9ee366d8ffde4f8315f0fa7232db7d89fba51d31923954776a5ef37ccee0d3afcf9163
+  metadata.gz: dee2acfaddc2865642aacb0d4dd464aa8e9656e9485511e16a78568b7305a60a8fb79c0529c86c493dab163e8f12d9549eda3f2638c589201c04630e6ea11462
+  data.tar.gz: 07adf9438e735fd1d9bc85149b95ae4f51795d193676f793f0e516f9dbff80f99d75380e081cde6bd9eea78c821a4d796016b1e54db693b8d7eb5584fad47cf0

data/.travis.yml

@@ -7,27 +7,28 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  - 2.1.7
-  - 2.2.3
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
   - jruby
   - jruby-20mode
   - jruby-21mode
   - rbx
 matrix:
   include:
-    - rvm: jruby-9.0.0.0
+    - rvm: jruby-9.0.1.0
       env: JRUBY_OPTS='--dev'
-    - rvm: jruby-9.0.0.0-20mode
+    - rvm: jruby-9.0.1.0-20mode
       env: JRUBY_OPTS='--dev'
-    - rvm: jruby-9.0.0.0-21mode
+    - rvm: jruby-9.0.1.0-21mode
       env: JRUBY_OPTS='--dev'
   allow_failures:
   - rvm: rbx
-  - rvm: jruby-9.0.0.0
+  - rvm: jruby-9.0.1.0
     env: JRUBY_OPTS='--dev'
-  - rvm: jruby-9.0.0.0-20mode
+  - rvm: jruby-9.0.1.0-20mode
     env: JRUBY_OPTS='--dev'
-  - rvm: jruby-9.0.0.0-21mode
+  - rvm: jruby-9.0.1.0-21mode
     env: JRUBY_OPTS='--dev'
 notifications:
   email:

data/History.md

@@ -1,10 +1,17 @@
 # Latest Release
 
+## [v0.12.0](https://github.com/cucumber/aruba/compare/v0.11.2...v0.12.0)
+
+* Add matcher to check if a command can be found in PATH (PR #336)
+* Fixed issue with environment variables set by external libraries (fix #321,
+  issue #320)
+
+# Old releases
+
 ## [v0.11.2](https://github.com/cucumber/aruba/compare/v0.11.1...v0.11.2)
 
 * Fixed problem with positional arguments in `#run_simple()` (issue #322)
 
-# Old releases
 
 ## [v0.11.1](https://github.com/cucumber/aruba/compare/v0.11.0...v0.11.1)
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2015 Aslak Hellesøy, David Chelimsky, Mike Sassak, Jarl Friis, Matt Wynne, Dennis Günnewig
+Copyright (c) 2010-2016 Aslak Hellesøy, David Chelimsky, Mike Sassak, Jarl Friis, Matt Wynne, Dennis Günnewig
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -219,8 +219,8 @@ A full documentation of the API can be found
 
 ## Contributing
 
-Please see the `CONTRIBUTING.md`.
+Please see the [CONTRIBUTING](CONTRIBUTING.md) file.
 
 ## Copyright
 
-Copyright (c) 2010-2015 Aslak Hellesøy et al. See LICENSE for details.
+Copyright (c) 2010-2016 Aslak Hellesøy et al. See [MIT License](LICENSE) for details.

data/aruba.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'thor', '~> 0.19'
   s.add_runtime_dependency 'event-bus', '~> 0.2'
 
-  s.add_development_dependency 'bundler', '~> 1.10.2'
+  s.add_development_dependency 'bundler', '~> 1.11'
 
   s.rubygems_version = ">= 1.6.1"
 
@@ -35,7 +35,7 @@ Use on ruby 1.8.7
 * Make sure you add something like that to your `Gemfile`. Otherwise you will
   get cucumber > 2 and this will fail on ruby 1.8.7
 
-  gem 'cucumber', ~> '1.3.20'
+  gem 'cucumber', '~> 1.3.20'
 
 With aruba >= 1.0 there will be breaking changes. Make sure to read https://github.com/cucumber/aruba/blob/master/History.md for 1.0.0
 EOS

data/features/api/environment/{remove_environment_variable.feature → delete_environment_variable.feature}

@@ -1,4 +1,4 @@
-Feature: Remove existing environment variable via API-method
+Feature: Delete existing environment variable via API-method
 
   It is quite handy to modify the environment of a process. To make this
   possible, `aruba` provides several methods. One of these is

data/features/api/environment/set_environment_variable.feature

@@ -69,6 +69,46 @@ Feature: Set environment variable via API-method
     When I run `rspec`
     Then the specs should all pass
 
+  Scenario: Set variable via ENV
+
+    Given a file named "spec/environment_spec.rb" with:
+    """ruby
+    require 'spec_helper'
+
+    RSpec.describe 'Environment command', :type => :aruba do
+      before(:each) { ENV['REALLY_LONG_LONG_VARIABLE'] = '2' }
+
+      before(:each) { run('env') }
+      before(:each) { stop_all_commands }
+
+      it { expect(last_command_started.output).to include 'REALLY_LONG_LONG_VARIABLE=2' }
+    end
+    """
+    When I run `rspec`
+    Then the specs should all pass
+
+  Scenario: Existing variable set in before block in RSpec
+
+    Setting environment variables with `#set_environment_variable('VAR', 'value')` takes
+    precedence before setting variables with `ENV['VAR'] = 'value'`.
+
+    Given a file named "spec/environment_spec.rb" with:
+    """ruby
+    require 'spec_helper'
+
+    RSpec.describe 'Environment command', :type => :aruba do
+      before(:each) { set_environment_variable 'REALLY_LONG_LONG_VARIABLE', '1' }
+      before(:each) { ENV['REALLY_LONG_LONG_VARIABLE'] = '2' }
+
+      before(:each) { run('env') }
+      before(:each) { stop_all_commands }
+
+      it { expect(last_command_started.output).to include 'REALLY_LONG_LONG_VARIABLE=1' }
+    end
+    """
+    When I run `rspec`
+    Then the specs should all pass
+
   Scenario: Run some ruby code in code with previously set environment
 
     The `#with_environment`-block makes the change environment temporary
@@ -304,3 +344,33 @@ Feature: Set environment variable via API-method
     """
     When I run `rspec`
     Then the specs should all pass
+
+  Scenario: External ruby file / ruby gem modifying ENV
+
+    There are some Rubygems around which need to modify ENV['NODE_PATH'] like
+    [`ruby-stylus`](https://github.com/forgecrafted/ruby-stylus/blob/e7293362dc8cbf550f7c317d721ba6b9087e8833/lib/stylus.rb#L168).
+    This is supported by aruba as well.
+
+    Given a file named "spec/environment_spec.rb" with:
+    """ruby
+    require 'spec_helper'
+
+    $LOAD_PATH <<  File.expand_path('../../lib', __FILE__)
+
+    RSpec.describe 'Environment command', :type => :aruba do
+      before(:each) do
+        require 'my_library'
+      end
+
+      before(:each) { run('env') }
+      before(:each) { stop_all_commands }
+
+      it { expect(last_command_started.output).to include 'LONG_LONG_VARIABLE=1' }
+    end
+    """
+    And a file named "lib/my_library.rb" with:
+    """
+    ENV['LONG_LONG_VARIABLE'] = '1'
+    """
+    When I run `rspec`
+    Then the specs should all pass

data/features/configuration/command_runtime_environment.feature

@@ -0,0 +1,129 @@
+Feature: Define default process environment
+  Say you want to have a default set of environment variables, then use this
+  code.
+
+  ~~~ruby
+  Aruba.configure do |config|
+    config.command_runtime_environment = { 'MY_VARIABLE' => 'x' }
+  end
+  ~~~
+
+  This can be changed via `#set_environment_variable`,
+  `#append_environment_variable`, `#delete_environment_variable` or
+  `#prepend_environment_variable`.
+
+  Background:
+    Given I use the fixture "cli-app"
+
+  Scenario: Overwrite existing variable with new default value
+    Given a file named "spec/environment_spec.rb" with:
+    """ruby
+    require 'spec_helper'
+
+    ENV['LONG_LONG_VARIABLE'] = 'y'
+
+    Aruba.configure do |config|
+      config.command_runtime_environment = { 'LONG_LONG_VARIABLE' => 'x' } 
+    end
+
+    RSpec.describe 'Environment command', :type => :aruba do
+      before(:each) { run('env') }
+      before(:each) { stop_all_commands }
+
+      it { expect(last_command_started.output).to include 'LONG_LONG_VARIABLE=x' }
+    end
+    """
+    When I run `rspec`
+    Then the specs should all pass
+
+  Scenario: Overwrite default value for variable
+    Given a file named "spec/environment_spec.rb" with:
+    """ruby
+    require 'spec_helper'
+
+    ENV['LONG_LONG_VARIABLE'] = 'y'
+
+    Aruba.configure do |config|
+      config.command_runtime_environment = { 'LONG_LONG_VARIABLE' => 'x' } 
+    end
+
+    RSpec.describe 'Environment command', :type => :aruba do
+      before(:each) { set_environment_variable 'LONG_LONG_VARIABLE', 'z' }
+
+      before(:each) { run('env') }
+      before(:each) { stop_all_commands }
+
+      it { expect(last_command_started.output).to include 'LONG_LONG_VARIABLE=z' }
+    end
+    """
+    When I run `rspec`
+    Then the specs should all pass
+
+  Scenario: Append value to default value
+    Given a file named "spec/environment_spec.rb" with:
+    """ruby
+    require 'spec_helper'
+
+    ENV['LONG_LONG_VARIABLE'] = 'y'
+
+    Aruba.configure do |config|
+      config.command_runtime_environment = { 'LONG_LONG_VARIABLE' => 'x' } 
+    end
+
+    RSpec.describe 'Environment command', :type => :aruba do
+      before(:each) { append_environment_variable 'LONG_LONG_VARIABLE', 'z' }
+
+      before(:each) { run('env') }
+      before(:each) { stop_all_commands }
+
+      it { expect(last_command_started.output).to include 'LONG_LONG_VARIABLE=xz' }
+    end
+    """
+    When I run `rspec`
+    Then the specs should all pass
+
+  Scenario: Prepend value
+    Given a file named "spec/environment_spec.rb" with:
+    """ruby
+    require 'spec_helper'
+
+    ENV['LONG_LONG_VARIABLE'] = 'y'
+
+    Aruba.configure do |config|
+      config.command_runtime_environment = { 'LONG_LONG_VARIABLE' => 'x' } 
+    end
+
+    RSpec.describe 'Environment command', :type => :aruba do
+      before(:each) { prepend_environment_variable 'LONG_LONG_VARIABLE', 'z' }
+
+      before(:each) { run('env') }
+      before(:each) { stop_all_commands }
+
+      it { expect(last_command_started.output).to include 'LONG_LONG_VARIABLE=zx' }
+    end
+    """
+    When I run `rspec`
+    Then the specs should all pass
+
+  Scenario: Remove variable from default set of variables
+    Given a file named "spec/environment_spec.rb" with:
+    """ruby
+    require 'spec_helper'
+
+    ENV['LONG_LONG_VARIABLE'] = 'y'
+
+    Aruba.configure do |config|
+      config.command_runtime_environment = { 'LONG_LONG_VARIABLE' => 'x' } 
+    end
+
+    RSpec.describe 'Environment command', :type => :aruba do
+      before(:each) { delete_environment_variable 'LONG_LONG_VARIABLE' }
+
+      before(:each) { run('env') }
+      before(:each) { stop_all_commands }
+
+      it { expect(last_command_started.output).not_to include 'LONG_LONG_VARIABLE' }
+    end
+    """
+    When I run `rspec`
+    Then the specs should all pass

data/features/matchers/file/be_a_command_found_in_path.feature

@@ -0,0 +1,115 @@
+Feature: Check if command can be found in PATH
+
+  If you need to check if a given command can be found in path, you can use the
+  `be_an_existing_executable`-matcher.
+
+  ```ruby
+  require 'spec_helper'
+
+  RSpec.describe 'Check if command can be found in PATH', :type => :aruba do
+    let(:file) { 'file.sh' }
+    before(:each) { touch(file) }
+    before(:each) { chmod(0755, file) }
+    before(:each) { prepend_environment_variable('PATH', format('%s:', expand_path('.')) }
+
+    it { expect(file).to be_an_existing_executable }
+  end
+  ```
+
+  Background:
+    Given I use a fixture named "cli-app"
+
+  Scenario: Expect single existing executable file
+    Given a file named "spec/existing_executable_spec.rb" with:
+    """
+    require 'spec_helper'
+
+    RSpec.describe 'Check if command can be found in PATH', :type => :aruba do
+      let(:file) { 'file.sh' }
+
+      before(:each) { touch(file) }
+      before(:each) { chmod(0755, file) }
+      before(:each) { prepend_environment_variable('PATH', format('%s:', expand_path('.'))) }
+
+      it { expect(file).to be_a_command_found_in_path }
+    end
+    """
+    When I run `rspec`
+    Then the specs should all pass
+
+  Scenario: Expect single non-existing executable file
+    Given a file named "spec/existing_executable_spec.rb" with:
+    """
+    require 'spec_helper'
+
+    RSpec.describe 'Check if command can be found in PATH', :type => :aruba do
+      let(:file) { 'file.sh' }
+
+      before(:each) { prepend_environment_variable('PATH', format('%s:', expand_path('.'))) }
+
+      it { expect(file).not_to be_a_command_found_in_path }
+    end
+    """
+    When I run `rspec`
+    Then the specs should all pass
+
+  Scenario: Expect single non-executable file
+    Given a file named "spec/existing_executable_spec.rb" with:
+    """
+    require 'spec_helper'
+
+    RSpec.describe 'Check if command can be found in PATH', :type => :aruba do
+      let(:file) { 'file.sh' }
+
+      before(:each) { touch(file) }
+      before(:each) { prepend_environment_variable('PATH', format('%s:', expand_path('.'))) }
+
+      it { expect(file).not_to be_a_command_found_in_path }
+    end
+    """
+    When I run `rspec`
+    Then the specs should all pass
+
+  Scenario: Expect multiple existing executable files
+    Given a file named "spec/existing_executable_spec.rb" with:
+    """
+    require 'spec_helper'
+
+    RSpec.describe 'Check if file exists and is an executable file', :type => :aruba do
+      let(:files) { %w(file1.sh file2.sh) }
+
+      before :each do
+        files.each do |f|
+          touch(f)
+          chmod(0755, f)
+        end
+      end
+
+      before(:each) { prepend_environment_variable('PATH', format('%s:', expand_path('.'))) }
+
+      it { expect(files).to all be_a_command_found_in_path }
+    end
+    """
+    When I run `rspec`
+    Then the specs should all pass
+
+  Scenario: Expect a least one existing executable file
+    Given a file named "spec/existing_executable_spec.rb" with:
+    """
+    require 'spec_helper'
+
+    RSpec.describe 'Check if file exists and is an executable file', :type => :aruba do
+      let(:files) { %w(file1.sh file2.sh) }
+
+      before :each do
+        touch(files.first)
+        chmod(0755, files.first)
+      end
+
+      before(:each) { prepend_environment_variable('PATH', format('%s:', expand_path('.'))) }
+
+      it { expect(files).to include a_command_found_in_path }
+    end
+    """
+    When I run `rspec`
+    Then the specs should all pass

data/features/matchers/file/be_existing_executable.feature

@@ -9,6 +9,7 @@ Feature: Check if path exists and is an executable file
   RSpec.describe 'Check if file exists and is an executable file', :type => :aruba do
     let(:file) { 'file.txt' }
     before(:each) { touch(file) }
+    before(:each) { chmod(0755, file) }
 
     it { expect(file).to be_an_existing_executable }
   end

data/lib/aruba/api/command.rb

@@ -164,7 +164,7 @@ module Aruba
         @commands ||= []
         @commands << cmd
 
-        environment       = aruba.environment.to_h
+        environment       = aruba.environment
         working_directory = expand_path('.')
         event_bus         = aruba.event_bus
 
@@ -202,7 +202,7 @@ module Aruba
           :exit_timeout      => exit_timeout,
           :io_wait_timeout   => io_wait_timeout,
           :working_directory => working_directory,
-          :environment       => environment,
+          :environment       => environment.to_hash,
           :main_class        => main_class,
           :stop_signal       => stop_signal,
           :startup_wait_time => startup_wait_time,
@@ -217,6 +217,7 @@ module Aruba
         end
 
         aruba.config.before(:command, self, command)
+
         command.start
 
         aruba.announcer.announce(:stop_signal, command.pid, stop_signal) if stop_signal

data/lib/aruba/api/core.rb

@@ -179,8 +179,10 @@ module Aruba
       def with_environment(env = {}, &block)
         old_aruba_env = aruba.environment.to_h
 
+        # make sure the old environment is really restored in "ENV"
         Aruba.platform.with_environment aruba.environment.update(env).to_h, &block
       ensure
+        # make sure the old environment is really restored in "aruba.environment"
         aruba.environment.clear
         aruba.environment.update old_aruba_env
       end

data/lib/aruba/config.rb

@@ -36,7 +36,7 @@ module Aruba
     option_accessor :io_wait_timeout, :contract => { Num => Num }, :default => 0.1
     option_accessor :startup_wait_time, :contract => { Num => Num }, :default => 0
     option_accessor :fixtures_directories, :contract => { Array => ArrayOf[String] }, :default => %w(features/fixtures spec/fixtures test/fixtures fixtures)
-    option_accessor :command_runtime_environment, :contract => { Hash => Hash }, :default => ENV.to_hash.dup
+    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

data/lib/aruba/cucumber/hooks.rb

@@ -10,9 +10,6 @@ if Aruba::VERSION >= '1.0.0'
 end
 
 Before do
-  # this is ENV by default ...
-  aruba.environment.update aruba.config.command_runtime_environment
-
   # ... so every change needs to be done later
   prepend_environment_variable 'PATH', aruba.config.command_search_paths.join(':') + ':'
   set_environment_variable 'HOME', aruba.config.home_directory

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

@@ -0,0 +1,36 @@
+require 'rspec/expectations/version'
+
+# @!method be_a_command_found_in_path
+#   This matchers checks if <command> can be found in path
+#
+#   @return [TrueClass, FalseClass] The result
+#
+#     false:
+#     * if command was not found in PATH
+#     true:
+#     * if command can be found in PATH
+#
+#   @example Use matcher
+#
+#     RSpec.describe do
+#       it { expect(cmd).to be_a_command_found_in_path }
+#     end
+RSpec::Matchers.define :be_a_command_found_in_path do
+  match do |actual|
+    @actual = Shellwords.split(actual.commandline).first if actual.respond_to? :commandline
+
+    !which(@actual).nil?
+  end
+
+  failure_message do |actual|
+    format(%(expected that command "%s" can be found in PATH "#{ENV['PATH']}".), actual)
+  end
+
+  failure_message_when_negated do |actual|
+    format(%(expected that command "%s" cannot be found in PATH "#{ENV['PATH']}".), actual)
+  end
+end
+
+if RSpec::Expectations::Version::STRING >= '3.0'
+  RSpec::Matchers.alias_matcher :a_command_found_in_path, :be_a_command_found_in_path
+end

data/lib/aruba/platforms/unix_environment_variables.rb

@@ -4,17 +4,69 @@ module Aruba
   module Platforms
     # Abstract environment variables
     class UnixEnvironmentVariables
+      # Update environment
+      class UpdateAction
+        attr_reader :other_env, :block
+
+        def initialize(other_env, &block)
+          @other_env = other_env
+
+          if RUBY_VERSION <= '1.9.3'
+            # rubocop:disable Style/EachWithObject
+            @other_env = @other_env.to_hash.inject({}) { |a, (k, v)| a[k] = v.to_s; a }
+            # rubocop:enable Style/EachWithObject
+          else
+            @other_env = @other_env.to_h.each_with_object({}) { |(k, v), a| a[k] = v.to_s }
+          end
+
+          if block_given?
+            @block     = block
+          else
+            @block     = nil
+          end
+        end
+
+        def call(env)
+          if block
+            env.update(other_env, &block)
+          else
+            env.update(other_env)
+          end
+        end
+      end
+
+      # Remove variables from environment
+      class RemoveAction
+        attr_reader :variables
+
+        def initialize(variables)
+          @variables = Array(variables)
+        end
+
+        def call(env)
+          variables.each { |v| env.delete v }
+
+          env
+        end
+      end
+
       # We need to use this, because `nil` is a valid value as default
       UNDEFINED = Object.new.freeze
 
       private
 
-      attr_reader :env
+      attr_reader :actions, :env
 
       public
 
-      def initialize(env = ENV.to_hash)
-        @env = Marshal.load(Marshal.dump(env))
+      def initialize(env = ENV)
+        @actions = []
+
+        if RUBY_VERSION < '2.0'
+          @env = env.to_hash
+        else
+          @env = env.to_h
+        end
       end
 
       # Update environment with other en
@@ -24,18 +76,10 @@ module Aruba
       #
       # @yield
       #   Pass block to env
-      def update(other_env, &block)
-        if RUBY_VERSION <= '1.9.3'
-          # rubocop:disable Style/EachWithObject
-          other_env = other_env.to_hash.inject({}) { |a, (k, v)| a[k] = v.to_s; a }
-          # rubocop:enable Style/EachWithObject
-        else
-          other_env = other_env.to_h.each_with_object({}) { |(k, v), a| a[k] = v.to_s }
-        end
+      def update(other_env)
+        actions << UpdateAction.new(other_env)
 
-        env.update(other_env, &block)
-
-        self
+        UnixEnvironmentVariables.new(to_h)
       end
 
       # Fetch variable from environment
@@ -47,9 +91,9 @@ module Aruba
       #   The default value used, if the variable is not defined
       def fetch(name, default = UNDEFINED)
         if default == UNDEFINED
-          env.fetch name.to_s
+          to_h.fetch name.to_s
         else
-          env.fetch name.to_s, default
+          to_h.fetch name.to_s, default
         end
       end
 
@@ -58,7 +102,7 @@ module Aruba
       # @param [#to_s] name
       #   The name of the variable
       def key?(name)
-        env.key? name.to_s
+        to_h.key? name.to_s
       end
 
       # Get value of variable
@@ -66,7 +110,7 @@ module Aruba
       # @param [#to_s] name
       #   The name of the variable
       def [](name)
-        env[name.to_s]
+        to_h[name.to_s]
       end
 
       # Set value of variable
@@ -77,9 +121,11 @@ module Aruba
       # @param [#to_s] value
       #   The value of the variable
       def []=(name, value)
-        env[name.to_s] = value.to_s
+        value = value.to_s
+
+        actions << UpdateAction.new(name.to_s => value)
 
-        self
+        value
       end
 
       # Append value to variable
@@ -90,10 +136,12 @@ module Aruba
       # @param [#to_s] value
       #   The value of the variable
       def append(name, value)
-        name = name.to_s
-        env[name] = env[name].to_s + value.to_s
+        name  = name.to_s
+        value = self[name].to_s + value.to_s
+
+        actions << UpdateAction.new(name => value )
 
-        self
+        value
       end
 
       # Prepend value to variable
@@ -104,10 +152,12 @@ module Aruba
       # @param [#to_s] value
       #   The value of the variable
       def prepend(name, value)
-        name = name.to_s
-        env[name] = value.to_s + env[name].to_s
+        name  = name.to_s
+        value = value.to_s + self[name].to_s
 
-        self
+        actions << UpdateAction.new(name => value)
+
+        value
       end
 
       # Delete variable
@@ -115,9 +165,24 @@ module Aruba
       # @param [#to_s] name
       #   The name of the variable
       def delete(name)
-        env.delete name.to_s
+        # Rescue value, before it is deleted
+        value = to_h[name.to_s]
+
+        actions << RemoveAction.new(name.to_s)
+
+        value
+      end
+
+      # Pass on checks
+      def method_missing(name, *args, &block)
+        super unless to_h.respond_to? name
+
+        to_h.send name, *args, &block
+      end
 
-        self
+      # Check for respond_to
+      def respond_to_missing?(name, _private)
+        to_h.respond_to? name
       end
 
       # Convert to hash
@@ -126,17 +191,31 @@ module Aruba
       #   A new hash from environment
       def to_h
         if RUBY_VERSION < '2.0'
-          Marshal.load(Marshal.dump(env.to_hash))
+          Marshal.load(Marshal.dump(prepared_environment.to_hash))
         else
-          Marshal.load(Marshal.dump(env.to_h))
+          Marshal.load(Marshal.dump(prepared_environment.to_h))
         end
       end
 
       # Reset environment
       def clear
-        env.clear
+        value = to_h
 
-        self
+        actions.clear
+
+        value
+      end
+
+      private
+
+      def prepared_environment
+        if RUBY_VERSION <= '1.9.3'
+          # rubocop:disable Style/EachWithObject
+          actions.inject(ENV.to_hash.merge(env)) { |a, e| e.call(a) }
+          # rubocop:enable Style/EachWithObject
+        else
+          actions.each_with_object(ENV.to_hash.merge(env)) { |e, a| a = e.call(a) }
+        end
       end
     end
   end

data/lib/aruba/platforms/unix_platform.rb

@@ -34,7 +34,7 @@ module Aruba
       end
 
       def environment_variables
-        UnixEnvironmentVariables.new
+        UnixEnvironmentVariables
       end
 
       def command_string

data/lib/aruba/platforms/windows_environment_variables.rb

@@ -34,14 +34,14 @@ module Aruba
     # will always work.
     class WindowsEnvironmentVariables < UnixEnvironmentVariables
       def initialize(env = ENV.to_hash)
-        @env = Marshal.load(Marshal.dump(env))
+        @actions = []
 
         if RUBY_VERSION <= '1.9.3'
           # rubocop:disable Style/EachWithObject
-          @env = @env.inject({}) { |a, (k,v)| a[k.to_s.upcase] = v; a }
+          @env = env.inject({}) { |a, (k,v)| a[k.to_s.upcase] = v; a }
           # rubocop:enable Style/EachWithObject
         else
-          @env = @env.each_with_object({}) { |(k,v), a| a[k.to_s.upcase] = v }
+          @env = env.each_with_object({}) { |(k,v), a| a[k.to_s.upcase] = v }
         end
       end
 

data/lib/aruba/platforms/windows_platform.rb

@@ -30,7 +30,7 @@ module Aruba
 
       # @see UnixPlatform#environment_variables
       def environment_variables
-        WindowsEnvironmentVariables.new
+        WindowsEnvironmentVariables
       end
 
       # @see UnixPlatform#which

data/lib/aruba/rspec.rb

@@ -91,14 +91,13 @@ RSpec.configure do |config|
   config.before :each do
     next unless self.class.include? Aruba::Api
 
-    aruba.environment.update aruba.config.command_runtime_environment
-    aruba.environment.prepend 'PATH', aruba.config.command_search_paths.join(':') + ':'
+    prepend_environment_variable 'PATH', aruba.config.command_search_paths.join(':') + ':'
   end
 
   # Use configured home directory as HOME
   config.before :each do |example|
     next unless self.class.include? Aruba::Api
 
-    aruba.environment['HOME'] =  aruba.config.home_directory
+    set_environment_variable 'HOME', aruba.config.home_directory
   end
 end

data/lib/aruba/runtime.rb

@@ -40,14 +40,15 @@ module Aruba
     attr_accessor :config, :environment, :logger, :command_monitor, :announcer, :event_bus
 
     def initialize(opts = {})
-      @environment     = opts.fetch(:environment, Aruba.platform.environment_variables)
-      @event_bus     = ::Event::Bus.new(::Event::NameResolver.new(Aruba::Events))
+      @event_bus       = ::Event::Bus.new(::Event::NameResolver.new(Aruba::Events))
       @announcer       = opts.fetch(:announcer, Aruba.platform.announcer.new)
-
-      @config            = opts.fetch(:config, ConfigWrapper.new(Aruba.config.make_copy, @event_bus))
+      @config          = opts.fetch(:config, ConfigWrapper.new(Aruba.config.make_copy, @event_bus))
+      @environment     = opts.fetch(:environment, Aruba.platform.environment_variables.new)
       @current_directory = ArubaPath.new(@config.working_directory)
       @root_directory    = ArubaPath.new(@config.root_directory)
 
+      @environment.update(@config.command_runtime_environment)
+
       if Aruba::VERSION < '1'
         @command_monitor = opts.fetch(:command_monitor, Aruba.platform.command_monitor.new(:announcer => @announcer))
       else

data/lib/aruba/version.rb

@@ -1,3 +1,3 @@
 module Aruba
-  VERSION = '0.11.2'
+  VERSION = '0.12.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aruba
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0
 platform: ruby
 authors:
 - Aslak Hellesøy
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2016-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -119,14 +119,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.2
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.2
+        version: '1.11'
 description: Extension for popular TDD and BDD frameworks like "Cucumber", "RSpec"
   and "Minitest" to make testing commandline applications meaningful, easy and fun.
 email: cukes@googlegroups.com
@@ -168,8 +168,8 @@ files:
 - features/api/command/which.feature
 - features/api/core/expand_path.feature
 - features/api/environment/append_environment_variable.feature
+- features/api/environment/delete_environment_variable.feature
 - features/api/environment/prepend_environment_variable.feature
-- features/api/environment/remove_environment_variable.feature
 - features/api/environment/set_environment_variable.feature
 - features/api/filesystem/cd.feature
 - features/api/filesystem/create_directory.feature
@@ -187,6 +187,7 @@ files:
 - features/api/text/unescape_text.feature
 - features/cli/console.feature
 - features/cli/init.feature
+- features/configuration/command_runtime_environment.feature
 - features/configuration/console_history_file.feature
 - features/configuration/exit_timeout.feature
 - features/configuration/fixtures_directories.feature
@@ -212,6 +213,7 @@ files:
 - features/hooks/before/command.feature
 - features/matchers/collection/include_an_object.feature
 - features/matchers/directory/have_sub_directory.feature
+- features/matchers/file/be_a_command_found_in_path.feature
 - features/matchers/file/be_existing_executable.feature
 - features/matchers/file/be_existing_file.feature
 - features/matchers/file/have_file_content.feature
@@ -345,6 +347,7 @@ files:
 - lib/aruba/matchers/directory/have_sub_directory.rb
 - lib/aruba/matchers/environment.rb
 - lib/aruba/matchers/file.rb
+- lib/aruba/matchers/file/be_a_command_found_in_path.rb
 - lib/aruba/matchers/file/be_an_existing_executable.rb
 - lib/aruba/matchers/file/be_an_existing_file.rb
 - lib/aruba/matchers/file/have_file_content.rb
@@ -450,7 +453,7 @@ post_install_message: |
   * Make sure you add something like that to your `Gemfile`. Otherwise you will
     get cucumber > 2 and this will fail on ruby 1.8.7
 
-    gem 'cucumber', ~> '1.3.20'
+    gem 'cucumber', '~> 1.3.20'
 
   With aruba >= 1.0 there will be breaking changes. Make sure to read https://github.com/cucumber/aruba/blob/master/History.md for 1.0.0
 rdoc_options:
@@ -469,10 +472,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: aruba-0.11.2
+summary: aruba-0.12.0
 test_files:
 - features/api/command/find_command.feature
 - features/api/command/last_command_started.feature
@@ -486,8 +489,8 @@ test_files:
 - features/api/command/which.feature
 - features/api/core/expand_path.feature
 - features/api/environment/append_environment_variable.feature
+- features/api/environment/delete_environment_variable.feature
 - features/api/environment/prepend_environment_variable.feature
-- features/api/environment/remove_environment_variable.feature
 - features/api/environment/set_environment_variable.feature
 - features/api/filesystem/cd.feature
 - features/api/filesystem/create_directory.feature
@@ -505,6 +508,7 @@ test_files:
 - features/api/text/unescape_text.feature
 - features/cli/console.feature
 - features/cli/init.feature
+- features/configuration/command_runtime_environment.feature
 - features/configuration/console_history_file.feature
 - features/configuration/exit_timeout.feature
 - features/configuration/fixtures_directories.feature
@@ -530,6 +534,7 @@ test_files:
 - features/hooks/before/command.feature
 - features/matchers/collection/include_an_object.feature
 - features/matchers/directory/have_sub_directory.feature
+- features/matchers/file/be_a_command_found_in_path.feature
 - features/matchers/file/be_existing_executable.feature
 - features/matchers/file/be_existing_file.feature
 - features/matchers/file/have_file_content.feature