rspec-bash 0.1.1 → 0.2.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-bash
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Ben Brewer
@@ -10,8 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-15 00:00:00.000000000 Z
+date: 2017-12-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: sparsify
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -46,9 +60,9 @@ email:
 - ben@benbrewer.me
 - mike.david.urban@gmail.com
 executables:
-- function_override.sh.erb
-- function_override_wrapper.sh.erb
-- stub.rb.erb
+- bash_stub.sh
+- bash_wrapper.sh.erb
+- ruby_stub.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -62,34 +76,52 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/function_override.sh.erb
-- bin/function_override_wrapper.sh.erb
-- bin/stub.rb.erb
+- bin/bash_stub.sh
+- bin/bash_wrapper.sh.erb
+- bin/ruby_stub.rb
 - lib/rspec/bash.rb
-- lib/rspec/bash/call_configuration.rb
-- lib/rspec/bash/call_log.rb
+- lib/rspec/bash/command.rb
+- lib/rspec/bash/command/call_configuration.rb
+- lib/rspec/bash/command/call_configuration_manager.rb
+- lib/rspec/bash/command/call_log.rb
+- lib/rspec/bash/command/call_log_manager.rb
+- lib/rspec/bash/command/stubbed_command.rb
 - lib/rspec/bash/matchers.rb
 - lib/rspec/bash/matchers/called_with_arguments.rb
 - lib/rspec/bash/matchers/called_with_no_arguments.rb
-- lib/rspec/bash/stubbed_command.rb
+- lib/rspec/bash/server.rb
+- lib/rspec/bash/server/bash_stub_marshaller.rb
+- lib/rspec/bash/server/ruby_stub_marshaller.rb
+- lib/rspec/bash/server/stub_server.rb
 - lib/rspec/bash/stubbed_env.rb
 - 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
+- lib/rspec/bash/wrapper.rb
+- lib/rspec/bash/wrapper/bash_stub_script.rb
+- lib/rspec/bash/wrapper/bash_wrapper.rb
+- lib/rspec/bash/wrapper/ruby_stub_script.rb
+- lib/rspec/bash/wrapper/stub_function.rb
 - rspec-bash.gemspec
-- spec/classes/call_configuration_spec.rb
-- spec/classes/call_log_spec.rb
-- spec/classes/stub_spec.rb
-- spec/classes/stubbed_command_spec.rb
+- spec/classes/command/call_configuration_manager_spec.rb
+- spec/classes/command/call_configuration_spec.rb
+- spec/classes/command/call_log_manager_spec.rb
+- spec/classes/command/call_log_spec.rb
+- spec/classes/command/stubbed_command_spec.rb
+- spec/classes/server/bash_stub_marshaller_spec.rb
+- spec/classes/server/ruby_stub_marshaller_spec.rb
+- spec/classes/server/stub_server_spec.rb
 - spec/classes/stubbed_env_spec.rb
 - spec/classes/util/call_conf_argument_list_matcher_spec.rb
 - spec/classes/util/call_log_argument_list_matcher_spec.rb
+- spec/classes/wrapper/bash_wrapper_spec.rb
+- spec/classes/wrapper/ruby_stub_script_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
+- spec/integration/edge_cases_spec.rb
 - spec/integration/matchers/be_called_with_arguments_spec.rb
 - spec/integration/matchers/be_called_with_no_arguments_spec.rb
 - spec/integration/stubbed_command/outputs_spec.rb
@@ -97,6 +129,9 @@ files:
 - spec/integration/stubbed_env/execute_with_env_vars_spec.rb
 - spec/integration/stubbed_env/execute_with_path_spec.rb
 - spec/integration/stubbed_env/execute_with_stub_wrapper_spec.rb
+- spec/integration/stubbed_env/override_spec.rb
+- spec/integration/wrapper/bash_stub_script_spec.rb
+- spec/integration/wrapper/bash_wrapper_spec.rb
 - spec/scripts/function_library.sh
 - spec/spec_helper.rb
 homepage: https://github.com/mdurban/rspec-bash
@@ -124,19 +159,25 @@ signing_key:
 specification_version: 4
 summary: Test Bash with RSpec
 test_files:
-- spec/classes/call_configuration_spec.rb
-- spec/classes/call_log_spec.rb
-- spec/classes/stub_spec.rb
-- spec/classes/stubbed_command_spec.rb
+- spec/classes/command/call_configuration_manager_spec.rb
+- spec/classes/command/call_configuration_spec.rb
+- spec/classes/command/call_log_manager_spec.rb
+- spec/classes/command/call_log_spec.rb
+- spec/classes/command/stubbed_command_spec.rb
+- spec/classes/server/bash_stub_marshaller_spec.rb
+- spec/classes/server/ruby_stub_marshaller_spec.rb
+- spec/classes/server/stub_server_spec.rb
 - spec/classes/stubbed_env_spec.rb
 - spec/classes/util/call_conf_argument_list_matcher_spec.rb
 - spec/classes/util/call_log_argument_list_matcher_spec.rb
