rspec-bash-x 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '0943308df600188a73abc10314d5ecebb942670b'
-  data.tar.gz: c86f4a7ff3988a3014fc1a31b3c9053fd1c224da
+  metadata.gz: 74cf305ed10730b811f278b17e84579525ca2f75
+  data.tar.gz: 69fafdc217a018885b31b568ac0a7f95c0752bdb
 SHA512:
-  metadata.gz: c7efe7d2457e5e2d166037b01deaf8f66da11e590c48538aa8b56df5963fe26ab83978c0cf9270f1c0a26c9e6da824434d2c4c4bc5d9f456b2b2d148f09ee203
-  data.tar.gz: 4ff1bc4e194464cff9b2318343048355f7de467d678ab88b8403b854e83244c298a855947868200ca356bec3994b405f1e769e4a73bdb2ce361ba6f075b20bfe
+  metadata.gz: 335ba43a3659066d595d1dd6e085c6ba6f1503e5d24730adf808764c1a0a0394ccebf4d31d07185517b15cf05b577e265019f3b968f1b04252a08ed8143c87b5
+  data.tar.gz: 39decb1ca2a1193e0c7eb4046d572e8454dd9e8b289f1bff4db8efbf53bf9bfca8c2492b8b5d2bd8acf0eeaf346aad8d3580e09a39ce9c539e5d70ac620762bf

data/lib/rspec/bash/fd.rb

@@ -5,10 +5,10 @@ module RSpec
         begin
           !fd.closed? && !fd.eof?
         rescue IOError => e
-          if e.to_s == "stream closed"
+          if noise? e
             return false
           else
-            throw
+            throw e
           end
         end
       end
@@ -22,7 +22,7 @@ module RSpec
             IO.select([ fd ])
             retry
           rescue IOError => e
-            if e.to_s == "stream closed" || e.to_s == "closed stream"
+            if noise? e
               break
             else
               throw e
@@ -32,6 +32,10 @@ module RSpec
           end
         end
       end
+
+      def self.noise?(error)
+        error.to_s == "stream closed" || error.to_s == "closed stream"
+      end
     end
   end
 end

data/lib/rspec/bash/message_decoder.rb

@@ -0,0 +1,70 @@
+module RSpec
+  module Bash
+    class MessageDecoder
+      READING_FRAME_COUNT = 1
+      READING_FRAME_SZ = 2
+      READING_FRAME = 3
+      RE_NUMBER = /\d/
+
+      def self.decode(buffer)
+        state = READING_FRAME_COUNT
+        buffersz = buffer.length
+        frames = []
+        frame_buf = ''
+        frame_count_buf = ''
+        frame_count = Float::INFINITY
+        framesz_buf = ''
+        framesz = Float::INFINITY
+        cursor = 0
+
+        while cursor < buffersz && frames.count < frame_count
+          char = buffer[cursor]
+          cursor += 1
+
+          case state
+          when READING_FRAME_COUNT
+            case char
+            when ';'
+              state = READING_FRAME_SZ
+              frame_count = frame_count_buf.to_i
+              frame_count_buf = ''
+              framesz_buf = ''
+            when /\d/
+              frame_count_buf += char
+            else
+              return nil, "invalid payload: illegal character in header '#{char}' (#{cursor}/#{buffersz})"
+            end
+          when READING_FRAME_SZ
+            case char
+            when ';'
+              state = READING_FRAME
+              frame_buf = ''
+              framesz = framesz_buf.to_i
+              framesz_buf = ''
+            when /\d/
+              framesz_buf += char
+            else
+              return nil, "invalid payload: illegal character in frame header '#{char}' (#{cursor}/#{buffersz})"
+            end
+          when READING_FRAME
+            frame_buf += char
+
+            if frame_buf.length == framesz
+              state = READING_FRAME_SZ
+              frames.push(frame_buf)
+              framesz = Float::INFINITY
+            end
+          end
+        end
+
+        if frames.count != frame_count
+          return nil, "invalid payload: expected #{frame_count} frames but got #{frames.count}"
+        end
+
+        [ frames.map do |frame|
+          frame_class, frame_content = frame[0..1].to_i, frame.slice(2..-1)
+        end ]
+      end
+    end
+  end
+end

