aruba 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c728c7b302f5e46b803fabe9a95ab2769c768b65
-  data.tar.gz: 2a613d641ff60f99b06774b89bd23513a6aa01e1
+  metadata.gz: e5ec77c0f2b08ab348a156340b1ef9c8f663b4ee
+  data.tar.gz: 5675b79f8e3cf85ba2a27ea371088dba3e781802
 SHA512:
-  metadata.gz: 8ed3b4ac93ed91676ec48e17eb70fae1ab9d456213810880e2cf50c1f84e3df75e5585c708647c6d6da00604c424e54ea907c2cd225779cac6a67cb766d21108
-  data.tar.gz: c3e739cc6c22e3b42bbd19d04b86b40c4c4f7c370b0bfd6fcaf0fae267654dd73b8f5c7e6f244d1ef2e59e16121fd3bcb31a799d47b0a2b9d50b010fb224109e
+  metadata.gz: 4bff6ec753cafe72067bc25c1f00680825e17c830905ff6c3783f4bb927f44ab20f34d7d8be73601329cc6ea019bd82c215f648307a755582bc635830abbe46e
+  data.tar.gz: 4021df9a869200d6d123ee2249706a42fe2459f516f69695502b49630ec7bb79dae9991a92b315a179b1cfaf9cb74b07a4b54d597f25c537b13855f2b66842f0

data/.rubocop.yml

@@ -128,7 +128,7 @@ Style/SingleLineBlockParams:
   Enabled: false
 
 # Cop supports --auto-correct.
-Style/SingleSpaceBeforeFirstArg:
+Style/SpaceBeforeFirstArg:
   Enabled: false
 
 # Cop supports --auto-correct.
@@ -136,7 +136,7 @@ Style/SpaceAfterComma:
   Enabled: false
 
 # Cop supports --auto-correct.
-Style/SpaceAfterControlKeyword:
+Style/SpaceAroundKeyword:
   Enabled: false
 
 # Cop supports --auto-correct.
@@ -180,3 +180,9 @@ Style/RaiseArgs:
 
 Metrics/ParameterLists:
   Enabled: false
+
+Style/IfInsideElse:
+  Enabled: false
+
+Style/IdenticalConditionalBranches:
+  Enabled: false

data/Gemfile

@@ -55,7 +55,7 @@ group :development, :test do
 
   if RUBY_VERSION >= '1.9.3'
     # Make aruba compliant to ruby community guide
-    gem 'rubocop', '~> 0.32.0'
+    gem 'rubocop', '~> 0.32'
   end
 
   if RUBY_VERSION >= '1.9.3'

data/History.md

@@ -54,6 +54,12 @@
 
 # RELEASED
 
+## [v0.14.0](https://github.com/cucumber/aruba/compare/v0.13.0...v0.14.0)
+
+* Add `<project_root>/exe` to search path for commands: This is the new default if you setup a
+  project with bundler.
+* Add some more steps to modify environment
+
 ## [v0.13.0](https://github.com/cucumber/aruba/compare/v0.12.0...v0.13.0)
 
 * Add two new hooks for rspec and cucumber to make troubleshooting feature

data/README.md

@@ -184,7 +184,7 @@ prefer to setup `aruba` yourself, please move on to the next section.
 
 ### User Documentation
 
