aruba 1.0.0.pre.alpha.4 → 1.0.0.pre.alpha.5

data/lib/aruba/cucumber/file.rb

@@ -88,21 +88,19 @@ 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
+    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
-    fail ArgumentError, %("#{directory_or_file}" can only be "directory" or "file".)
+    expect(path).to be_an_existing_directory
   end
 end
 
@@ -180,7 +178,7 @@ Then(/^(?:a|the) file(?: named)? "([^"]*)" should (not )?be equal to file "([^"]
   end
 end
 
-Then(/^the (?:file|directory)(?: named)? "([^"]*)" should( not)? have permissions "([^"]*)"$/) do |path, negated, permissions|
+Then(/^(?:a|the) (?:file|directory)(?: named)? "([^"]*)" should( not)? have permissions "([^"]*)"$/) do |path, negated, permissions|
   if negated
     expect(path).not_to have_permissions(permissions)
   else

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,38 @@ 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 +78,38 @@ 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}>"

data/lib/aruba/in_config_wrapper.rb

@@ -15,10 +15,14 @@ module Aruba
     end
 
     def method_missing(name, *args)
-      fail ArgumentError, 'Options take no argument' if args.count > 0
+      fail ArgumentError, 'Options take no argument' if args.any?
       fail UnknownOptionError, %(Option "#{name}" is unknown. Please use only earlier defined options) unless config.key? name
 
       config[name]
     end
+
+    def respond_to_missing?(*)
+      true
+    end
   end
 end

data/lib/aruba/initializer.rb

@@ -80,18 +80,18 @@ module Aruba
                     :create_file
                   end
 
-        send creator, file, <<-EOS
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+        send creator, file, <<~EOS
+          $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
-::Dir.glob(::File.expand_path('../support/*.rb', __FILE__)).each { |f| require_relative f }
-::Dir.glob(::File.expand_path('../support/**/*.rb', __FILE__)).each { |f| require_relative f }
-EOS
+          ::Dir.glob(::File.expand_path('../support/*.rb', __FILE__)).each { |f| require_relative f }
+          ::Dir.glob(::File.expand_path('../support/**/*.rb', __FILE__)).each { |f| require_relative f }
+        EOS
       end
 
       def create_support_file
-        create_file 'spec/support/aruba.rb', <<-EOS
-require 'aruba/rspec'
-EOS
+        create_file 'spec/support/aruba.rb', <<~EOS
+          require 'aruba/rspec'
+        EOS
       end
     end
   end
@@ -114,9 +114,9 @@ module Aruba
       end
 
       def create_support_file
-        create_file 'features/support/aruba.rb', <<-EOS
-require 'aruba/cucumber'
-EOS
+        create_file 'features/support/aruba.rb', <<~EOS
+          require 'aruba/cucumber'
+        EOS
       end
     end
   end
@@ -146,30 +146,30 @@ module Aruba
                     :create_file
                   end
 
-        send creator, file, <<-EOS
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+        send creator, file, <<~EOS
+          $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
-::Dir.glob(::File.expand_path('../support/*.rb', __FILE__)).each { |f| require_relative f }
-::Dir.glob(::File.expand_path('../support/**/*.rb', __FILE__)).each { |f| require_relative f }
-EOS
+          ::Dir.glob(::File.expand_path('../support/*.rb', __FILE__)).each { |f| require_relative f }
+          ::Dir.glob(::File.expand_path('../support/**/*.rb', __FILE__)).each { |f| require_relative f }
+        EOS
       end
 
       def create_example
-        create_file 'test/use_aruba_with_minitest.rb', <<-EOS
-$LOAD_PATH.unshift File.expand_path('../test', __FILE__)
+        create_file 'test/use_aruba_with_minitest.rb', <<~EOS
+          $LOAD_PATH.unshift File.expand_path('../test', __FILE__)
 
-require 'test_helper'
-require 'minitest/autorun'
-require 'aruba/api'
+          require 'test_helper'
+          require 'minitest/autorun'
+          require 'aruba/api'
 
-class FirstRun < Minitest::Test
-  include Aruba::Api
+          class FirstRun < Minitest::Test
+            include Aruba::Api
 
-  def setup
-    aruba_setup
-  end
-end
-EOS
+            def setup
+              aruba_setup
+            end
+          end
+        EOS
       end
     end
   end

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

@@ -27,6 +27,10 @@ RSpec::Matchers.define :be_successfully_executed do
 
     expect(@old_actual).to have_exit_status(0)
   end
+
+  failure_message do |_actual|
+    "Expected `#{@actual}` to succeed but got non-zero exit status and the following output:\n\n#{@old_actual.output}\n"
+  end
 end
 
 RSpec::Matchers.define_negated_matcher :have_failed_running, :be_successfully_executed

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

@@ -23,16 +23,26 @@ RSpec::Matchers.define :have_exit_status do |expected|
     @old_actual.stop
     @actual = actual.exit_status
 
-    next false unless @old_actual.respond_to? :exit_status
+    raise "Expected #{@old_actual} to respond to #exit_status" unless @old_actual.respond_to? :exit_status
 
     values_match? expected, @actual
   end
 
   failure_message do |actual|
-    format(%(expected that command "%s" has exit status of "%s", but has "%s".), @old_actual.commandline, expected.to_s, actual.to_s)
+    format(
+      %(expected that command "%s" has exit status of "%s", but has "%s".),
+      @old_actual.commandline,
+      expected.to_s,
+      actual.to_s
+    )
   end
 
   failure_message_when_negated do |actual|
-    format(%(expected that command "%s" does not have exit status of "%s", but has "%s".), @old_actual.commandline, expected.to_s, actual.to_s)
+    format(
+      %(expected that command "%s" does not have exit status of "%s", but has "%s".),
+      @old_actual.commandline,
+      expected.to_s,
+      actual.to_s
+    )
   end
 end

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

@@ -24,7 +24,7 @@ RSpec::Matchers.define :have_finished_in_time do
     @old_actual = actual
     @actual     = @old_actual.commandline
 
-    next false unless @old_actual.respond_to? :timed_out?
+    raise "Expected #{@old_actual} to respond to #timed_out?" unless @old_actual.respond_to? :timed_out?
 
     @old_actual.stop
 

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

@@ -19,7 +19,7 @@ RSpec::Matchers.define :have_output do |expected|
   match do |actual|
     @old_actual = actual
 
-    next false unless @old_actual.respond_to? :output
+    raise "Expected #{@old_actual} to respond to #output" unless @old_actual.respond_to? :output
 
     @old_actual.stop
 

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

@@ -17,7 +17,7 @@ RSpec::Matchers.define :have_output_on_stderr do |expected|
   match do |actual|
     @old_actual = actual
 
-    next false unless @old_actual.respond_to? :stderr
+    raise "Expected #{@old_actual} to respond to #stderr" unless @old_actual.respond_to? :stderr
 
     @old_actual.stop
 

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

@@ -17,7 +17,7 @@ RSpec::Matchers.define :have_output_on_stdout do |expected|
   match do |actual|
     @old_actual = actual
 
-    next false unless @old_actual.respond_to? :stdout
+    raise "Expected #{@old_actual} to respond to #stdout" unless @old_actual.respond_to? :stdout
 
     @old_actual.stop
 

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

@@ -18,7 +18,7 @@
 #     end
 RSpec::Matchers.define :have_output_size do |expected|
   match do |actual|
-    next false unless actual.respond_to? :size
+    raise "Expected #{actual} to respond to #size" unless actual.respond_to? :size
 
     @actual = actual.size
     values_match? expected, @actual

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

@@ -19,7 +19,7 @@ RSpec::Matchers.define :be_an_existing_directory do |_|
   match do |actual|
     stop_all_commands
 
-    next false unless actual.is_a? String
+    raise 'String expected' unless actual.is_a? String
 
     directory?(actual)
   end

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

@@ -19,7 +19,7 @@ RSpec::Matchers.define :be_an_existing_file do |_|
   match do |actual|
     stop_all_commands
 
-    next false unless actual.is_a? String
+    raise 'String expected' unless actual.is_a? String
 
     file?(actual)
   end

data/lib/aruba/platform.rb

@@ -4,16 +4,9 @@ require 'aruba/platforms/windows_platform'
 # Aruba
 module Aruba
   PLATFORM_MUTEX = Mutex.new
-end
 
-# Aruba
-module Aruba
-  # Platform
   Platform = [Platforms::WindowsPlatform, Platforms::UnixPlatform].find(&:match?)
-end
 
-# Aruba
-module Aruba
   PLATFORM_MUTEX.synchronize do
     @platform = Platform.new
   end

data/lib/aruba/platforms/announcer.rb

@@ -1,7 +1,7 @@
 require 'shellwords'
 require 'aruba/colorizer'
 
-Aruba::AnsiColor.coloring = false if !STDOUT.tty? && !ENV.key?('AUTOTEST')
+Aruba::Colorizer.coloring = false if !STDOUT.tty? && !ENV.key?('AUTOTEST')
 
 # Aruba
 module Aruba
@@ -92,9 +92,9 @@ module Aruba
         output_format :stop_signal, proc { |p, s| format('Command will be stopped with `kill -%s %s`', s, p) }
         output_format :timeout, '# %s-timeout: %s seconds'
         output_format :wait_time, '# %s: %s seconds'
-        # rubocop:disable Metrics/LineLength
-        output_format :command_filesystem_status, proc { |status| format("<<-COMMAND FILESYSTEM STATUS\n%s\nCOMMAND FILESYSTEM STATUS", Aruba.platform.simple_table(status.to_h, sort: false)) }
-        # rubocop:enable Metrics/LineLength
+        output_format :command_filesystem_status, proc { |status|
+          format("<<-COMMAND FILESYSTEM STATUS\n%s\nCOMMAND FILESYSTEM STATUS",
+                 Aruba.platform.simple_table(status.to_h, sort: false)) }
       end
 
       def output_format(channel, string = '%s', &block)
@@ -171,13 +171,18 @@ module Aruba
 
         return unless activated?(channel)
 
-        message = if block_given?
-                    the_output_format.call(yield)
-                  else
-                    the_output_format.call(*args)
-                  end
-        message += "\n"
-        message = colorizer.cyan(message)
+        begin
+          if block_given?
+            value = yield
+            args << value
+          end
+
+          message = the_output_format.call(*args)
+          message += "\n"
+          message = colorizer.cyan(message)
+        rescue NotImplementedError => e
+          message = "Error fetching announced value for #{channel}: #{e.message}"
+        end
 
         announcer.announce(message)