data/lib/rspec/bash/mocks/doubles/abstract_double.rb

@@ -3,15 +3,17 @@ module RSpec
     module Mocks
       module Doubles
         class AbstractDouble
-          attr_accessor :body,
+          attr_accessor(
+            :behaviors,
             :call_original,
             :calls,
             :expected_call_count,
             :expected_calls,
             :subshell
+          )
 
           def initialize(*)
-            @body = nil
+            @behaviors = []
             @call_original = false
             @calls = []
             @expected_call_count = [:at_least, 1]

data/lib/rspec/bash/mocks/doubles/conditional_double.rb

@@ -3,6 +3,8 @@ module RSpec
     module Mocks
       module Doubles
         class ConditionalDouble < AbstractDouble
+          attr_accessor :expr
+
           def initialize(expr)
             super()
 
@@ -10,7 +12,9 @@ module RSpec
           end
 
           def apply(script)
-            script.stub_conditional(@expr, &body)
+            script.stub_conditional(@expr,
+              behaviors: behaviors
+            )
           end
 
           def call_count(script)
@@ -18,7 +22,7 @@ module RSpec
           end
 
           def call_args(script)
-            script.conditional_calls_for(@expr).map { |x| x[:args] }
+            script.conditional_calls_for(@expr)
           end
 
           def to_s

data/lib/rspec/bash/mocks/doubles/exact_conditional_double.rb

@@ -0,0 +1,35 @@
+module RSpec
+  module Bash
+    module Mocks
+      module Doubles
+        class ExactConditionalDouble < AbstractDouble
+          attr_accessor :fullexpr
+
+          def initialize(fullexpr)
+            super()
+
+            @fullexpr = fullexpr
+          end
+
+          def apply(script)
+            script.stub_conditional(@fullexpr,
+              behaviors: behaviors
+            )
+          end
+
+          def call_count(script)
+            script.exact_conditional_calls_for(@fullexpr).count
+          end
+
+          def call_args(script)
+            script.exact_conditional_calls_for(@fullexpr)
+          end
+
+          def to_s
+            @fullexpr.to_s
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rspec/bash/mocks/doubles/function_double.rb

@@ -10,7 +10,11 @@ module RSpec
           end
 
           def apply(script)
-            script.stub(@routine, call_original: call_original, subshell: subshell, &body)
+            script.stub(@routine,
+              call_original: call_original,
+              behaviors: behaviors,
+              subshell: subshell,
+            )
           end
 
           def call_count(script)

data/lib/rspec/bash/mocks/doubles.rb

@@ -1,5 +1,6 @@
 require_relative './doubles/abstract_double'
 require_relative './doubles/conditional_double'
+require_relative './doubles/exact_conditional_double'
 require_relative './doubles/function_double'
 
 module RSpec

data/lib/rspec/bash/mocks/matchers/base_matcher.rb

@@ -20,22 +20,47 @@ module RSpec
           end
 
           def with_args(args)
-            tap { @double.expected_calls << args }
-          end
-
-          def and_return(code)
-            tap { @double.body = lambda { |*| "return #{code}" } }
+            tap {
+              @double.expected_calls << args
+              @double.behaviors << create_behavior({ args: args })
+            }
           end
 
-          def and_yield(subshell: true, &block)
+          def and_yield(subshell: true, times: 1, &body)
             tap {
-              @double.body = block
               @double.subshell = subshell
+
+              behavior = find_last_blank_or_create_behavior
+              behavior[:body] = body
+              behavior[:charges] = behavior[:charges] == 0 ? times : behavior[:charges]
+              behavior[:subshell] = subshell
             }
           end
 
+          def and_return(code, times: 1)
+            and_yield(subshell: false, times: times) { |*| "return #{code}" }
+          end
+
+          def and_always_return(code)
+            and_return(code, times: Float::INFINITY)
+          end
+
+          def and_always_yield(subshell: true, &body)
+            and_yield(subshell: subshell, times: Float::INFINITY, &body)
+          end
+
           def exactly(n)
