aruba 1.0.0.pre.alpha.2 → 1.0.1

data/lib/aruba/cucumber/environment.rb

@@ -1,4 +1,4 @@
-Given(/^a mocked home directory$/)do
+Given(/^a mocked home directory$/) do
   set_environment_variable 'HOME', expand_path('.')
 end
 

data/lib/aruba/cucumber/file.rb

@@ -3,11 +3,13 @@ Given(/^I use (?:a|the) fixture(?: named)? "([^"]*)"$/) do |name|
   cd name
 end
 
-Given(/^I copy (?:a|the) (file|directory)(?: (?:named|from))? "([^"]*)" to "([^"]*)"$/) do |file_or_directory, source, destination|
+Given(/^I copy (?:a|the) (?:file|directory)(?: (?:named|from))? "([^"]*)" to "([^"]*)"$/) \
+  do |source, destination|
   copy source, destination
 end
 
-Given(/^I move (?:a|the) (file|directory)(?: (?:named|from))? "([^"]*)" to "([^"]*)"$/) do |file_or_directory, source, destination|
+Given(/^I move (?:a|the) (?:file|directory)(?: (?:named|from))? "([^"]*)" to "([^"]*)"$/) \
+  do |source, destination|
   move source, destination
 end
 
@@ -15,7 +17,8 @@ Given(/^(?:a|the|(?:an empty)) directory(?: named)? "([^"]*)"$/) do |dir_name|
   create_directory(dir_name)
 end
 
-Given(/^(?:a|the) directory(?: named)? "([^"]*)" with mode "([^"]*)"$/) do |dir_name, dir_mode|
+Given(/^(?:a|the) directory(?: named)? "([^"]*)" with mode "([^"]*)"$/) \
+  do |dir_name, dir_mode|
   create_directory(dir_name)
   chmod(dir_mode, dir_name)
 end
@@ -32,7 +35,8 @@ Given(/^(?:a|the) file(?: named)? "([^"]*)" with "([^"]*)"$/) do |file_name, fil
   write_file(file_name, unescape_text(file_content))
 end
 
-Given(/^(?:a|the) file(?: named)? "([^"]*)" with mode "([^"]*)" and with:$/) do |file_name, file_mode, file_content|
+Given(/^(?:a|the) file(?: named)? "([^"]*)" with mode "([^"]*)" and with:$/) \
+  do |file_name, file_mode, file_content|
   write_file(file_name, unescape_text(file_content))
   chmod(file_mode, file_name)
 end
@@ -42,11 +46,12 @@ Given(/^(?:a|the) (\d+) byte file(?: named)? "([^"]*)"$/) do |file_size, file_na
 end
 
 Given(/^(?:an|the) empty file(?: named)? "([^"]*)"$/) do |file_name|
-  write_file(file_name, "")
+  write_file(file_name, '')
 end
 
-Given(/^(?:an|the) empty file(?: named)? "([^"]*)" with mode "([^"]*)"$/) do |file_name, file_mode|
-  write_file(file_name, "")
+Given(/^(?:an|the) empty file(?: named)? "([^"]*)" with mode "([^"]*)"$/) \
+  do |file_name, file_mode|
+  write_file(file_name, '')
   chmod(file_mode, file_name)
 end
 
@@ -54,7 +59,8 @@ When(/^I write to "([^"]*)" with:$/) do |file_name, file_content|
   write_file(file_name, file_content)
 end
 
-When(/^I overwrite(?: (?:a|the) file(?: named)?)? "([^"]*)" with:$/) do |file_name, file_content|
+When(/^I overwrite(?: (?:a|the) file(?: named)?)? "([^"]*)" with:$/) \
+  do |file_name, file_content|
   overwrite_file(file_name, file_content)
 end
 
@@ -66,12 +72,13 @@ When(/^I append to "([^"]*)" with "([^"]*)"$/) do |file_name, file_content|
   append_to_file(file_name, file_content)
 end
 
-When(/^I remove (?:a|the) (?:file|directory)(?: named)? "([^"]*)"( with full force)?$/) do |name, force_remove|
-  remove(name, :force => force_remove.nil? ? false : true)
+When(/^I remove (?:a|the) (?:file|directory)(?: named)? "([^"]*)"( with full force)?$/) \
+  do |name, force_remove|
+  remove(name, force: force_remove.nil? ? false : true)
 end
 
 Given(/^(?:a|the) (?:file|directory)(?: named)? "([^"]*)" does not exist$/) do |name|
