aruba 0.14.7 → 0.14.8

data/lib/aruba/generators/script_file.rb

@@ -16,7 +16,7 @@ module Aruba
 
     def call
       Aruba.platform.write_file(path, "#{header}#{content}")
-      Aruba.platform.chmod(0755, path, {})
+      Aruba.platform.chmod(0o755, path, {})
     end
 
     private

data/lib/aruba/matchers/deprecated/file.rb

@@ -1,10 +1,12 @@
 module RSpec
   module Matchers
+    # rubocop:disable Style/PredicateName
     def have_same_file_content_like(expected)
       RSpec.deprecate('`have_same_file_content_like`', :replacement => '`have_same_file_content_as`')
 
       have_same_file_content_as(expected)
     end
+    # rubocop:enable Style/PredicateName
 
     def a_file_with_same_content_like(expected)
       RSpec.deprecate('`a_file_with_same_content_like`', :replacement => '`a_file_with_same_content_as`')
@@ -12,4 +14,4 @@ module RSpec
       a_file_with_same_content_as(expected)
     end
   end
-end
+end

data/lib/aruba/platforms/command_monitor.rb

@@ -34,7 +34,6 @@ module Aruba
       end
     end
 
-    # rubocop:disable Metrics/MethodLength
     def initialize(opts = {})
       @registered_commands = []
       @announcer = opts.fetch(:announcer)
@@ -135,9 +134,7 @@ module Aruba
       registered_commands.each(&:stop)
 
       if RUBY_VERSION < '1.9.3'
-        # rubocop:disable Style/EachWithObject
         registered_commands.inject("") { |a, e| a << e.stdout; a }
-        # rubocop:enable Style/EachWithObject
       else
         registered_commands.each_with_object("") { |e, a| a << e.stdout }
       end
@@ -152,9 +149,7 @@ module Aruba
       registered_commands.each(&:stop)
 
       if RUBY_VERSION < '1.9.3'
-        # rubocop:disable Style/EachWithObject
         registered_commands.inject("") { |a, e| a << e.stderr; a }
-        # rubocop:enable Style/EachWithObject
       else
         registered_commands.each_with_object("") { |e, a| a << e.stderr }
       end

data/lib/aruba/platforms/unix_environment_variables.rb

@@ -14,7 +14,7 @@ module Aruba
           @other_env = if RUBY_VERSION <= '1.9.3'
                          # rubocop:disable Style/EachWithObject
                          @other_env.to_hash.inject({}) { |a, (k, v)| a[k] = v.to_s; a }
-                       # rubocop:enable Style/EachWithObject
+                         # rubocop:enable Style/EachWithObject
                        else
                          @other_env.to_h.each_with_object({}) { |(k, v), a| a[k] = v.to_s }
                        end
@@ -208,9 +208,7 @@ module Aruba
 
       def prepared_environment
         if RUBY_VERSION <= '1.9.3'
-          # rubocop:disable Style/EachWithObject
           actions.inject(ENV.to_hash.merge(env)) { |a, e| e.call(a) }
-          # rubocop:enable Style/EachWithObject
         else
           actions.each_with_object(ENV.to_hash.merge(env)) { |e, a| a = e.call(a) }
         end

data/lib/aruba/platforms/unix_which.rb

@@ -36,8 +36,6 @@ module Aruba
           Aruba.platform.command?(program)
         end
 
-        # rubocop:disable Metrics/CyclomaticComplexity
-        # rubocop:disable Metrics/MethodLength
         def call(program, path)
           # Iterate over each path glob the dir + program.
           path.split(File::PATH_SEPARATOR).each do |dir|
@@ -50,8 +48,6 @@ module Aruba
 
           nil
         end
-        # rubocop:enable Metrics/CyclomaticComplexity
-        # rubocop:enable Metrics/MethodLength
       end
 
       private

data/lib/aruba/platforms/windows_which.rb

@@ -38,8 +38,6 @@ module Aruba
           Aruba.platform.command?(program)
         end
 
-        # rubocop:disable Metrics/CyclomaticComplexity
-        # rubocop:disable Metrics/MethodLength
         def call(program, path)
           # Iterate over each path glob the dir + program.
           path.split(File::PATH_SEPARATOR).each do |dir|
@@ -63,8 +61,6 @@ module Aruba
 
           nil
         end
-        # rubocop:enable Metrics/CyclomaticComplexity
-        # rubocop:enable Metrics/MethodLength
       end
 
       private

data/lib/aruba/processes/basic_process.rb