-            tap { @double.expected_call_count = [:exactly, n] }
+            tap do
+              if @double.behaviors.last
+                @double.behaviors.last[:charges] = n
+
+                (n-1).times do
+                  @double.expected_calls << @double.expected_calls.last
+                end
+              else
+                @double.expected_call_count = [:exactly, n]
+              end
+            end
           end
 
           def at_least(n)
@@ -89,11 +114,25 @@ module RSpec
             )
           end
 
-          private
+          protected
 
           def proxy_for(subject)
             ::RSpec::Mocks.space.proxy_for(subject)
           end
+
+          def find_last_blank_or_create_behavior
+            @double.behaviors.detect { |x| x[:body].nil? } || begin
+              create_behavior.tap { |x| @double.behaviors << x }
+            end
+          end
+
+          def create_behavior(args: nil, body: nil, charges: 0)
+            {
+              args: args,
+              body: body,
+              charges: charges
+            }
+          end
         end
       end
     end

data/lib/rspec/bash/mocks/matchers/test_by.rb

@@ -0,0 +1,29 @@
+require_relative '../doubles'
+require_relative './base_matcher'
+
+module RSpec
+  module Bash
+    module Mocks
+      module Matchers
+        # @private
+        class TestBy < BaseMatcher
+          def initialize(expr)
+            @double = Doubles::ConditionalDouble.new(expr)
+            @display_name = "test_by"
+
+            super()
+          end
+
+          def with_args(args)
+            tap {
+              fullexpr = "#{@double.expr} #{args}"
+
+              @double.expected_calls << fullexpr
+              @double.behaviors << create_behavior(args: fullexpr)
+            }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rspec/bash/mocks/matchers/test_for.rb

@@ -0,0 +1,30 @@
+require_relative '../doubles'
+require_relative './base_matcher'
+
+module RSpec
+  module Bash
+    module Mocks
+      module Matchers
+        # @private
+        class TestFor < BaseMatcher
+          def initialize(fullexpr)
+            @double = Doubles::ExactConditionalDouble.new(fullexpr)
+            @display_name = "test_for"
+
+            super()
+          end
+
+          def with_args(args)
+            fail "#{to_s}: cannot be used with '.with_args', use 'test_by' instead"
+          end
+
+          protected
+
+          def create_behavior(**rest)
+            super(**rest, args: @double.fullexpr)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,5 +1,6 @@
 require_relative './matchers/receive'
-require_relative './matchers/test'
+require_relative './matchers/test_for'
+require_relative './matchers/test_by'
 
 module RSpec
   module Bash
@@ -9,8 +10,16 @@ module RSpec
           Receive.new(*args)
         end
 
-        def test(*args)
-          Test.new(*args)
+        def receive_function(method_name, &block)
+          ::RSpec::Mocks::Matchers::Receive.new(method_name, block)
+        end
+
+        def test_for(*args)
+          TestFor.new(*args)
+        end
+
+        def test_by(*args)
+          TestBy.new(*args)
         end
       end
     end

data/lib/rspec/bash/mocks/script_proxy.rb

@@ -28,12 +28,12 @@ module RSpec
         def expect_message(double:, display_name:)
           allow_message(double: double)
 
-          @expectations << ScriptMessageExpectation.new(
+          ScriptMessageExpectation.new(
             double: double,
             display_name: display_name,
             error_generator: @error_generator,
             backtrace_line: ::RSpec::CallerFilter.first_non_rspec_line
-          )
+          ).tap { |x| @expectations << x }
         end
 
         def allow_message(double:)

data/lib/rspec/bash/script.rb

@@ -1,14 +1,18 @@
+require_relative './stub_behavior'
+require_relative './script_generator'
+
 module RSpec
   module Bash
     class Script
       MAIN_SCRIPT_FILE = File.expand_path('../controller.sh', __FILE__)
       NOOP = lambda { |*| '' }
