aruba 1.0.1 → 1.1.1

data/lib/aruba/configuration.rb

@@ -1,15 +1,15 @@
-require 'contracts'
+require "contracts"
 
-require 'aruba/version'
-require 'aruba/basic_configuration'
-require 'aruba/in_config_wrapper'
-require 'aruba/hooks'
+require "aruba/version"
+require "aruba/basic_configuration"
+require "aruba/in_config_wrapper"
+require "aruba/hooks"
 
-require 'aruba/contracts/relative_path'
-require 'aruba/contracts/absolute_path'
-require 'aruba/contracts/enum'
+require "aruba/contracts/relative_path"
+require "aruba/contracts/absolute_path"
+require "aruba/contracts/enum"
 
-require 'aruba/contracts/is_power_of_two'
+require "aruba/contracts/is_power_of_two"
 
 # Aruba
 module Aruba
@@ -17,69 +17,59 @@ module Aruba
   #
   # This defines the configuration options of aruba
   class Configuration < BasicConfiguration
-    option_reader :root_directory, contract: { None => String }, default: Dir.getwd
+    option_reader :root_directory, type: String, default: Dir.getwd
 
     option_accessor :working_directory,
-                    contract: { Aruba::Contracts::RelativePath =>
-                                Aruba::Contracts::RelativePath },
-                    default: 'tmp/aruba'
+                    type: Aruba::Contracts::RelativePath,
+                    default: "tmp/aruba"
 
-    option_reader :fixtures_path_prefix, contract: { None => String }, default: '%'
+    option_reader :fixtures_path_prefix, type: String, default: "%"
 
-    option_accessor :exit_timeout, contract: { Num => Num }, default: 15
-    option_accessor :stop_signal, contract: { Maybe[String] => Maybe[String] }, default: nil
-    option_accessor :io_wait_timeout, contract: { Num => Num }, default: 0.1
-    option_accessor :startup_wait_time, contract: { Num => Num }, default: 0
+    option_accessor :exit_timeout, type: Num, default: 15
+    option_accessor :stop_signal, type: Maybe[String], default: nil
+    option_accessor :io_wait_timeout, type: Num, default: 0.1
+    option_accessor :startup_wait_time, type: Num, default: 0
     option_accessor :fixtures_directories,
-                    contract: { Array => ArrayOf[String] },
+                    type: ArrayOf[String],
                     default: %w(features/fixtures spec/fixtures test/fixtures fixtures)
 
-    option_accessor :command_runtime_environment, contract: { Hash => Hash }, default: {}
+    option_accessor :command_runtime_environment, type: Hash, default: {}
     option_accessor :command_search_paths,
-                    contract: { ArrayOf[String] => ArrayOf[String] } do |config|
-                      [File.join(config.root_directory.value, 'bin'),
-                       File.join(config.root_directory.value, 'exe')]
+                    type: ArrayOf[String] do |config|
+                      [File.join(config.root_directory.value, "bin"),
+                       File.join(config.root_directory.value, "exe")]
                     end
-    option_accessor :remove_ansi_escape_sequences, contract: { Bool => Bool }, default: true
+    option_accessor :remove_ansi_escape_sequences, type: Bool, default: true
     option_accessor :command_launcher,
-                    contract: {
-                      Aruba::Contracts::Enum[:in_process, :spawn, :debug] =>
-                        Aruba::Contracts::Enum[:in_process, :spawn, :debug]
-                    },
+                    type: Aruba::Contracts::Enum[:in_process, :spawn, :debug],
                     default: :spawn
-    option_accessor :main_class, contract: { Class => Maybe[Class] }, default: nil
+    option_accessor :main_class, type: Maybe[Class], default: nil
 
     option_accessor :home_directory,
