rspec-bash 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5264f0b8921b472fdb32e393e55004b5e1f3c885
-  data.tar.gz: bf99d54315422b4e885dfabab09729e39e94053c
+  metadata.gz: b8768c8e7a3e2d1a30a82c8a7a4608786d38a619
+  data.tar.gz: aa8e860680f978205a989b10f7f141d89f4c9bb3
 SHA512:
-  metadata.gz: 3bffee5f454d467b72a797016d1745cc1c5c6aa1743a4b24654394bd762738d953678d42350806e67a0a5c78c976fe99a05c2bc39793715b90a1cafffa811703
-  data.tar.gz: b9cb113c2ead82843566c750ce0b4fcf7f98e97a63117df42e8a2c603dbacac27243a0bcf2aaabff60b775c39f681f1bdc65910ef3fde1833c1590cd32c116d5
+  metadata.gz: 2ad5a2600f1aa8e2e30ff92834aedcbd070d01067f2f9e51683de3624c957ee6bbbd86214dd30bcd4d6816c86714156b2abafeee83791de33757acdaaccf2e4e
+  data.tar.gz: 4bd0fa4d49b57f6618c5ba970359d3f6a2472dc21b5d6d0c6c1f30d709f7f0e9e2eff1f50785cb10cfccece5458428c99d4da59340103377d57c9959e5d8adc8

data/.travis.yml

@@ -1,6 +1,8 @@
 language: ruby
 sudo: false
 rvm:
+  - 2.4.1
+  - 2.3.4
   - 2.2.0
   - 2.1.0
   - 2.0.0

data/README.md

@@ -76,7 +76,7 @@ see specs in *spec/integration* folder:
 
   it 'is stubbed' do
     stubbed_env.execute 'my-script.sh'