+      NOOP_BEHAVIOR = StubBehavior.new(body: NOOP, charges: Float::INFINITY)
 
       def self.load(path)
         new(File.read(path))
       end
 
-      attr_reader :source, :source_file, :stdout, :stderr, :exit_code
+      attr_reader :exit_code, :source, :source_file, :stdout, :stderr, :stubs
 
       def initialize(source, path = 'Anonymous')
         @conditional_stubs = []
@@ -23,41 +27,46 @@ module RSpec
       end
 
       def to_s
-        to_bash_script
+        ScriptGenerator.generate(self)
       end
 
       def inspect
         "Script(\"#{File.basename(@source_file)}\")"
       end
 
-      def stub(fn, call_original: false, subshell: true, &body)
+      def stub(fn, behaviors:, call_original: false, subshell: true)
         @stubs[fn.to_sym] = {
-          body: (call_original || !body) ? NOOP : body,
+          behaviors: behaviors.map { |x| StubBehavior.new(x) },
           subshell: subshell,
           call_original: call_original
         }
       end
 
-      def stub_conditional(expr, &body)
-        @conditional_stubs << { expr: expr, body: body || NOOP }
+      def stub_conditional(expr, behaviors:)
+        @conditional_stubs << {
+          behaviors: behaviors.map { |x| StubBehavior.new(x) },
+          expr: expr,
+        }
       end
 
       def stubbed(name, args)
-        fail "#{name} is not stubbed" unless @stubs.key?(name.to_sym)
-
-        @stubs[name.to_sym][:body].call(args)
+        apply_matching_behavior @stubs[name.to_sym], args
       end
 
-      def stubbed_conditional(expr, args)
-        conditional_stub = @conditional_stubs.detect { |x| x[:expr] == expr }
+      def stubbed_conditional(fullexpr)
+        conditional_stub = @conditional_stubs.detect { |x| fullexpr.index(x[:expr]) == 0 }
 
         if conditional_stub
-          conditional_stub[:body].call(args)
+          apply_matching_behavior conditional_stub, fullexpr
         else
           ""
         end
       end
 
+      def has_stub?(name)
+        @stubs.key?(name.to_sym)
+      end
+
       def has_conditional_stubs?
         @conditional_stubs.any?
       end
@@ -67,7 +76,11 @@ module RSpec
       end
 
       def conditional_calls_for(expr)
-        @conditional_stub_calls.select { |x| x[:expr] == expr }
+        @conditional_stub_calls.select { |x| x.index(expr) == 0 }
+      end
+
+      def exact_conditional_calls_for(fullexpr)
+        @conditional_stub_calls.select { |x| x == fullexpr }
       end
 
       def track_call(name, args)
@@ -76,8 +89,8 @@ module RSpec
         @stub_calls[name.to_sym].push({ args: args })
       end
 
-      def track_conditional_call(expr, args)
-        @conditional_stub_calls.push({ expr: expr, args: args })
+      def track_conditional_call(fullexpr)
+        @conditional_stub_calls.push(fullexpr)
       end
 
       def track_exit_code(code)
@@ -86,36 +99,11 @@ module RSpec
 
       private
 
-      def to_bash_script
-        buffer = ""
-        buffer << "builtin source '#{Script::MAIN_SCRIPT_FILE}'"
-        buffer << "\n"
-
-        @stubs.keys.each do |name|
-          stub_def = @stubs[name]
-
-          if stub_def[:call_original] then
-            buffer << <<-EOF
-              #{name}() {
-                __rspec_bash_run_stub '#{name}' $@
-
-                builtin #{name} $@
-              }
-            EOF
-          elsif stub_def[:subshell] == false then
-            buffer << <<-EOF
-              #{name}() {
-                __rspec_bash_run_stub '#{name}' $@
-              }
-            EOF
-          else
-            buffer << "#{name}()(__rspec_bash_run_stub '#{name}' $@)\n"
-          end
-        end
-
-        buffer << "\n"
-        buffer << @source
-        buffer
+      def apply_matching_behavior(stub, args)
+        behavior = stub[:behaviors].detect { |x| x.usable? && x.applicable?(args) }
+        behavior ||= stub[:behaviors].detect { |x| x.usable? && x.context_free? }
+        behavior ||= NOOP_BEHAVIOR
+        behavior.apply!(args)
       end
     end
   end