-                    contract: {
-                      Or[Aruba::Contracts::AbsolutePath, Aruba::Contracts::RelativePath] =>
-                        Or[Aruba::Contracts::AbsolutePath, Aruba::Contracts::RelativePath]
-                    } do |config|
-                      File.join(config.root_directory.value, config.working_directory.value)
-                    end
+                    type: Or[Aruba::Contracts::AbsolutePath,
+                             Aruba::Contracts::RelativePath] do |config|
+      File.join(config.root_directory.value, config.working_directory.value)
+    end
 
     option_accessor :log_level,
-                    contract: {
-                      Aruba::Contracts::Enum[:fatal, :warn, :debug, :info,
-                                             :error, :unknown, :silent] =>
+                    type:
                         Aruba::Contracts::Enum[:fatal, :warn, :debug, :info,
-                                               :error, :unknown, :silent]
-                    },
+                                               :error, :unknown, :silent],
                     default: :info
 
     # TODO: deprecate this value and replace with "filesystem allocation unit"
     # equal to 4096 by default. "filesystem allocation unit" would represent
     # the actual MINIMUM space taken in bytes by a 1-byte file
     option_accessor :physical_block_size,
-                    contract: { Aruba::Contracts::IsPowerOfTwo =>
-                                Aruba::Contracts::IsPowerOfTwo },
+                    type: Aruba::Contracts::IsPowerOfTwo,
                     default: 512
-    option_accessor :console_history_file, contract: { String => String },
-                                           default: '~/.aruba_history'
+    option_accessor :console_history_file, type: String,
+                                           default: "~/.aruba_history"
 
     option_accessor :activate_announcer_on_command_failure,
-                    contract: { ArrayOf[Symbol] => ArrayOf[Symbol] },
+                    type: ArrayOf[Symbol],
                     default: []
-    option_accessor :allow_absolute_paths, contract: { Bool => Bool }, default: false
+    option_accessor :allow_absolute_paths, type: Bool, default: false
   end
 end
 

data/lib/aruba/console.rb

@@ -1,7 +1,7 @@
-require 'irb'
+require "irb"
 
-require 'aruba/api'
-require 'aruba/console/help'
+require "aruba/api"
+require "aruba/console/help"
 
 # Aruba
 module Aruba
@@ -15,21 +15,21 @@ module Aruba
       ARGV.clear
       IRB.setup nil
 
-      IRB.conf[:IRB_NAME] = 'aruba'
+      IRB.conf[:IRB_NAME] = "aruba"
 
       IRB.conf[:PROMPT] = {}
       IRB.conf[:PROMPT][:ARUBA] = {
-        PROMPT_I: '%N:%03n:%i> ',
-        PROMPT_S: '%N:%03n:%i%l ',
-        PROMPT_C: '%N:%03n:%i* ',
+        PROMPT_I: "%N:%03n:%i> ",
+        PROMPT_S: "%N:%03n:%i%l ",
+        PROMPT_C: "%N:%03n:%i* ",
         RETURN: "# => %s\n"
       }
       IRB.conf[:PROMPT_MODE] = :ARUBA
 
       IRB.conf[:RC] = false
 
-      require 'irb/completion'
-      require 'irb/ext/save-history'
+      require "irb/completion"
+      require "irb/ext/save-history"
       IRB.conf[:READLINE] = true
       IRB.conf[:SAVE_HISTORY] = 1000
       IRB.conf[:HISTORY_FILE] = Aruba.config.console_history_file
@@ -43,14 +43,14 @@ module Aruba
         end
 
         def inspect
-          'nil'
+          "nil"
         end
       end
 
       irb = IRB::Irb.new(IRB::WorkSpace.new(context.new))
       IRB.conf[:MAIN_CONTEXT] = irb.context
 
-      trap('SIGINT') do
+      trap("SIGINT") do
         irb.signal_handle
       end
 

data/lib/aruba/console/help.rb

@@ -1,4 +1,4 @@
-require 'aruba/api'
+require "aruba/api"
 
 # Aruba
 module Aruba