-If you're interested in our steps and API, please browser our [feature
+If you're interested in our steps and API, please browse our [feature
 files](https://github.com/cucumber/aruba/tree/master/features). You can find a
 lot of examples there. A good starting point are [Getting
 Started](https://github.com/cucumber/aruba/tree/master/features/getting_started)

data/Rakefile

@@ -36,17 +36,11 @@ namespace :travis do
   end
 end
 
-if RUBY_VERSION < '1.9.3'
+task :rubocop do
   begin
-    require 'rubocop/rake_task'
-    RuboCop::RakeTask.new
-  rescue LoadError
-    desc 'Stub task to make rake happy'
-    task(:rubocop) {}
+    sh 'rubocop --fail-level E'
+  rescue
   end
-else
-  require 'rubocop/rake_task'
-  RuboCop::RakeTask.new
 end
 
 desc "Run tests, both RSpec and Cucumber"

data/TODO.md

@@ -6,3 +6,8 @@
 * Add variation of check and stop of command if output contains
     Add something like `(?: of last command)?`. If this is true, just check the last command.
 * Use aruba.config.exit_timeout everywhere
+* Fix problem with long running commands in background:
+
+  Since we need to stop all commands to access the status of the last command
+  stopped, we have problems with long running commands
+

data/features/steps/command/run.feature

@@ -48,3 +48,19 @@ Feature: Run commands
 
     STDOUT
     """
+
+  Scenario: Run command found in "bin"-directory which is found in the current directory
+    Given a file named "features/run.feature" with:
+    """
+    Feature: Run it
+      Scenario: Run command
+        Given an executable named "bin/local_cli" with:
+        \"\"\"
+        #!/bin/bash
+        exit 0
+        \"\"\"
+        And I look for executables in "bin" within the current directory
+        When I successfully run `local_cli`
+    """
+    When I run `cucumber`
+    Then the features should all pass

data/features/steps/environment/append_environment_variable.feature

@@ -0,0 +1,52 @@
+Feature: Append environment variable via "cucumber"-step
+
+  It is quite handy to modify the environment of a process. To make this
+  possible, `aruba` provides several steps. One of these is
+  `I append the values to environment variables:`-step. Using this step appends
+  the values. Each variable name and each value is converted to a string.
+  Otherwise `ruby` would complain about an invalid argument.
+
+  Background:
+    Given I use the fixture "cli-app"
+    And an executable named "bin/cli" with:
+    """
+    #!/bin/bash
+
+    echo $LONG_LONG_VARIABLE
+    """
+    And a file named "features/support/variables.rb" with:
+    """
+    ENV['LONG_LONG_VARIABLE'] = '1'
+    """
+
+  Scenario: Append environment variable by using a step given in table
+    Given a file named "features/home_variable.feature" with:
+    """
+    Feature: Environment Variable
+      Scenario: Run command
+        Given I append the values to the environment variables:
+          | variable           | value      |
+          | LONG_LONG_VARIABLE | long_value |
+        When I run `cli`
+        Then the output should contain:
+        \"\"\"
+        1long_value
+        \"\"\"
+    """
+    When I run `cucumber`
+    Then the features should all pass
+
+  Scenario: Append single environment variable by using a step
+    Given a file named "features/home_variable.feature" with:
+    """
+    Feature: Environment Variable
+      Scenario: Run command
+        Given I append "long_value" to the environment variable "LONG_LONG_VARIABLE"
+        When I run `cli`
+        Then the output should contain:
+        \"\"\"
+        1long_value
+        \"\"\"
+    """
+    When I run `cucumber`
+    Then the features should all pass

data/features/steps/environment/prepend_environment_variable.feature

@@ -0,0 +1,52 @@
+Feature: Prepend environment variable via "cucumber"-step
+
+  It is quite handy to modify the environment of a process. To make this
+  possible, `aruba` provides several steps. One of these is
+  `I prepend the values to environment variables:`-step. Using this step prepends
+  the values. Each variable name and each value is converted to a string.
+  Otherwise `ruby` would complain about an invalid argument.
+
+  Background:
+    Given I use the fixture "cli-app"
+    And an executable named "bin/cli" with:
+    """
+    #!/bin/bash
+
+    echo $LONG_LONG_VARIABLE
+    """
+    And a file named "features/support/variables.rb" with:
+    """
+    ENV['LONG_LONG_VARIABLE'] = '1'
+    """
+
+  Scenario: Prepend environment variable by using a step given in table
+    Given a file named "features/home_variable.feature" with:
+    """
+    Feature: Environment Variable
+      Scenario: Run command
+        Given I prepend the values to the environment variables:
+          | variable           | value      |
+          | LONG_LONG_VARIABLE | long_value |
+        When I run `cli`
+        Then the output should contain:
+        \"\"\"
+        long_value1
+        \"\"\"
+    """
+    When I run `cucumber`
+    Then the features should all pass
+
+  Scenario: Prepend single environment variable by using a step
+    Given a file named "features/home_variable.feature" with:
+    """
+    Feature: Environment Variable
+      Scenario: Run command
+        Given I prepend "long_value" to the environment variable "LONG_LONG_VARIABLE"
+        When I run `cli`
+        Then the output should contain:
+        \"\"\"
+        long_value1
+        \"\"\"
+    """
+    When I run `cucumber`
+    Then the features should all pass

data/features/steps/environment/set_environment_variable.feature

@@ -9,15 +9,15 @@ Feature: Set environment variable via "cucumber"-step
 
   Background:
     Given I use the fixture "cli-app"
-
-  Scenario: Set environment variable by using a step
-    Given an executable named "bin/cli" with:
+    And an executable named "bin/cli" with:
     """
     #!/bin/bash
 
     echo $LONG_LONG_VARIABLE
     """
-    And a file named "features/home_variable.feature" with:
+
+  Scenario: Set environment variable by using a step given in table
+    Given a file named "features/home_variable.feature" with:
     """
     Feature: Environment Variable
       Scenario: Run command
@@ -32,3 +32,18 @@ Feature: Set environment variable via "cucumber"-step
     """
     When I run `cucumber`
     Then the features should all pass
+
+  Scenario: Set single environment variable by using a step
+    Given a file named "features/home_variable.feature" with:
+    """
+    Feature: Environment Variable
+      Scenario: Run command
+        Given I set the environment variable "LONG_LONG_VARIABLE" to "long_value"
+        When I run `cli`
+        Then the output should contain:
+        \"\"\"
+        long_value
+        \"\"\"
+    """
+    When I run `cucumber`
+    Then the features should all pass

data/features/support/env.rb

@@ -25,9 +25,9 @@ Before do |scenario|
   simplecov_setup_pathname = Pathname.new(__FILE__).expand_path.parent.join('simplecov_setup')
 
   # set environment variable so child processes will merge their coverage data with parent process's coverage data.
-  if RUBY_VERSION < '1.9'
-    ENV['RUBYOPT'] = "-r rubygems -r#{simplecov_setup_pathname} #{ENV['RUBYOPT']}"
-  else
-    ENV['RUBYOPT'] = "-r#{simplecov_setup_pathname} #{ENV['RUBYOPT']}"
-  end
+  ENV['RUBYOPT'] = if RUBY_VERSION < '1.9'
+                     "-r rubygems -r#{simplecov_setup_pathname} #{ENV['RUBYOPT']}"
+                   else
+                     "-r#{simplecov_setup_pathname} #{ENV['RUBYOPT']}"
+                   end
 end

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

@@ -1,5 +1,5 @@
 module Cli
   module App
-    VERSION = "0.1.0"
+    VERSION = "0.1.0".freeze
   end
 end

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

@@ -1,5 +1,5 @@
 module Cli
   module App
-    VERSION = "0.1.0"
+    VERSION = "0.1.0".freeze
   end
 end

data/lib/aruba/api/core.rb

@@ -57,7 +57,7 @@ module Aruba
 
             aruba.event_bus.notify Events::ChangedWorkingDirectory.new(:old => old_directory, :new => new_directory)
 
-            old_dir    = Aruba.platform.getwd
+            old_dir = Aruba.platform.getwd
 
             Aruba.platform.chdir File.join(aruba.root_directory, aruba.current_directory)
 

data/lib/aruba/api/deprecated.rb

@@ -289,7 +289,7 @@ module Aruba
 
         stop_all_commands
 
-        cd('') { block.call }
+        cd('') { yield }
       end
 
       # @deprecated
@@ -388,7 +388,7 @@ module Aruba
         env.each do |k,v|
           set_env k, v
         end
-        block.call
+        yield
         restore_env
       end
 
@@ -565,9 +565,7 @@ module Aruba
       # @return [TrueClass, FalseClass]
       #   If arg1 is exactly the same as arg2 return true, otherwise false
       def assert_exact_output(expected, actual)
-        # rubocop:disable Metrics/LineLength
         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"')
-        # rubocop:enable Metrics/LineLength
 
         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)
@@ -580,9 +578,7 @@ module Aruba
       # @return [TrueClass, FalseClass]
       #   If arg2 contains arg1 return true, otherwise false
       def assert_partial_output(expected, actual)
-        # rubocop:disable Metrics/LineLength
         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"')
-        # rubocop:enable Metrics/LineLength
 
         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))
@@ -595,9 +591,7 @@ module Aruba
       # @return [TrueClass, FalseClass]
       #   If arg2 matches arg1 return true, otherwise false
       def assert_matching_output(expected, actual)
-        # rubocop:disable Metrics/LineLength
         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"')
-        # rubocop:enable Metrics/LineLength
 
         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)
@@ -610,9 +604,7 @@ module Aruba
       # @return [TrueClass, FalseClass]
       #   If arg2 does not match arg1 return true, otherwise false
       def assert_not_matching_output(expected, actual)
-        # rubocop:disable Metrics/LineLength
         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"')
-        # rubocop:enable Metrics/LineLength
 
         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)
@@ -625,9 +617,7 @@ module Aruba
       # @return [TrueClass, FalseClass]
       #   If arg2 does not match/include arg1 return true, otherwise false
       def assert_no_partial_output(unexpected, actual)
-        # rubocop:disable Metrics/LineLength
         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"')
-        # rubocop:enable Metrics/LineLength
 
         actual.force_encoding(unexpected.encoding) if RUBY_VERSION >= "1.9"
         if Regexp === unexpected
@@ -644,9 +634,7 @@ module Aruba
       # @return [TrueClass, FalseClass]
       #   If output of interactive command includes arg1 return true, otherwise false
       def assert_partial_output_interactive(expected)
-        # rubocop:disable Metrics/LineLength
         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"')
-        # rubocop:enable Metrics/LineLength
 
         Aruba.platform.unescape(last_command_started.stdout, aruba.config.keep_ansi).include?(Aruba.platform.unescape(expected, aruba.config.keep_ansi)) ? true : false
       end
@@ -658,9 +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)
-        # rubocop:disable Metrics/LineLength
         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"')
-        # rubocop:enable Metrics/LineLength
 
         assert_success(true)
         assert_partial_output(expected, all_output)
@@ -673,9 +659,7 @@ module Aruba
       # @return [TrueClass, FalseClass]
       #   If exit status is not equal 0 and arg1 is included in output return true, otherwise false
       def assert_failing_with(expected)
-        # rubocop:disable Metrics/LineLength
         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"')
-        # rubocop:enable Metrics/LineLength
 
         assert_success(false)
         assert_partial_output(expected, all_output)
@@ -689,9 +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)
-        # rubocop:disable Metrics/LineLength
         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)')
-        # rubocop:enable Metrics/LineLength
 
         if success
           expect(last_command_started).to be_successfully_executed
@@ -702,18 +684,14 @@ module Aruba
 
       # @deprecated
       def assert_exit_status(status)
-        # rubocop:disable Metrics/LineLength
         Aruba.platform.deprecated('The use of "#assert_success" is deprecated. Use "expect(last_command_started).to have_exit_status(status)"')
-        # rubocop:enable Metrics/LineLength
 
         expect(last_command_started).to have_exit_status(status)
       end
 
       # @deprecated
       def assert_not_exit_status(status)
-        # rubocop:disable Metrics/LineLength
         Aruba.platform.deprecated('The use of "#assert_success" is deprecated. Use "expect(last_command_started).not_to have_exit_status(status)"')
-        # rubocop:enable Metrics/LineLength
 
         expect(last_exit_status).not_to eq(status),
           append_output_to("Exit status was #{last_exit_status} which was not expected.")

data/lib/aruba/api/filesystem.rb

@@ -43,7 +43,7 @@ module Aruba
       # @param [String] file
       #   The file which should exist
       def executable?(path)
-        path =  expand_path(path)
+        path = expand_path(path)
 
         Aruba.platform.file?(path) && Aruba.platform.executable?(path)
       end

data/lib/aruba/aruba_path.rb

@@ -41,7 +41,7 @@ module Aruba
     def push(p)
       @delegate_sd_obj << p
     end
-    alias_method :<<, :push
+    alias << push
 
     # Remove last component of path
     #

data/lib/aruba/colorizer.rb

@@ -32,7 +32,7 @@ module Aruba
       [ :on_magenta   ,  45 ],
       [ :on_cyan      ,  46 ],
       [ :on_white     ,  47 ]
-    ]
+    ].freeze
 
     ATTRIBUTE_NAMES = ATTRIBUTES.transpose.first
     # :startdoc:

data/lib/aruba/command.rb

@@ -22,7 +22,6 @@ module Aruba
 
     public
 
-    # rubocop:disable Metrics/MethodLength
     def initialize(command, opts = {})
       launchers = []
       launchers << Processes::DebugProcess
@@ -46,7 +45,6 @@ module Aruba
     rescue KeyError => e
       raise ArgumentError, e.message
     end
-    # rubocop:enable Metrics/MethodLength
 
     # Stop command
     def stop(*)
@@ -71,6 +69,6 @@ module Aruba
 
       self
     end
-    alias_method :run!, :start
+    alias run! start
   end
 end

data/lib/aruba/config.rb

@@ -38,7 +38,7 @@ module Aruba
     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
     # rubocop:disable Metrics/LineLength
-    option_accessor(:command_search_paths, :contract => { ArrayOf[String] => ArrayOf[String] }) { |config| [File.join(config.root_directory.value, 'bin')] }
+    option_accessor(:command_search_paths, :contract => { ArrayOf[String] => ArrayOf[String] }) { |config| [File.join(config.root_directory.value, 'bin'), File.join(config.root_directory.value, 'exe')] }
     # rubocop:enable Metrics/LineLength
     option_accessor :keep_ansi, :contract => { Bool => Bool }, :default => false
     option_accessor :remove_ansi_escape_sequences, :contract => { Bool => Bool }, :default => true

data/lib/aruba/config/jruby.rb

@@ -9,7 +9,7 @@ Aruba.configure do |config|
     ENV['JRUBY_OPTS'] = "-X-C #{ENV['JRUBY_OPTS']}" unless ENV['JRUBY_OPTS'].include? '-X-C'
 
     # Faster startup for jruby
-    ENV['JRUBY_OPTS'] = "--dev #{ENV['JRUBY_OPTS']}"  unless ENV['JRUBY_OPTS'].include? '--dev'
+    ENV['JRUBY_OPTS'] = "--dev #{ENV['JRUBY_OPTS']}" unless ENV['JRUBY_OPTS'].include? '--dev'
 
     # force jRuby to use client JVM for faster startup times
     ENV['JAVA_OPTS'] = "-d32 #{ENV['JAVA_OPTS']}" if RbConfig::CONFIG['host_os'] =~ /solaris|sunos/i && !ENV['JAVA_OPTS'].include?('-d32')

data/lib/aruba/config_wrapper.rb

@@ -21,7 +21,7 @@ module Aruba
     # @param [#notify] event_bus
     #   The event queue which should be notified.
     def initialize(config, event_bus)
-      @config      = config
+      @config = config
       @event_bus = event_bus
     end
 

data/lib/aruba/cucumber/command.rb

@@ -416,3 +416,7 @@ When(/^I send the signal "([^"]*)" to the command (?:"([^"]*)"|(?:started last))
     last_command_started.send_signal signal
   end
 end
+
+Given(/^I look for executables in "(.*)" within the current directory$/) do |directory|
+  prepend_environment_variable 'PATH', expand_path(directory) + ':'
+end

data/lib/aruba/cucumber/environment.rb

@@ -6,6 +6,14 @@ Given(/^I set the environment variable "(.*)" to "(.*)"/) do |variable, value|
   set_environment_variable(variable.to_s, value.to_s)
 end
 
+Given(/^I append "(.*)" to the environment variable "(.*)"/) do |value, variable|
+  append_environment_variable(variable.to_s, value.to_s)
+end
+
+Given(/^I prepend "(.*)" to the environment variable "(.*)"/) do |value, variable|
+  prepend_environment_variable(variable.to_s, value.to_s)
+end
+
 Given(/^I set the environment variables? to:/) do |table|
   table.hashes.each do |row|
     variable = row['variable'].to_s

data/lib/aruba/file_size.rb

@@ -22,7 +22,7 @@ module Aruba
     def to_byte
       bytes
     end
-    alias_method :to_i, :to_byte
+    alias to_i to_byte
 
     # Convert to float
     def to_f
@@ -33,7 +33,7 @@ module Aruba
     def to_s
       to_i.to_s
     end
-    alias_method :inspect, :to_s
+    alias inspect to_s
 
     # Move to other
     def coerce(other)

data/lib/aruba/matchers/base/object_formatter.rb

@@ -57,7 +57,7 @@ module Aruba
         end
       end
 
-      TIME_FORMAT = "%Y-%m-%d %H:%M:%S"
+      TIME_FORMAT = "%Y-%m-%d %H:%M:%S".freeze
 
       if Time.method_defined?(:nsec)
         # @private
@@ -71,7 +71,7 @@ module Aruba
         end
       end
 
-      DATE_TIME_FORMAT = "%a, %d %b %Y %H:%M:%S.%N %z"
+      DATE_TIME_FORMAT = "%a, %d %b %Y %H:%M:%S.%N %z".freeze
 
       # ActiveSupport sometimes overrides inspect. If `ActiveSupport` is
       # defined use a custom format string that includes more time precision.

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

@@ -26,7 +26,7 @@ RSpec::Matchers.define :match_path_pattern do |_|
   match do |actual|
     Aruba.platform.deprecated('The use of `expect().to match_path_pattern` is deprecated. Please use `expect().to include pattern /regex/` instead.')
 
-    next  !actual.select { |a| a == expected }.empty? if expected.is_a? String
+    next !actual.select { |a| a == expected }.empty? if expected.is_a? String
 
     !actual.grep(expected).empty?
   end

data/lib/aruba/platforms/announcer.rb

@@ -118,20 +118,20 @@ module Aruba
       # rubocop:enable Metrics/MethodLength
 
       def output_format(channel, string = '%s', &block)
-        if block_given?
-          output_formats[channel.to_sym] = block
-        elsif  string.is_a?(Proc)
-          output_formats[channel.to_sym] = string
-        else
-          output_formats[channel.to_sym] = proc { |*args| format(string, *args) }
-        end
+        output_formats[channel.to_sym] = if block_given?
+                                           block
+                                         elsif string.is_a?(Proc)
+                                           string
+                                         else
+                                           proc { |*args| format(string, *args) }
+                                         end
       end
 
       public
 
       # Reset announcer
       def reset
-        @announcer         = @announcers.first
+        @announcer = @announcers.first
       end
 
       # Change mode of announcer
@@ -185,7 +185,7 @@ module Aruba
         return unless activated?(channel)
 
         message = if block_given?
-                    the_output_format.call(block.call)
+                    the_output_format.call(yield)
                   else
                     the_output_format.call(*args)
                   end

data/lib/aruba/platforms/filesystem_status.rb

@@ -12,7 +12,7 @@ module Aruba
         :atime,
         :mtime,
         :size
-      ]
+      ].freeze
 
       extend Forwardable
 

data/lib/aruba/platforms/local_environment.rb

@@ -19,7 +19,7 @@ module Aruba
         ENV.clear
         ENV.update env
 
-        block.call if block_given?
+        yield if block_given?
       ensure
         ENV.clear
         ENV.update old_env

data/lib/aruba/platforms/simple_table.rb

@@ -29,7 +29,7 @@ module Aruba
         longest_key = hash.keys.map(&:to_s).max_by(&:length)
         return '' if longest_key.nil?
 
-        name_size  = longest_key.length
+        name_size = longest_key.length
 
         if RUBY_VERSION < '2'
           rows = []

data/lib/aruba/platforms/unix_command_string.rb

@@ -20,7 +20,7 @@ module Aruba
         def to_s
           __getobj__.to_s
         end
-        alias_method :inspect, :to_s
+        alias inspect to_s
       end
     end
   end

data/lib/aruba/platforms/unix_environment_variables.rb

@@ -11,19 +11,17 @@ module Aruba
         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
+          @other_env = if RUBY_VERSION <= '1.9.3'
+                         # rubocop:disable Style/EachWithObject
+                         @other_env.to_hash.inject({}) { |a, (k, v)| a[k] = v.to_s; a }
+                       # rubocop:enable Style/EachWithObject
+                       else
+                         @other_env.to_h.each_with_object({}) { |(k, v), a| a[k] = v.to_s }
+                       end
+
+          @block = if block_given?
+                     block
+                   end
         end
 
         def call(env)
@@ -62,11 +60,11 @@ module Aruba
       def initialize(env = ENV)
         @actions = []
 
-        if RUBY_VERSION < '2.0'
-          @env = env.to_hash
-        else
-          @env = env.to_h
-        end
+        @env = if RUBY_VERSION < '2.0'
+                 env.to_hash
+               else
+                 env.to_h
+               end
       end
 
       # Update environment with other en

data/lib/aruba/platforms/windows_command_string.rb

@@ -23,7 +23,7 @@ module Aruba
         def to_s
           __getobj__.to_s
         end
-        alias_method :inspect, :to_s
+        alias inspect to_s
       end
     end
   end

data/lib/aruba/platforms/windows_environment_variables.rb

@@ -36,23 +36,23 @@ module Aruba
       def initialize(env = ENV.to_hash)
         @actions = []
 
-        if RUBY_VERSION <= '1.9.3'
-          # rubocop:disable Style/EachWithObject
-          @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 }
-        end
+        @env = if RUBY_VERSION <= '1.9.3'
+                 # rubocop:disable Style/EachWithObject
+                 env.inject({}) { |a, (k,v)| a[k.to_s.upcase] = v; a }
+               # rubocop:enable Style/EachWithObject
+               else
+                 env.each_with_object({}) { |(k,v), a| a[k.to_s.upcase] = v }
+               end
       end
 
       def update(other_env, &block)
-        if RUBY_VERSION <= '1.9.3'
-          # rubocop:disable Style/EachWithObject
-          other_env = other_env.inject({}) { |a, (k,v)| a[k.to_s.upcase] = v; a }
-          # rubocop:enable Style/EachWithObject
-        else
-          other_env = other_env.each_with_object({}) { |(k,v), a| a[k.to_s.upcase] = v }
-        end
+        other_env = if RUBY_VERSION <= '1.9.3'
+                      # rubocop:disable Style/EachWithObject
+                      other_env.inject({}) { |a, (k,v)| a[k.to_s.upcase] = v; a }
+                    # rubocop:enable Style/EachWithObject
+                    else
+                      other_env.each_with_object({}) { |(k,v), a| a[k.to_s.upcase] = v }
+                    end
 
         super(other_env, &block)
       end

data/lib/aruba/processes/basic_process.rb

@@ -125,7 +125,7 @@ module Aruba
 
         format '#<%s:%s commandline="%s": output="%s">', self.class, self.object_id, commandline, out
       end
-      alias_method :to_s, :inspect
+      alias to_s inspect
 
       private
 

data/lib/aruba/processes/debug_process.rb

@@ -17,8 +17,6 @@ module Aruba
         mode == :debug || (mode.is_a?(Class) && mode <= DebugProcess)
       end
 
-      # rubocop:disable Metrics/MethodLength
-      # rubocop:disable Metrics/CyclomaticComplexity
       def start
         Dir.chdir @working_directory do
           Aruba.platform.with_environment(environment) do
@@ -26,8 +24,6 @@ module Aruba
           end
         end
       end
-      # rubocop:enable Metrics/CyclomaticComplexity
-      # rubocop:enable Metrics/MethodLength
 
       # Return stdin
       #

data/lib/aruba/processes/spawn_process.rb

@@ -50,7 +50,6 @@ module Aruba
       #   Run code for process which was started
       #
       # rubocop:disable Metrics/MethodLength
-      # rubocop:disable Metrics/CyclomaticComplexity
       def start
         # rubocop:disable Metrics/LineLength
         fail CommandAlreadyStartedError, %(Command "#{commandline}" has already been started. Please `#stop` the command first and `#start` it again. Alternatively use `#restart`.\n#{caller.join("\n")}) if started?
@@ -58,7 +57,7 @@ module Aruba
 
         @started = true
 
-        @process   = ChildProcess.build(*[command_string.to_a, arguments].flatten)
+        @process = ChildProcess.build(*[command_string.to_a, arguments].flatten)
         @stdout_file = Tempfile.new('aruba-stdout-')
         @stderr_file = Tempfile.new('aruba-stderr-')
 
@@ -91,8 +90,7 @@ module Aruba
 
         yield self if block_given?
       end
-      # rubocop:enable Metrics/MethodLength
-      # rubocop:enable Metrics/CyclomaticComplexity
+      # rubocop:disable Metrics/MethodLength
 
       # Access to stdout of process
       def stdin
@@ -264,7 +262,7 @@ module Aruba
 
       def wait_for_io(time_to_wait, &block)
         sleep time_to_wait.to_i
-        block.call
+        yield
       end
 
       def read_temporary_output_file(file)

data/lib/aruba/runtime.rb

@@ -49,11 +49,11 @@ module Aruba
 
       @environment.update(@config.command_runtime_environment)
 
-      if Aruba::VERSION < '1'
-        @command_monitor = opts.fetch(:command_monitor, Aruba.platform.command_monitor.new(:announcer => @announcer))
-      else
-        @command_monitor = opts.fetch(:command_monitor, Aruba.platform.command_monitor.new)
-      end
+      @command_monitor = if Aruba::VERSION < '1'
+                           opts.fetch(:command_monitor, Aruba.platform.command_monitor.new(:announcer => @announcer))
+                         else
+                           opts.fetch(:command_monitor, Aruba.platform.command_monitor.new)
+                         end
 
       @logger = opts.fetch(:logger, Aruba.platform.logger.new)
       @logger.mode = @config.log_level

data/lib/aruba/setup.rb

@@ -7,7 +7,7 @@ module Aruba
     public
 
     def initialize(runtime)
-      @runtime      = runtime
+      @runtime = runtime
     end
 
     def call

data/lib/aruba/version.rb

@@ -1,3 +1,3 @@
 module Aruba
-  VERSION = '0.13.0'
+  VERSION = '0.14.0'.freeze
 end

data/spec/aruba/api_spec.rb

@@ -3,7 +3,7 @@ require 'securerandom'
 require 'aruba/api'
 require 'fileutils'
 
-describe Aruba::Api  do
+describe Aruba::Api do
   include_context 'uses aruba API'
 
   describe '#all_paths' do
@@ -110,7 +110,7 @@ describe Aruba::Api  do
     let(:content) { 'asdf' }
 
     before :each do
-      @aruba.set_environment_variable 'HOME',  File.expand_path(@aruba.aruba.current_directory)
+      @aruba.set_environment_variable 'HOME', File.expand_path(@aruba.aruba.current_directory)
     end
 
     context 'when does not exist' do
@@ -164,7 +164,7 @@ describe Aruba::Api  do
     let(:path) { File.join(@aruba.aruba.current_directory, name) }
 
     before :each do
-      @aruba.set_environment_variable 'HOME',  File.expand_path(@aruba.aruba.current_directory)
+      @aruba.set_environment_variable 'HOME', File.expand_path(@aruba.aruba.current_directory)
     end
 
     context 'when does not exist' do
@@ -196,7 +196,7 @@ describe Aruba::Api  do
         context 'when has subdirectories' do
           context 'when is simple path' do
             let(:existing_files) { @aruba.list(name) }
-            let(:expected_files) { content.map { |c| File.join(name, c) }.sort  }
+            let(:expected_files) { content.map { |c| File.join(name, c) }.sort }
 
             it { expect(expected_files - existing_files).to be_empty}
           end
@@ -227,7 +227,7 @@ describe Aruba::Api  do
     let(:options) { {} }
 
     before :each do
-      @aruba.set_environment_variable 'HOME',  File.expand_path(@aruba.aruba.current_directory)
+      @aruba.set_environment_variable 'HOME', File.expand_path(@aruba.aruba.current_directory)
     end
 
     context 'when file' do
@@ -326,7 +326,7 @@ describe Aruba::Api  do
       let(:options) { {} }
 
       before :each do
-        @aruba.set_environment_variable 'HOME',  File.expand_path(@aruba.aruba.current_directory)
+        @aruba.set_environment_variable 'HOME', File.expand_path(@aruba.aruba.current_directory)
       end
 
       context 'when file' do
@@ -784,7 +784,7 @@ describe Aruba::Api  do
       let(:permissions) { '0655' }
 
       before :each do
-        @aruba.set_environment_variable 'HOME',  File.expand_path(@aruba.aruba.current_directory)
+        @aruba.set_environment_variable 'HOME', File.expand_path(@aruba.aruba.current_directory)
       end
 
       before(:each) do
@@ -822,7 +822,7 @@ describe Aruba::Api  do
       let(:permissions) { '0655' }
 
       before :each do
-        @aruba.set_environment_variable 'HOME',  File.expand_path(@aruba.aruba.current_directory)
+        @aruba.set_environment_variable 'HOME', File.expand_path(@aruba.aruba.current_directory)
       end
 
       before(:each) do
@@ -1047,7 +1047,7 @@ describe Aruba::Api  do
           end . not_to raise_error
         end
 
-        it "raises RSpec::Expectations::ExpectationNotMetError when the inner expectations don't match"  do
+        it "raises RSpec::Expectations::ExpectationNotMetError when the inner expectations don't match" do
           expect do
             @aruba.with_file_content @file_name do |full_content|
               expect(full_content).to     match(/zoo/)
@@ -1125,20 +1125,20 @@ describe Aruba::Api  do
     it "respond to input" do
       @aruba.type "Hello"
       @aruba.type ""
-      expect(@aruba.all_output).to eq  "Hello\n"
+      expect(@aruba.all_output).to eq "Hello\n"
     end
 
     it "respond to close_input" do
       @aruba.type "Hello"
       @aruba.close_input
-      expect(@aruba.all_output).to eq  "Hello\n"
+      expect(@aruba.all_output).to eq "Hello\n"
     end
 
     it "pipes data" do
       @aruba.write_file(@file_name, "Hello\nWorld!")
       @aruba.pipe_in_file(@file_name)
       @aruba.close_input
-      expect(@aruba.all_output).to eq  "Hello\nWorld!"
+      expect(@aruba.all_output).to eq "Hello\nWorld!"
     end
   end
 

data/spec/aruba/jruby_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'aruba/api'
 
-describe "Aruba JRuby Startup Helper"  do
+describe "Aruba JRuby Startup Helper" do
   before(:all) do
     @fake_env = ENV.clone
   end

data/spec/aruba/matchers/file_spec.rb

@@ -76,7 +76,7 @@ RSpec.describe 'File Matchers' do
       end
 
       context "when matcher" do
-        it { expect(have_file_content(a_string_starting_with "a").description).to eq('have file content: a string starting with "a"') }
+        it { expect(have_file_content(a_string_starting_with("a")).description).to eq('have file content: a string starting with "a"') }
       end
     end
 
@@ -99,7 +99,7 @@ RSpec.describe 'File Matchers' do
 
       example 'for a matcher' do
         expect do
-          expect(@file_name).to have_file_content(a_string_starting_with "z")
+          expect(@file_name).to have_file_content(a_string_starting_with("z"))
         end.to fail_with('expected "test.txt" to have file content: a string starting with "z"')
       end
     end

data/spec/support/helpers/reporting.rb

@@ -35,7 +35,7 @@ module SpecHelpers
       captured_stream.unlink
       stream_io.reopen(origin_stream)
     end
-    alias_method :silence, :capture
+    alias silence capture
   end
 end
 

data/spec/support/shared_examples/configuration.rb

@@ -21,7 +21,7 @@ RSpec.shared_examples 'a basic configuration' do
     end
 
     context 'when one tries to write a value' do
-      it { expect{ config.new_opt = 1}.to raise_error NoMethodError  }
+      it { expect{ config.new_opt = 1}.to raise_error NoMethodError }
     end
 
     context 'when block is defined' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aruba
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Aslak Hellesøy
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -227,7 +227,9 @@ files:
 - features/steps/command/stdout.feature
 - features/steps/command/stop.feature
 - features/steps/core/announce.feature
+- features/steps/environment/append_environment_variable.feature
 - features/steps/environment/home_variable.feature
+- features/steps/environment/prepend_environment_variable.feature
 - features/steps/environment/set_environment_variable.feature
 - features/steps/filesystem/append_to_file.feature
 - features/steps/filesystem/cd_to_directory.feature
@@ -473,7 +475,7 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: aruba-0.13.0
+summary: aruba-0.14.0
 test_files:
 - features/api/command/find_command.feature
 - features/api/command/last_command_started.feature
@@ -560,7 +562,9 @@ test_files:
 - features/steps/command/stdout.feature
 - features/steps/command/stop.feature
 - features/steps/core/announce.feature
+- features/steps/environment/append_environment_variable.feature
 - features/steps/environment/home_variable.feature
+- features/steps/environment/prepend_environment_variable.feature
 - features/steps/environment/set_environment_variable.feature
 - features/steps/filesystem/append_to_file.feature
 - features/steps/filesystem/cd_to_directory.feature