aruba 0.9.0 → 0.10.0.pre

data/lib/aruba/api/environment.rb

@@ -58,6 +58,24 @@ module Aruba
 
         self
       end
+
+      # Remove existing environment variable
+      #
+      # @param [String] key
+      #   The name of the environment variable as string, e.g. 'HOME'
+      #
+      # @param [String] value
+      #   The value of the environment variable. Needs to be a string.
+      def delete_environment_variable(name)
+        name = name.to_s
+
+        announcer.announce(:environment, name, '')
+        announcer.announce(:modified_environment, name, '')
+
+        aruba.environment.delete name
+
+        self
+      end
     end
   end
 end

data/lib/aruba/api/filesystem.rb

@@ -360,7 +360,7 @@ module Aruba
       # @result [FileSize]
       #   Bytes on disk
       def disk_usage(*paths)
-        expect(paths.flatten).to all_objects be_an_existing_path
+        expect(paths.flatten).to Aruba::Matchers.all be_an_existing_path
 
         Aruba.platform.determine_disk_usage paths.flatten.map { |p| ArubaPath.new(expand_path(p)) }, aruba.config.physical_block_size
       end

data/lib/aruba/api/text.rb

@@ -0,0 +1,41 @@
+module Aruba
+  module Api
+    module Text
+      # Unescape text
+      #
+      # '\n' => "\n"
+      # '\e' => "\e"
+      # '\033' => "\e"
+      # '\"' => '"'
+      #
+      # @param [#to_s] text
+      #   Input
+      def unescape_text(text)
+        text.gsub('\n', "\n").gsub('\"', '"').gsub('\e', "\e").gsub('\033', "\e").gsub('\016', "\016").gsub('\017', "\017").gsub('\t', "\t")
+      end
+
+      # Remove ansi characters from text
+      #
+      # @param [#to_s] text
+      #   Input
+      def extract_text(text)
+        if Aruba::VERSION < '1'
+          text.gsub(/(?:\e|\033)\[\d+(?>(;\d+)*)m/, '')
+        else
+          text.gsub(/(?:\e|\033)\[\d+(?>(;\d+)*)m/, '').gsub(/\\\[|\\\]/, '').gsub(/\007|\016|\017/, '')
+        end
+      end
+
+      # Unescape special characters and remove ANSI characters
+      #
+      # @param [#to_s] text
+      #   The text to sanitize
+      def sanitize_text(text)
+        text = unescape_text(text)
+        text = extract_text(text) if !aruba.config.keep_ansi || aruba.config.remove_ansi_escape_sequences
+
+        text.chomp
+      end
+    end
+  end
+end

data/lib/aruba/cli.rb

@@ -1,11 +1,22 @@
 require 'thor'
 require 'aruba/console'
+require 'aruba/initializer'
 
 module Aruba
   class Cli < Thor
+    def self.exit_on_failure?
+      true
+    end
+
     desc 'console', "Start aruba's console"
     def console
       Aruba::Console.new.start
     end
+
+    desc 'init', 'Initialize aruba'
+    option :test_framework, :default => 'cucumber', :enum => %w(cucumber rspec minitest), :desc => 'Choose which test framework to use'
+    def init
+      Aruba::Initializer.new.call(options[:test_framework])
+    end
   end
 end

data/lib/aruba/console.rb

@@ -12,8 +12,9 @@ module Aruba
       ARGV.clear
       IRB.setup nil
 
-      IRB.conf[:PROMPT] = {}
       IRB.conf[:IRB_NAME] = 'aruba'
+
+      IRB.conf[:PROMPT] = {}
       IRB.conf[:PROMPT][:ARUBA] = {
         :PROMPT_I => '%N:%03n:%i> ',
         :PROMPT_N => '%N:%03n:%i> ',
@@ -50,7 +51,7 @@ module Aruba
       IRB.conf[:MAIN_CONTEXT] = irb.context
 
       trap("SIGINT") do
-        IRB.irb.signal_handle
+        irb.signal_handle
       end
 
       begin

data/lib/aruba/cucumber.rb

@@ -8,5 +8,6 @@ require 'aruba/cucumber/command'
 require 'aruba/cucumber/core'
 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

@@ -1,34 +1,26 @@
 When(/^I run "(.*)"$/)do |cmd|
   warn(%{\e[35m    The /^I run "(.*)"$/ step definition is deprecated. Please use the `backticks` version\e[0m})
 
-  cmd = unescape_text(cmd)
-  cmd = extract_text(cmd) if !aruba.config.keep_ansi || aruba.config.remove_ansi_escape_sequences
-
+  cmd = sanitize_text(cmd)
   run_simple(cmd, false)
 end
 
 When(/^I run `([^`]*)`$/)do |cmd|
-  cmd = unescape_text(cmd)
-  cmd = extract_text(cmd) if !aruba.config.keep_ansi || aruba.config.remove_ansi_escape_sequences
-
+  cmd = sanitize_text(cmd)
   run_simple(cmd, 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 = unescape_text(cmd)
-  cmd = extract_text(cmd) if !aruba.config.keep_ansi || aruba.config.remove_ansi_escape_sequences
-
+  cmd = sanitize_text(cmd)
   run_simple(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|
-  cmd = unescape_text(cmd)
-  cmd = extract_text(cmd) if !aruba.config.keep_ansi || aruba.config.remove_ansi_escape_sequences
-
+  cmd = sanitize_text(cmd)
   run_simple(cmd, true, secs && secs.to_i)
 end
 
@@ -39,9 +31,7 @@ When(/^I run "([^"]*)" interactively$/) do |cmd|
 end
 
 When(/^I run `([^`]*)` interactively$/)do |cmd|
-  cmd = unescape_text(cmd)
-  cmd = extract_text(cmd) if !aruba.config.keep_ansi || aruba.config.remove_ansi_escape_sequences
-
+  cmd = sanitize_text(cmd)
   @interactive = run(cmd)
 end
 
@@ -71,11 +61,8 @@ When(/^I stop the command(?: started last)? if (output|stdout|stderr) contains:$
                    last_command_started.public_send channel.to_sym, :wait_for_io => 0
                  end
 
-        output = unescape_text(output)
-        output = extract_text(output) if !aruba.config.keep_ansi || aruba.config.remove_ansi_escape_sequences
-
-        expected = unescape_text(expected)
-        expected = extract_text(expected) if !aruba.config.keep_ansi || aruba.config.remove_ansi_escape_sequences
+        output   = sanitize_text(output)
+        expected = sanitize_text(expected)
 
         if output.include? expected
           last_command_started.terminate
@@ -98,10 +85,7 @@ When(/^I wait for (?:output|stdout) to contain:$/) do |expected|
   Timeout.timeout(exit_timeout) do
     loop do
       begin
-        expected = unescape_text(expected)
-        expected = extract_text(expected) if !aruba.config.keep_ansi || aruba.config.remove_ansi_escape_sequences
-
-        expect(last_command_started).to have_output Regexp.new(expected)
+        expect(last_command_started).to have_output an_output_string_including(expected)
       rescue ExpectationError
         sleep 0.1
         retry
@@ -116,10 +100,7 @@ When(/^I wait for (?:output|stdout) to contain "([^"]*)"$/) do |expected|
   Timeout.timeout(exit_timeout) do
     loop do
       begin
-        expected = unescape_text(expected)
-        expected = extract_text(expected) if !aruba.config.keep_ansi || aruba.config.remove_ansi_escape_sequences
-
-        expect(last_command_started).to have_output Regexp.new(expected)
+        expect(last_command_started).to have_output an_output_string_including(expected)
       rescue ExpectationError
         sleep 0.1
         retry
@@ -150,14 +131,11 @@ Then(/^(?:the )?(output|stderr|stdout)(?: from "([^"]*)")? should( not)? contain
                all_commands
              end
 
-  expected = unescape_text(expected).chomp
-  expected = extract_text(expected) if !aruba.config.keep_ansi || aruba.config.remove_ansi_escape_sequences
-
-  expected = if exactly
-               expected
-             else
-               Regexp.new(Regexp.escape(expected))
-             end
+  output_string_matcher = if exactly
+                            :an_output_string_being_eq
+                          else
+                            :an_output_string_including
+                          end
 
   if Aruba::VERSION < '1.0'
     combined_output = commands.map do |c|
@@ -166,15 +144,15 @@ Then(/^(?:the )?(output|stderr|stdout)(?: from "([^"]*)")? should( not)? contain
     end.join("\n")
 
     if negated
-      expect(combined_output).not_to match expected
+      expect(combined_output).not_to send(output_string_matcher, expected)
     else
-      expect(combined_output).to match expected
+      expect(combined_output).to send(output_string_matcher, expected)
     end
   else
     if negated
-      expect(commands).not_to include_an_object send(matcher, expected)
+      expect(commands).not_to include_an_object send(matcher, send(output_string_matcher, expected))
     else
-      expect(commands).to include_an_object send(matcher, expected)
+      expect(commands).to include_an_object send(matcher, send(output_string_matcher, expected))
     end
   end
 end
@@ -201,14 +179,11 @@ Then(/^(?:the )?(output|stderr|stdout)(?: from "([^"]*)")? should( not)? contain
                all_commands
              end
 
-  expected = unescape_text(expected).chomp
-  expected = extract_text(expected) if !aruba.config.keep_ansi || aruba.config.remove_ansi_escape_sequences
-
-  expected = if exactly
-               expected
-             else
-               Regexp.new(Regexp.escape(expected))
-             end
+  output_string_matcher = if exactly
+                            :an_output_string_being_eq
+                          else
+                            :an_output_string_including
+                          end
 
   if Aruba::VERSION < '1.0'
     combined_output = commands.map do |c|
@@ -217,15 +192,15 @@ Then(/^(?:the )?(output|stderr|stdout)(?: from "([^"]*)")? should( not)? contain
     end.join("\n")
 
     if negated
-      expect(combined_output).not_to match expected
+      expect(combined_output).not_to send(output_string_matcher, expected)
     else
-      expect(combined_output).to match expected
+      expect(combined_output).to send(output_string_matcher, expected)
     end
   else
     if negated
-      expect(commands).not_to include_an_object send(matcher, expected)
+      expect(commands).not_to include_an_object send(matcher, send(output_string_matcher, expected))
     else
-      expect(commands).to include_an_object send(matcher, expected)
+      expect(commands).to include_an_object send(matcher, send(output_string_matcher, expected))
     end
   end
 end
@@ -236,25 +211,25 @@ end
 # appear naturally in the output
 Then(/^the output should( not)? match \/([^\/]*)\/$/) do |negated, expected|
   if negated
-    expect(all_commands).not_to include_an_object have_output Regexp.new(expected, Regexp::MULTILINE)
+    expect(all_commands).not_to include_an_object have_output an_output_string_matching(expected)
   else
-    expect(all_commands).to include_an_object have_output Regexp.new(expected, Regexp::MULTILINE)
+    expect(all_commands).to include_an_object have_output an_output_string_matching(expected)
   end
 end
 
 Then(/^the output should( not)? match %r<([^>]*)>$/) do |negated, expected|
   if negated
-    expect(all_commands).not_to include_an_object have_output Regexp.new(expected, Regexp::MULTILINE)
+    expect(all_commands).not_to include_an_object have_output an_output_string_matching(expected)
   else
-    expect(all_commands).to include_an_object have_output Regexp.new(expected, Regexp::MULTILINE)
+    expect(all_commands).to include_an_object have_output an_output_string_matching(expected)
   end
 end
 
 Then(/^the output should( not)? match:$/) do |negated, expected|
   if negated
-    expect(all_commands).not_to include_an_object have_output Regexp.new(expected, Regexp::MULTILINE)
+    expect(all_commands).not_to include_an_object have_output an_output_string_matching(expected)
   else
-    expect(all_commands).to include_an_object have_output Regexp.new(expected, Regexp::MULTILINE)
+    expect(all_commands).to include_an_object have_output an_output_string_matching(expected)
   end
 end
 
@@ -267,10 +242,6 @@ Then(/^the exit status should( not)? be (\d+)$/) do |negated, exit_status|
 end
 
 Then(/^it should( not)? (pass|fail) with "(.*?)"$/) do |negated, pass_fail, expected|
-  expected = unescape_text(expected).chomp
-  expected = extract_text(expected) if !aruba.config.keep_ansi || aruba.config.remove_ansi_escape_sequences
-  expected = Regexp.new(Regexp.escape(expected))
-
   if pass_fail == 'pass'
     expect(last_command_stopped).to be_successfully_executed
   else
@@ -278,17 +249,13 @@ Then(/^it should( not)? (pass|fail) with "(.*?)"$/) do |negated, pass_fail, expe
   end
 
   if negated
-    expect(last_command_stopped).not_to have_output expected
+    expect(last_command_stopped).not_to have_output an_output_string_including(expected)
   else
-    expect(last_command_stopped).to have_output expected
+    expect(last_command_stopped).to have_output an_output_string_including(expected)
   end
 end
 
 Then(/^it should( not)? (pass|fail) with:$/) do |negated, pass_fail, expected|
-  expected = unescape_text(expected).chomp
-  expected = extract_text(expected) if !aruba.config.keep_ansi || aruba.config.remove_ansi_escape_sequences
-  expected = Regexp.new(Regexp.escape(expected))
-
   if pass_fail == 'pass'
     expect(last_command_stopped).to be_successfully_executed
   else
@@ -296,16 +263,13 @@ Then(/^it should( not)? (pass|fail) with:$/) do |negated, pass_fail, expected|
   end
 
   if negated
-    expect(last_command_stopped).not_to have_output expected
+    expect(last_command_stopped).not_to have_output an_output_string_including(expected)
   else
-    expect(last_command_stopped).to have_output expected
+    expect(last_command_stopped).to have_output an_output_string_including(expected)
   end
 end
 
 Then(/^it should( not)? (pass|fail) with exactly:$/) do |negated, pass_fail, expected|
-  expected = unescape_text(expected).chomp
-  expected = extract_text(expected) if !aruba.config.keep_ansi || aruba.config.remove_ansi_escape_sequences
-
   if pass_fail == 'pass'
     expect(last_command_stopped).to be_successfully_executed
   else
@@ -313,17 +277,13 @@ Then(/^it should( not)? (pass|fail) with exactly:$/) do |negated, pass_fail, exp
   end
 
   if negated
-    expect(last_command_stopped).not_to have_output expected
+    expect(last_command_stopped).not_to have_output an_output_string_eq(expected)
   else
-    expect(last_command_stopped).to have_output expected
+    expect(last_command_stopped).to have_output an_output_string_being_eq(expected)
   end
 end
 
-Then(/^it should( not)? (pass|fail) with regexp?:$/) do |negated, pass_fail, expected|
-  expected = unescape_text(expected).chomp
-  expected = extract_text(expected) if !aruba.config.keep_ansi || aruba.config.remove_ansi_escape_sequences
-  expected = Regexp.new(expected, Regexp::MULTILINE)
-
+Then(/^it should( not)? (pass|fail) (?:with regexp?|matching):$/) do |negated, pass_fail, expected|
   if pass_fail == 'pass'
     expect(last_command_stopped).to be_successfully_executed
   else
@@ -331,9 +291,9 @@ Then(/^it should( not)? (pass|fail) with regexp?:$/) do |negated, pass_fail, exp
   end
 
   if negated
-    expect(last_command_stopped).not_to have_output expected
+    expect(last_command_stopped).not_to have_output an_output_string_matching(expected)
   else
-    expect(last_command_stopped).to have_output expected
+    expect(last_command_stopped).to have_output an_output_string_matching(expected)
   end
 end
 
@@ -354,10 +314,6 @@ end
 
 Then(/^(?:the )?(output|stdout|stderr) should( not)? contain all of these lines:$/) do |channel, negated, table|
   table.raw.flatten.each do |expected|
-    expected = unescape_text(expected).chomp
-    expected = extract_text(expected) if !aruba.config.keep_ansi || aruba.config.remove_ansi_escape_sequences
-    expected = Regexp.new(Regexp.escape(expected))
-
     matcher = case channel.to_sym
               when :output
                 :have_output
@@ -370,9 +326,9 @@ Then(/^(?:the )?(output|stdout|stderr) should( not)? contain all of these lines:
               end
 
     if negated
-      expect(all_commands).not_to include_an_object send(matcher, expected)
+      expect(all_commands).not_to include_an_object have_output an_output_string_including(expected)
     else
-      expect(all_commands).to include_an_object send(matcher, expected)
+      expect(all_commands).to include_an_object have_output an_output_string_including(expected)
     end
   end
 end

data/lib/aruba/cucumber/environment.rb

@@ -2,9 +2,13 @@ Given(/^a mocked home directory$/)do
   set_environment_variable 'HOME', expand_path('.')
 end
 
+Given(/^I set the environment variable "(.*)" to "(.*)"/) do |variable, value|
+  set_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.upcase
+    variable = row['variable'].to_s
     value = row['value'].to_s
 
     set_environment_variable(variable, value)
@@ -13,7 +17,7 @@ end
 
 Given(/^I append the values? to the environment variables?:/) do |table|
   table.hashes.each do |row|
-    variable = row['variable'].to_s.upcase
+    variable = row['variable'].to_s
     value = row['value'].to_s
 
     append_environment_variable(variable, value)
@@ -22,7 +26,7 @@ end
 
 Given(/^I prepend the values? to the environment variables?:/) do |table|
   table.hashes.each do |row|
-    variable = row['variable'].to_s.upcase
+    variable = row['variable'].to_s
     value = row['value'].to_s
 
     prepend_environment_variable(variable, value)