-  remove(name, :force => true)
+  remove(name, force: true)
 end
 
 When(/^I cd to "([^"]*)"$/) do |dir|
@@ -88,21 +95,21 @@ Then(/^the following files should (not )?exist:$/) do |negated, files|
   end
 end
 
-Then(/^(?:a|the) (file|directory)(?: named)? "([^"]*)" should (not )?exist(?: anymore)?$/) do |directory_or_file, path, expect_match|
-  if directory_or_file == 'file'
-    if expect_match
-      expect(path).not_to be_an_existing_file
-    else
-      expect(path).to be_an_existing_file
-    end
-  elsif directory_or_file == 'directory'
-    if expect_match
-      expect(path).not_to be_an_existing_directory
-    else
-      expect(path).to be_an_existing_directory
-    end
+Then(/^(?:a|the) file(?: named)? "([^"]*)" should (not )?exist(?: anymore)?$/) \
+  do |path, expect_match|
+  if expect_match
+    expect(path).not_to be_an_existing_file
   else
-    fail ArgumentError, %("#{directory_or_file}" can only be "directory" or "file".)
+    expect(path).to be_an_existing_file
+  end
+end
+
+Then(/^(?:a|the) directory(?: named)? "([^"]*)" should (not )?exist(?: anymore)?$/) \
+  do |path, expect_match|
+  if expect_match
+    expect(path).not_to be_an_existing_directory
+  else
+    expect(path).to be_an_existing_directory
   end
 end
 
@@ -114,7 +121,8 @@ Then(/^(?:a|the) file matching %r<(.*?)> should (not )?exist$/) do |pattern, exp
   end
 end
 
-Then(/^(?:a|the) (\d+) byte file(?: named)? "([^"]*)" should (not )?exist$/) do |size, file, negated|
+Then(/^(?:a|the) (\d+) byte file(?: named)? "([^"]*)" should (not )?exist$/) \
+  do |size, file, negated|
   if negated
     expect(file).not_to have_file_size(size)
   else
@@ -132,7 +140,8 @@ Then(/^the following directories should (not )?exist:$/) do |negated, directorie
   end
 end
 
-Then(/^(?:a|the) file(?: named)? "([^"]*)" should (not )?contain "([^"]*)"$/) do |file, negated, content|
+Then(/^(?:a|the) file(?: named)? "([^"]*)" should (not )?contain "([^"]*)"$/) \
+  do |file, negated, content|
   if negated
     expect(file).not_to have_file_content file_content_including(content.chomp)
   else
@@ -140,7 +149,8 @@ Then(/^(?:a|the) file(?: named)? "([^"]*)" should (not )?contain "([^"]*)"$/) do
   end
 end
 
-Then(/^(?:a|the) file(?: named)? "([^"]*)" should (not )?contain:$/) do |file, negated, content|
+Then(/^(?:a|the) file(?: named)? "([^"]*)" should (not )?contain:$/) \
+  do |file, negated, content|
   if negated
     expect(file).not_to have_file_content file_content_including(content.chomp)
   else
@@ -148,7 +158,8 @@ Then(/^(?:a|the) file(?: named)? "([^"]*)" should (not )?contain:$/) do |file, n
   end
 end
 
-Then(/^(?:a|the) file(?: named)? "([^"]*)" should (not )?contain exactly:$/) do |file, negated, content|
+Then(/^(?:a|the) file(?: named)? "([^"]*)" should (not )?contain exactly:$/) \
+  do |file, negated, content|
   if negated
     expect(file).not_to have_file_content content
   else
@@ -156,7 +167,8 @@ Then(/^(?:a|the) file(?: named)? "([^"]*)" should (not )?contain exactly:$/) do
   end
 end
 
-Then(/^(?:a|the) file(?: named)? "([^"]*)" should (not )?match %r<([^\/]*)>$/) do |file, negated, content|
+Then(/^(?:a|the) file(?: named)? "([^"]*)" should (not )?match %r<([^>]*)>$/) \
+  do |file, negated, content|
   if negated
     expect(file).not_to have_file_content file_content_matching(content)
   else
@@ -164,7 +176,8 @@ Then(/^(?:a|the) file(?: named)? "([^"]*)" should (not )?match %r<([^\/]*)>$/) d
   end
 end
 