@@ -26,6 +26,7 @@ module Aruba
         @io_wait_timeout = io_wait_timeout
 
         @started         = false
+        @timed_out       = false
       end
 
       # Return command line

data/lib/aruba/processes/spawn_process.rb

@@ -93,7 +93,7 @@ module Aruba
 
         yield self if block_given?
       end
-      # rubocop:disable Metrics/MethodLength
+      # rubocop:enable Metrics/MethodLength
 
       # Access to stdin of process
       def stdin
@@ -256,9 +256,7 @@ module Aruba
         # gather fully qualified path
         cmd = Aruba.platform.which(command, environment['PATH'])
 
-        # rubocop:disable  Metrics/LineLength
         fail LaunchError, %(Command "#{command}" not found in PATH-variable "#{environment['PATH']}".) if cmd.nil?
-        # rubocop:enable  Metrics/LineLength
 
         Aruba.platform.command_string.new(cmd)
       end

data/lib/aruba/runtime.rb

@@ -81,11 +81,12 @@ module Aruba
     # @return [ArubaPath]
     #   The directory to where your fixtures are stored
     def fixtures_directory
-      unless @fixtures_directory
+      @fixtures_directory ||= begin
         candidates = config.fixtures_directories.map { |dir| File.join(root_directory, dir) }
-        @fixtures_directory = candidates.find { |d| Aruba.platform.directory? d }
+        directory = candidates.find { |d| Aruba.platform.directory? d }
 
-        fail "No existing fixtures directory found in #{candidates.map { |d| format('"%s"', d) }.join(', ')}. " unless @fixtures_directory
+        fail "No existing fixtures directory found in #{candidates.map { |d| format('"%s"', d) }.join(', ')}." unless directory
+        directory
       end
 
       fail %(Fixtures directory "#{@fixtures_directory}" is not a directory) unless Aruba.platform.directory?(@fixtures_directory)

data/lib/aruba/version.rb

@@ -1,3 +1,3 @@
 module Aruba
-  VERSION = '0.14.7'.freeze
+  VERSION = '0.14.8'.freeze
 end

data/spec/aruba/api/deprecated_spec.rb

@@ -54,7 +54,7 @@ RSpec.describe 'Deprecated API' do
       end
 
       context 'and permissions are given as octal number' do
-        let(:permissions) { 0655 }
+        let(:permissions) { 0o655 }
         it { expect(actual_permissions).to eq('0655') }
       end
 
@@ -93,7 +93,7 @@ RSpec.describe 'Deprecated API' do
         end
 
         context 'and permissions are given as octal number' do
-          let(:permissions) { 0666 }
+          let(:permissions) { 0o666 }
 
           it { @aruba.check_filesystem_permissions(permissions, file_name, true) }
         end
@@ -107,7 +107,7 @@ RSpec.describe 'Deprecated API' do
         end
 
         context 'but fails because the permissions are different' do
-          let(:expected_permissions) { 0666 }
+          let(:expected_permissions) { 0o666 }
 
           it { expect { @aruba.check_filesystem_permissions(expected_permissions, file_name, true) }.to raise_error RSpec::Expectations::ExpectationNotMetError }
         end
@@ -115,13 +115,13 @@ RSpec.describe 'Deprecated API' do
 
       context 'and should not have permissions' do
         context 'and succeeds when the difference is expected and permissions are different' do
-          let(:different_permissions) { 0666 }
+          let(:different_permissions) { 0o666 }
 
           it { @aruba.check_filesystem_permissions(different_permissions, file_name, false) }
         end
 
         context 'and fails because the permissions are the same although they should be different' do
-          let(:different_permissions) { 0655 }
+          let(:different_permissions) { 0o655 }
 
           it { expect { @aruba.check_filesystem_permissions(different_permissions, file_name, false) }.to raise_error RSpec::Expectations::ExpectationNotMetError }
         end

data/spec/aruba/api_spec.rb

@@ -778,7 +778,7 @@ describe Aruba::Api do
         end
 
         context 'and permissions are given as octal number' do
-          let(:permissions) { 0655 }
+          let(:permissions) { 0o655 }
           it { expect(actual_permissions).to eq('0655') }
         end
 
@@ -864,7 +864,7 @@ describe Aruba::Api do
         end
 
         it "should announce to stdout exactly once" do
-          @aruba.run_simple('echo "hello world"', false)
+          @aruba.run_command_and_stop('echo "hello world"')
           expect(@aruba.last_command_started.output).to include('hello world')
         end
       end
@@ -872,7 +872,7 @@ describe Aruba::Api do
       context 'disabled' do
         it "should not announce to stdout" do
           result = capture(:stdout) do
