aruba 0.14.14 → 1.0.0.pre.alpha.1

data/lib/aruba/cucumber.rb

@@ -6,9 +6,7 @@ World(Aruba::Api)
 require 'aruba/cucumber/hooks'
 require 'aruba/cucumber/command'
 require 'aruba/cucumber/core'
-require 'aruba/cucumber/deprecated'
 require 'aruba/cucumber/environment'
 require 'aruba/cucumber/file'
 require 'aruba/cucumber/testing_frameworks'
 require 'aruba/cucumber/rvm'
-require 'aruba/reporting'

data/lib/aruba/cucumber/command.rb

@@ -3,16 +3,30 @@ if Aruba::VERSION < '1.0.0'
 end
 require 'aruba/generators/script_file'
 
-When(/^I run `([^`]*)`$/) do |cmd|
+When(/^I run "(.*)"$/)do |cmd|
+  warn(%{\e[35m    The /^I run "(.*)"$/ step definition is deprecated. Please use the `backticks` version\e[0m})
+
+  cmd = sanitize_text(cmd)
+  run_command_and_stop(cmd, false)
+end
+
+When(/^I run `([^`]*)`$/)do |cmd|
   cmd = sanitize_text(cmd)
   run_command_and_stop(cmd, :fail_on_error => false)
 end
 
+When(/^I successfully run "(.*)"$/)do |cmd|
+  warn(%{\e[35m    The  /^I successfully run "(.*)"$/ step definition is deprecated. Please use the `backticks` version\e[0m})
+
+  cmd = sanitize_text(cmd)
+  run_command_and_stop(cmd)
+end
+
 ## I successfully run `echo -n "Hello"`
 ## I successfully run `sleep 29` for up to 30 seconds
-When(/^I successfully run `(.*?)`(?: for up to ([\d.]+) seconds)?$/) do |cmd, secs|
+When(/^I successfully run `(.*?)`(?: for up to (\d+) seconds)?$/)do |cmd, secs|
   cmd = sanitize_text(cmd)
-  run_command_and_stop(cmd, :fail_on_error => true, :exit_timeout => secs && secs.to_f)
+  run_command_and_stop(cmd, :fail_on_error => true, :exit_timeout => secs && secs.to_i)
 end
 
 When(/^I run the following (?:commands|script)(?: (?:with|in) `([^`]+)`)?:$/) do |shell, commands|
@@ -26,13 +40,19 @@ When(/^I run the following (?:commands|script)(?: (?:with|in) `([^`]+)`)?:$/) do
   step 'I run `myscript`'
 end
 
-When(/^I run `([^`]*)` interactively$/) do |cmd|
+When(/^I run "([^"]*)" interactively$/) do |cmd|
+  Aruba.platform.deprecated(%{\e[35m    The /^I run "([^"]*)" interactively$/ step definition is deprecated. Please use the `backticks` version\e[0m})
+
+  step %(I run `#{cmd}` interactively)
+end
+
+When(/^I run `([^`]*)` interactively$/)do |cmd|
   cmd = sanitize_text(cmd)
   @interactive = run_command(cmd)
 end
 
 # Merge interactive and background after refactoring with event queue
-When(/^I run `([^`]*)` in background$/) do |cmd|
+When(/^I run `([^`]*)` in background$/)do |cmd|
   run_command(sanitize_text(cmd))
 end
 
@@ -79,11 +99,7 @@ When(/^I stop the command(?: started last)? if (output|stdout|stderr) contains:$
   begin
     Timeout.timeout(aruba.config.exit_timeout) do
       loop do
-        output = if RUBY_VERSION < '1.9.3'
-                   last_command_started.send channel.to_sym, :wait_for_io => 0
-                 else
-                   last_command_started.public_send channel.to_sym, :wait_for_io => 0
-                 end
+        output = last_command_started.public_send channel.to_sym, :wait_for_io => 0
 
         output   = sanitize_text(output)
         expected = sanitize_text(expected)
@@ -133,33 +149,10 @@ When(/^I wait for (?:output|stdout) to contain "([^"]*)"$/) do |expected|
 end
 
 Then(/^the output should be (\d+) bytes long$/) do |size|
-  expect(last_command_started.output).to have_output_size size.to_i
-end
-
-Then(/^(?:the )?(output|stderr|stdout) should( not)? contain( exactly)? "([^"]*)"$/) do |channel, negated, exactly, expected|
-  combined_output = case channel.to_sym
-                    when :output
-                      all_output
-                    when :stderr
-                      all_stderr
-                    when :stdout
-                      all_stdout
-                    end
-
-  output_string_matcher = if exactly
-                            :an_output_string_being_eq
-                          else
-                            :an_output_string_including
-                          end
-
-  if negated
-    expect(combined_output).not_to send(output_string_matcher, expected)
-  else
-    expect(combined_output).to send(output_string_matcher, expected)
-  end
+  expect(all_output).to have_output_size size.to_i
 end
 
-Then(/^(?:the )?(output|stderr|stdout) from "([^"]*)" should( not)? contain( exactly)? "([^"]*)"$/) do |channel, cmd, negated, exactly, expected|
+Then(/^(?:the )?(output|stderr|stdout)(?: from "([^"]*)")? should( not)? contain( exactly)? "([^"]*)"$/) do |channel, cmd, negated, exactly, expected|
   matcher = case channel.to_sym
             when :output
               :have_output
@@ -169,7 +162,11 @@ Then(/^(?:the )?(output|stderr|stdout) from "([^"]*)" should( not)? contain( exa
               :have_output_on_stdout
             end
 
-  command = aruba.command_monitor.find(Aruba.platform.detect_ruby(cmd))
+  commands = if cmd
+               [aruba.command_monitor.find(Aruba.platform.detect_ruby(cmd))]
+             else
+               all_commands
+             end
 
   output_string_matcher = if exactly
                             :an_output_string_being_eq
@@ -177,37 +174,31 @@ Then(/^(?:the )?(output|stderr|stdout) from "([^"]*)" should( not)? contain( exa
                             :an_output_string_including
                           end
 
-  if negated
-    expect(command).not_to send(matcher, send(output_string_matcher, expected))
-  else
-    expect(command).to send(matcher, send(output_string_matcher, expected))
-  end
-end
-
-Then(/^(?:the )?(output|stderr|stdout) should( not)? contain( exactly)?:$/) do |channel, negated, exactly, expected|
-  combined_output = case channel.to_sym
-                    when :output
-                      all_output
-                    when :stderr
-                      all_stderr
-                    when :stdout
-                      all_stdout
-                    end
+  if Aruba::VERSION < '1.0'
+    combined_output = commands.map do |c|
+      c.stop
+      c.send(channel.to_sym).chomp
+    end.join("\n")
 
-  output_string_matcher = if exactly
-                            :an_output_string_being_eq
-                          else
-                            :an_output_string_including
-                          end
-
-  if negated
-    expect(combined_output).not_to send(output_string_matcher, expected)
+    if negated
+      expect(combined_output).not_to send(output_string_matcher, expected)
+    else
+      expect(combined_output).to send(output_string_matcher, expected)
+    end
   else
-    expect(combined_output).to send(output_string_matcher, expected)
+    if negated
+      expect(commands).not_to include_an_object send(matcher, send(output_string_matcher, expected))
+    else
+      expect(commands).to include_an_object send(matcher, send(output_string_matcher, expected))
+    end
   end
 end
 
-Then(/^(?:the )?(output|stderr|stdout) from "([^"]*)" should( not)? contain( exactly)?:$/) do |channel, cmd, negated, exactly, expected|
+## the stderr should contain "hello"
+## the stderr from "echo -n 'Hello'" should contain "hello"
+## the stderr should contain exactly:
+## the stderr from "echo -n 'Hello'" should contain exactly:
+Then(/^(?:the )?(output|stderr|stdout)(?: from "([^"]*)")? should( not)? contain( exactly)?:$/) do |channel, cmd, negated, exactly, expected|
   matcher = case channel.to_sym
             when :output
               :have_output
@@ -215,9 +206,15 @@ Then(/^(?:the )?(output|stderr|stdout) from "([^"]*)" should( not)? contain( exa
               :have_output_on_stderr
             when :stdout
               :have_output_on_stdout
+            else
+              fail ArgumentError, %(Invalid channel "#{channel}" chosen. Only "output", "stderr" or "stdout" are allowed.)
             end
 
-  command = aruba.command_monitor.find(Aruba.platform.detect_ruby(cmd))
+  commands = if cmd
+               [aruba.command_monitor.find(Aruba.platform.detect_ruby(cmd))]
+             else
+               all_commands
+             end
 
   output_string_matcher = if exactly
                             :an_output_string_being_eq
@@ -225,10 +222,23 @@ Then(/^(?:the )?(output|stderr|stdout) from "([^"]*)" should( not)? contain( exa
                             :an_output_string_including
                           end
 
-  if negated
-    expect(command).not_to send(matcher, send(output_string_matcher, expected))
+  if Aruba::VERSION < '1.0'
+    combined_output = commands.map do |c|
+      c.stop
+      c.send(channel.to_sym).chomp
+    end.join("\n")
+
+    if negated
+      expect(combined_output).not_to send(output_string_matcher, expected)
+    else
+      expect(combined_output).to send(output_string_matcher, expected)
+    end
   else
-    expect(command).to send(matcher, send(output_string_matcher, expected))
+    if negated
+      expect(commands).not_to include_an_object send(matcher, send(output_string_matcher, expected))
+    else
+      expect(commands).to include_an_object send(matcher, send(output_string_matcher, expected))
+    end
   end
 end
 
@@ -360,20 +370,36 @@ Then(/^(?:the )?(output|stdout|stderr) should( not)? contain all of these lines:
   end
 end
 
-Given(/^the (?:default )?aruba io wait timeout is ([\d.]+) seconds?$/) do |seconds|
-  aruba.config.io_wait_timeout = seconds.to_f
+Given(/the default aruba timeout is (\d+) seconds/) do |seconds|
+  # rubocop:disable Metrics/LineLength
+  Aruba.platform.deprecated(%{The /^the default aruba timeout is (\d+) seconds/ step definition is deprecated. Please use /^the default aruba exit timeout is (\d+) seconds/ step definition is deprecated.})
+  # rubocop:enable Metrics/LineLength
+
+  aruba.config.exit_timeout = seconds.to_i
+end
+
+Given(/The default aruba timeout is (\d+) seconds/) do |seconds|
+  # rubocop:disable Metrics/LineLength
+  Aruba.platform.deprecated(%{The /^The default aruba timeout is (\d+) seconds/ step definition is deprecated. Please use /^the default aruba exit timeout is (\d+) seconds/ step definition is deprecated.})
+  # rubocop:enable Metrics/LineLength
+
+  aruba.config.exit_timeout = seconds.to_i
+end
+
+Given(/^the (?:default )?aruba io wait timeout is (\d+) seconds?$/) do |seconds|
+  aruba.config.io_wait_timeout = seconds.to_i
 end
 
-Given(/^the (?:default )?aruba exit timeout is ([\d.]+) seconds?$/) do |seconds|
-  aruba.config.exit_timeout = seconds.to_f
+Given(/^the (?:default )?aruba exit timeout is (\d+) seconds?$/) do |seconds|
+  aruba.config.exit_timeout = seconds.to_i
 end
 
 Given(/^the (?:default )?aruba stop signal is "([^"]*)"$/) do |signal|
   aruba.config.stop_signal = signal
 end
 
-Given(/^I wait ([\d.]+) seconds? for (?:a|the) command to start up$/) do |seconds|
-  aruba.config.startup_wait_time = seconds.to_f
+Given(/^I wait (\d+) seconds? for (?:a|the) command to start up$/) do |seconds|
+  aruba.config.startup_wait_time = seconds.to_i
 end
 
 When(/^I send the signal "([^"]*)" to the command (?:"([^"]*)"|(?:started last))$/) do |signal, command|

data/lib/aruba/cucumber/file.rb

@@ -79,7 +79,7 @@ When(/^I cd to "([^"]*)"$/) do |dir|
 end
 
 Then(/^the following files should (not )?exist:$/) do |negated, files|
-  files = files.rows.flatten
+  files = files.raw.flatten
 
   if negated
     expect(files).not_to include an_existing_file
@@ -174,9 +174,21 @@ end
 
 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_as(reference_file)
+    expect(file).not_to have_same_file_content_like(reference_file)
   else
-    expect(file).to have_same_file_content_as(reference_file)
+    expect(file).to have_same_file_content_like(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
 end
 

data/lib/aruba/cucumber/hooks.rb

@@ -16,14 +16,11 @@ Before do
 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
@@ -44,6 +41,12 @@ 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
@@ -57,6 +60,12 @@ 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
@@ -65,10 +74,28 @@ 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
@@ -97,19 +124,25 @@ Before('@announce') do
   aruba.announcer.activate :command_filesystem_status
 end
 
-Before('@debug') do
-  aruba.config.command_launcher = :debug
-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
 
-# After('@debug') do
-#   aruba.config.command_launcher = :spawn
-# end
+  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
   set_environment_variable 'HOME', expand_path('.')
 end
@@ -117,3 +150,31 @@ end
 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
+
+Before('@command-launcher-spawn') do
+  aruba.config.command_launcher = :spawn
+end
+
+Before('@command-launcher-in-process') do
+  aruba.config.command_launcher = :in_process
+end
+
+Before('@command-launcher-debug') do
+  aruba.config.command_launcher = :debug
+end

data/lib/aruba/event_bus/name_resolver.rb

@@ -10,11 +10,7 @@ module Aruba
       # Helpers for Resolvers
       module ResolveHelpers
         def camel_case(underscored_name)
-          if RUBY_VERSION < '1.9.3'
-            underscored_name.to_s.split('_').map { |word| word.upcase.chars.to_a[0] + word.chars.to_a[1..-1].join }.join
-          else
-            underscored_name.to_s.split('_').map { |word| word.upcase[0] + word[1..-1] }.join
-          end
+          underscored_name.to_s.split('_').map { |word| word.upcase[0] + word[1..-1] }.join
         end
 
         # Thanks ActiveSupport
@@ -36,11 +32,7 @@ module Aruba
             else
               candidate = constant.const_get(name)
 
-              if RUBY_VERSION < '1.9.3'
-                next candidate if constant.const_defined?(name)
-              else
-                next candidate if constant.const_defined?(name, false)
-              end
+              next candidate if constant.const_defined?(name, false)
 
               next candidate unless Object.const_defined?(name)