data/lib/rspec/bash/script_evaluator.rb

@@ -4,12 +4,18 @@ require 'tempfile'
 require_relative './fd'
 require_relative './open3'
 require_relative './noisy_thread'
+require_relative './message_decoder'
 
 module RSpec
   module Bash
     class ScriptEvaluator
+      BLOCK_SIZE  = 1024
       CONDITIONAL_EXPR_STUB = 'conditional_expr'.freeze
-      BLOCK_SIZE = 4096
+      FRAME_NAME  = 1
+      FRAME_ARG   = 2
+      FRAME_TRACE = 3
+      MESSAGE_REQ = '<rspec-bash::req>'.freeze
+      MESSAGE_ACK = '<rspec-bash::ack>'.freeze
 
       # (String, Object?): Boolean
       #
@@ -63,8 +69,8 @@ module RSpec
 
           # accept & respond to prompts
           workers << NoisyThread.new do
-            FD.poll(b2r, throttle: Bash.configuration.throttle) do
-              respond_to_prompts(r2b, b2r, script, bus_file)
+            FD.poll(b2r, throttle: 0) do
+              respond_to_prompts(r2b, b2r, bus_file, script)
             end
           end
 
@@ -87,92 +93,96 @@ module RSpec
 
       private
 
-      def respond_to_prompts(fd_in, fd_out, script, bus_file)
-        fd_out.expect("</rspec_bash::stub>", 1) do |result|
+      def respond_to_prompts(fd_in, fd_out, bus_file, script)
+        fd_out.expect(MESSAGE_REQ, 1) do |result|
           break if result.nil?
 
-          prompts = result[0].split("\n").reject(&:empty?).reduce([]) do |acc, line|
-            if line == "</rspec_bash::stub>"
-              if acc[-1]
-                acc[-1].merge!(classify_stub(acc[-1][:buffer]))
-              else
-                puts "[WARN] cannot match stub entry: #{line} => #{acc}"
-              end
-            else
-              acc.push({ type: :unknown, buffer: line })
-            end
+          lines = result[0].split("\n").reject(&:empty?)
 
-            acc
-          end
-
-          prompts.each do |type:, buffer:, **stub|
-            case type
-            when :conditional
-              if !script.has_conditional_stubs? && !Bash.configuration.allow_unstubbed_conditionals
-                fail "conditional expressions are not stubbed!"
-              end
+          stubs = lines.each_with_index.reduce([]) do |acc, (line, index)|
+            next acc unless line == MESSAGE_REQ
 
-              File.write(bus_file, script.stubbed_conditional(stub[:expr], stub[:args]))
+            message = lines[index-1]
+            frames, err = MessageDecoder.decode(message)
 
-              fd_in.puts bus_file.path
-              fd_in.flush
+            if err
+              STDERR.puts <<-EOF
+                bash-rspec: communication between Ruby and Bash failed, this is
+                most likely an internal error.
 
-              fd_out.expect('</rspec_bash::stub-body>', 1)
+                #{err}
+              EOF
 
-              script.track_conditional_call(stub[:expr], stub[:args])
-            when :function
-              routine = stub[:name]
-              args    = stub[:args]
-              body    = script.stubbed(routine, args)
+              next acc
+            end
 
-              File.write(bus_file, body)
+            stub = frames.reduce({ expr: nil, type: nil, args: [], stacktrace: [] }) do |x, (type, content)|
+              case type
+              when FRAME_NAME
+                x[:expr] = content
+                x[:type] = content == CONDITIONAL_EXPR_STUB ? :conditional : :function
+              when FRAME_ARG
+                x[:args] << content
+              when FRAME_TRACE
+                x[:stacktrace] << content unless content.empty?
+              else
+                STDERR.puts "rspec-bash: unrecognized frame '#{type}' => '#{content}'"
+                STDERR.puts "rspec-bash: source:\n#{message}"
+              end
 
