aruba 0.5.3 → 0.5.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fb86636b75dbff7127e814b3e4ddc8d0dbfc17aa
+  data.tar.gz: 062abfc4550ad7a49265cc2a1bf1db54f46e1025
+SHA512:
+  metadata.gz: 66422110e4192b2e11fa3cd08f6df00cd862312d9bb2a2cb86fda2b4911ef7d10ee8ab85d2199511cb6b0791fbd8720afedbfd02f23a7c5f8294cd69ae31c792
+  data.tar.gz: 02126e2869de5ba3301f84c61c79afcbc1c60dd48813fec687ba2a930908023038dbbd5256e61cb13d6b19c7406e412323b14710d7edbdc022021bfcb50db0e7

data/History.md

@@ -1,4 +1,11 @@
-## [master](https://github.com/cucumber/aruba/compare/v0.5.2...master)
+## [master](https://github.com/cucumber/aruba/compare/v0.5.4...master)
+
+## [v0.5.4](https://github.com/cucumber/aruba/compare/v0.5.3...v0.5.4)
+* Added support for piping in files (#154 maxmeyer, dg-vrnetze)
+* Added cucumber steps for environment variables (#156 dg-vrnetze)
+* Added support for file mode (#157 maxmeyer, dg-vrnetze)
+
+## [v0.5.3](https://github.com/cucumber/aruba/compare/v0.5.2...v0.5.3)
 * Fix for UTF-8 support (#151 Matt Wynne, Jarl Friis)
 * Fix for open file leakage (#150 @JonRowe)
 

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://secure.travis-ci.org/cucumber/aruba.png)](http://travis-ci.org/cucumber/aruba) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/cucumber/aruba)
+[![Build Status](https://secure.travis-ci.org/cucumber/aruba.png)](http://travis-ci.org/cucumber/aruba) [![Code Climate](https://codeclimate.com/github/cucumber/aruba.png)](https://codeclimate.com/github/cucumber/aruba)
 
 Aruba is Cucumber extension for testing command line applications written in any programming language. Features at a glance:
 

data/aruba.gemspec

@@ -2,10 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name        = 'aruba'
-  s.version     = '0.5.3'
+  s.version     = '0.5.4'
   s.authors     = ["Aslak Hellesøy", "David Chelimsky", "Mike Sassak", "Matt Wynne"]
   s.description = 'CLI Steps for Cucumber, hand-crafted for you in Aruba'
   s.summary     = "aruba-#{s.version}"
+  s.license     = 'MIT'
   s.email       = 'cukes@googlegroups.com'
   s.homepage    = 'http://github.com/cucumber/aruba'
 
@@ -15,7 +16,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'bcat', '>= 0.6.1'
   s.add_development_dependency 'kramdown', '>= 0.14'
   s.add_development_dependency 'rake', '>= 0.9.2'
-  s.add_development_dependency 'rspec', '>= 2.7.0'
+  s.add_development_dependency 'rspec', '>= 2.11.0'
+  s.add_development_dependency 'fuubar', '>= 1.1.1'
 
   s.rubygems_version = ">= 1.6.1"
   s.files            = `git ls-files`.split("\n")
@@ -24,4 +26,3 @@ Gem::Specification.new do |s|
   s.rdoc_options     = ["--charset=UTF-8"]
   s.require_path     = "lib"
 end
-

data/features/command_environment_variables.feature

@@ -0,0 +1,15 @@
+Feature: Command environment variables
+
+  In order to test command line applications which make use of environment variables
+  As a developer using Cucumber
+  I want to use the command environment variable step
+
+  Scenario: Changing the environment
+    Given I set the environment variables to:
+      | variable           | value      |
+      | LONG_LONG_VARIABLE | long_value |
+    When I run `/usr/bin/env`
+    Then the output should contain:
+      """
+      long_value
+      """

data/features/file_system_commands.feature

@@ -89,6 +89,17 @@ Feature: file system commands
   Scenario: Check for absence of a single file
     Then a file named "lorem/ipsum/dolor" should not exist
 
+  Scenario: Check for absence of a single file using a regex
+    Then a file matching %r<^ipsum> should not exist
+
+  Scenario: Check for presence of a single file using a regex
+    Given an empty file named "lorem/ipsum/dolor"
+    Then a file matching %r<dolor$> should exist
+
+  Scenario: Check for presence of a single file using a more complicated regex
+    Given an empty file named "lorem/ipsum/dolor"
+    Then a file matching %r<ipsum/dolor> should exist
+
   Scenario: Check for presence of a subset of directories
     Given a directory named "foo/bar"
     Given a directory named "foo/bla"
@@ -159,3 +170,18 @@ Feature: file system commands
     Given an empty file named "a/b.txt"
     Given an empty file named "a/b/c.txt"
     Given an empty file named "a/b/c/d.txt"
+
+  Scenario: Change mode of empty file
+    Given an empty file named "test.txt" with mode "0666"
+    Then the mode of filesystem object "test.txt" should match "0666"
+
+  Scenario: Change mode of a directory
+    Given a directory named "test.d" with mode "0666"
+    Then the mode of filesystem object "test.d" should match "0666"
+
+  Scenario: Change mode of file
+    Given a file named "test.txt" with mode "0666" and with:
+    """
+    asdf
+    """
+    Then the mode of filesystem object "test.txt" should match "0666"

data/features/flushing.feature

@@ -11,12 +11,14 @@ Feature: Flushing output
     And the exit status should be 0
 
   Scenario: Tons of output
+    Given The default aruba timeout is 10 seconds
     When I run `bash -c 'for ((c=0; c<65536; c = c+1)); do echo -n "a"; done'`
     Then the output should contain "a"
     And the output should be 65536 bytes long
     And the exit status should be 0
 
   Scenario: Tons of interactive output
+    Given The default aruba timeout is 10 seconds
     When I run `bash -c 'read size; for ((c=0; c<$size; c = c+1)); do echo -n "a"; done'` interactively
     And I type "65536"
     Then the output should contain "a"

data/features/interactive.feature

@@ -31,6 +31,31 @@ Feature: Interactive process control
       Hello, world
       """
 
+  @posix
+  Scenario: Pipe in a file
+    Given a file named "test.txt" with:
+      """
+      line1
+      line2
+      """
+    When I run `cat` interactively
+    And I pipe in the file "test.txt"
+    Then the output should contain:
+      """
+      line1
+      line2
+      """
+
+  @posix
+  Scenario: Close stdin stream
+    When I run `cat` interactively
+    And I type "Hello, world"
+    And I close the stdin stream
+    Then the output should contain:
+      """
+      Hello, world
+      """
+
   @posix
   Scenario: Stop processes before checking for filesystem changes 
     See: http://github.com/aslakhellesoy/aruba/issues#issue/17 for context

data/lib/aruba.rb

@@ -5,4 +5,4 @@ module Aruba
     attr_accessor :process
   end
   self.process = Aruba::SpawnProcess
-end
+end

data/lib/aruba/api.rb

@@ -4,6 +4,8 @@ require 'rspec/expectations'
 require 'aruba'
 require 'aruba/config'
 
+Dir.glob( File.join( File.expand_path( '../matchers' , __FILE__ )  , '*.rb' ) ).each { |rb| require rb }
+
 module Aruba
   module Api
     include RSpec::Matchers
@@ -13,6 +15,11 @@ module Aruba
       Dir.chdir(current_dir, &block)
     end
 
+    def clean_current_dir
+      _rm_rf(current_dir)
+      _mkdir(current_dir)
+    end
+
     def current_dir
       File.join(*dirs)
     end
@@ -46,6 +53,23 @@ module Aruba
       end
     end
 
+    def chmod(mode, name)
+      in_current_dir do
+        raise "expected #{name} to be present" unless FileTest.exists?(name)
+        if mode.kind_of? String
+          FileUtils.chmod(mode.to_i(8),name)
+        else
+          FileUtils.chmod(mode,name)
+        end
+      end
+    end
+
+    def mod?(mode, name)
+      in_current_dir do
+        mode == sprintf( "%o", File::Stat.new(name).mode )[-4,4].to_i(8)
+      end
+    end
+
     def _create_fixed_size_file(file_name, file_size, check_presence)
       in_current_dir do
         raise "expected #{file_name} to be present" if check_presence && !File.file?(file_name)
@@ -82,25 +106,41 @@ module Aruba
     def check_file_presence(paths, expect_presence)
       prep_for_fs_check do
         paths.each do |path|
-          if expect_presence
-            File.should be_file(path)
+          if path.kind_of? Regexp
+            if expect_presence
+              expect(Dir.glob('**/*')).to include_regexp(path)
+            else
+              expect(Dir.glob('**/*')).not_to include_regexp(path)
+            end
           else
-            File.should_not be_file(path)
+            if expect_presence
+              expect(File).to be_file(path)
+            else
+              expect(File).not_to be_file(path)
+            end
           end
         end
       end
     end
 
+    def pipe_in_file(file)
+      in_current_dir do
+        File.open(file, 'r').each_line do |line|
+          _write_interactive(line)
+        end
+      end
+    end
+
     def check_file_size(paths_and_sizes)
       prep_for_fs_check do
         paths_and_sizes.each do |path, size|
-          File.size(path).should == size
+          expect(File.size(path)).to eq size
         end
       end
     end
 
     def with_file_content(file, &block)
-      prep_for_fs_check do 
+      prep_for_fs_check do
         content = IO.read(file)
         yield(content)
       end
@@ -108,27 +148,27 @@ module Aruba
 
     def check_file_content(file, partial_content, expect_match)
       regexp = regexp(partial_content)
-      prep_for_fs_check do 
+      prep_for_fs_check do
         content = IO.read(file)
         if expect_match
-          content.should =~ regexp
+          expect(content).to match regexp
         else
-          content.should_not =~ regexp
+          expect(content).not_to match regexp
         end
       end
     end
 
     def check_exact_file_content(file, exact_content)
-      prep_for_fs_check { IO.read(file).should == exact_content }
+      prep_for_fs_check { expect(IO.read(file)).to eq exact_content }
     end
 
     def check_directory_presence(paths, expect_presence)
       prep_for_fs_check do
         paths.each do |path|
           if expect_presence
-            File.should be_directory(path)
+            expect(File).to be_directory(path)
           else
-            File.should_not be_directory(path)
+            expect(File).not_to be_directory(path)
           end
         end
       end
@@ -143,6 +183,10 @@ module Aruba
       FileUtils.mkdir_p(dir_name) unless File.directory?(dir_name)
     end
 
+    def _rm_rf(dir_name)
+      FileUtils.rm_rf(dir_name)
+    end
+
     def unescape(string)
       string = string.gsub('\n', "\n").gsub('\"', '"').gsub('\e', "\e")
       string = string.gsub(/\e\[\d+(?>(;\d+)*)m/, '') unless @aruba_keep_ansi
@@ -184,30 +228,30 @@ module Aruba
 
     def assert_exact_output(expected, actual)
       actual.force_encoding(expected.encoding) if RUBY_VERSION >= "1.9"
-      unescape(actual).should == unescape(expected)
+      expect(unescape(actual)).to eq unescape(expected)
     end
 
     def assert_partial_output(expected, actual)
       actual.force_encoding(expected.encoding) if RUBY_VERSION >= "1.9"
-      unescape(actual).should include(unescape(expected))
+      expect(unescape(actual)).to include(unescape(expected))
     end
 
     def assert_matching_output(expected, actual)
       actual.force_encoding(expected.encoding) if RUBY_VERSION >= "1.9"
-      unescape(actual).should =~ /#{unescape(expected)}/m
+      expect(unescape(actual)).to match /#{unescape(expected)}/m
     end
 
     def assert_not_matching_output(expected, actual)
       actual.force_encoding(expected.encoding) if RUBY_VERSION >= "1.9"
-      unescape(actual).should_not =~ /#{unescape(expected)}/m
+      expect(unescape(actual)).not_to match /#{unescape(expected)}/m
     end
 
     def assert_no_partial_output(unexpected, actual)
       actual.force_encoding(unexpected.encoding) if RUBY_VERSION >= "1.9"
       if Regexp === unexpected
-        unescape(actual).should_not =~ unexpected
+        expect(unescape(actual)).not_to match unexpected
       else
-        unescape(actual).should_not include(unexpected)
+        expect(unescape(actual)).not_to include(unexpected)
       end
     end
 
@@ -243,12 +287,12 @@ module Aruba
     end
 
     def assert_exit_status(status)
-      last_exit_status.should eq(status),
+      expect(last_exit_status).to eq(status),
         append_output_to("Exit status was #{last_exit_status} but expected it to be #{status}.")
     end
 
     def assert_not_exit_status(status)
-      last_exit_status.should_not eq(status),
+      expect(last_exit_status).not_to eq(status),
         append_output_to("Exit status was #{last_exit_status} which was not expected.")
     end
 
@@ -278,7 +322,9 @@ module Aruba
     end
 
     def get_process(wanted)
-      processes.reverse.find{ |name, _| name == wanted }[-1]
+      matching_processes = processes.reverse.find{ |name, _| name == wanted }
+      raise ArgumentError.new("No process named '#{wanted}' has been started") unless matching_processes
+      matching_processes.last
     end
 
     def only_processes
@@ -331,14 +377,19 @@ module Aruba
     end
 
     def type(input)
-      return eot if "" == input
+      return close_input if "" == input
       _write_interactive(_ensure_newline(input))
     end
 
-    def eot
+    def close_input
       @interactive.stdin.close
     end
 
+    def eot
+      warn(%{\e[35m    The \"#eot\"-method is deprecated. It will be deleted with the next major version. Please use \"#close_input\"-method instead.\e[0m})
+      close_input
+    end
+
     def _write_interactive(input)
       @interactive.stdin.write(input)
       @interactive.stdin.flush
@@ -430,8 +481,8 @@ module Aruba
     end
 
     def announcer
-      Announcer.new(self, 
-                    :stdout => @announce_stdout, 
+      Announcer.new(self,
+                    :stdout => @announce_stdout,
                     :stderr => @announce_stderr,
                     :dir => @announce_dir,
                     :cmd => @announce_cmd,

data/lib/aruba/cucumber.rb

@@ -16,10 +16,20 @@ Given /^a directory named "([^"]*)"$/ do |dir_name|
   create_dir(dir_name)
 end
 
+Given /^a directory named "([^"]*)" with mode "([^"]*)"$/ do |dir_name, dir_mode|
+  create_dir(dir_name)
+  chmod(dir_mode, dir_name)
+end
+
 Given /^a file named "([^"]*)" with:$/ do |file_name, file_content|
   write_file(file_name, file_content)
 end
 
+Given /^a file named "([^"]*)" with mode "([^"]*)" and with:$/ do |file_name, file_mode, file_content|
+  write_file(file_name, file_content)
+  chmod(file_mode, file_name)
+end
+
 Given /^a (\d+) byte file named "([^"]*)"$/ do |file_size, file_name|
   write_fixed_size_file(file_name, file_size.to_i)
 end
@@ -28,6 +38,11 @@ Given /^an empty file named "([^"]*)"$/ do |file_name|
   write_file(file_name, "")
 end
 
+Given /^an empty file named "([^"]*)" with mode "([^"]*)"$/ do |file_name, file_mode|
+  write_file(file_name, "")
+  chmod(file_mode, file_name)
+end
+
 When /^I write to "([^"]*)" with:$/ do |file_name, file_content|
   write_file(file_name, file_content)
 end
@@ -52,6 +67,15 @@ When /^I cd to "([^"]*)"$/ do |dir|
   cd(dir)
 end
 
+Given /^I set the environment variables to:/ do |table|
+  table.hashes.each do |row|
+    variable = row['variable'].to_s.upcase
+    value = row['value'].to_s
+
+    set_env(variable, value)
+  end
+end
+
 When /^I run "(.*)"$/ do |cmd|
   warn(%{\e[35m    The /^I run "(.*)"$/ step definition is deprecated. Please use the `backticks` version\e[0m})
   run_simple(unescape(cmd), false)
@@ -85,6 +109,16 @@ When /^I type "([^"]*)"$/ do |input|
   type(input)
 end
 
+When /^I close the stdin stream$/ do
+  close_input
+end
+
+When /^I pipe in the file "([^"]*)"$/ do |file|
+  pipe_in_file(file)
+
+  close_input
+end
+
 When /^I wait for (?:output|stdout) to contain "([^"]*)"$/ do |expected|
   Timeout::timeout(exit_timeout) do
     loop do
@@ -269,6 +303,14 @@ Then /^a file named "([^"]*)" should not exist$/ do |file|
   check_file_presence([file], false)
 end
 
+Then /^a file matching %r<(.*?)> should exist$/ do |regex|
+  check_file_presence([ Regexp.new( regex ) ], true )
+end
+
+Then /^a file matching %r<(.*?)> should not exist$/ do |regex|
+  check_file_presence([ Regexp.new( regex ) ], false )
+end
+
 Then /^a (\d+) byte file named "([^"]*)" should exist$/ do |file_size, file_name|
   check_file_size([[file_name, file_size.to_i]])
 end
@@ -312,3 +354,7 @@ end
 Then /^the file "([^"]*)" should not match \/([^\/]*)\/$/ do |file, partial_content|
   check_file_content(file, /#{partial_content}/, false)
 end
+
+Then /^the mode of filesystem object "([^"]*)" should match "([^"]*)"$/ do |name, mode|
+  mod?(mode, name)
+end

data/lib/aruba/cucumber/hooks.rb

@@ -12,7 +12,7 @@ After do
 end
 
 Before('~@no-clobber') do
-  FileUtils.rm_rf(current_dir)
+  clean_current_dir
 end
 
 Before('@puts') do

data/lib/aruba/in_process.rb

@@ -30,7 +30,7 @@ module Aruba
       @kernel = FakeKernel.new
     end
 
-    def run!(&block)
+    def run!
       raise "You need to call Aruba::InProcess.main_class = YourMainClass" unless @@main_class
       @@main_class.new(@argv, @stdin, @stdout, @stderr, @kernel).execute!
       yield self if block_given?

data/lib/aruba/matchers/rspec_matcher_include_regexp.rb

@@ -0,0 +1,5 @@
+RSpec::Matchers.define :include_regexp do |expected|
+  match do |actual|
+    ! actual.grep(expected).empty?
+  end
+end

data/spec/aruba/api_spec.rb

@@ -31,7 +31,22 @@ describe Aruba::Api  do
 
   describe 'current_dir' do
     it "should return the current dir as 'tmp/aruba'" do
-      @aruba.current_dir.should match(/^tmp\/aruba$/)
+      expect(@aruba.current_dir).to match(/^tmp\/aruba$/)
+    end
+
+    it "can be cleared" do
+      write_file( 'test', 'test test test' )
+
+      in_current_dir do
+        expect( File.exist? 'test' ).to be_true
+      end
+
+      clean_current_dir
+
+      in_current_dir do
+        expect( File.exist? 'test' ).to be_false
+      end
+
     end
   end
 
@@ -44,7 +59,7 @@ describe Aruba::Api  do
       end
       it 'should delete directory' do
         @aruba.remove_dir(@directory_name)
-        File.exist?(@directory_path).should == false
+        expect(File.exist?(@directory_path)).to eq false
       end
     end
   end
@@ -53,8 +68,8 @@ describe Aruba::Api  do
     context 'fixed size' do
       it "should write a fixed sized file" do
         @aruba.write_fixed_size_file(@file_name, @file_size)
-        File.exist?(@file_path).should == true
-        File.size(@file_path).should == @file_size
+        expect(File.exist?(@file_path)).to eq true
+        expect(File.size(@file_path)).to eq @file_size
       end
 
       it "should check an existing file size" do
@@ -64,15 +79,70 @@ describe Aruba::Api  do
 
       it "should check an existing file size and fail" do
         @aruba.write_fixed_size_file(@file_name, @file_size)
-        lambda { @aruba.check_file_size([[@file_name, @file_size + 1]]) }.should raise_error
+        expect { @aruba.check_file_size([[@file_name, @file_size + 1]]) }.to raise_error
       end
     end
     context 'existing' do
       before(:each) { File.open(@file_path, 'w') { |f| f << "" } }
       it "should delete file" do
         @aruba.remove_file(@file_name)
-        File.exist?(@file_path).should == false
+        expect(File.exist?(@file_path)).to eq false
+      end
+
+      it "should change a file's mode" do
+        @aruba.chmod(0644, @file_name)
+        result = sprintf( "%o" , File::Stat.new(@file_path).mode )[-4,4]
+        expect(result).to eq('0644')
+
+        @aruba.chmod(0655, @file_name)
+        result = sprintf( "%o" , File::Stat.new(@file_path).mode )[-4,4]
+        expect(result).to eq('0655')
+
+        @aruba.chmod("0655", @file_name)
+        result = sprintf( "%o" , File::Stat.new(@file_path).mode )[-4,4]
+        expect(result).to eq('0655')
+      end
+
+      it "should check the mode of a file" do
+        @aruba.chmod(0666, @file_name)
+        expect(@aruba.mod?(0666, @file_name) ).to eq(true)
+      end
+
+      it "should check existence using plain match" do
+        file_name = 'nested/dir/hello_world.txt'
+        file_path = File.join(@aruba.current_dir, file_name)
+
+        FileUtils.mkdir_p File.dirname( file_path )
+        File.open(file_path, 'w') { |f| f << "" }
+
+        @aruba.check_file_presence( [ file_name ], true )
+        @aruba.check_file_presence( [ 'asdf' ] , false )
+      end
+
+      it "should check existence using regex" do
+        file_name = 'nested/dir/hello_world.txt'
+        file_path = File.join(@aruba.current_dir, file_name)
+
+        FileUtils.mkdir_p File.dirname( file_path )
+        File.open(file_path, 'w') { |f| f << "" }
+
+        @aruba.check_file_presence([ /test123/ ], false )
+        @aruba.check_file_presence([ /hello_world.txt$/ ], true )
+        @aruba.check_file_presence([ /dir/ ], true )
+        @aruba.check_file_presence([ %r{nested/.+/} ], true )
+      end
+
+      it "is no problem to mix both" do
+        file_name = 'nested/dir/hello_world.txt'
+        file_path = File.join(@aruba.current_dir, file_name)
+
+        FileUtils.mkdir_p File.dirname( file_path )
+        File.open(file_path, 'w') { |f| f << "" }
+
+        @aruba.check_file_presence([ file_name, /nested/  ], true )
+        @aruba.check_file_presence([ /test123/, 'asdf' ], false )
       end
+
     end
   end
 
@@ -81,19 +151,19 @@ describe Aruba::Api  do
       after(:each){@aruba.stop_processes!}
       context 'enabled' do
         it "should announce to stdout exactly once" do
-          @aruba.should_receive(:announce_or_puts).once
+          expect(@aruba).to receive(:announce_or_puts).once
           @aruba.set_tag(:announce_stdout, true)
           @aruba.run_simple('echo "hello world"', false)
-          @aruba.all_output.should match(/hello world/)
+          expect(@aruba.all_output).to match(/hello world/)
         end
       end
 
       context 'disabled' do
         it "should not announce to stdout" do
-          @aruba.should_not_receive(:announce_or_puts)
+          expect(@aruba).not_to receive(:announce_or_puts)
           @aruba.set_tag(:announce_stdout, false)
           @aruba.run_simple('echo "hello world"', false)
-          @aruba.all_output.should match(/hello world/)
+          expect(@aruba.all_output).to match(/hello world/)
         end
       end
     end
@@ -106,7 +176,7 @@ describe Aruba::Api  do
 
     it "checks the given file's full content against the expectations in the passed block" do
        @aruba.with_file_content @file_name do |full_content|
-         full_content.should == "foo bar baz"
+         expect(full_content).to eq "foo bar baz"
        end
     end
 
@@ -114,17 +184,17 @@ describe Aruba::Api  do
       it "is successful when the inner expectations match" do
         expect do
           @aruba.with_file_content @file_name do |full_content|
-            full_content.should     match /foo/
-            full_content.should_not match /zoo/
+            expect(full_content).to     match /foo/
+            expect(full_content).not_to match /zoo/
           end
-        end . not_to raise_error RSpec::Expectations::ExpectationNotMetError
+        end . not_to raise_error
       end
 
       it "raises RSpec::Expectations::ExpectationNotMetError when the inner expectations don't match"  do
         expect do
           @aruba.with_file_content @file_name do |full_content|
-            full_content.should     match /zoo/
-            full_content.should_not match /foo/
+            expect(full_content).to     match /zoo/
+            expect(full_content).not_to match /foo/
           end
         end . to raise_error RSpec::Expectations::ExpectationNotMetError
       end
@@ -152,14 +222,47 @@ describe Aruba::Api  do
     it "respond to input" do
       @aruba.type "Hello"
       @aruba.type ""
-      @aruba.all_output.should == "Hello\n"
+      expect(@aruba.all_output).to eq  "Hello\n"
     end
 
-    it "respond to eot" do
+    it "respond to close_input" do
       @aruba.type "Hello"
-      @aruba.eot
-      @aruba.all_output.should == "Hello\n"
+      @aruba.close_input
+      expect(@aruba.all_output).to eq  "Hello\n"
     end
+
+    it "pipes data" do
+      @aruba.write_file(@file_name, "Hello\nWorld!")
+      @aruba.pipe_in_file(@file_name)
+      @aruba.close_input
+      expect(@aruba.all_output).to eq  "Hello\nWorld!"
+    end
+  end
+
+  describe "#run_simple" do
+    before(:each){@aruba.run_simple "true"}
+    after(:each){@aruba.stop_processes!}
+    describe "get_process" do
+      it "returns a process" do
+        expect(@aruba.get_process("true")).not_to be(nil)
+      end
+
+      it "raises a descriptive exception" do
+        expect do
+          expect(@aruba.get_process("false")).not_to be(nil)
+        end.to raise_error(ArgumentError, "No process named 'false' has been started")
+      end
+    end
+  end
+
+  describe "#run_simple" do
+    after(:each){@aruba.stop_processes!}
+    it "runs with different env" do
+      @aruba.set_env 'LONG_LONG_ENV_VARIABLE', 'true'
+      @aruba.run "env"
+      expect(@aruba.all_output).to include("LONG_LONG_ENV_VARIABLE")
+    end
+
   end
 
 end # Aruba::Api

data/spec/aruba/hooks_spec.rb

@@ -5,14 +5,14 @@ describe Aruba::Hooks do
     hook_was_run = false
     subject.append :hook_label, lambda { hook_was_run = true }
     subject.execute :hook_label, self
-    hook_was_run.should be_true
+    expect(hook_was_run).to be_true
   end
 
   it 'executes a stored hook that takes multiple arguments' do
     hook_values = []
     subject.append :hook_label, lambda { |a,b,c| hook_values = [a,b,c] }
     subject.execute :hook_label, self, 1, 2, 3
-    hook_values.should == [1,2,3]
+    expect(hook_values).to eq [1,2,3]
   end
 
 end

data/spec/aruba/jruby_spec.rb

@@ -17,8 +17,8 @@ describe "Aruba JRuby Startup Helper"  do
     with_constants :ENV => @fake_env, :RUBY_PLATFORM => 'x86_64-chocolate' do
       load 'aruba/jruby.rb'
       Aruba.config.hooks.execute :before_cmd, self
-      ENV['JRUBY_OPTS'].should  == "--1.9"
-      ENV['JAVA_OPTS'].should  == "-Xdebug"
+      expect(ENV['JRUBY_OPTS']).to eq "--1.9"
+      expect(ENV['JAVA_OPTS']).to eq "-Xdebug"
     end
   end
 
@@ -27,8 +27,8 @@ describe "Aruba JRuby Startup Helper"  do
       RbConfig::CONFIG.stub(:[] => 'solaris')
       load 'aruba/jruby.rb'
       Aruba.config.hooks.execute :before_cmd, self
-      ENV['JRUBY_OPTS'].should  == "-X-C --1.9"
-      ENV['JAVA_OPTS'].should  == "-d32 -Xdebug"
-    end 
+      expect(ENV['JRUBY_OPTS']).to eq "-X-C --1.9"
+      expect(ENV['JAVA_OPTS']).to eq "-d32 -Xdebug"
+    end
   end
 end

data/spec/aruba/spawn_process_spec.rb

@@ -9,12 +9,12 @@ module Aruba
       before { process.run! }
 
       it "returns the stdout" do
-        process.stdout.should == "yo\n"
+        expect(process.stdout).to eq "yo\n"
       end
 
       it "returns all the stdout, every time you call it" do
-        process.stdout.should == "yo\n"
-        process.stdout.should == "yo\n"
+        expect(process.stdout).to eq "yo\n"
+        expect(process.stdout).to eq "yo\n"
       end
 
     end
@@ -23,8 +23,10 @@ module Aruba
       before { process.run! }
 
       it "sends any output to the reader" do
-        reader = stub.as_null_object
-        reader.should_receive(:stdout).with("yo\n")
+        reader = double( 'null_object' )
+        allow( reader ).to receive( :stderr )
+        expect( reader ).to receive( :stdout ).with("yo\n")
+
         process.stop(reader)
       end
     end
@@ -34,7 +36,7 @@ module Aruba
         let(:process_failure) { SpawnProcess.new('does_not_exists', 1, 1) }
 
         it "raises a Aruba::LaunchError" do
-          lambda{process_failure.run!}.should raise_error(::Aruba::LaunchError)
+          expect{process_failure.run!}.to raise_error(::Aruba::LaunchError)
         end
       end
     end

data/spec/spec_helper.rb

@@ -40,4 +40,11 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.include(ManipulatesConstants)
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+
+  config.before( :each ) {
+    clean_current_dir
+  }
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aruba
 version: !ruby/object:Gem::Version
-  version: 0.5.3
-  prerelease: 
+  version: 0.5.4
 platform: ruby
 authors:
 - Aslak Hellesøy
@@ -12,120 +11,120 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.6
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: bcat
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.11.0
+- !ruby/object:Gem::Dependency
+  name: fuubar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 description: CLI Steps for Cucumber, hand-crafted for you in Aruba
 email: cukes@googlegroups.com
 executables: []
@@ -146,6 +145,7 @@ files:
 - config/.gitignore
 - cucumber.yml
 - features/before_cmd_hooks.feature
+- features/command_environment_variables.feature
 - features/custom_ruby_process.feature
 - features/exit_statuses.feature
 - features/file_system_commands.feature
@@ -166,6 +166,7 @@ files:
 - lib/aruba/errors.rb
 - lib/aruba/in_process.rb
 - lib/aruba/jruby.rb
+- lib/aruba/matchers/rspec_matcher_include_regexp.rb
 - lib/aruba/reporting.rb
 - lib/aruba/spawn_process.rb
 - spec/aruba/api_spec.rb
@@ -187,34 +188,28 @@ files:
 - templates/js/jquery-1.6.1.min.js
 - templates/main.erb
 homepage: http://github.com/cucumber/aruba
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4547606792464091190
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4547606792464091190
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
-summary: aruba-0.5.3
+specification_version: 4
+summary: aruba-0.5.4
 test_files: []