-            @aruba.run_simple('echo "hello world"', false)
+            @aruba.run_command_and_stop('echo "hello world"')
           end
 
           expect(result).not_to include('hello world')
@@ -882,8 +882,8 @@ describe Aruba::Api do
     end
   end
 
-  describe '#run' do
-    before(:each){ @aruba.run 'cat' }
+  describe '#run_command' do
+    before(:each){ @aruba.run_command 'cat' }
     after(:each) { @aruba.all_commands.each(&:stop) }
 
     it "respond to input" do
@@ -927,7 +927,7 @@ describe Aruba::Api do
 
     it "set environment variable" do
       @aruba.set_environment_variable 'LONG_LONG_ENV_VARIABLE', 'true'
-      @aruba.run_simple "env"
+      @aruba.run_command_and_stop "env"
       expect(@aruba.last_command_started.output).
         to include("LONG_LONG_ENV_VARIABLE=true")
     end
@@ -935,7 +935,7 @@ describe Aruba::Api do
     it "overwrites environment variable" do
       @aruba.set_environment_variable 'LONG_LONG_ENV_VARIABLE', 'true'
       @aruba.set_environment_variable 'LONG_LONG_ENV_VARIABLE', 'false'
-      @aruba.run_simple "env"
+      @aruba.run_command_and_stop "env"
       expect(@aruba.last_command_started.output).
         to include("LONG_LONG_ENV_VARIABLE=false")
     end

data/spec/aruba/matchers/command_spec.rb

@@ -14,7 +14,7 @@ RSpec.describe 'Command Matchers' do
   describe '#to_have_exit_status' do
     let(:cmd) { 'true' }
 
-    before(:each) { run(cmd) }
+    before(:each) { run_command(cmd) }
 
     context 'when has exit 0' do
       it { expect(last_command_started).to have_exit_status 0 }
@@ -29,7 +29,7 @@ RSpec.describe 'Command Matchers' do
   describe '#to_be_successfully_executed_' do
     let(:cmd) { 'true' }
 
-    before(:each) { run(cmd) }
+    before(:each) { run_command(cmd) }
 
     context 'when has exit 0' do
       it { expect(last_command_started).to be_successfully_executed }
@@ -46,15 +46,15 @@ RSpec.describe 'Command Matchers' do
     let(:output) { 'hello world' }
 
     context 'when have output hello world on stdout' do
-      before(:each) { run(cmd) }
+      before(:each) { run_command(cmd) }
       it { expect(last_command_started).to have_output output }
     end
 
     context 'when multiple commands output hello world on stdout' do
       context 'and all comands must have the output' do
         before(:each) do
-          run(cmd)
-          run(cmd)
+          run_command(cmd)
+          run_command(cmd)
         end
 
         it { expect(all_commands).to all have_output output }
@@ -62,8 +62,8 @@ RSpec.describe 'Command Matchers' do
 
       context 'and any comand can have the output' do
         before(:each) do
-          run(cmd)
-          run('echo hello universe')
+          run_command(cmd)
+          run_command('echo hello universe')
         end
 
         it { expect(all_commands).to include have_output(output) }
@@ -80,19 +80,19 @@ RSpec.describe 'Command Matchers' do
 
         File.open(expand_path('cmd.sh'), 'w') { |f| f.puts string }
 
-        File.chmod 0755, expand_path('cmd.sh')
+        File.chmod 0o755, expand_path('cmd.sh')
         prepend_environment_variable 'PATH', "#{expand_path('.')}#{File::PATH_SEPARATOR}"
       end
 
       let(:cmd) { "cmd.sh #{output}" }
 
-      before(:each) { run(cmd) }
+      before(:each) { run_command(cmd) }
 
       it { expect(last_command_started).to have_output output }
     end
 
     context 'when not has output' do
-      before(:each) { run(cmd) }
+      before(:each) { run_command(cmd) }
 
       it { expect(last_command_started).not_to have_output 'hello universe' }
     end
@@ -103,7 +103,7 @@ RSpec.describe 'Command Matchers' do
     let(:output) { 'hello world' }
 
     context 'when have output hello world on stdout' do
-      before(:each) { run(cmd) }
+      before(:each) { run_command(cmd) }
       it { expect(last_command_started).to have_output_on_stdout output }
     end
 
@@ -117,19 +117,19 @@ RSpec.describe 'Command Matchers' do
 
         File.open(expand_path('cmd.sh'), 'w') { |f| f.puts string }
 