-              fd_in.puts bus_file.path
-              fd_in.flush
+              x
+            end.tap do |stub|
+              stub[:args] = stub[:args].join(' ')
+            end
 
-              fd_out.expect('</rspec_bash::stub-body>', 1)
+            acc.push(stub)
+          end
 
-              script.track_call(routine, args)
+          stubs.each do |stub|
+            case stub[:type]
+            when :conditional
+              relay_conditional_stub(fd_in, fd_out, bus_file, script: script, stub: stub)
+            when :function
+              relay_command_stub(fd_in, fd_out, bus_file, script: script, stub: stub)
             when :unknown
-              STDERR.write "[err] unexpected message from bash: #{buffer}"
+              STDERR.puts "[err] unexpected message from bash: #{stub.inspect}"
             end
           end
         end
       end
 
-      def classify_stub(command)
-        identifier, args = split_by_first_space(command)
-
-        case identifier
-        when CONDITIONAL_EXPR_STUB
-          expr, expr_args = split_by_first_space(args)
-
-          {
-            type: :conditional,
-            expr: expr,
-            args: expr_args,
-          }
-        else
-          {
-            type: :function,
-            name: identifier,
-            args: args,
-          }
+      def relay_command_stub(fd_in, fd_out, bus_file, script:, stub:)
+        if !script.has_stub?(stub[:expr])
+          fail(
+            "#{stub[:expr]} is not stubbed!\n\n" +
+            "Call stack:\n" +
+            stub[:stacktrace].map { |x| "- #{x}" }.join("\n")
+          )
         end
-      end
 
-      def split_by_first_space(string)
-        delim = string.index(' ')
+        File.write(bus_file, script.stubbed(stub[:expr], stub[:args]))
+
+        fd_in.puts bus_file.path
+        fd_in.flush
+
+        fd_out.expect(MESSAGE_ACK, 1)
 
-        # single-argument expressions, this usually happens in unary tests
-        # where the argument evaluates to an empty string, a la:
-        #
-        #     test -z "${string}" => "-z"
-        if delim.nil?
-          return [ string, '' ]
+        script.track_call(stub[:expr], stub[:args])
+      end
+
+      def relay_conditional_stub(fd_in, fd_out, bus_file, script:, stub:)
+        if !script.has_conditional_stubs? && !Bash.configuration.allow_unstubbed_conditionals
+          fail "conditional expressions are not stubbed!\n#{stub[:stacktrace]}"
         end
 
-        [ string[0..delim - 1], string[delim + 1..-1] ]
+        File.write(bus_file, script.stubbed_conditional(stub[:args]))
+
+        fd_in.puts bus_file.path
+        fd_in.flush
+
+        fd_out.expect(MESSAGE_ACK, 1)
+
+        script.track_conditional_call(stub[:args])
       end
 
       def try_hard(what)

data/lib/rspec/bash/script_generator/conditional.sh