-    expect(bundle).to be_called_with_arguments('install)
+    expect(bundle).to be_called_with_arguments('install')
   end
 ```
 

data/lib/rspec/bash/call_log.rb

@@ -55,6 +55,10 @@ module Rspec
         write new_log
       end
 
+      def call_log_arguments
+        call_log.map { |call_log| call_log[:args] || [] }.compact
+      end
+
       private
 
       def write(call_log_to_write)

data/lib/rspec/bash/matchers/called_with_arguments.rb

@@ -7,6 +7,7 @@ RSpec::Matchers.define :be_called_with_arguments do |*expected_argument_list|
 
   match do |actual_command|
     called_with_correct_args = actual_command.called_with_args?(*expected_argument_list)
+
     if @expected_invocations
       called_correct_number_of_times =
         actual_command.call_count(*expected_argument_list) == @expected_invocations
@@ -16,4 +17,33 @@ RSpec::Matchers.define :be_called_with_arguments do |*expected_argument_list|
 
     called_with_correct_args && called_correct_number_of_times
   end
+
+  failure_message do |actual_command|
+    formatted_actual_calls, formatted_expected_call =
+      get_expected_and_actual_call_strings(actual_command, expected_argument_list)
+
+    "Expected #{actual_command.command} to be called with args #{expected_argument_list}\n\n" \
+      "Expected Calls:\n#{formatted_expected_call}\n\n" \
+      "Actual Calls:\n#{formatted_actual_calls}\n"
+  end
+
+  failure_message_when_negated do |actual_command|
+    formatted_actual_calls, formatted_expected_call =
+      get_expected_and_actual_call_strings(actual_command, expected_argument_list)
+
+    "Expected #{actual_command.command} to not be called with args #{expected_argument_list}\n\n" \
+      "Expected Omissions:\n#{formatted_expected_call}\n\n" \
+      "Actual Calls:\n#{formatted_actual_calls}\n"
+  end
+end
+
+def get_expected_and_actual_call_strings(actual_command, expected_argument_list)
+  command_name = actual_command.command
+
+  formatted_expected_call = "#{command_name} #{expected_argument_list.join(' ')}"
+  formatted_actual_calls = actual_command.call_log.call_log_arguments.map do |arg_array|
+    "#{command_name} #{arg_array.join(' ')}"
+  end.join("\n")
+
+  [formatted_actual_calls, formatted_expected_call]
 end

data/lib/rspec/bash/stubbed_command.rb

@@ -36,6 +36,10 @@ module Rspec
         @call_log.call_count(*arg)
       end
 
+      def command
+        @call_configuration.command
+      end
+
       def returns_exitstatus(exitcode)
         @call_configuration.set_exitcode(exitcode, @arguments)
         self

data/rspec-bash.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'rspec-bash'
-  spec.version       = '0.1.0'
+  spec.version       = '0.1.1'
   spec.authors       = ['Ben Brewer', 'Mike Urban', 'Matthijs Groen']
   spec.email         = ['ben@benbrewer.me', 'mike.david.urban@gmail.com']
   spec.summary       = 'Test Bash with RSpec'

data/spec/integration/call_log/called_with_args_spec.rb

@@ -43,6 +43,41 @@ describe 'CallLog' do
       it 'matches for regex matches' do
         expect(first_command).to be_called_with_arguments(/f..st_argument/, /se..nd_argument/)
       end
+
+      it 'displays the diff between what was called and what was expected' do
+        begin
+          expect(first_command).to be_called_with_arguments('not_first_argument', 'second_argument')
+        rescue RSpec::Expectations::ExpectationNotMetError => rex
+          expected_error_string = <<-multiline_string
+Expected first_command to be called with args ["not_first_argument", "second_argument"]
+
+Expected Calls:
+first_command not_first_argument second_argument
+
+Actual Calls:
+first_command first_argument second_argument
+first_command first_argument second_argument third_argument
+          multiline_string
+          expect(rex.message).to eql expected_error_string
+        end
+      end
+      it 'displays the diff between what was called and what was not expected' do
+        begin
+          expect(first_command).to_not be_called_with_arguments('first_argument', 'second_argument')
+        rescue RSpec::Expectations::ExpectationNotMetError => rex
+          expected_error_string = <<-multiline_string
+Expected first_command to not be called with args ["first_argument", "second_argument"]
+
+Expected Omissions:
+first_command first_argument second_argument
+
+Actual Calls:
+first_command first_argument second_argument
+first_command first_argument second_argument third_argument
+          multiline_string
+          expect(rex.message).to eql expected_error_string
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-bash
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ben Brewer
@@ -10,34 +10,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-10 00:00:00.000000000 Z
+date: 2017-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 description: |2
@@ -52,11 +52,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".ruby-version"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -76,7 +76,6 @@ files:
 - lib/rspec/bash/util.rb
 - lib/rspec/bash/util/call_conf_argument_list_matcher.rb
 - lib/rspec/bash/util/call_log_argument_list_matcher.rb
-- return_exitstatus_spec.rb
 - rspec-bash.gemspec
 - spec/classes/call_configuration_spec.rb
 - spec/classes/call_log_spec.rb
@@ -87,6 +86,7 @@ files:
 - spec/classes/util/call_log_argument_list_matcher_spec.rb
 - spec/helper/shared_tmpdir.rb
 - spec/helper/string_file_io.rb
+- spec/integration/assert_called_spec.rb
 - spec/integration/call_log/called_with_args_spec.rb
 - spec/integration/call_log/called_with_no_args_spec.rb
 - spec/integration/call_log/stdin_spec.rb
@@ -109,17 +109,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Test Bash with RSpec
@@ -133,6 +133,7 @@ test_files:
 - spec/classes/util/call_log_argument_list_matcher_spec.rb
 - spec/helper/shared_tmpdir.rb
 - spec/helper/string_file_io.rb
+- spec/integration/assert_called_spec.rb
 - spec/integration/call_log/called_with_args_spec.rb
 - spec/integration/call_log/called_with_no_args_spec.rb
 - spec/integration/call_log/stdin_spec.rb

data/return_exitstatus_spec.rb

@@ -1,14 +0,0 @@
-require 'English'
-require 'rspec/bash'
-
-describe 'very simple script that just exits' do
-  include Rspec::Bash
-  let(:stubbed_env) { create_stubbed_env }
-  it 'returns an exit status of 0' do
-    out, err, rv = stubbed_env.execute_inline('exit 0')
-
-    expect(out).to eql ''
-    expect(err).to eql ''
-    expect(rv.exitstatus).to eql 0
-  end
-end