aruba 0.5.2 → 0.5.3

data/.travis.yml

@@ -1,15 +1,9 @@
 language: ruby
 rvm: 
+  - 2.0.0
   - 1.9.3
-  - 1.9.2
   - 1.8.7
-  - ree
   - jruby-18mode
-#  - jruby-19mode
-# whitelist
-branches:
-  only:
-    - master
 
 notifications:
   email:

data/History.md

@@ -1,13 +1,17 @@
-## [v0.5.2](https://github.com/cucumber/aruba/compare/v0.5.1..v0.5.2)
+## [master](https://github.com/cucumber/aruba/compare/v0.5.2...master)
+* Fix for UTF-8 support (#151 Matt Wynne, Jarl Friis)
+* Fix for open file leakage (#150 @JonRowe)
+
+## [v0.5.2](https://github.com/cucumber/aruba/compare/v0.5.1...v0.5.2)
 
 * Plugin API for greater speed. Test Ruby CLI programs in a single Ruby process (#148 Aslak Hellesøy)
 * Fix memory leak when several commands are executed in a single run (#144 @y-higuchi)
 
-## [v0.5.1](https://github.com/cucumber/aruba/compare/v0.5.0..v0.5.1)
+## [v0.5.1](https://github.com/cucumber/aruba/compare/v0.5.0...v0.5.1)
 * Individual timeout settings when running commands (#124 Jarl Friis)
 * Varous fixes for JRuby tests, should now work on more versions of JRuby
 
-## [v0.5.0](https://github.com/cucumber/aruba/compare/v0.4.10..v0.5.0)
+## [v0.5.0](https://github.com/cucumber/aruba/compare/v0.4.10...v0.5.0)
 * Add #with_file_content to the DSL (#110 Pavel Argentov)
 * Make JRuby performance tweaks optional (#102 Taylor Carpenter, #125 Andy Lindeman)
 * Add assert_partial_output_interactive so you can peek at the output from a running process (#104 Taylor Carpenter)

data/README.md

@@ -1,6 +1,6 @@
 [![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)
 
-Aruba is Cucumber extension for Command line applications written in any programming language. Features at a glance:
+Aruba is Cucumber extension for testing command line applications written in any programming language. Features at a glance:
 
 * Test any command line application
 * Manipulate the file system

data/aruba.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'aruba'
-  s.version     = '0.5.2'
+  s.version     = '0.5.3'
   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}"
@@ -10,10 +10,10 @@ Gem::Specification.new do |s|
   s.homepage    = 'http://github.com/cucumber/aruba'
 
   s.add_runtime_dependency 'cucumber', '>= 1.1.1'
-  s.add_runtime_dependency 'childprocess', '~> 0.3.6'
+  s.add_runtime_dependency 'childprocess', '>= 0.3.6'
   s.add_runtime_dependency 'rspec-expectations', '>= 2.7.0'
   s.add_development_dependency 'bcat', '>= 0.6.1'
-  s.add_development_dependency 'kramdown', '~> 0.14'
+  s.add_development_dependency 'kramdown', '>= 0.14'
   s.add_development_dependency 'rake', '>= 0.9.2'
   s.add_development_dependency 'rspec', '>= 2.7.0'
 

data/cucumber.yml

@@ -1,9 +1,10 @@
 <%
+java_version = (RUBY_DESCRIPTION.match(/.*?on.*?(1\.[\d]\..*? )/))[1] if defined?(JRUBY_VERSION)
 std_opts = "--color --tags ~@wip"
-std_opts << " --tags ~@wip-jruby-1.6" if defined?(JRUBY_VERSION) && (JRUBY_VERSION < '1.7.0')
+std_opts << " --tags ~@wip-jruby-java-1.6" if defined?(JRUBY_VERSION) && (java_version < '1.7.0')
 
 wip_opts = "--color --tags @wip:3"
-wip_opts = "--color --tags @wip:3,@wip-jruby-1.6:3" if defined?(JRUBY_VERSION) && (JRUBY_VERSION < '1.7.0')
+wip_opts = "--color --tags @wip:3,@wip-jruby-java-1.6:3" if defined?(JRUBY_VERSION) && (java_version < '1.7.0')
 %>
 default: <%= std_opts %>
 wip: --wip <%= wip_opts %>

data/features/interactive.feature

@@ -4,7 +4,7 @@ Feature: Interactive process control
   As a developer using Cucumber
   I want to use the interactive session steps
 
-  @wip-jruby-1.6
+  @wip-jruby-java-1.6
   Scenario: Running ruby interactively
     Given a file named "echo.rb" with:
       """

data/features/utf-8.feature

@@ -0,0 +1,14 @@
+Feature: UTF-8
+
+  Scenario: Write then assert on the content of a file with UTF-8 characters in
+    Given a file named "turning-japanese" with:
+      """
+      フィーチャ
+
+      """
+    And I run `cat turning-japanese`
+    Then the output should contain exactly:
+      """
+      フィーチャ
+
+      """

data/lib/aruba/api.rb

@@ -183,22 +183,27 @@ module Aruba
     end
 
     def assert_exact_output(expected, actual)
+      actual.force_encoding(expected.encoding) if RUBY_VERSION >= "1.9"
       unescape(actual).should == 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))
     end
 
     def assert_matching_output(expected, actual)
+      actual.force_encoding(expected.encoding) if RUBY_VERSION >= "1.9"
       unescape(actual).should =~ /#{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
     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
       else

data/lib/aruba/spawn_process.rb

@@ -14,6 +14,8 @@ module Aruba
       @cmd = cmd
       @process = nil
       @exit_code = nil
+      @output_cache = nil
+      @error_cache = nil
     end
 
     def run!(&block)
@@ -41,17 +43,11 @@ module Aruba
     end
 
     def stdout
-      wait_for_io do
-        @out.rewind
-        @out.read
-      end
+      wait_for_io { read(@out) } || @output_cache
     end
 
     def stderr
-      wait_for_io do
-        @err.rewind
-        @err.read
-      end
+      wait_for_io { read(@err) } || @error_cache
     end
 
     def read_stdout
@@ -66,26 +62,48 @@ module Aruba
       unless @process.exited?
         @process.poll_for_exit(@exit_timeout)
       end
-      reader.stdout stdout
-      reader.stderr stderr
       @exit_code = @process.exit_code
       @process = nil
+      close_and_cache_out
+      close_and_cache_err
+      if reader
+        reader.stdout stdout
+        reader.stderr stderr
+      end
       @exit_code
     end
 
     def terminate
       if @process
-        stdout && stderr # flush output
         @process.stop
-        stdout && stderr # flush output
+        stop nil
       end
     end
 
     private
 
     def wait_for_io(&block)
-      sleep @io_wait if @process
-      yield
+      if @process
+        sleep @io_wait
+        yield
+      end
+    end
+
+    def read(io)
+      io.rewind
+      io.read
+    end
+
+    def close_and_cache_out
+      @output_cache = read @out
+      @out.close
+      @out = nil
+    end
+
+    def close_and_cache_err
+      @error_cache = read @err
+      @err.close
+      @err = nil
     end
 
   end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: aruba
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
+  prerelease: 
 platform: ruby
 authors:
 - Aslak Hellesøy
@@ -11,104 +12,118 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-05-17 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
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.7.0
 description: CLI Steps for Cucumber, hand-crafted for you in Aruba
@@ -142,6 +157,7 @@ files:
 - features/support/custom_main.rb
 - features/support/env.rb
 - features/support/jruby.rb
+- features/utf-8.feature
 - lib/aruba.rb
 - lib/aruba/api.rb
 - lib/aruba/config.rb
@@ -172,43 +188,33 @@ files:
 - templates/main.erb
 homepage: http://github.com/cucumber/aruba
 licenses: []
-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: 2.0.0
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
-summary: aruba-0.5.2
-test_files:
-- features/before_cmd_hooks.feature
-- features/custom_ruby_process.feature
-- features/exit_statuses.feature
-- features/file_system_commands.feature
-- features/flushing.feature
-- features/interactive.feature
-- features/no_clobber.feature
-- features/output.feature
-- features/step_definitions/aruba_dev_steps.rb
-- features/support/custom_main.rb
-- features/support/env.rb
-- features/support/jruby.rb
-- spec/aruba/api_spec.rb
-- spec/aruba/hooks_spec.rb
-- spec/aruba/jruby_spec.rb
-- spec/aruba/spawn_process_spec.rb
-- spec/spec_helper.rb
+specification_version: 3
+summary: aruba-0.5.3
+test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: c32a3208631d64e4bb80c234b0631c7747f9e173
-  data.tar.gz: c8badeb14b86f1e2c1654127a2042adbdf223614
-SHA512:
-  metadata.gz: 02ccf28c607e88a1216c32c30c52dd8414fb4f26b19035378c7a891587148aa147223e4d1eb24204742a1097a3e168628201d6009f4a2198d5b2b73a1486b627
-  data.tar.gz: ea7267f34b7e1a6352d84377b58500554dcf5b9d6af94d0b2593224e5413932d5c534270b80512dfec76501d161f6fa7e331d96c36d73d4c40b056095a898e89