aruba 0.14.2 → 0.14.3

data/lib/aruba/cucumber/command.rb

@@ -30,7 +30,7 @@ When(/^I successfully run `(.*?)`(?: for up to (\d+) seconds)?$/)do |cmd, secs|
 end
 
 When(/^I run the following (?:commands|script)(?: (?:with|in) `([^`]+)`)?:$/) do |shell, commands|
-  prepend_environment_variable('PATH', expand_path('bin') + ':')
+  prepend_environment_variable('PATH', expand_path('bin') + File::PATH_SEPARATOR)
 
   Aruba.platform.mkdir(expand_path('bin'))
   shell ||= Aruba.platform.default_shell
@@ -153,7 +153,7 @@ When(/^I wait for (?:output|stdout) to contain "([^"]*)"$/) do |expected|
 end
 
 Then(/^the output should be (\d+) bytes long$/) do |size|
-  expect(all_output).to have_output_size size.to_i
+  expect(last_command_started.output).to have_output_size size.to_i
 end
 
 Then(/^(?:the )?(output|stderr|stdout)(?: from "([^"]*)")? should( not)? contain( exactly)? "([^"]*)"$/) do |channel, cmd, negated, exactly, expected|
@@ -418,5 +418,5 @@ When(/^I send the signal "([^"]*)" to the command (?:"([^"]*)"|(?:started last))
 end
 
 Given(/^I look for executables in "(.*)" within the current directory$/) do |directory|
-  prepend_environment_variable 'PATH', expand_path(directory) + ':'
+  prepend_environment_variable 'PATH', expand_path(directory) + File::PATH_SEPARATOR
 end

data/lib/aruba/cucumber/hooks.rb

@@ -11,12 +11,11 @@ end
 
 Before do
   # ... so every change needs to be done later
-  prepend_environment_variable 'PATH', aruba.config.command_search_paths.join(':') + ':'
+  prepend_environment_variable 'PATH', aruba.config.command_search_paths.join(File::PATH_SEPARATOR) + File::PATH_SEPARATOR
   set_environment_variable 'HOME', aruba.config.home_directory
 end
 
 After do
-  restore_env
   terminate_all_commands
   aruba.command_monitor.clear
 end

data/lib/aruba/platforms/windows_command_string.rb

@@ -16,7 +16,8 @@ module Aruba
 
       # Convert to array
       def to_a
-        Shellwords.split __getobj__
+        Shellwords.split( __getobj__.gsub('\\', 'ARUBA_TMP_PATHSEPARATOR') ).
+          map { |w| w.gsub('ARUBA_TMP_PATHSEPARATOR', '\\') }
       end
 
       if RUBY_VERSION < '1.9'

data/lib/aruba/processes/spawn_process.rb

@@ -64,6 +64,9 @@ module Aruba
         @stdout_file.sync = true
         @stderr_file.sync = true
 
+        @stdout_file.binmode
+        @stderr_file.binmode
+
         @exit_status = nil
         @duplex      = true
 
@@ -92,7 +95,7 @@ module Aruba
       end
       # rubocop:disable Metrics/MethodLength
 
-      # Access to stdout of process
+      # Access to stdin of process
       def stdin
         return if @process.exited?
 
@@ -271,7 +274,11 @@ module Aruba
         data = file.read
         file.close
 
-        data
+        if RUBY_VERSION >= '1.9'
+          data.force_encoding('UTF-8')
+        else
+          data
+        end
       end
     end
   end

data/lib/aruba/rspec.rb

@@ -16,7 +16,6 @@ RSpec.configure do |config|
   # Setup environment for aruba
   config.around :each do |example|
     if self.class.include? Aruba::Api
-      restore_env
       setup_aruba
     end
 

data/lib/aruba/version.rb

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

data/spec/aruba/api/deprecated_spec.rb

@@ -0,0 +1,308 @@
+require 'spec_helper'
+
+RSpec.describe 'Deprecated API' do
+  include_context 'uses aruba API'
+
+  around do |example|
+    Aruba.platform.with_environment do
+      example.run
+    end
+  end
+
+  before do
+    allow(Aruba.platform).to receive(:deprecated)
+  end
+
+  describe "#assert_not_matching_output" do
+    before(:each){ @aruba.run_simple("echo foo", false) }
+    after(:each) { @aruba.all_commands.each(&:stop) }
+
+    it "passes when the output doesn't match a regexp" do
+      @aruba.assert_not_matching_output "bar", @aruba.all_output
+    end
+    it "fails when the output does match a regexp" do
+      expect do
+        @aruba.assert_not_matching_output "foo", @aruba.all_output
+      end . to raise_error RSpec::Expectations::ExpectationNotMetError
+    end
+  end
+
+  describe '#filesystem_permissions' do
+    def actual_permissions
+      format( "%o" , File::Stat.new(file_path).mode )[-4,4]
+    end
+
+    let(:file_name) { @file_name }
+    let(:file_path) { @file_path }
+    let(:permissions) { '0655' }
+
+    before :each do
+      @aruba.set_environment_variable 'HOME', File.expand_path(@aruba.aruba.current_directory)
+    end
+
+    before(:each) do
+      File.open(file_path, 'w') { |f| f << "" }
+    end
+
+    before(:each) do
+      @aruba.filesystem_permissions(permissions, file_name)
+    end
+
+    context 'when file exists' do
+      context 'and permissions are given as string' do
+        it { expect(actual_permissions).to eq('0655') }
+      end
+
+      context 'and permissions are given as octal number' do
+        let(:permissions) { 0655 }
+        it { expect(actual_permissions).to eq('0655') }
+      end
+
+      context 'and path has ~ in it' do
+        let(:path) { random_string }
+        let(:file_name) { File.join('~', path) }
+        let(:file_path) { File.join(@aruba.aruba.current_directory, path) }
+
+        it { expect(actual_permissions).to eq('0655') }
+      end
+    end
+  end
+
+  describe '#check_filesystem_permissions' do
+    let(:file_name) { @file_name }
+    let(:file_path) { @file_path }
+
+    let(:permissions) { '0655' }
+
+    before :each do
+      @aruba.set_environment_variable 'HOME', File.expand_path(@aruba.aruba.current_directory)
+    end
+
+    before(:each) do
+      File.open(file_path, 'w') { |f| f << "" }
+    end
+
+    before(:each) do
+      @aruba.filesystem_permissions(permissions, file_name)
+    end
+
+    context 'when file exists' do
+      context 'and should have permissions' do
+        context 'and permissions are given as string' do
+          it { @aruba.check_filesystem_permissions(permissions, file_name, true) }
+        end
+
+        context 'and permissions are given as octal number' do
+          let(:permissions) { 0666 }
+
+          it { @aruba.check_filesystem_permissions(permissions, file_name, true) }
+        end
+
+        context 'and path includes ~' do
+          let(:string) { random_string }
+          let(:file_name) { File.join('~', string) }
+          let(:file_path) { File.join(@aruba.aruba.current_directory, string) }
+
+          it { @aruba.check_filesystem_permissions(permissions, file_name, true) }
+        end
+
+        context 'but fails because the permissions are different' do
+          let(:expected_permissions) { 0666 }
+
+          it { expect { @aruba.check_filesystem_permissions(expected_permissions, file_name, true) }.to raise_error RSpec::Expectations::ExpectationNotMetError }
+        end
+      end
+
+      context 'and should not have permissions' do
+        context 'and succeeds when the difference is expected and permissions are different' do
+          let(:different_permissions) { 0666 }
+
+          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 }
+
+          it { expect { @aruba.check_filesystem_permissions(different_permissions, file_name, false) }.to raise_error RSpec::Expectations::ExpectationNotMetError }
+        end
+      end
+    end
+  end
+
+  context '#check_file_presence' do
+    before(:each) { File.open(@file_path, 'w') { |f| f << "" } }
+
+    it "should check existence using plain match" do
+      file_name = 'nested/dir/hello_world.txt'
+      file_path = File.join(@aruba.aruba.current_directory, file_name)
+
+      Aruba.platform.mkdir(File.dirname(file_path))
+      File.open(file_path, 'w') { |f| f << "" }
+
+      @aruba.check_file_presence(file_name)
+      @aruba.check_file_presence([file_name])
+      @aruba.check_file_presence([file_name], true)
+      @aruba.check_file_presence(['asdf'], false)
+    end
+
+    it "should check existence using regex" do
+      file_name = 'nested/dir/hello_world.txt'
+      file_path = File.join(@aruba.aruba.current_directory, file_name)
+
+      Aruba.platform.mkdir(File.dirname(file_path))
+      File.open(file_path, 'w') { |f| f << "" }
+
+      @aruba.check_file_presence([ /test123/ ], false )
+      @aruba.check_file_presence([ /hello_world.txt$/ ], true )
+      @aruba.check_file_presence([ /dir/ ], true )
+      @aruba.check_file_presence([ %r{nested/.+/} ], true )
+    end
+
+    it "is no problem to mix both" do
+      file_name = 'nested/dir/hello_world.txt'
+      file_path = File.join(@aruba.aruba.current_directory, file_name)
+
+      Aruba.platform.mkdir(File.dirname(file_path))
+      File.open(file_path, 'w') { |f| f << "" }
+
+      @aruba.check_file_presence([ file_name, /nested/  ], true )
+      @aruba.check_file_presence([ /test123/, 'asdf' ], false )
+    end
+
+    it "works with ~ in path name" do
+      file_path = File.join('~', random_string)
+
+      @aruba.with_environment 'HOME' => File.expand_path(@aruba.aruba.current_directory) do
+        Aruba.platform.mkdir(File.dirname(File.expand_path(file_path)))
+        File.open(File.expand_path(file_path), 'w') { |f| f << "" }
+
+        @aruba.check_file_presence( [ file_path ], true )
+      end
+    end
+  end
+
+  context "check file content" do
+    before :example do
+      @aruba.write_file(@file_name, "foo bar baz")
+    end
+
+    describe "#check_binary_file_content" do
+      let(:file_name) { @file_name }
+      let(:file_path) { @file_path }
+
+      let(:reference_file) { 'fixture' }
+      let(:reference_file_content) { 'foo bar baz' }
+
+      before :each do
+        @aruba.write_file(reference_file, reference_file_content)
+      end
+
+      context 'when files are the same' do
+        context 'and this is expected' do
+          it { @aruba.check_binary_file_content(file_name, reference_file) }
+          it { @aruba.check_binary_file_content(file_name, reference_file, true) }
+        end
+
+        context 'and this is not expected' do
+          it { expect { @aruba.check_binary_file_content(file_name, reference_file, false) }.to raise_error RSpec::Expectations::ExpectationNotMetError }
+        end
+      end
+
+      context 'when files are not the same' do
+        let(:reference_file_content) { 'bar' }
+
+        context 'and this is expected' do
+          it { @aruba.check_binary_file_content(file_name, reference_file, false) }
+        end
+
+        context 'and this is not expected' do
+          it { expect { @aruba.check_binary_file_content(file_name, reference_file, true) }.to raise_error RSpec::Expectations::ExpectationNotMetError }
+        end
+      end
+    end
+
+    context "#check_file_content" do
+      context "with regexp" do
+        let(:matching_content){/bar/}
+        let(:non_matching_content){/nothing/}
+        it "succeeds if file content matches" do
+          @aruba.check_file_content(@file_name, matching_content)
+          @aruba.check_file_content(@file_name, matching_content, true)
+        end
+
+        it "succeeds if file content does not match" do
+          @aruba.check_file_content(@file_name, non_matching_content, false)
+        end
+
+        it "works with ~ in path name" do
+          file_path = File.join('~', random_string)
+
+          @aruba.with_environment 'HOME' => File.expand_path(aruba.current_directory) do
+            @aruba.write_file(file_path, "foo bar baz")
+            @aruba.check_file_content(file_path, non_matching_content, false)
+          end
+        end
+      end
+      context "with string" do
+        let(:matching_content){"foo bar baz"}
+        let(:non_matching_content){"bar"}
+        it "succeeds if file content matches" do
+          @aruba.check_file_content(@file_name, matching_content)
+          @aruba.check_file_content(@file_name, matching_content, true)
+        end
+
+        it "succeeds if file content does not match" do
+          @aruba.check_file_content(@file_name, non_matching_content, false)
+        end
+
+        it "works with ~ in path name" do
+          file_path = File.join('~', random_string)
+
+          @aruba.with_environment 'HOME' => File.expand_path(aruba.current_directory) do
+            @aruba.write_file(file_path, "foo bar baz")
+            @aruba.check_file_content(file_path, non_matching_content, false)
+          end
+        end
+      end
+    end
+  end
+
+  context '#check_file_size' do
+    it "should check an existing file size" do
+      @aruba.write_fixed_size_file(@file_name, @file_size)
+      @aruba.check_file_size([[@file_name, @file_size]])
+    end
+
+    it "should check an existing file size and fail" do
+      @aruba.write_fixed_size_file(@file_name, @file_size)
+      expect { @aruba.check_file_size([[@file_name, @file_size + 1]]) }.to raise_error RSpec::Expectations::ExpectationNotMetError
+    end
+
+    it "works with ~ in path name" do
+      file_path = File.join('~', random_string)
+
+      @aruba.with_environment 'HOME' => File.expand_path(aruba.current_directory) do
+        @aruba.write_fixed_size_file(file_path, @file_size)
+        @aruba.check_file_size([[file_path, @file_size]])
+      end
+    end
+
+    it "should check an existing file size and fail" do
+      @aruba.write_fixed_size_file(@file_name, @file_size)
+      expect { @aruba.check_file_size([[@file_name, @file_size + 1]]) }.to raise_error RSpec::Expectations::ExpectationNotMetError
+    end
+  end
+
+  describe "#get_process" do
+    before(:each){@aruba.run_simple "true"}
+    after(:each) { @aruba.all_commands.each(&:stop) }
+
+    it "returns a process" do
+      expect(@aruba.get_process("true")).not_to be(nil)
+    end
+
+    it "raises a descriptive exception" do
+      expect { @aruba.get_process("false") }.to raise_error CommandNotFoundError, "No command named 'false' has been started"
+    end
+  end
+end

data/spec/aruba/api/environment/restore_env_spec.rb

@@ -9,6 +9,10 @@ RSpec.describe 'Command Environment' do
     end
   end
 
+  before do
+    allow(Aruba.platform).to receive(:deprecated)
+  end
+
   describe '#restore_env' do
     context 'when non-existing variable' do
       before :each do
@@ -62,4 +66,21 @@ RSpec.describe 'Command Environment' do
       end
     end
   end
+
+  describe "#restore_env" do
+    after(:each) { @aruba.all_commands.each(&:stop) }
+    it "restores environment variable" do
+      @aruba.set_env 'LONG_LONG_ENV_VARIABLE', 'true'
+      @aruba.restore_env
+      @aruba.run "env"
+      expect(@aruba.all_output).not_to include("LONG_LONG_ENV_VARIABLE")
+    end
+    it "restores environment variable that has been set multiple times" do
+      @aruba.set_env 'LONG_LONG_ENV_VARIABLE', 'true'
+      @aruba.set_env 'LONG_LONG_ENV_VARIABLE', 'false'
+      @aruba.restore_env
+      @aruba.run "env"
+      expect(@aruba.all_output).not_to include("LONG_LONG_ENV_VARIABLE")
+    end
+  end
 end

data/spec/aruba/api/environment/set_env_spec.rb

@@ -9,6 +9,10 @@ RSpec.describe 'Command Environment' do
     end
   end
 
+  before do
+    allow(Aruba.platform).to receive(:deprecated)
+  end
+
   describe '#set_env' do
     context 'when non-existing variable' do
       before :each do