aruba 0.14.3 → 0.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d1a28b38002e8be7a18ef7f565bf01e03af948af
-  data.tar.gz: 9d9a66748e6626e01c26c1aaf81f0c6d9531adc4
+SHA256:
+  metadata.gz: d4cc495b4f8d40275335450c938adca9d0bd7a47b2c2f8e38c639620c822fd1b
+  data.tar.gz: f27059712ef37f5eeac18139ac8634f495c65d8d4f0ee626aeb539796e5d2998
 SHA512:
-  metadata.gz: d622dcb0c21bd5f01ec339928e9638f1a0dfc7bcfc0aa52026832672c37037294dd94082e376ed8094eff08269563f8c1b7fe28601941bb971b0d9fff11e8d48
-  data.tar.gz: 1bc9c24af389bd3daccde3fc5dd84c779e749060684a6e425386c60d063a02da8be5670dc3c067a6af26f8e38c269fb9eefe3ab535f9d72b50e12f43affbf2b7
+  metadata.gz: 0fdcce2f62d27eebaf4a294f4725abfe75212a26a30a62024d532a302446bcde074cb3ad8f4767b5fb8d20f851d77c01dde22e29ad333605eab70ad6f5cd8cec
+  data.tar.gz: f8a4721f5075b6769c8100896b0f92d06095959e40683d1d2006a9bcd9627613b04e7c5b6156e62b9064463f54df0a89941253ee63eaf845b18718cc6876465f

data/History.md

@@ -1,5 +1,11 @@
 #  RELEASED
 
