aruba 0.14.5 → 0.14.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13399850eaa9ccc7953005c38a7c84258a73a639cdf4931a8437e4626eef25d0
-  data.tar.gz: 4761c4c8fce0ea58b2aff755cab0998aee20ebf1c988beb172229e74dc26eddc
+  metadata.gz: 36afa2404b1af00e5c354bab122b797efe0b76b081968ba2ef7a2d4e28766023
+  data.tar.gz: 22cede1491c8f912f3d10595f0456421d11810752129ea25813eaf92f1406d4c
 SHA512:
-  metadata.gz: 279053a7d31f7686bc96fd871c9ecc1d1a042947cdedfbde3c21d67c2392377e8b408060ce8e6e56c1237405409a7c83284f5a7fb10cdf5fd232a3e54469daa1
-  data.tar.gz: 2fdea553fdef059945d6cd0494a2de2b203a2c6694db60cd53590069da975af91b946644b666f8d18891afbda6b2a9d5676cbd8e26389ec54488eb38d84f5f0a
+  metadata.gz: 172bbd209a8e61f153329e96cfd48fa5d43f09a6886392eea1ea32bd42d85eb8b81a384a94eb9817a02c8c79add61f1357481b302f5ebea579d0f5f8711331af
+  data.tar.gz: 3cb4616934fa7fb2f1e554d6dc11ff3f42d34c72d8c83064211f70c2153333979c8cccd7e57e402cda779839e99c2080567f3443c09703259cbebdfacbb8e7b4

data/History.md

@@ -1,5 +1,11 @@
 #  RELEASED
 