@@ -0,0 +1,17 @@
+function test() {
+  if __rspec_bash_load_stub 'conditional_expr' "${@}"; then
+    builtin . "${__rspec_bash_stub_body}" "${@}"
+  else
+    builtin test "${@}"
+  fi
+}
+
+function [() {
+  local without_bracket="${@:1:$(($#-1))}"
+
+  if __rspec_bash_load_stub 'conditional_expr' "${without_bracket[@]}"; then
+    builtin . "${__rspec_bash_stub_body}" "${without_bracket[@]}"
+  else
+    builtin [ "${@}"
+  fi
+}

data/lib/rspec/bash/script_generator/controller.sh

@@ -0,0 +1,53 @@
+export __rspec_bash_stub_body=""
+
+function __rspec_bash_read() {
+  local fd=${BASHIT_R_FD:-4}
+
+  builtin read -u $fd "${@}"
+}
+
+function __rspec_bash_write() {
+  local fd=${BASHIT_W_FD:-5}
+
+  builtin echo 1>&$fd "${@}"
+}
+
+function __rspec_bash_load_stub() {
+  local name="${1}"
+  local arg
+  local message
+  local fragments=(
+    "1 ${name}"
+    "3 $(caller 1)"
+    "3 $(caller 2)"
+    "3 $(caller 3)"
+  )
+
+  builtin shift 1
+
+  for arg in "${@}"; do
+    fragments+=("2 ${arg}")
+  done
+
+  message="${#fragments[@]};"
+
+  for fragment in "${fragments[@]}"; do
+    message="${message}${#fragment};${fragment}"
+  done
+
+  __rspec_bash_write "${message}"
+  __rspec_bash_write "<rspec-bash::req>"
+
+  __rspec_bash_read  __rspec_bash_stub_body
+  __rspec_bash_write "<rspec-bash::ack>"
+
+  builtin test -s "${__rspec_bash_stub_body}"
+}
+
+function __rspec_bash_call_stubbed() {
+  __rspec_bash_load_stub "${@}"
+
+  builtin shift 1
+
+  builtin . "${__rspec_bash_stub_body}" "${@}"
+}

data/lib/rspec/bash/script_generator.rb

@@ -0,0 +1,58 @@
+module RSpec
+  module Bash
+    class ScriptGenerator
+      NOOP = lambda { |*| '' }
+      SCRIPTS = {
+        conditionals: File.expand_path('../script_generator/conditional.sh', __FILE__),
+        controller: File.expand_path('../script_generator/controller.sh', __FILE__)
+      }
+      SPIES = {
+        builtin: lambda { |name|
+          <<-EOF
+            #{name}() {
+              __rspec_bash_call_stubbed '#{name}' "${@}"
+
+              builtin #{name} $@
+            }
+          EOF
+        },
+      }
+      STUBS = {
+        function: lambda { |name|
+          <<-EOF
+            #{name}() {
+              __rspec_bash_call_stubbed '#{name}' "${@}"
+            }
+          EOF
+        },
+
+        function_in_subshell: lambda { |name|
+          "#{name}()(__rspec_bash_call_stubbed '#{name}' \"${@}\")\n"
+        }
+      }
+
+      def self.generate(script)
+        buffer = ""
+        buffer << "builtin . '#{SCRIPTS[:controller]}'\n"
+        buffer << "builtin . '#{SCRIPTS[:conditionals]}'\n" if script.has_conditional_stubs?
+        buffer << "\n"
+
+        script.stubs.keys.each do |name|
+          stub_def = script.stubs[name]
+
+          if stub_def[:call_original] then
+            buffer << SPIES[:builtin].call(name)
+          elsif stub_def[:subshell] == false then
+            buffer << STUBS[:function].call(name)
+          else
+            buffer << STUBS[:function_in_subshell].call(name)
+          end
+        end
+
+        buffer << "\n"
+        buffer << script.source
+        buffer
+      end
+    end
+  end
+end

data/lib/rspec/bash/stub_behavior.rb

@@ -0,0 +1,35 @@
+module RSpec
+  module Bash
+    class StubBehavior
+      attr_accessor :args, :body
+
+      def initialize(args: nil, body:, charges: 1, subshell: true)
+        @args = args
+        @body = body
+        @subshell = subshell
+        @charges = charges
+      end
+
+      def usable?
+        @charges > 0
+      end
+
+      def applicable?(args)
+        @args == args
+      end
+
+      def context_free?
+        @args.nil?
+      end
+
+      def requires_subshell?
+        @subshell
+      end
+
+      def apply!(args)
+        @charges -= 1
+        @body.call(args)
+      end
+    end
+  end
+end

data/lib/rspec/bash/support.rb

@@ -1,6 +1,10 @@
 module RSpec
   module Bash
     module Support
+      def a_script(*args)
+        Script.new(*args)
+      end
+
       def run_script(script, args = [], **opts)
         ScriptEvaluator.new.eval(script, args, opts)
       end

data/lib/rspec/bash/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module Bash
-    VERSION = '1.0.1'
+    VERSION = '1.1.0'
   end
 end

data/lib/rspec/bash.rb

@@ -4,6 +4,7 @@ require_relative './bash/noisy_thread'
 require_relative './bash/open3'
 require_relative './bash/script'
 require_relative './bash/script_evaluator'