-Then(/^(?:a|the) file(?: named)? "([^"]*)" should (not )?match \/([^\/]*)\/$/) do |file, negated, content|
+Then(%r{^(?:a|the) file(?: named)? "([^"]*)" should (not )?match /([^/]*)/$}) \
+  do |file, negated, content|
   if negated
     expect(file).not_to have_file_content file_content_matching(content)
   else
@@ -172,30 +185,23 @@ Then(/^(?:a|the) file(?: named)? "([^"]*)" should (not )?match \/([^\/]*)\/$/) d
   end
 end
 
-Then(/^(?:a|the) file(?: named)? "([^"]*)" should (not )?be equal to file "([^"]*)"/) do |file, negated, reference_file|
+Then(/^(?:a|the) file(?: named)? "([^"]*)" should (not )?be equal to file "([^"]*)"/) \
+  do |file, negated, reference_file|
   if negated
-    expect(file).not_to have_same_file_content_like(reference_file)
+    expect(file).not_to have_same_file_content_as(reference_file)
   else
-    expect(file).to have_same_file_content_like(reference_file)
+    expect(file).to have_same_file_content_as(reference_file)
   end
 end
 
-Then(/^the mode of filesystem object "([^"]*)" should (not )?match "([^"]*)"$/) do |file, negated, permissions|
-  # rubocop:disable Metrics/LineLength
-  Aruba.platform.deprecated('The use of step "the mode of filesystem object "([^"]*)" should (not )?match "([^"]*)" is deprecated. Use "^the (?:file|directory)(?: named)? "([^"]*)" should have permissions "([^"]*)"$" instead')
-  # rubocop:enable Metrics/LineLength
-
-  if negated
-    expect(file).not_to have_permissions(permissions)
-  else
-    expect(file).to have_permissions(permissions)
-  end
+Then(
+  /^(?:a|the) (?:file|directory)(?: named)? "([^"]*)" should have permissions "([^"]*)"$/
+) do |path, permissions|
+  expect(path).to have_permissions(permissions)
 end
 
-Then(/^the (?:file|directory)(?: named)? "([^"]*)" should( not)? have permissions "([^"]*)"$/) do |path, negated, permissions|
-  if negated
-    expect(path).not_to have_permissions(permissions)
-  else
-    expect(path).to have_permissions(permissions)
-  end
+Then(
+  /^(?:a|the) (?:file|directory)(?: named)? "([^"]*)" should not have permissions "([^"]*)"$/
+) do |path, permissions|
+  expect(path).not_to have_permissions(permissions)
 end

data/lib/aruba/cucumber/hooks.rb

@@ -3,24 +3,28 @@ require 'aruba/api'
 require 'aruba/platform'
 World(Aruba::Api)
 
-if Aruba::VERSION >= '1.0.0'
-  Around do |_, block|
-    with_environment(&block)
-  end
+Around do |_, block|
+  with_environment(&block)
 end
 
 Before do
   # ... so every change needs to be done later
-  prepend_environment_variable 'PATH', aruba.config.command_search_paths.join(File::PATH_SEPARATOR) + File::PATH_SEPARATOR
+  prepend_environment_variable(
+    'PATH',
+    aruba.config.command_search_paths.join(File::PATH_SEPARATOR) + File::PATH_SEPARATOR
+  )
   set_environment_variable 'HOME', aruba.config.home_directory
 end
 
 After do
-  restore_env
   terminate_all_commands
   aruba.command_monitor.clear
 end
 
+Before('@no-clobber') do
+  setup_aruba(false)
+end
+
 Before('~@no-clobber') do
   setup_aruba
 end
@@ -41,12 +45,6 @@ Before('@announce-command-filesystem-status') do
   aruba.announcer.activate :command_filesystem_status
 end
 
-Before('@announce-cmd') do
-  Aruba.platform.deprecated 'The use of "@announce-cmd"-hook is deprecated. Please use "@announce-command"'
-
-  aruba.announcer.activate :command
-end
-
 Before('@announce-output') do
   aruba.announcer.activate :stdout
   aruba.announcer.activate :stderr
@@ -60,12 +58,6 @@ Before('@announce-stderr') do
   aruba.announcer.activate :stderr
 end
 
-Before('@announce-dir') do
-  Aruba.platform.deprecated 'The use of "@announce-dir"-hook is deprecated. Please use "@announce-directory"'
-
-  aruba.announcer.activate :directory
-end
-
 Before('@announce-directory') do
   aruba.announcer.activate :directory
 end
@@ -74,28 +66,10 @@ Before('@announce-stop-signal') do
   aruba.announcer.activate :stop_signal
 end
 
-Before('@announce-env') do
-  Aruba.platform.deprecated 'The use of "@announce-env"-hook is deprecated. Please use "@announce-changed-environment"'
-
-  aruba.announcer.activate :environment
-end
-
-Before('@announce-environment') do
-  Aruba.platform.deprecated '@announce-environment is deprecated. Use @announce-changed-environment instead'
-
-  aruba.announcer.activate :changed_environment
-end
-
 Before('@announce-full-environment') do
   aruba.announcer.activate :full_environment
 end
 
-Before('@announce-modified-environment') do
-  Aruba.platform.deprecated '@announce-modified-environment is deprecated. Use @announce-changed-environment instead'
-
-  aruba.announcer.activate :changed_environment
-end
-
 Before('@announce-changed-environment') do
   aruba.announcer.activate :changed_environment
 end
@@ -124,23 +98,8 @@ Before('@announce') do
   aruba.announcer.activate :command_filesystem_status
 end
 
-Before('@ansi') do
-  # rubocop:disable Metrics/LineLength
-  Aruba::Platform.deprecated('The use of "@ansi" is deprecated. Use "@keep-ansi-escape-sequences" instead. But be aware, that this hook uses the aruba configuration and not an instance variable')
-  # rubocop:enable Metrics/LineLength
-
-  aruba.config.remove_ansi_escape_sequences = false
-end
-
 Before('@keep-ansi-escape-sequences') do
   aruba.config.remove_ansi_escape_sequences = false
-  aruba.config.keep_ansi = true
-end
-
-Before '@mocked_home_directory' do
-  Aruba.platform.deprecated('The use of "@mocked_home_directory" is deprecated. Use "@mocked-home-directory" instead')
-
-  set_environment_variable 'HOME', expand_path('.')
 end
 
 Before '@mocked-home-directory' do
@@ -151,18 +110,6 @@ Before('@disable-bundler') do
   unset_bundler_env_vars
 end
 
-Before('@spawn') do
-  Aruba.platform.deprecated('The use of "@spawn" is deprecated. Use "@command-launcher-spawn" instead')
-
-  aruba.config.command_launcher = :spawn
-end
-
-Before('@in_process') do
-  Aruba.platform.deprecated('The use of "@in_process" is deprecated. Use "@command-launcher-in-process" instead')
-
-  aruba.config.command_launcher = :in_process
-end
-
 Before('@debug') do
   aruba.config.command_launcher = :debug
 end

data/lib/aruba/cucumber/testing_frameworks.rb

@@ -1,25 +1,33 @@
 # Cucumber
-Then /^the feature(?:s)? should( not)?(?: all)? pass$/ do |negated|
-  if negated
-    step 'the output should contain " failed)"'
-    step 'the exit status should be 1'
-  else
-    step 'the output should not contain " failed)"'
-    step 'the output should not contain " undefined)"'
-    step 'the exit status should be 0'
-  end
+Then(/^the feature(?:s)? should not(?: all)? pass$/) do
+  step 'the output should contain " failed)"'
+  step 'the exit status should be 1'
+end
+
+# Cucumber
+Then(/^the feature(?:s)? should(?: all)? pass$/) do
+  step 'the output should not contain " failed)"'
+  step 'the output should not contain " undefined)"'
+  step 'the exit status should be 0'
 end
 
 # Cucumber
-Then /^the feature(?:s)? should( not)?(?: all)? pass with( regex)?:$/ do |negated, regex, string|
-  if negated
-    step 'the output should contain " failed)"'
-    step 'the exit status should be 1'
+Then(/^the feature(?:s)? should not(?: all)? pass with( regex)?:$/) do |regex, string|
+  step 'the output should contain " failed)"'
+  step 'the exit status should be 1'
+
+  if regex
+    step "the output should match %r<#{string}>"
   else
-    step 'the output should not contain " failed)"'
-    step 'the output should not contain " undefined)"'
-    step 'the exit status should be 0'
+    step 'the output should contain:', string
   end
+end
+
+# Cucumber
+Then(/^the feature(?:s)? should(?: all)? pass with( regex)?:$/) do |regex, string|
+  step 'the output should not contain " failed)"'
+  step 'the output should not contain " undefined)"'
+  step 'the exit status should be 0'
 
   if regex
     step "the output should match %r<#{string}>"
@@ -29,30 +37,39 @@ Then /^the feature(?:s)? should( not)?(?: all)? pass with( regex)?:$/ do |negate
 end
 
 # RSpec
-Then /^the spec(?:s)? should( not)?(?: all)? pass(?: with (\d+) failures?)?$/ do |negated, count_failures|
-  if negated
-    if count_failures.nil?
-      step 'the output should not contain "0 failures"'
-    else
-      step %(the output should contain "#{count_failures} failures")
-    end
-
-    step 'the exit status should be 1'
+Then(/^the spec(?:s)? should not(?: all)? pass(?: with (\d+) failures?)?$/) \
+  do |count_failures|
+  if count_failures.nil?
+    step 'the output should not contain "0 failures"'
   else
-    step 'the output should contain "0 failures"'
-    step 'the exit status should be 0'
+    step %(the output should contain "#{count_failures} failures")
   end
+
+  step 'the exit status should be 1'
 end
 
 # RSpec
-Then /^the spec(?:s)? should( not)?(?: all)? pass with( regex)?:$/ do |negated, regex, string|
-  if negated
-    step 'the output should not contain "0 failures"'
-    step 'the exit status should be 1'
+Then(/^the spec(?:s)? should all pass$/) do
+  step 'the output should contain "0 failures"'
+  step 'the exit status should be 0'
+end
+
+# RSpec
+Then(/^the spec(?:s)? should not(?: all)? pass with( regex)?:$/) do |regex, string|
+  step 'the output should not contain "0 failures"'
+  step 'the exit status should be 1'
+
+  if regex
+    step "the output should match %r<#{string}>"
   else
-    step 'the output should contain "0 failures"'
-    step 'the exit status should be 0'
+    step 'the output should contain:', string
   end
+end
+
+# RSpec
+Then(/^the spec(?:s)? should(?: all)? pass with( regex)?:$/) do |regex, string|
+  step 'the output should contain "0 failures"'
+  step 'the exit status should be 0'
 
   if regex
     step "the output should match %r<#{string}>"
@@ -62,30 +79,39 @@ Then /^the spec(?:s)? should( not)?(?: all)? pass with( regex)?:$/ do |negated,
 end
 
 # Minitest
-Then /^the tests(?:s)? should( not)?(?: all)? pass(?: with (\d+) failures?)?$/ do |negated, count_failures|
-  if negated
-    if count_failures.nil?
-      step 'the output should not contain "0 errors"'
-    else
-      step %(the output should contain "#{count_failures} errors")
-    end
-
-    step 'the exit status should be 1'
+Then(/^the tests(?:s)? should not(?: all)? pass(?: with (\d+) failures?)?$/) \
+  do |count_failures|
+  if count_failures.nil?
+    step 'the output should not contain "0 errors"'
   else
-    step 'the output should contain "0 errors"'
-    step 'the exit status should be 0'
+    step %(the output should contain "#{count_failures} errors")
   end
+
+  step 'the exit status should be 1'
 end
 
 # Minitest
-Then /^the test(?:s)? should( not)?(?: all)? pass with( regex)?:$/ do |negated, regex, string|
-  if negated
-    step 'the output should contain "0 errors"'
-    step 'the exit status should be 1'
+Then(/^the tests(?:s)? should all pass$/) do
+  step 'the output should contain "0 errors"'
+  step 'the exit status should be 0'
+end
+
+# Minitest
+Then(/^the test(?:s)? should not(?: all)? pass with( regex)?:$/) do |regex, string|
+  step 'the output should contain "0 errors"'
+  step 'the exit status should be 1'
+
+  if regex
+    step "the output should match %r<#{string}>"
   else
-    step 'the output should not contain "0 errors"'
-    step 'the exit status should be 0'
+    step 'the output should contain:', string
   end
+end
+
+# Minitest
+Then(/^the test(?:s)? should(?: all)? pass with( regex)?:$/) do |regex, string|
+  step 'the output should not contain "0 errors"'
+  step 'the exit status should be 0'
 
   if regex
     step "the output should match %r<#{string}>"