@@ -8,10 +8,10 @@ module Aruba
     module Help
       # Output help information
       def aruba_help
-        puts 'Aruba Version: ' + Aruba::VERSION
-        puts 'Issue Tracker: ' + 'https://github.com/cucumber/aruba/issues'
-        puts 'Documentation:'
-        puts '* http://www.rubydoc.info/gems/aruba'
+        puts "Aruba Version: #{Aruba::VERSION}"
+        puts "Issue Tracker: https://github.com/cucumber/aruba/issues"
+        puts "Documentation:"
+        puts "* http://www.rubydoc.info/gems/aruba"
         puts
 
         nil
@@ -20,10 +20,10 @@ module Aruba
       # List available methods in aruba
       def aruba_methods
         ms = (Aruba::Api.instance_methods - Module.instance_methods)
-             .each_with_object([]) { |e, a| a << format('* %s', e) }
+             .each_with_object([]) { |e, a| a << format("* %s", e) }
              .sort
 
-        puts "Available Methods:\n" + ms.join("\n")
+        puts "Available Methods:\n#{ms.join("\n")}"
 
         nil
       end

data/lib/aruba/contracts/absolute_path.rb

@@ -1,4 +1,4 @@
-require 'aruba/platform'
+require "aruba/platform"
 
 # Aruba
 module Aruba

data/lib/aruba/contracts/enum.rb

@@ -1,4 +1,4 @@
-require 'contracts'
+require "contracts"
 
 # Aruba
 module Aruba

data/lib/aruba/contracts/is_power_of_two.rb

@@ -1,4 +1,4 @@
-require 'aruba/aruba_path'
+require "aruba/aruba_path"
 
 # Aruba
 module Aruba

data/lib/aruba/contracts/relative_path.rb

@@ -1,4 +1,4 @@
-require 'aruba/platform'
+require "aruba/platform"
 
 # Aruba
 module Aruba

data/lib/aruba/cucumber.rb

@@ -1,8 +1,8 @@
-require 'aruba/version'
+require "aruba/version"
 
-require 'aruba/api'
-require 'aruba/cucumber/hooks'
-require 'aruba/cucumber/command'
-require 'aruba/cucumber/environment'
-require 'aruba/cucumber/file'
-require 'aruba/cucumber/testing_frameworks'
+require "aruba/api"
+require "aruba/cucumber/hooks"
+require "aruba/cucumber/command"
+require "aruba/cucumber/environment"
+require "aruba/cucumber/file"
+require "aruba/cucumber/testing_frameworks"

data/lib/aruba/cucumber/command.rb

@@ -1,4 +1,4 @@
-require 'aruba/generators/script_file'
+require "aruba/generators/script_file"
 
 When(/^I run `([^`]*)`$/) do |cmd|
   cmd = sanitize_text(cmd)
@@ -14,9 +14,9 @@ end
 
 When(/^I run the following (?:commands|script)(?: (?:with|in) `([^`]+)`)?:$/) \
   do |shell, commands|
-  full_path = expand_path('bin/myscript')
+  full_path = expand_path("bin/myscript")
 
-  Aruba.platform.mkdir(expand_path('bin'))
+  Aruba.platform.mkdir(expand_path("bin"))
   shell ||= Aruba.platform.default_shell
 
   Aruba::ScriptFile.new(interpreter: shell, content: commands, path: full_path).call
@@ -55,7 +55,7 @@ When(/^I (terminate|stop) the command (?:"([^"]*)"|(?:started last))$/) do |sign
           last_command_started
         end
 
-  if signal == 'terminate'
+  if signal == "terminate"
     cmd.terminate
   else
     cmd.stop
@@ -88,30 +88,22 @@ end
 
 When(/^I wait for (?:output|stdout) to contain:$/) do |expected|
   Timeout.timeout(aruba.config.exit_timeout) do