+require_relative './bash/script_generator'
 require_relative './bash/support'
 require_relative './bash/version'
 require_relative './bash/mocks/doubles'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-bash-x
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Ahmad Amireh
@@ -50,22 +50,28 @@ files:
 - ext/rspec-mocks/space.rb
 - lib/rspec/bash.rb
 - lib/rspec/bash/configuration.rb
-- lib/rspec/bash/controller.sh
 - lib/rspec/bash/fd.rb
+- lib/rspec/bash/message_decoder.rb
 - lib/rspec/bash/mocks/doubles.rb
 - lib/rspec/bash/mocks/doubles/abstract_double.rb
 - lib/rspec/bash/mocks/doubles/conditional_double.rb
+- lib/rspec/bash/mocks/doubles/exact_conditional_double.rb
 - lib/rspec/bash/mocks/doubles/function_double.rb
 - lib/rspec/bash/mocks/matchers.rb
 - lib/rspec/bash/mocks/matchers/base_matcher.rb
 - lib/rspec/bash/mocks/matchers/receive.rb
-- lib/rspec/bash/mocks/matchers/test.rb
+- lib/rspec/bash/mocks/matchers/test_by.rb
+- lib/rspec/bash/mocks/matchers/test_for.rb
 - lib/rspec/bash/mocks/script_message_expectation.rb
 - lib/rspec/bash/mocks/script_proxy.rb
 - lib/rspec/bash/noisy_thread.rb
 - lib/rspec/bash/open3.rb
 - lib/rspec/bash/script.rb
 - lib/rspec/bash/script_evaluator.rb
+- lib/rspec/bash/script_generator.rb
+- lib/rspec/bash/script_generator/conditional.sh
+- lib/rspec/bash/script_generator/controller.sh
+- lib/rspec/bash/stub_behavior.rb
 - lib/rspec/bash/support.rb
 - lib/rspec/bash/version.rb
 homepage: 

data/lib/rspec/bash/controller.sh

@@ -1,49 +0,0 @@
-__rspec_bash_stub_body=""
-
-let r_fd=${BASHIT_R_FD:-4}
-let w_fd=${BASHIT_W_FD:-5}
-
-function __rspec_bash_write() {
-  builtin echo 1>&$w_fd $@
-}
-
-function __rspec_bash_read() {
-  builtin read -u $r_fd $@
-}
-
-function __rspec_bash_retrieve_stub() {
-  local name=$1
-
-  builtin shift 1
-
-  __rspec_bash_write $name $@
-  __rspec_bash_write "</rspec_bash::stub>"
-  __rspec_bash_read  __rspec_bash_stub_body
-  __rspec_bash_write "</rspec_bash::stub-body>"
-
-  builtin test -s "${__rspec_bash_stub_body}"
-}
-
-function __rspec_bash_run_stub() {
-  __rspec_bash_retrieve_stub $@
-
-  builtin . "${__rspec_bash_stub_body}" $@
-}
-
-function test() {
-  if __rspec_bash_retrieve_stub "conditional_expr" $@; then
-    builtin . "${__rspec_bash_stub_body}" $@
-  else
-    builtin test $@
-  fi
-}
-
-function [()(
-  local without_bracket="${@:1:$(($#-1))}"
-
-  if __rspec_bash_retrieve_stub "conditional_expr" "${without_bracket[@]}"; then
-    builtin . "${__rspec_bash_stub_body}" "${without_bracket[@]}"
-  else
-    builtin [ $@
-  fi
-)

data/lib/rspec/bash/mocks/matchers/test.rb

@@ -1,20 +0,0 @@
-require_relative '../doubles'
-require_relative './base_matcher'
-
-module RSpec
-  module Bash
-    module Mocks
-      module Matchers
-        # @private
-        class Test < BaseMatcher
-          def initialize(expr)
-            @double = Doubles::ConditionalDouble.new(expr)
-            @display_name = "test(#{expr})"
-
-            super()
-          end
-        end
-      end
-    end
-  end
-end