+## [v0.14.4](https://github.com/cucumber/aruba/compare/v0.14.3...v0.14.4)
+
+* Fix command spawning when run in directories with spaces (#490)
+* Ensure setup is still done when using `@no-clobber` (#529)
+* Make `#expand_path` handle absolute paths correctly (#486)
+
 ## [v0.14.3](https://github.com/cucumber/aruba/compare/v0.14.2...v0.14.3)
 
 * Fix path bug (#422)

data/features/getting_started/cleanup.feature

@@ -9,57 +9,48 @@ Feature: Cleanup Aruba Working Directory
   Background:
     Given I use a fixture named "cli-app"
 
-  Scenario: Changes in the filesystem
-    Given a file named "tmp/aruba/file.txt" with "content"
-    And a directory named "tmp/aruba/dir.d"
-    And a file named "features/flushing.feature" with:
+  Scenario: Clean up artifacts and pwd from a previous scenario
+    Given a file named "features/cleanup.feature" with:
     """
     Feature: Check
-      Scenario: Check
-        Then a file named "file.txt" does not exist
-        And a directory named "dir.d" does not exist
+      Scenario: Check #1
+        Given a file named "file.txt" with "content"
+        And a directory named "dir.d"
+        Then a file named "file.txt" should exist
+        And a directory named "dir.d" should exist
+        When I cd to "dir.d"
+        And I run `pwd`
+        Then the output should match %r</tmp/aruba/dir.d$>
+
+      Scenario: Check #2
+        Then a file named "file.txt" should not exist
+        And a directory named "dir.d" should not exist
+        When I run `pwd`
+        Then the output should match %r</tmp/aruba$>
     """
     When I run `cucumber`
     Then the features should all pass
 
   Scenario: Do not clobber before run
+    The `@no-clobber` tag stops Aruba from clearing out its scratch directory.
+    Other setup steps are still performed, such as setting the current working
+    directory.
+
     Given a file named "tmp/aruba/file.txt" with "content"
     And a directory named "tmp/aruba/dir.d"
-    And a file named "features/flushing.feature" with:
+    And a file named "features/cleanup.feature" with:
     """
     Feature: Check
-      @no-clobber
-      Scenario: Check
+      Scenario: Check #1
+        Given a file named "file.txt" with "content"
+        And a directory named "dir.d"
         Then a file named "file.txt" should exist
         And a directory named "dir.d" should exist
-    """
-    When I run `cucumber`
-    Then the features should all pass
-
-  Scenario: Cleanup and verify the previous scenario
-    Given a file named "features/flushing.feature" with:
-    """
-    Feature: Check
-      Scenario: Check #1
-        Given a file named "tmp/aruba/file.txt" with "content"
-        And a directory named "tmp/aruba/dir.d"
 
+      @no-clobber
       Scenario: Check #2
-        Then a file named "file.txt" should not exist
-        And a directory named "dir.d" should not exist
-    """
-    When I run `cucumber`
-    Then the features should all pass
-
-  Scenario:  Current directory from previous scenario is reseted
-    Given a file named "features/non-existence.feature" with:
-    """
-    Feature: Reset
-      Scenario: Reset #1
-        Given a directory named "dir1"
-        When I cd to "dir1"
-
-      Scenario: Reset #2
+        Then a file named "file.txt" should exist
+        And a directory named "dir.d" should exist
         When I run `pwd`
         Then the output should match %r</tmp/aruba$>
     """

data/lib/aruba/api/core.rb

@@ -25,8 +25,8 @@ module Aruba
       # This will only clean up aruba's working directory to remove all
       # artifacts of your tests. This does NOT clean up the current working
       # directory.
-      def setup_aruba
-        Aruba::Setup.new(aruba).call
+      def setup_aruba(clobber = true)
+        Aruba::Setup.new(aruba).call(clobber)
 
         self
       end
@@ -163,7 +163,8 @@ module Aruba
           path.to_s
         else
           directory = File.join(aruba.root_directory, aruba.current_directory)
-          ArubaPath.new(File.join(*[directory, dir_string, file_name].compact)).expand_path.to_s
+          directory = File.expand_path(dir_string, directory) if dir_string
+          File.expand_path(file_name, directory)
         end
       end
       # rubocop:enable Metrics/MethodLength

data/lib/aruba/api/deprecated.rb

@@ -294,7 +294,7 @@ module Aruba
 
       # @deprecated
       def assert_exit_status_and_partial_output(expect_to_pass, expected)
-        Aruba.platform.deprecated('The use of "assert_exit_status_and_partial_output" is deprecated. Use "#assert_access" and "#assert_partial_output" instead')
+        Aruba.platform.deprecated('The use of "assert_exit_status_and_partial_output" is deprecated. Use "#assert_success" and "#assert_partial_output" instead')
 
         assert_success(expect_to_pass)
         assert_partial_output(expected, all_output)

data/lib/aruba/cucumber/hooks.rb

@@ -20,6 +20,10 @@ After do
   aruba.command_monitor.clear
 end
 
+Before('@no-clobber') do
+  setup_aruba(false)
+end
+
 Before('~@no-clobber') do
   setup_aruba
 end

data/lib/aruba/platforms/unix_command_string.rb

@@ -13,7 +13,7 @@ module Aruba
 
       # Convert to array
       def to_a
-        Shellwords.split __getobj__
+        [__getobj__]
       end
 
       if RUBY_VERSION < '1.9'

data/lib/aruba/platforms/windows_command_string.rb

@@ -10,14 +10,9 @@ module Aruba
     #
     # @private
     class WindowsCommandString < SimpleDelegator
-      def initialize(cmd)
-        __setobj__ format('%s /c "%s"', Aruba.platform.which('cmd.exe'), cmd)
-      end
-
       # Convert to array
       def to_a
-        Shellwords.split( __getobj__.gsub('\\', 'ARUBA_TMP_PATHSEPARATOR') ).
-          map { |w| w.gsub('ARUBA_TMP_PATHSEPARATOR', '\\') }
+        [cmd_path, '/c', __getobj__]
       end
 
       if RUBY_VERSION < '1.9'
@@ -26,6 +21,12 @@ module Aruba
         end
         alias inspect to_s
       end
+
+      private
+
+      def cmd_path
+        Aruba.platform.which('cmd.exe')
+      end
     end
   end
 end

data/lib/aruba/setup.rb

@@ -10,10 +10,10 @@ module Aruba
       @runtime = runtime
     end
 
-    def call
+    def call(clobber = true)
       return if runtime.setup_already_done?
 
-      working_directory
+      working_directory(clobber)
       events
 
       runtime.setup_done
@@ -23,8 +23,10 @@ module Aruba
 
     private
 
-    def working_directory
-      Aruba.platform.rm File.join(runtime.config.root_directory, runtime.config.working_directory), :force => true
+    def working_directory(clobber = true)
+      if clobber
+        Aruba.platform.rm File.join(runtime.config.root_directory, runtime.config.working_directory), :force => true
+      end
       Aruba.platform.mkdir File.join(runtime.config.root_directory, runtime.config.working_directory)
       Aruba.platform.chdir runtime.config.root_directory
     end

data/lib/aruba/version.rb

@@ -1,3 +1,3 @@
 module Aruba
-  VERSION = '0.14.3'.freeze
+  VERSION = '0.14.4'.freeze
 end

data/spec/aruba/api_spec.rb

@@ -654,6 +654,10 @@ describe Aruba::Api do
         it { expect(@aruba.expand_path(@file_name)).to eq File.expand_path(@file_path) }
       end
 
+      context 'when file_path is given' do
+        it { expect(@aruba.expand_path(@file_path)).to eq @file_path }
+      end
+
       context 'when path contains "."' do
         it { expect(@aruba.expand_path('.')).to eq File.expand_path(aruba.current_directory) }
       end

data/spec/aruba/platforms/unix_command_string_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+RSpec.describe Aruba::Platforms::UnixCommandString do
+  let(:command_string) { described_class.new(base_command) }
+
+  describe '#to_a' do
+    context 'with a command with a path' do
+      let(:base_command) { '/foo/bar' }
+      it { expect(command_string.to_a).to eq [base_command] }
+    end
+
+    context 'with a command with a path containing spaces' do
+      let(:base_command) { '/foo bar/baz' }
+      it { expect(command_string.to_a).to eq [base_command] }
+    end
+  end
+end

data/spec/aruba/platforms/windows_command_string_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+RSpec.describe Aruba::Platforms::WindowsCommandString do
+  let(:command_string) { described_class.new(base_command) }
+  let(:cmd_path) { 'C:\Some Path\cmd.exe' }
+
+  before do
+    allow(Aruba.platform).to receive(:which).with('cmd.exe').and_return(cmd_path)
+  end
+
+  describe '#to_a' do
+    context 'with a command with a path' do
+      let(:base_command) { 'C:\Foo\Bar' }
+      it { expect(command_string.to_a).to eq [cmd_path, '/c', base_command] }
+    end
+
+    context 'with a command with a path containing spaces' do
+      let(:base_command) { 'C:\Foo Bar\Baz' }
+      it { expect(command_string.to_a).to eq [cmd_path, '/c', base_command] }
+    end
+  end
+end

data/spec/aruba/spawn_process_spec.rb

@@ -56,5 +56,41 @@ RSpec.describe Aruba::Processes::SpawnProcess do
 
       it { expect {process.start}.to raise_error Aruba::LaunchError }
     end
+
+    context 'with a command with a space in the path on unix' do
+      let(:child) { instance_double(ChildProcess::AbstractProcess).as_null_object }
+      let(:io) { instance_double(ChildProcess::AbstractIO).as_null_object }
+      let(:command) { 'foo' }
+      let(:command_path) { '/path with space/foo' }
+
+      before do
+        allow(Aruba.platform).to receive(:command_string).and_return Aruba::Platforms::UnixCommandString
+        allow(Aruba.platform).to receive(:which).with(command, anything).and_return(command_path)
+        allow(ChildProcess).to receive(:build).with(command_path).and_return(child)
+        allow(child).to receive(:io).and_return io
+        allow(child).to receive(:environment).and_return({})
+      end
+
+      it { expect { process.start }.to_not raise_error }
+    end
+
+    context 'with a command with a space in the path on windows' do
+      let(:child) { instance_double(ChildProcess::AbstractProcess).as_null_object }
+      let(:io) { instance_double(ChildProcess::AbstractIO).as_null_object }
+      let(:command) { 'foo' }
+      let(:cmd_path) { 'C:\Some Path\cmd.exe' }
+      let(:command_path) { 'D:\Bar Baz\foo' }
+
+      before do
+        allow(Aruba.platform).to receive(:command_string).and_return Aruba::Platforms::WindowsCommandString
+        allow(Aruba.platform).to receive(:which).with('cmd.exe').and_return(cmd_path)
+        allow(Aruba.platform).to receive(:which).with(command, anything).and_return(command_path)
+        allow(ChildProcess).to receive(:build).with(cmd_path, '/c', command_path).and_return(child)
+        allow(child).to receive(:io).and_return io
+        allow(child).to receive(:environment).and_return({})
+      end
+
+      it { expect { process.start }.to_not raise_error }
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aruba
 version: !ruby/object:Gem::Version
-  version: 0.14.3
+  version: 0.14.4
 platform: ruby
 authors:
 - Aslak Hellesøy
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-15 00:00:00.000000000 Z
+date: 2018-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -412,6 +412,8 @@ files:
 - spec/aruba/matchers/path_spec.rb
 - spec/aruba/platform/simple_table_spec.rb
 - spec/aruba/platform/windows_environment_variables_spec.rb
+- spec/aruba/platforms/unix_command_string_spec.rb
+- spec/aruba/platforms/windows_command_string_spec.rb
 - spec/aruba/rspec_spec.rb
 - spec/aruba/runtime_spec.rb
 - spec/aruba/spawn_process_spec.rb
@@ -473,8 +475,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
-summary: aruba-0.14.3
+summary: aruba-0.14.4
 test_files: []