aruba 0.14.10 → 0.14.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aac7113c05858afc5a48b644bdb6e29427357319e13d6b7c5fb0c2a4d5afef4b
-  data.tar.gz: 463b5d14a0f1c0a2cbab30a5f51ab188916e077e8e00364d635353cdcb9346af
+  metadata.gz: 060046e288870eabc33857b26f77aab613780b56e2708fa792a05d6c92b5d889
+  data.tar.gz: ad6ec98600b5caeaa4a086e7dd87d9c38bb5949aca1a03bd4e35b263899527be
 SHA512:
-  metadata.gz: e525789f39d2f6cb13f178a174eae0c55a02ea8b8487353da9f075cc7dcab54498638ea101a7727bb9c87265d1232f711d9294988c81eb0de71408fa26113dde
-  data.tar.gz: 9604df096eb13935a3fe24114c9c381dc8cd0f3f749b01bcdde73e315dd1d8d23ba0dd819c0277517974b0a588788b787f9b648131a1a257a5cc954aea7ef966
+  metadata.gz: f64c63be6aa7ac7944221ab21b6c90252c920dcda7f14e4879002e72aabb2d197f44519fccb1cce5f23bd0450199f1f065140aeda6fb3781c95fcd7eb27210d6
+  data.tar.gz: 3b64947ad59c0b3d13ec081493325900c080d1e3cbd107d957e9c58ecfc052065afef3aedc7bd46d824586ba3fa4af6c3e499e100735c14207ab25719d844f6b

data/CHANGELOG.md

@@ -6,6 +6,13 @@ This project will adhere to [Semantic Versioning][1] once version 1.0.0 is relea
 
 This document is formatted according to the principles of [Keep A CHANGELOG][2].
 