+- spec/classes/wrapper/bash_wrapper_spec.rb
+- spec/classes/wrapper/ruby_stub_script_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
+- spec/integration/edge_cases_spec.rb
 - spec/integration/matchers/be_called_with_arguments_spec.rb
 - spec/integration/matchers/be_called_with_no_arguments_spec.rb
 - spec/integration/stubbed_command/outputs_spec.rb
@@ -144,5 +185,8 @@ test_files:
 - spec/integration/stubbed_env/execute_with_env_vars_spec.rb
 - spec/integration/stubbed_env/execute_with_path_spec.rb
 - spec/integration/stubbed_env/execute_with_stub_wrapper_spec.rb
+- spec/integration/stubbed_env/override_spec.rb
+- spec/integration/wrapper/bash_stub_script_spec.rb
+- spec/integration/wrapper/bash_wrapper_spec.rb
 - spec/scripts/function_library.sh
 - spec/spec_helper.rb

data/bin/function_override.sh.erb

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-function <%=function_command_binding_for_template%> {
-  <%=function_command_path_binding_for_template%> "${@}"
-}
-
-readonly -f <%=function_command_binding_for_template%> &> /dev/null

data/bin/function_override_wrapper.sh.erb

@@ -1,19 +0,0 @@
-/usr/bin/env bash -c '
-# load in command and function overrides
-system_ls=$(which ls)
-system_grep=$(which grep)
-
-for override_file in $(${system_ls} -d <%=function_override_path_binding_for_template%> 2> /dev/null); do
-  source ${override_file}
-done
-
-(
-  <%=execution_binding_for_template%>
-) 2> <%=wrapped_error_path_binding_for_template%>
-command_exit_code=$?
-
-# filter stderr for readonly problems
-${system_grep} -v "readonly function" <%=wrapped_error_path_binding_for_template%> >&2
-
-# return original exit code
-exit ${command_exit_code}'

data/bin/stub.rb.erb

@@ -1,56 +0,0 @@
-#!/usr/bin/env ruby
-$LOAD_PATH.unshift('<%= rspec_bash_library_path_for_template %>')
-
-require 'rspec/bash'
-require 'pathname'
-require 'yaml'
-
-include Rspec::Bash
-
-command = File.basename(__FILE__)
-folder = File.dirname(__FILE__)
-
-call_log_path = Pathname.new(folder).join("#{command}_calls.yml")
-call_log = CallLog.new(call_log_path)
-call_log.add_log(STDIN.tty? ? '' : $stdin.read, ARGV)
-
-def interpolate_filename(elements)
-  return elements if elements.is_a? String
-  return nil unless elements.is_a? Array
-
-  elements.map do |element|
-    case element
-    when String then
-      element
-    when Symbol then
-      interpolate_argument(element)
-    end
-  end.join
-end
-
-def interpolate_argument(name)
-  return unless (data = /^arg(\d+)$/.match(name.to_s))
-  ARGV[data[1].to_i - 1]
-end
-
-call_conf_path = Pathname.new(folder).join("#{command}_stub.yml")
-if call_conf_path.exist?
-  call_conf = CallConfiguration.new(call_conf_path, command)
-  config = call_conf.call_configuration
-
-  call_conf_arg_matcher = Util::CallConfArgumentListMatcher.new(config)
-  best_matching_call_conf = call_conf_arg_matcher.get_best_call_conf(*ARGV)
-  exit 0 if best_matching_call_conf.empty?
-
-  (best_matching_call_conf[:outputs] || []).each do |data|
-    $stdout.print data[:content] if data[:target] == :stdout
-    $stderr.print data[:content] if data[:target] == :stderr
-
-    output_filename = interpolate_filename(data[:target])
-    next unless output_filename
-    Pathname.new(output_filename).open('w') do |f|
-      f.print data[:content]
-    end
-  end
-  exit best_matching_call_conf[:exitcode] || 0
-end

data/lib/rspec/bash/call_configuration.rb

@@ -1,62 +0,0 @@
-require 'yaml'
-
-module Rspec
-  module Bash
-    class CallConfiguration
-      attr_reader :command
-
-      def initialize(config_path, command)
-        @config_path = config_path
-        @configuration = []
-        @command = command
-      end
-
-      def set_exitcode(exitcode, args = [])
-        current_conf = create_or_get_conf(args)
-        current_conf[:exitcode] = exitcode
-        write @configuration
-      end
-
-      def add_output(content, target, args = [])
-        current_conf = create_or_get_conf(args)
-        current_conf[:outputs] << {
-          target: target,
-          content: content
-        }
-        write @configuration
-      end
-
-      def call_configuration
-        @config_path.open('r') do |conf_file|
-          YAML.load(conf_file.read) || []
-        end
-      rescue NoMethodError, Errno::ENOENT
-        return []
-      end
-
-      def call_configuration=(new_conf)
-        write new_conf
-      end
-
-      private
-
-      def write(call_conf_to_write)
-        @config_path.open('w') do |conf_file|
-          conf_file.write call_conf_to_write.to_yaml
-        end
-      end
-
-      def create_or_get_conf(args)
-        @configuration = call_configuration
-        new_conf = {
-          args: args,
-          exitcode: 0,
-          outputs: []
-        }
-        current_conf = @configuration.select { |conf| conf[:args] == args }
-        @configuration << new_conf if current_conf.empty?
-        current_conf.first || new_conf
-      end
-    end
-  end
-end