+## [v0.14.6](https://github.com/cucumber/aruba/compare/v0.14.5...v0.14.6)
+
+* Document and fix `@disable-bundler` hook (#561)
+* Deprecate `have_same_file_content_like` and `a_file_with_same_content_like`
+  in favor of `have_same_file_content_as` and `a_file_with_same_content_as` (#557)
+
 ## [v0.14.5](https://github.com/cucumber/aruba/compare/v0.14.4...v0.14.5)
 
 * Loosen dependency on child_process (#551)

data/features/steps/environment/disable_bunder.feature

@@ -0,0 +1,18 @@
+Feature: Disable Bundler environment
+  Use the @disable-bundler tag to escape from your project's Gemfile.
+
+  Background:
+    Given I use the fixture "cli-app"
+
+  Scenario: Clear the Bundler environment
+
+    Given a file named "features/run.feature" with:
+    """
+    Feature: My Feature
+      @disable-bundler
+      Scenario: Check environment
+        When I run `env`
+        Then the output should not match /^BUNDLE_GEMFILE=/
+    """
+    When I run `cucumber`
+    Then the features should all pass

data/lib/aruba/api.rb

@@ -15,6 +15,7 @@ end
 require 'aruba/api/environment'
 require 'aruba/api/filesystem'
 require 'aruba/api/text'
+require 'aruba/api/bundler'
 require 'aruba/api/rvm'
 
 Aruba.platform.require_matching_files('../matchers/**/*.rb', __FILE__)
@@ -27,6 +28,7 @@ module Aruba
     include Aruba::Api::Commands
     include Aruba::Api::Environment
     include Aruba::Api::Filesystem
+    include Aruba::Api::Bundler
     include Aruba::Api::Rvm
     include Aruba::Api::Deprecated
     include Aruba::Api::Text

data/lib/aruba/api/bundler.rb

@@ -0,0 +1,16 @@
+require 'aruba/api/environment'
+
+module Aruba
+  module Api
+    module Bundler
+      include Environment
+
+      # Unset variables used by bundler
+      def unset_bundler_env_vars
+        %w[RUBYOPT BUNDLE_PATH BUNDLE_BIN_PATH BUNDLE_GEMFILE].each do |key|
+          delete_environment_variable(key)
+        end
+      end
+    end
+  end
+end

data/lib/aruba/api/rvm.rb

@@ -32,13 +32,6 @@ module Aruba
           raise "I didn't understand rvm's output: #{all_stdout}"
         end
       end
-
-      # Unset variables used by bundler
-      def unset_bundler_env_vars
-        %w[RUBYOPT BUNDLE_PATH BUNDLE_BIN_PATH BUNDLE_GEMFILE].each do |key|
-          set_environment_variable(key, nil)
-        end
-      end
     end
   end
 end

data/lib/aruba/matchers/deprecated.rb

@@ -0,0 +1 @@
+Aruba.platform.require_matching_files('../deprecated/**/*.rb', __FILE__)

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

@@ -0,0 +1,15 @@
+module RSpec
+  module Matchers
+    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
+
+    def a_file_with_same_content_like(expected)
+      RSpec.deprecate('`a_file_with_same_content_like`', :replacement => '`a_file_with_same_content_as`')
+
+      a_file_with_same_content_as(expected)
+    end
+  end
+end

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

@@ -2,7 +2,7 @@ require 'rspec/expectations/version'
 
 require 'fileutils'
 
-# @!method have_same_file_content_like(file_name)
+# @!method have_same_file_content_as(file_name)
 #   This matchers checks if <file1> has the same content like <file2>
 #
 #   @param [String] file_name
@@ -19,10 +19,10 @@ require 'fileutils'
 #   @example Use matcher
 #
 #     RSpec.describe do
-#       it { expect(file1).to have_same_file_content_like(file2) }
-#       it { expect(files).to include a_file_with_same_content_like(file2) }
+#       it { expect(file1).to have_same_file_content_as(file2) }
+#       it { expect(files).to include a_file_with_same_content_as(file2) }
 #     end
-RSpec::Matchers.define :have_same_file_content_like do |expected|
+RSpec::Matchers.define :have_same_file_content_as do |expected|
   match do |actual|
     stop_all_commands
 
@@ -44,5 +44,5 @@ RSpec::Matchers.define :have_same_file_content_like do |expected|
 end
 
 if RSpec::Expectations::Version::STRING >= '3.0'
-  RSpec::Matchers.alias_matcher :a_file_with_same_content_like, :have_same_file_content_like
+  RSpec::Matchers.alias_matcher :a_file_with_same_content_as, :have_same_file_content_as
 end

data/lib/aruba/version.rb

@@ -1,3 +1,3 @@
 module Aruba
-  VERSION = '0.14.5'.freeze
+  VERSION = '0.14.6'.freeze
 end

data/spec/aruba/api/bundler_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+require 'aruba/api'
+
+RSpec.describe Aruba::Api::Bundler do
+  include_context 'uses aruba API'
+
+  describe '#unset_bundler_env_vars' do
+    it "sets up Aruba's environment to clear Bundler's variables" do
+      @aruba.unset_bundler_env_vars
+
+      expect(@aruba.aruba.environment['BUNDLE_PATH']).to be_nil
+      expect(@aruba.aruba.environment['BUNDLE_GEMFILE']).to be_nil
+    end
+  end
+end

data/spec/aruba/matchers/deprecated_spec.rb

@@ -36,4 +36,86 @@ RSpec.describe 'Deprecated matchers' do
       end
     end
   end
+
+  describe "to have_same_file_content_like" do
+    let(:file_name) { @file_name }
+    let(:file_path) { @file_path }
+
+    let(:reference_file) { 'fixture' }
+
+    before :each do
+      @aruba.write_file(@file_name, "foo bar baz")
+      @aruba.write_file(reference_file, reference_file_content)
+    end
+
+    context 'when files are the same' do
+      let(:reference_file_content) { 'foo bar baz' }
+
+      context 'and this is expected' do
+        it { expect(file_name).to have_same_file_content_like reference_file }
+      end
+
+      context 'and this is not expected' do
+        it do
+          expect { expect(file_name).not_to have_same_file_content_like reference_file }.to raise_error RSpec::Expectations::ExpectationNotMetError
+        end
+      end
+    end
+
+    context 'when files are not the same' do
+      let(:reference_file_content) { 'bar' }
+
+      context 'and this is expected' do
+        it { expect(file_name).not_to have_same_file_content_like reference_file }
+      end
+
+      context 'and this is not expected' do
+        it do
+          expect { expect(file_name).to have_same_file_content_like reference_file }.to raise_error RSpec::Expectations::ExpectationNotMetError
+        end
+      end
+    end
+  end
+
+  describe "include a_file_with_same_content_like" do
+    let(:reference_file) { 'fixture' }
+    let(:reference_file_content) { 'foo bar baz' }
+    let(:file_with_same_content) { 'file_a.txt' }
+    let(:file_with_different_content) { 'file_b.txt' }
+
+    before :each do
+      @aruba.write_file(file_with_same_content, reference_file_content)
+      @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] }
+
+      context 'and this is expected' do
+        it { expect(files).to include a_file_with_same_content_like reference_file }
+      end
+
+      context 'and this is not expected' do
+        it 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
+      let(:files) { [file_with_different_content] }
+
+      context 'and this is expected' do
+        it { expect(files).not_to include a_file_with_same_content_like reference_file }
+      end
+
+      context 'and this is not expected' do
+        it do
+          expect { expect(files).to include a_file_with_same_content_like reference_file }.to raise_error RSpec::Expectations::ExpectationNotMetError
+        end
+      end
+    end
+  end
 end

data/spec/aruba/matchers/file_spec.rb

@@ -124,4 +124,86 @@ RSpec.describe 'File Matchers' do
       it { expect(@file_name).not_to have_file_size(0) }
     end
   end
+
+  describe "to have_same_file_content_as" do
+    let(:file_name) { @file_name }
+    let(:file_path) { @file_path }
+
+    let(:reference_file) { 'fixture' }
+
+    before :each do
+      @aruba.write_file(@file_name, "foo bar baz")
+      @aruba.write_file(reference_file, reference_file_content)
+    end
+
+    context 'when files are the same' do
+      let(:reference_file_content) { 'foo bar baz' }
+
+      context 'and this is expected' do
+        it { expect(file_name).to have_same_file_content_as reference_file }
+      end
+
+      context 'and this is not expected' do
+        it do
+          expect { expect(file_name).not_to have_same_file_content_as reference_file }.to raise_error RSpec::Expectations::ExpectationNotMetError
+        end
+      end
+    end
+
+    context 'when files are not the same' do
+      let(:reference_file_content) { 'bar' }
+
+      context 'and this is expected' do
+        it { expect(file_name).not_to have_same_file_content_as reference_file }
+      end
+
+      context 'and this is not expected' do
+        it do
+          expect { expect(file_name).to have_same_file_content_as reference_file }.to raise_error RSpec::Expectations::ExpectationNotMetError
+        end
+      end
+    end
+  end
+
+  describe "include a_file_with_same_content_as" do
+    let(:reference_file) { 'fixture' }
+    let(:reference_file_content) { 'foo bar baz' }
+    let(:file_with_same_content) { 'file_a.txt' }
+    let(:file_with_different_content) { 'file_b.txt' }
+
+    before :each do
+      @aruba.write_file(file_with_same_content, reference_file_content)
+      @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] }
+
+      context 'and this is expected' do
+        it { expect(files).to include a_file_with_same_content_as reference_file }
+      end
+
+      context 'and this is not expected' do
+        it 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
+      let(:files) { [file_with_different_content] }
+
+      context 'and this is expected' do
+        it { expect(files).not_to include a_file_with_same_content_as reference_file }
+      end
+
+      context 'and this is not expected' do
+        it do
+          expect { expect(files).to include a_file_with_same_content_as reference_file }
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aruba
 version: !ruby/object:Gem::Version