-    loop do
-      begin
-        expect(last_command_started).to have_output an_output_string_including(expected)
-      rescue ExpectationError
-        sleep 0.1
-        retry
-      end
-
-      break
+    begin
+      expect(last_command_started).to have_output an_output_string_including(expected)
+    rescue ExpectationError
+      sleep 0.1
+      retry
     end
   end
 end
 
 When(/^I wait for (?:output|stdout) to contain "([^"]*)"$/) do |expected|
   Timeout.timeout(aruba.config.exit_timeout) do
-    loop do
-      begin
-        expect(last_command_started).to have_output an_output_string_including(expected)
-      rescue ExpectationError
-        sleep 0.1
-        retry
-      end
-
-      break
+    begin
+      expect(last_command_started).to have_output an_output_string_including(expected)
+    rescue ExpectationError
+      sleep 0.1
+      retry
     end
   end
 end
@@ -143,9 +135,9 @@ Then(
   /^(?:the )?(output|stderr|stdout) from "([^"]*)" should contain( exactly)? "([^"]*)"$/
 ) do |channel, cmd, exactly, expected|
   matcher = case channel
-            when 'output'; then :have_output
-            when 'stderr'; then :have_output_on_stderr
-            when 'stdout'; then :have_output_on_stdout
+            when "output"; then :have_output
+            when "stderr"; then :have_output_on_stderr
+            when "stdout"; then :have_output_on_stdout
             end
 
   command = aruba.command_monitor.find(Aruba.platform.detect_ruby(cmd))
@@ -164,9 +156,9 @@ Then(
   /^(?:the )?(output|stderr|stdout) from "([^"]*)" should not contain( exactly)? "([^"]*)"$/
 ) do |channel, cmd, exactly, expected|
   matcher = case channel
-            when 'output'; then :have_output
-            when 'stderr'; then :have_output_on_stderr
-            when 'stdout'; then :have_output_on_stdout
+            when "output"; then :have_output
+            when "stderr"; then :have_output_on_stderr
+            when "stdout"; then :have_output_on_stdout
             end
 
   command = aruba.command_monitor.find(Aruba.platform.detect_ruby(cmd))
@@ -212,9 +204,9 @@ end
 Then(/^(?:the )?(output|stderr|stdout) from "([^"]*)" should not contain( exactly)?:$/) \
   do |channel, cmd, exactly, expected|
   matcher = case channel
-            when 'output'; then :have_output
-            when 'stderr'; then :have_output_on_stderr
-            when 'stdout'; then :have_output_on_stdout
+            when "output"; then :have_output
+            when "stderr"; then :have_output_on_stderr
+            when "stdout"; then :have_output_on_stdout
             end
 
   command = aruba.command_monitor.find(Aruba.platform.detect_ruby(cmd))
@@ -232,9 +224,9 @@ end
 Then(/^(?:the )?(output|stderr|stdout) from "([^"]*)" should contain( exactly)?:$/) \
   do |channel, cmd, exactly, expected|
   matcher = case channel
-            when 'output'; then :have_output
-            when 'stderr'; then :have_output_on_stderr
-            when 'stdout'; then :have_output_on_stdout
+            when "output"; then :have_output
+            when "stderr"; then :have_output_on_stderr
+            when "stdout"; then :have_output_on_stdout
             end
 
   command = aruba.command_monitor.find(Aruba.platform.detect_ruby(cmd))
@@ -295,7 +287,7 @@ end
 Then(/^it should not (pass|fail) with "(.*?)"$/) do |pass_fail, expected|
   last_command_started.stop
 
-  if pass_fail == 'pass'
+  if pass_fail == "pass"
     expect(last_command_stopped).to be_successfully_executed
   else
     expect(last_command_stopped).not_to be_successfully_executed
@@ -307,7 +299,7 @@ end
 Then(/^it should (pass|fail) with "(.*?)"$/) do |pass_fail, expected|
   last_command_started.stop
 