+## [v0.14.11]
+
+* Loosen childprocess dependency ([#658])
+* Do not set binmode on output temp files, so automatic line ending conversion works ([#650])
+* Improve deprecation suggestions ([#647])
+* Backport fixes to code organization, layout and spelling ([#645])
+
 ## [v0.14.10]
 
 * Backport replacement of problematic AnsiColor module with simple
@@ -667,6 +674,10 @@ This document is formatted according to the principles of [Keep A CHANGELOG][2].
 
 <!-- issues & pull requests -->
 
+[#658]: https://github.com/cucumber/aruba/pull/658
+[#650]: https://github.com/cucumber/aruba/pull/650
+[#647]: https://github.com/cucumber/aruba/pull/647
+[#645]: https://github.com/cucumber/aruba/pull/645
 [#642]: https://github.com/cucumber/aruba/pull/642
 [#639]: https://github.com/cucumber/aruba/pull/639
 [#638]: https://github.com/cucumber/aruba/pull/638
@@ -860,6 +871,7 @@ This document is formatted according to the principles of [Keep A CHANGELOG][2].
 
 <!-- Releases -->
 
+[v0.14.11]:       https://github.com/cucumber/aruba/compare/v0.14.10...v0.14.11
 [v0.14.10]:       https://github.com/cucumber/aruba/compare/v0.14.9...v0.14.10
 [v0.14.9]:        https://github.com/cucumber/aruba/compare/v0.14.8...v0.14.9
 [v0.14.8]:        https://github.com/cucumber/aruba/compare/v0.14.7...v0.14.8

data/Gemfile

@@ -86,8 +86,10 @@ group :development, :test do
 
   if RUBY_VERSION < '1.9.2'
     gem 'childprocess', '~> 0.6.3'
-  else
+  elsif RUBY_VERSION < '2.3.0'
     gem 'childprocess', '~> 1.0.1'
+  else
+    gem 'childprocess', '~> 2.0'
   end
 
   if RUBY_VERSION < '1.9.2'

data/aruba.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.homepage    = 'http://github.com/cucumber/aruba'
 
   s.add_runtime_dependency 'cucumber', '>= 1.3.19'
-  s.add_runtime_dependency 'childprocess', ['>= 0.6.3', '< 1.1.0']
+  s.add_runtime_dependency 'childprocess', ['>= 0.6.3', '< 3.0.0']
   s.add_runtime_dependency 'ffi', '~> 1.9'
   s.add_runtime_dependency 'rspec-expectations', '>= 2.99'
   s.add_runtime_dependency 'contracts', '~> 0.9'

data/lib/aruba/api/deprecated.rb

@@ -774,8 +774,7 @@ module Aruba
       def assert_partial_output(expected, actual)
         Aruba.platform.deprecated(
           'The use of "#assert_partial_output" is deprecated.' \
-          ' Use "expect(command).to have_output /partial/" instead.' \
-          ' There are also special matchers for "stdout" and "stderr"'
+          ' Use "expect(actual).to include_output_string partial" instead.'
         )
 
         actual.force_encoding(expected.encoding) if RUBY_VERSION >= "1.9"
@@ -792,8 +791,7 @@ module Aruba
       def assert_matching_output(expected, actual)
         Aruba.platform.deprecated(
           'The use of "#assert_matching_output" is deprecated.' \
-          ' Use "expect(command).to have_output /partial/" instead.' \
-          ' There are also special matchers for "stdout" and "stderr"'
+          ' Use "expect(actual).to match_output partial" instead.'
         )
 
         actual.force_encoding(expected.encoding) if RUBY_VERSION >= "1.9"
@@ -810,8 +808,7 @@ module Aruba
       def assert_not_matching_output(expected, actual)
         Aruba.platform.deprecated(
           'The use of "#assert_not_matching_output" is deprecated.' \
-          ' Use "expect(command).not_to have_output /partial/" instead.' \
-          ' There are also special matchers for "stdout" and "stderr"'
+          ' Use "expect(actual).not_to match_output partial" instead.'
         )
 
         actual.force_encoding(expected.encoding) if RUBY_VERSION >= "1.9"
@@ -828,8 +825,7 @@ module Aruba
       def assert_no_partial_output(unexpected, actual)
         Aruba.platform.deprecated(
           'The use of "#assert_no_partial_output" is deprecated.' \
-          ' Use "expect(command).not_to have_output /partial/" instead.' \
-          ' There are also special matchers for "stdout" and "stderr"'
+          ' Use "expect(actual).not_to include_output_string partial" instead.'
         )
 
         actual.force_encoding(unexpected.encoding) if RUBY_VERSION >= "1.9"
@@ -851,8 +847,7 @@ module Aruba
       def assert_partial_output_interactive(expected)
         Aruba.platform.deprecated(
           'The use of "#assert_partial_output_interactive" is deprecated.' \
-          ' Use "expect(last_command_started).to have_output /partial/" instead.' \
-          ' There are also special matchers for "stdout" and "stderr"'
+          ' Use "expect(last_command_started).to have_output an_output_string_including partial" instead.'
         )
 
         Aruba.platform.unescape(last_command_started.stdout, aruba.config.keep_ansi).
@@ -1003,9 +998,6 @@ module Aruba
       # @deprecated
       #
       # Default exit timeout for running commands with aruba
-      #
-      # Overwrite this method if you want a different timeout or set
-      # `@aruba_timeout_seconds`.
       def exit_timeout
         Aruba.platform.deprecated(
           'The use of "#exit_timeout" is deprecated.' \

data/lib/aruba/cucumber/command.rb

@@ -3,7 +3,7 @@ if Aruba::VERSION < '1.0.0'
 end
 require 'aruba/generators/script_file'
 
-When(/^I run `([^`]*)`$/)do |cmd|
+When(/^I run `([^`]*)`$/) do |cmd|
   cmd = sanitize_text(cmd)
   run_command_and_stop(cmd, :fail_on_error => false)
 end
@@ -26,13 +26,13 @@ When(/^I run the following (?:commands|script)(?: (?:with|in) `([^`]+)`)?:$/) do
   step 'I run `myscript`'
 end
 
-When(/^I run `([^`]*)` interactively$/)do |cmd|
+When(/^I run `([^`]*)` interactively$/) do |cmd|
   cmd = sanitize_text(cmd)
   @interactive = run_command(cmd)
 end
 
 # Merge interactive and background after refactoring with event queue
-When(/^I run `([^`]*)` in background$/)do |cmd|
+When(/^I run `([^`]*)` in background$/) do |cmd|
   run_command(sanitize_text(cmd))
 end
 

data/lib/aruba/platforms/command_monitor.rb

@@ -66,7 +66,7 @@ module Aruba
       @last_command_started = find(cmd)
     end
 
-    # Set last command started
+    # Set last command stopped
     #
     # @param [String] cmd
     #   The commandline of the command

data/lib/aruba/processes/spawn_process.rb

@@ -76,8 +76,10 @@ module Aruba
         @stdout_file.sync = true
         @stderr_file.sync = true
 
-        @stdout_file.binmode
-        @stderr_file.binmode
+        if RUBY_VERSION >= '1.9'
+          @stdout_file.set_encoding('ASCII-8BIT')
+          @stderr_file.set_encoding('ASCII-8BIT')
+        end
 
         @exit_status = nil
         @duplex      = true

data/lib/aruba/version.rb

@@ -1,3 +1,3 @@
 module Aruba
-  VERSION = '0.14.10'.freeze
+  VERSION = '0.14.11'.freeze
 end

data/spec/aruba/api/commands_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+require 'aruba/api'
+
+RSpec.describe Aruba::Api::Commands do
+  include_context 'uses aruba API'
+
+  describe '#run_command' do
+    before(:each){ @aruba.run_command 'cat' }
+    after(:each) { @aruba.all_commands.each(&:stop) }
+
+    it "responds to input" do
+      @aruba.type "Hello"
+      @aruba.type ""
+      expect(@aruba.last_command_started).to have_output "Hello"
+    end
+
+    it "responds to close_input" do
+      @aruba.type "Hello"
+      @aruba.close_input
+      expect(@aruba.last_command_started).to have_output "Hello"
+    end
+
+    it "pipes data" do
+      @aruba.write_file(@file_name, "Hello\nWorld!")
+      @aruba.pipe_in_file(@file_name)
+      @aruba.close_input
+      expect(@aruba.last_command_started).to have_output "Hello\nWorld!"
+    end
+  end
+end

data/spec/aruba/api/core_spec.rb

@@ -5,6 +5,51 @@ require 'fileutils'
 RSpec.describe Aruba::Api::Core do
   include_context 'uses aruba API'
 
+  describe '#cd' do
+    before do
+      @directory_name = 'test_dir'
+      @directory_path = File.join(@aruba.aruba.current_directory, @directory_name)
+    end
+
+    context 'with a block given' do
+      it 'runs the passed block in the given directory' do
+        @aruba.create_directory @directory_name
+        full_path = File.expand_path(@directory_path)
+        @aruba.cd @directory_name do
+          expect(Dir.pwd).to eq full_path
+        end
+        expect(Dir.pwd).not_to eq full_path
+      end
+
+      it 'sets directory environment in the passed block' do
+        @aruba.create_directory @directory_name
+        old_pwd = ENV['PWD']
+        full_path = File.expand_path(@directory_path)
+        @aruba.cd @directory_name do
+          expect(ENV['PWD']).to eq full_path
+          expect(ENV['OLDPWD']).to eq old_pwd
+        end
+      end
+
+      it 'sets aruba environment in the passed block' do
+        @aruba.create_directory @directory_name
+        @aruba.set_environment_variable('FOO', 'bar')
+        @aruba.cd @directory_name do
+          expect(ENV['FOO']).to eq 'bar'
+        end
+      end
+
+      it 'does not touch other environment variables in the passed block' do
+        keys = ENV.keys - ['PWD', 'OLDPWD']
+        old_values = ENV.values_at(*keys)
+        @aruba.create_directory @directory_name
+        @aruba.cd @directory_name do
+          expect(ENV.values_at(*keys)).to eq old_values
+        end
+      end
+    end
+  end
+
   describe '#expand_path' do
     context 'when file_name is given' do
       it { expect(@aruba.expand_path(@file_name)).to eq File.expand_path(@file_path) }
@@ -82,61 +127,58 @@ RSpec.describe Aruba::Api::Core do
     end
   end
 
-  describe '#cd' do
-    before do
-      @directory_name = 'test_dir'
-      @directory_path = File.join(@aruba.aruba.current_directory, @directory_name)
-    end
+  describe '#with_environment' do
+    it 'modifies env for block' do
+      variable = 'THIS_IS_A_ENV_VAR_1'
+      ENV[variable] = '1'
 
-    context 'with a block given' do
-      it 'runs the passed block in the given directory' do
-        @aruba.create_directory @directory_name
-        full_path = File.expand_path(@directory_path)
-        @aruba.cd @directory_name do
-          expect(Dir.pwd).to eq full_path
-        end
-        expect(Dir.pwd).not_to eq full_path
+      @aruba.with_environment variable => '0' do
+        expect(ENV[variable]).to eq '0'
       end
 
-      it 'sets directory environment in the passed block' do
-        @aruba.create_directory @directory_name
-        old_pwd = ENV['PWD']
-        full_path = File.expand_path(@directory_path)
-        @aruba.cd @directory_name do
-          expect(ENV['PWD']).to eq full_path
-          expect(ENV['OLDPWD']).to eq old_pwd
-        end
-      end
+      expect(ENV[variable]).to eq '1'
+    end
 
-      it 'sets aruba environment in the passed block' do
-        @aruba.create_directory @directory_name
-        @aruba.set_environment_variable('FOO', 'bar')
-        @aruba.cd @directory_name do
-          expect(ENV['FOO']).to eq 'bar'
+    it 'works together with #set_environment_variable' do
+      variable = 'THIS_IS_A_ENV_VAR_2'
+      @aruba.set_environment_variable variable, '1'
+
+      @aruba.with_environment do
+        expect(ENV[variable]).to eq '1'
+        @aruba.set_environment_variable variable, '0'
+        @aruba.with_environment do
+          expect(ENV[variable]).to eq '0'
         end
+        expect(ENV[variable]).to eq '1'
       end
+    end
 
-      it 'does not touch other environment variables in the passed block' do
-        keys = ENV.keys - ['PWD', 'OLDPWD']
-        old_values = ENV.values_at(*keys)
-        @aruba.create_directory @directory_name
-        @aruba.cd @directory_name do
-          expect(ENV.values_at(*keys)).to eq old_values
+    it 'works with a mix of ENV and #set_environment_variable' do
+      variable = 'THIS_IS_A_ENV_VAR_3'
+      @aruba.set_environment_variable variable, '1'
+      ENV[variable] = '2'
+      expect(ENV[variable]).to eq '2'
+
+      @aruba.with_environment do
+        expect(ENV[variable]).to eq '1'
+        @aruba.set_environment_variable variable, '0'
+        @aruba.with_environment do
+          expect(ENV[variable]).to eq '0'
         end
+        expect(ENV[variable]).to eq '1'
       end
+      expect(ENV[variable]).to eq '2'
     end
-  end
 
-  describe '#with_environment' do
-    it 'modifies env for block' do
-      variable = 'THIS_IS_A_ENV_VAR'
-      ENV[variable] = '1'
+    it 'keeps values not set in argument' do
+      variable = 'THIS_IS_A_ENV_VAR_4'
+      ENV[variable] = '2'
+      expect(ENV[variable]).to eq '2'
 
-      @aruba.with_environment variable => '0' do
-        expect(ENV[variable]).to eq '0'
+      @aruba.with_environment do
+        expect(ENV[variable]).to eq '2'
       end
-
-      expect(ENV[variable]).to eq '1'
+      expect(ENV[variable]).to eq '2'
     end
   end
 end

data/spec/aruba/api_spec.rb

@@ -36,30 +36,6 @@ describe Aruba::Api do
     end
   end
 
-  describe '#run_command' do
-    before(:each){ @aruba.run_command 'cat' }
-    after(:each) { @aruba.all_commands.each(&:stop) }
-
-    it "respond to input" do
-      @aruba.type "Hello"
-      @aruba.type ""
-      expect(@aruba.last_command_started).to have_output "Hello"
-    end
-
-    it "respond to close_input" do
-      @aruba.type "Hello"
-      @aruba.close_input
-      expect(@aruba.last_command_started).to have_output "Hello"
-    end
-
-    it "pipes data" do
-      @aruba.write_file(@file_name, "Hello\nWorld!")
-      @aruba.pipe_in_file(@file_name)
-      @aruba.close_input
-      expect(@aruba.last_command_started).to have_output "Hello\nWorld!"
-    end
-  end
-
   describe 'fixtures' do
     let(:api) do
       klass = Class.new do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aruba
 version: !ruby/object:Gem::Version
-  version: 0.14.10
+  version: 0.14.11
 platform: ruby
 authors:
 - Aslak Hellesøy
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-08 00:00:00.000000000 Z
+date: 2019-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -38,7 +38,7 @@ dependencies:
         version: 0.6.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -48,7 +48,7 @@ dependencies:
         version: 0.6.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -257,7 +257,6 @@ files:
 - features/step_definitions/hooks.rb
 - features/support/aruba.rb
 - features/support/env.rb
-- features/support/jruby.rb
 - features/support/simplecov_setup.rb
 - fixtures/cli-app/.gitignore
 - fixtures/cli-app/.rspec
@@ -401,6 +400,7 @@ files:
 - script/console
 - script/test
 - spec/aruba/api/bundler_spec.rb
+- spec/aruba/api/commands_spec.rb
 - spec/aruba/api/core_spec.rb
 - spec/aruba/api/deprecated_spec.rb
 - spec/aruba/api/filesystem_spec.rb
@@ -485,5 +485,5 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: aruba-0.14.10
+summary: aruba-0.14.11
 test_files: []

data/features/support/jruby.rb

@@ -1,5 +0,0 @@
-if RUBY_PLATFORM == 'java'
-  Before do
-    @aruba_timeout_seconds = 15
-  end
-end