-  version: 0.14.5
+  version: 0.14.6
 platform: ruby
 authors:
 - Aslak Hellesøy
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-14 00:00:00.000000000 Z
+date: 2018-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -233,6 +233,7 @@ files:
 - features/steps/command/stop.feature
 - features/steps/core/announce.feature
 - features/steps/environment/append_environment_variable.feature
+- features/steps/environment/disable_bunder.feature
 - features/steps/environment/home_variable.feature
 - features/steps/environment/prepend_environment_variable.feature
 - features/steps/environment/set_environment_variable.feature
@@ -288,6 +289,7 @@ files:
 - fixtures/spawn_process/stderr.sh
 - lib/aruba.rb
 - lib/aruba/api.rb
+- lib/aruba/api/bundler.rb
 - lib/aruba/api/command.rb
 - lib/aruba/api/core.rb
 - lib/aruba/api/deprecated.rb
@@ -343,6 +345,8 @@ files:
 - lib/aruba/matchers/command/have_output_on_stderr.rb
 - lib/aruba/matchers/command/have_output_on_stdout.rb
 - lib/aruba/matchers/command/have_output_size.rb
+- lib/aruba/matchers/deprecated.rb
+- lib/aruba/matchers/deprecated/file.rb
 - lib/aruba/matchers/directory.rb
 - lib/aruba/matchers/directory/be_an_existing_directory.rb
 - lib/aruba/matchers/directory/have_sub_directory.rb
@@ -398,6 +402,7 @@ files:
 - script/bootstrap
 - script/console
 - script/test
+- spec/aruba/api/bundler_spec.rb
 - spec/aruba/api/deprecated_spec.rb
 - spec/aruba/api/environment/restore_env_spec.rb
 - spec/aruba/api/environment/set_env_spec.rb
@@ -484,5 +489,5 @@ rubyforge_project:
 rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
-summary: aruba-0.14.5
+summary: aruba-0.14.6
 test_files: []