-  if pass_fail == 'pass'
+  if pass_fail == "pass"
     expect(last_command_stopped).to be_successfully_executed
   else
     expect(last_command_stopped).not_to be_successfully_executed
@@ -319,7 +311,7 @@ end
 Then(/^it should not (pass|fail) with:$/) do |pass_fail, expected|
   last_command_started.stop
 
-  if pass_fail == 'pass'
+  if pass_fail == "pass"
     expect(last_command_stopped).to be_successfully_executed
   else
     expect(last_command_stopped).not_to be_successfully_executed
@@ -331,7 +323,7 @@ end
 Then(/^it should (pass|fail) with:$/) do |pass_fail, expected|
   last_command_started.stop
 
-  if pass_fail == 'pass'
+  if pass_fail == "pass"
     expect(last_command_stopped).to be_successfully_executed
   else
     expect(last_command_stopped).not_to be_successfully_executed
@@ -343,7 +335,7 @@ end
 Then(/^it should not (pass|fail) with exactly:$/) do |pass_fail, expected|
   last_command_started.stop
 
-  if pass_fail == 'pass'
+  if pass_fail == "pass"
     expect(last_command_stopped).to be_successfully_executed
   else
     expect(last_command_stopped).not_to be_successfully_executed
@@ -355,7 +347,7 @@ end
 Then(/^it should (pass|fail) with exactly:$/) do |pass_fail, expected|
   last_command_started.stop
 
-  if pass_fail == 'pass'
+  if pass_fail == "pass"
     expect(last_command_stopped).to be_successfully_executed
   else
     expect(last_command_stopped).not_to be_successfully_executed
@@ -367,7 +359,7 @@ end
 Then(/^it should not (pass|fail) (?:with regexp?|matching):$/) do |pass_fail, expected|
   last_command_started.stop
 
-  if pass_fail == 'pass'
+  if pass_fail == "pass"
     expect(last_command_stopped).to be_successfully_executed
   else
     expect(last_command_stopped).not_to be_successfully_executed
@@ -379,7 +371,7 @@ end
 Then(/^it should (pass|fail) (?:with regexp?|matching):$/) do |pass_fail, expected|
   last_command_started.stop
 
-  if pass_fail == 'pass'
+  if pass_fail == "pass"
     expect(last_command_stopped).to be_successfully_executed
   else
     expect(last_command_stopped).not_to be_successfully_executed
@@ -390,9 +382,9 @@ end
 
 Then(/^(?:the )?(output|stderr|stdout) should not contain anything$/) do |channel|
   matcher = case channel
-            when 'output'; then :have_output
-            when 'stderr'; then :have_output_on_stderr
-            when 'stdout'; then :have_output_on_stdout
+            when "output"; then :have_output
+            when "stderr"; then :have_output_on_stderr
+            when "stdout"; then :have_output_on_stdout
             end
 
   expect(all_commands).to include_an_object send(matcher, be_nil.or(be_empty))
@@ -402,9 +394,9 @@ Then(/^(?:the )?(output|stdout|stderr) should( not)? contain all of these lines:
   do |channel, negated, table|
   table.raw.flatten.each do |expected|
     _matcher = case channel
-               when 'output'; then :have_output
-               when 'stderr'; then :have_output_on_stderr
-               when 'stdout'; then :have_output_on_stdout
+               when "output"; then :have_output
+               when "stderr"; then :have_output_on_stderr
+               when "stdout"; then :have_output_on_stdout
                end
 
     # TODO: This isn't actually using the above. It's hardcoded to use have_output only
@@ -448,5 +440,5 @@ When(/^I send the signal "([^"]*)" to the command (?:"([^"]*)"|(?:started last))
 end
 
 Given(/^I look for executables in "(.*)" within the current directory$/) do |directory|
-  prepend_environment_variable 'PATH', expand_path(directory) + File::PATH_SEPARATOR
+  prepend_environment_variable "PATH", expand_path(directory) + File::PATH_SEPARATOR
 end