-        File.chmod 0755, expand_path('cmd.sh')
+        File.chmod 0o755, expand_path('cmd.sh')
         prepend_environment_variable 'PATH', "#{expand_path('.')}#{File::PATH_SEPARATOR}"
       end
 
       let(:cmd) { "cmd.sh #{output}" }
 
-      before(:each) { run(cmd) }
+      before(:each) { run_command(cmd) }
 
       it { expect(last_command_started).not_to have_output_on_stdout output }
     end
 
     context 'when not has output' do
-      before(:each) { run(cmd) }
+      before(:each) { run_command(cmd) }
 
       it { expect(last_command_started).not_to have_output_on_stdout 'hello universe' }
     end
@@ -140,7 +140,7 @@ RSpec.describe 'Command Matchers' do
     let(:output) { 'hello world' }
 
     context 'when have output hello world on stdout' do
-      before(:each) { run(cmd) }
+      before(:each) { run_command(cmd) }
       it { expect(last_command_started).not_to have_output_on_stderr output }
     end
 
@@ -154,19 +154,19 @@ RSpec.describe 'Command Matchers' do
 
         File.open(expand_path('cmd.sh'), 'w') { |f| f.puts string }
 
-        File.chmod 0755, expand_path('cmd.sh')
+        File.chmod 0o755, expand_path('cmd.sh')
         prepend_environment_variable 'PATH', "#{expand_path('.')}#{File::PATH_SEPARATOR}"
       end
 
       let(:cmd) { "cmd.sh #{output}" }
 
-      before(:each) { run(cmd) }
+      before(:each) { run_command(cmd) }
 
       it { expect(last_command_started).to have_output_on_stderr output }
     end
 
     context 'when not has output' do
-      before(:each) { run(cmd) }
+      before(:each) { run_command(cmd) }
 
       it { expect(last_command_started).not_to have_output_on_stderr 'hello universe' }
     end

data/spec/aruba/matchers/deprecated_spec.rb

@@ -88,7 +88,7 @@ RSpec.describe 'Deprecated matchers' do
       @aruba.write_file(reference_file, reference_file_content)
       @aruba.write_file(file_with_different_content, 'Some different content here...')
     end
-    
+
     context 'when the array of files includes a file with the same content' do
       let(:files) { [file_with_different_content, file_with_same_content] }
 
@@ -101,7 +101,6 @@ RSpec.describe 'Deprecated matchers' do
           expect { expect(files).not_to include a_file_with_same_content_like reference_file }.to raise_error RSpec::Expectations::ExpectationNotMetError
         end
       end
-      
     end
 
     context 'when the array of files does not include a file with the same content' do

data/spec/aruba/matchers/file_spec.rb

@@ -176,7 +176,7 @@ RSpec.describe 'File Matchers' do
       @aruba.write_file(reference_file, reference_file_content)
       @aruba.write_file(file_with_different_content, 'Some different content here...')
     end
-    
+
     context 'when the array of files includes a file with the same content' do
       let(:files) { [file_with_different_content, file_with_same_content] }
 
@@ -189,7 +189,6 @@ RSpec.describe 'File Matchers' do
           expect { expect(files).not_to include a_file_with_same_content_as reference_file }
         end
       end
-      
     end
 
     context 'when the array of files does not include a file with the same content' do

data/spec/event_bus_spec.rb

@@ -1,6 +1,5 @@
 require 'aruba/event_bus'
 
-# rubocop:disable Style/Documentation
 module Events
   class TestEvent; end
   class AnotherTestEvent; end
@@ -12,7 +11,6 @@ class MyHandler
 end
 
 class MyMalformedHandler; end
-# rubocop:enable Style/Documentation
 
 describe Aruba::EventBus do
   subject(:bus) { described_class.new(name_resolver) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aruba
 version: !ruby/object:Gem::Version
-  version: 0.14.7
+  version: 0.14.8
 platform: ruby
 authors:
 - Aslak Hellesøy
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-08 00:00:00.000000000 Z
+date: 2019-02-02 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: 0.10.0
+        version: 1.1.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: 0.10.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -295,7 +295,7 @@ files:
 - lib/aruba.rb
 - lib/aruba/api.rb
 - lib/aruba/api/bundler.rb
-- lib/aruba/api/command.rb
+- lib/aruba/api/commands.rb
 - lib/aruba/api/core.rb
 - lib/aruba/api/deprecated.rb
 - lib/aruba/api/environment.rb
@@ -493,5 +493,5 @@ requirements: []
 rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
-summary: aruba-0.14.7
+summary: aruba-0.14.8
 test_files: []