aruba 0.2.2 → 0.2.3

data/Gemfile

@@ -1,5 +1,10 @@
 source "http://rubygems.org"
 gemspec
 
-gem 'cucumber', :path => '../cucumber' if File.directory?(File.dirname(__FILE__) + '/../cucumber')
-gem 'gherkin',  :path => '../gherkin'  if File.directory?(File.dirname(__FILE__) + '/../gherkin')
+# Use source from sibling folders (if available) instead of gems
+%w[cucumber].each do |g|
+  if File.directory?(File.dirname(__FILE__) + "/../#{g}")
+    @dependencies.reject!{|dep| dep.name == g}
+    gem g, :path => "../#{g}"
+  end
+end

data/History.txt

@@ -1,3 +1,14 @@
+== 0.2.3
+
+=== Bug fixes
+* Directory should not exist gives false-positive (#13,#15 Nicholas Rutherford)
+
+=== New Features
+* Added step definitions for comparing file contents with regexps (#9 Aslak Hellesøy)
+* Always put ./bin at the beginning of $PATH to make it easier to run own executables (#7 Aslak Hellesøy)
+* Communication with interactive processes (#4 Mike Sassak)
+* Remove hyphens separating stdout and stderr (Arve Knudsen)
+
 == 0.2.2
 
 === New Features

data/README.rdoc

@@ -1,8 +1,7 @@
 = aruba
 
 Cucumber steps for driving out command line applications. The command line application can be anything,
-a compiled C program, a Java program, a Perl script - anything. There is also special support for various
-Ruby versions (see below).
+a compiled C program, a Java program, a Perl script - anything.
 
 == Usage
 
@@ -18,13 +17,14 @@ itself).
 
 == Getting more output with tags.
 
-Aruba has several tags you can use to see what command actually gets run (useful if you're using the RVM steps),
-STDOUT or STDERR. You can put these tags on individual scenarios, or on a feature. The tags are:
+Aruba has several tags you can use to get more information. You can put these tags on individual scenarios, or on a feature. The tags are:
 
-* <tt>@announce-cmd</tt>
-* <tt>@announce-stdout</tt>
-* <tt>@announce-stderr</tt>
-* <tt>@announce</tt> (does all of the above)
+* <tt>@announce-cmd</tt> - See what command is is run
+* <tt>@announce-stdout</tt> - See the stdout
+* <tt>@announce-stderr</tt> - See the stderr
+* <tt>@announce-dir</tt> - See the current directory
+* <tt>@announce-env</tt> - See environment variables set by Aruba
+* <tt>@announce</tt> - Does all of the above
 
 == Note on Patches/Pull Requests
  

data/aruba.gemspec

@@ -1,17 +1,17 @@
 # -*- encoding: utf-8 -*-
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'aruba'
-  s.version     = "0.2.2"
+  s.version     = "0.2.3"
   s.authors     = ["Aslak Hellesøy", "David Chelimsky"]
   s.description = 'CLI Steps for Cucumber, hand-crafted for you in Aruba'
   s.summary     = "aruba-#{s.version}"
   s.email       = 'cukes@googlegroups.com'
   s.homepage    = 'http://github.com/aslakhellesoy/aruba'
 
-  s.add_dependency 'cucumber', '~> 0.9.0' unless File.directory?(File.dirname(__FILE__) + '/../cucumber')
-  s.add_development_dependency('rspec', "~> 2.0.0.beta.22")
+  s.add_dependency 'cucumber', '~> 0.9.0'
+  s.add_dependency 'background_process' # Can't specify a version - bundler/rubygems chokes on '2.1'
+  s.add_development_dependency 'rspec', '~> 2.0.0.beta.22'
 
   s.rubygems_version   = "1.3.7"
   s.files            = `git ls-files`.split("\n")

data/features/file_system_commands.feature

@@ -74,7 +74,17 @@ Feature: file system commands
     Then the following directories should exist:
       | foo/bar |
       | foo/bla |
-
+  
+  Scenario: check for absence of directories
+    Given a directory named "foo/bar"
+    Given a directory named "foo/bla"
+    Then the following step should fail with Spec::Expectations::ExpectationNotMetError:
+    """
+    Then the following directories should not exist:
+      | foo/bar/ |
+      | foo/bla/ |
+    """
+  
   Scenario: Check file contents
     Given a file named "foo" with:
       """
@@ -82,3 +92,11 @@ Feature: file system commands
       """
     Then the file "foo" should contain "hello world"
     And the file "foo" should not contain "HELLO WORLD"
+
+  Scenario: Check file contents
+    Given a file named "foo" with:
+      """
+      hello world
+      """
+    Then the file "foo" should match /hel.o world/
+    And the file "foo" should not match /HELLO WORLD/

data/features/interactive.feature

@@ -0,0 +1,30 @@
+Feature: Interactive process control
+
+  In order to test interactive command line applications
+  As a developer using Cucumber
+  I want to use the interactive session steps
+
+  Scenario: Running ruby interactively
+    Given a file named "echo.rb" with:
+      """
+      while res = gets.chomp
+        break if res == "quit"
+        puts res.reverse
+      end
+      """
+    When I run "ruby echo.rb" interactively
+    And I type "hello, world"
+    And I type "quit"
+    Then the output should contain:
+      """
+      dlrow ,olleh
+      """
+
+  Scenario: Running a native binary interactively
+    When I run "bc -q" interactively
+    And I type "4 + 3"
+    And I type "quit"
+    Then the output should contain:
+      """
+      7
+      """

data/features/output.feature

@@ -8,7 +8,7 @@ Feature: Output
     When I run "neverever gonna work"
     Then the output should contain:
     """
-    sh: neverever: command not found
+    No such file or directory - neverever gonna work
     """
 
   Scenario: Detect subset of one-line output
@@ -83,6 +83,14 @@ Feature: Output
       hello
       """
 
+  @announce-stdout
+  Scenario: Match failing exit status and output with regex
+    When I run "ruby -e 'puts \"hello\\nworld\";exit 99'"
+    Then it should fail with regex:
+      """
+      hello\s*world
+      """
+
   @announce-cmd
   Scenario: Match output in stdout
     When I run "ruby -e 'puts \"hello\\nworld\"'"

data/features/step_definitions/aruba_dev_steps.rb

@@ -1,7 +1,3 @@
-Given /^I have a local file named "([^"]*)" with:$/ do |filename, content|
-  File.open(filename, 'w') {|io| io.write(content)}
-end
-
 When /^I do aruba (.*)$/ do |aruba_step|
   begin
     When(aruba_step)
@@ -10,15 +6,10 @@ When /^I do aruba (.*)$/ do |aruba_step|
   end
 end
 
-Then /^the output should contain the JRuby version$/ do
-  pending "This must be manually run in JRuby" unless defined?(JRUBY_VERSION)
-  Then %{the output should contain "#{JRUBY_VERSION}"}
-end
-
-Then /^the output should contain the current Ruby version$/ do
-  Then %{the output should contain "#{RUBY_VERSION}"}
+Then /^aruba should fail with "([^"]*)"$/ do |error_message|
+  @aruba_exception.message.should =~ regexp(error_message)
 end
 
-Then /^aruba should fail with "([^"]*)"$/ do |error_message|
-  @aruba_exception.message.should =~ compile_and_escape(error_message)
+Then /^the following step should fail with Spec::Expectations::ExpectationNotMetError:$/ do |multiline_step|
+  proc {steps multiline_step}.should raise_error(RSpec::Expectations::ExpectationNotMetError)
 end

data/lib/aruba/api.rb

@@ -1,5 +1,6 @@
 require 'tempfile'
 require 'rbconfig'
+require 'background_process'
 
 module Aruba
   module Api
@@ -54,7 +55,7 @@ module Aruba
     end
 
     def check_file_content(file, partial_content, expect_match)
-      regexp = compile_and_escape(partial_content)
+      regexp = regexp(partial_content)
       in_current_dir do
         content = IO.read(file)
         if expect_match
@@ -91,16 +92,20 @@ module Aruba
       eval(%{"#{string}"})
     end
 
-    def compile_and_escape(string)
-      Regexp.compile(Regexp.escape(string))
+    def regexp(string_or_regexp)
+      Regexp === string_or_regexp ? string_or_regexp : Regexp.compile(Regexp.escape(string_or_regexp))
     end
 
     def combined_output
-      @last_stdout + (@last_stderr == '' ? '' : "\n#{'-'*70}\n#{@last_stderr}")
+      if @interactive
+        interactive_output
+      else
+        @last_stdout + @last_stderr
+      end
     end
 
     def assert_partial_output(partial_output)
-      combined_output.should =~ compile_and_escape(partial_output)
+      combined_output.should =~ regexp(partial_output)
     end
 
     def assert_passing_with(partial_output)
@@ -131,24 +136,16 @@ module Aruba
     def run(cmd, fail_on_error=true)
       cmd = detect_ruby(cmd)
 
-      stderr_file = Tempfile.new('cucumber')
-      stderr_file.close
       in_current_dir do
         announce_or_puts("$ cd #{Dir.pwd}") if @announce_dir
         announce_or_puts("$ #{cmd}") if @announce_cmd
-
-        mode = RUBY_VERSION =~ /^1\.9/ ? {:external_encoding=>"UTF-8"} : 'r'
-        
-        IO.popen("#{cmd} 2> #{stderr_file.path}", mode) do |io|
-          @last_stdout = io.read
-          announce_or_puts(@last_stdout) if @announce_stdout
-        end
-
-        @last_exit_status = $?.exitstatus
+        ps = BackgroundProcess.run(cmd)
+        @last_exit_status = ps.exitstatus # waits for the process to finish
+        @last_stdout = ps.stdout.read
+        announce_or_puts(@last_stdout) if @announce_stdout
+        @last_stderr = ps.stderr.read
+        announce_or_puts(@last_stderr) if @announce_stderr
       end
-      @last_stderr = IO.read(stderr_file.path)
-
-      announce_or_puts(@last_stderr) if @announce_stderr
 
       if(@last_exit_status != 0 && fail_on_error)
         fail("Exit status was #{@last_exit_status}. Output:\n#{combined_output}")
@@ -157,6 +154,27 @@ module Aruba
       @last_stderr
     end
 
+    def run_interactive(cmd)
+      cmd = detect_ruby(cmd)
+
+      in_current_dir do
+        @interactive = BackgroundProcess.run(cmd)
+      end
+    end
+
+    def interactive_output
+      if @interactive
+        @interactive.wait(1) || @interactive.kill('TERM')
+        @interactive.stdout.read
+      else
+        ""
+      end
+    end
+
+    def write_interactive(input)
+      @interactive.stdin.write(input)
+    end
+
     def announce_or_puts(msg)
       if(@puts)
         puts(msg)
@@ -174,7 +192,7 @@ module Aruba
     end
 
     def current_ruby
-      File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
+      File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
     end
 
     def use_clean_gemset(gemset)
@@ -216,5 +234,9 @@ module Aruba
     def original_env
       @original_env ||= {}
     end
+
+    def ensure_newline(str)
+      str.chomp << "\n"
+    end
   end
 end

data/lib/aruba/cucumber.rb

@@ -6,12 +6,12 @@ Before('@disable-bundler') do
   unset_bundler_env_vars
 end
 
-Before('@bin') do
+Before do
   @__aruba_original_paths = (ENV['PATH'] || '').split(File::PATH_SEPARATOR)
   ENV['PATH'] = ([File.expand_path('bin')] + @__aruba_original_paths).join(File::PATH_SEPARATOR)
 end
 
-After('@bin') do
+After do
   ENV['PATH'] = @__aruba_original_paths.join(File::PATH_SEPARATOR)
 end
 
@@ -95,20 +95,28 @@ When /^I successfully run "(.*)"$/ do |cmd|
   run(unescape(cmd))
 end
 
+When /^I run "([^"]*)" interactively$/ do |cmd|
+  run_interactive(unescape(cmd))
+end
+
+When /^I type "([^"]*)"$/ do |input|
+  write_interactive(ensure_newline(input))
+end
+
 Then /^the output should contain "([^"]*)"$/ do |partial_output|
   assert_partial_output(partial_output)
 end
 
 Then /^the output should not contain "([^"]*)"$/ do |partial_output|
-  combined_output.should_not =~ compile_and_escape(partial_output)
+  combined_output.should_not =~ regexp(partial_output)
 end
 
 Then /^the output should contain:$/ do |partial_output|
-  combined_output.should =~ compile_and_escape(partial_output)
+  combined_output.should =~ regexp(partial_output)
 end
 
 Then /^the output should not contain:$/ do |partial_output|
-  combined_output.should_not =~ compile_and_escape(partial_output)
+  combined_output.should_not =~ regexp(partial_output)
 end
 
 Then /^the output should contain exactly "([^"]*)"$/ do |exact_output|
@@ -143,20 +151,29 @@ Then /^it should (pass|fail) with:$/ do |pass_fail, partial_output|
   self.__send__("assert_#{pass_fail}ing_with", partial_output)
 end
 
+Then /^it should (pass|fail) with regexp?:$/ do |pass_fail, partial_output|
+  Then "the output should match:", partial_output
+  if pass_fail == 'pass'
+    @last_exit_status.should == 0
+  else
+    @last_exit_status.should_not == 0
+  end
+end
+
 Then /^the stderr should contain "([^"]*)"$/ do |partial_output|
-  @last_stderr.should =~ compile_and_escape(partial_output)
+  @last_stderr.should =~ regexp(partial_output)
 end
 
 Then /^the stdout should contain "([^"]*)"$/ do |partial_output|
-  @last_stdout.should =~ compile_and_escape(partial_output)
+  @last_stdout.should =~ regexp(partial_output)
 end
 
 Then /^the stderr should not contain "([^"]*)"$/ do |partial_output|
-  @last_stderr.should_not =~ compile_and_escape(partial_output)
+  @last_stderr.should_not =~ regexp(partial_output)
 end
 
 Then /^the stdout should not contain "([^"]*)"$/ do |partial_output|
-  @last_stdout.should_not =~ compile_and_escape(partial_output)
+  @last_stdout.should_not =~ regexp(partial_output)
 end
 
 Then /^the following files should exist:$/ do |files|
@@ -172,7 +189,7 @@ Then /^the following directories should exist:$/ do |directories|
 end
 
 Then /^the following directories should not exist:$/ do |directories|
-  check_file_presence(directories.raw.map{|directory_row| directory_row[0]}, false)
+  check_directory_presence(directories.raw.map{|directory_row| directory_row[0]}, false)
 end
 
 Then /^the file "([^"]*)" should contain "([^"]*)"$/ do |file, partial_content|
@@ -186,3 +203,11 @@ end
 Then /^the file "([^"]*)" should contain exactly:$/ do |file, exact_content|
   check_exact_file_content(file, exact_content)
 end
+
+Then /^the file "([^"]*)" should match \/([^\/]*)\/$/ do |file, partial_content|
+  check_file_content(file, /#{partial_content}/, true)
+end
+
+Then /^the file "([^"]*)" should not match \/([^\/]*)\/$/ do |file, partial_content|
+  check_file_content(file, /#{partial_content}/, false)
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: aruba
 version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -15,16 +16,46 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-28 00:00:00 +02:00
+date: 2010-09-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 9
+        - 0
+        version: 0.9.0
+  requirement: *id001
+  type: :runtime
+  name: cucumber
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id002
+  type: :runtime
+  name: background_process
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 62196431
         segments: 
         - 2
         - 0
@@ -32,9 +63,10 @@ dependencies:
         - beta
         - 22
         version: 2.0.0.beta.22
+  requirement: *id003
   type: :development
+  name: rspec
   prerelease: false
-  version_requirements: *id001
 description: CLI Steps for Cucumber, hand-crafted for you in Aruba
 email: cukes@googlegroups.com
 executables: []
@@ -59,6 +91,7 @@ files:
 - config/.gitignore
 - features/exit_statuses.feature
 - features/file_system_commands.feature
+- features/interactive.feature
 - features/output.feature
 - features/step_definitions/aruba_dev_steps.rb
 - features/support/env.rb
@@ -79,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4569990399703836797
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -88,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4569990399703836797
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -98,10 +131,11 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: aruba-0.2.2
+summary: aruba-0.2.3
 test_files: 
 - features/exit_statuses.feature
 - features/file_system_commands.feature
+- features/interactive.feature
 - features/output.feature
 - features/step_definitions/aruba_dev_steps.rb
 - features/support/env.rb