data/lib/rspec/bash/call_log.rb

@@ -1,71 +0,0 @@
-module Rspec
-  module Bash
-    class CallLog
-      def initialize(call_log_path)
-        @call_log_path = call_log_path
-      end
-
-      def exist?
-        @call_log_path.exist?
-      end
-
-      def stdin_for_args(*argument_list)
-        call_argument_list_matcher = Util::CallLogArgumentListMatcher.new(*argument_list)
-        matching_call_log_list = call_argument_list_matcher.get_call_log_matches(call_log)
-        matching_call_log_list.first[:stdin] unless matching_call_log_list.empty?
-      end
-
-      def call_count(*argument_list)
-        call_argument_list_matcher = Util::CallLogArgumentListMatcher.new(*argument_list)
-        call_argument_list_matcher.get_call_count(call_log)
-      end
-
-      def called_with_args?(*argument_list)
-        call_argument_list_matcher = Util::CallLogArgumentListMatcher.new(*argument_list)
-        call_argument_list_matcher.args_match?(call_log)
-      end
-
-      def called_with_no_args?
-        return false if call_log.empty?
-
-        call_log.all? do |call_log|
-          argument_list = call_log[:args] || []
-          argument_list.empty?
-        end
-      end
-
-      def add_log(stdin, argument_list)
-        updated_log = call_log
-        updated_log << {
-          args: argument_list,
-          stdin: stdin
-        }
-        write updated_log
-      end
-
-      def call_log
-        @call_log_path.open('r') do |call_log|
-          YAML.load(call_log.read) || []
-        end
-      rescue NoMethodError, Errno::ENOENT
-        return []
-      end
-
-      def call_log=(new_log)
-        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)
-        @call_log_path.open('w') do |call_log|
-          call_log.write call_log_to_write.to_yaml
-        end
-      end
-    end
-  end
-end

data/lib/rspec/bash/stubbed_command.rb

@@ -1,88 +0,0 @@
-module Rspec
-  module Bash
-    class StubbedCommand
-      attr_reader :call_log, :arguments, :path
-
-      def initialize(command, dir)
-        @path = create_stub_file(command, dir)
-        @arguments = []
-        @call_configuration = CallConfiguration.new(
-          Pathname.new(dir).join("#{command}_stub.yml"),
-          command
-        )
-        @call_log = CallLog.new(
-          Pathname.new(dir).join("#{command}_calls.yml")
-        )
-      end
-
-      def with_args(*args)
-        @arguments = args
-        self
-      end
-
-      def called?
-        @call_log.exist? && @call_log.called_with_args?(*@args)
-      end
-
-      def called_with_no_args?
-        @call_log.called_with_no_args?
-      end
-
-      def called_with_args?(*args)
-        @call_log.called_with_args?(*args)
-      end
-
-      def call_count(*arg)
-        @call_log.call_count(*arg)
-      end
-
-      def command
-        @call_configuration.command
-      end
-
-      def returns_exitstatus(exitcode)
-        @call_configuration.set_exitcode(exitcode, @arguments)
-        self
-      end
-
-      def outputs(contents, to: :stdout)
-        @call_configuration.add_output(contents, to, @arguments)
-        self
-      end
-
-      def stdin
-        @call_log.stdin_for_args(*@arguments) if @call_log.exist?
-      end
-
-      def inspect
-        if @arguments.any?
-          "<Stubbed #{@call_configuration.command.inspect} " \
-            "args: #{@arguments.join(' ').inspect}>"
-        else
-          "<Stubbed #{@call_configuration.command.inspect}>"
-        end
-      end
-
-      private
-
-      def create_stub_file(command_name, directory)
-        command_path = File.join(directory, command_name)
-
-        stub_template_path = File.expand_path(
-          'stub.rb.erb', "#{File.dirname(__FILE__)}/../../../bin"
-        )
-        template = ERB.new File.read(stub_template_path), nil, '%'
-        rspec_bash_library_path_for_template = project_root.join('lib')
-        stub_content = template.result(binding)
-        File.open(command_path, 'w') { |file| file.write(stub_content) }
-        File.chmod(0755, command_path)
-
-        command_path
-      end
-
-      def project_root
-        Pathname.new(File.dirname(File.expand_path(__FILE__))).join('..', '..', '..')
-      end
-    end
-  end
-end