rspec-bash 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49d5aad81e5823b77cd475a99f803af8afc6f445
-  data.tar.gz: 8dbe7fb5dfb13c7cccc5b6b791318a4341afc53c
+  metadata.gz: adb76c72f692325f6aa85d9a578b13190083fcae
+  data.tar.gz: 712b69713f4ad701961cfb0332945456b37a803f
 SHA512:
-  metadata.gz: 956d35847b75501827d811a4453c1db3dd988baec17306aaa4bb8ee82dbd49f42b635ade5e19fe56da6ed82a98bff3fc7c1853db70b8e2e2d2b1b8fc2fbdf34d
-  data.tar.gz: 0a308ef87217a944f9bcbeda8444d797daf6f3ea3cd4d6f057d718179cea4fe198ce8a5da4b0aaad03fba0c3dca12362a001b5151bfa9ffef4512f1c429b1d45
+  metadata.gz: df61e714d3a72219babba6fa5b7b9cb62f72f5f8183f0b7b984aaf0efc8d7e939bdc1b025576b7b6380219fe35de0d812863ffd6e051da3a997865e799af3826
+  data.tar.gz: f8649135e3247edb923e8f25b5df390ed50e50379e75f4027871606099a3fbf9e605cd0be1f8715a5b98f551a8e4c95b2196d75fd6479d5520ca640cc0b3e32f

data/bin/bash_stub.sh

@@ -64,15 +64,21 @@ function extract-string-properties {
 }
 
 function print-output {
-  case ${1} in
+  local type=${1}
+  local target=${2}
+  local content=${3}
+
+  case ${type} in
     stdout)
-      echo -en "${2}"
+      echo -en "${content}"
       ;;
     stderr)
-      echo -en "${2}" >&2
+      echo -en "${content}" >&2
       ;;
-    *)
-      echo -en "${2}" > ${1}
+    file)
+      if [[ -n "${target}" ]]; then
+          echo -en "${content}" > "${target}"
+      fi
       ;;
   esac
 }
@@ -81,13 +87,15 @@ function main {
   server_message=$(send-to-server "${2}" "${client_message}")
   IFS=$'\n'
   target_list=( $(extract-string-properties "${server_message}" "outputs\..*\.target") )
+  type_list=( $(extract-string-properties "${server_message}" "outputs\..*\.type") )
   content_list=( $(extract-string-properties "${server_message}" "outputs\..*\.content") )
   exit_code=$(extract-number-properties "${server_message}" "exitcode")
 
   for index in "${!target_list[@]}"; do
     target=${target_list[${index}]}
+    type=${type_list[${index}]}
     content=$(json-decode "${content_list[${index}]}")
-    print-output "${target}" "${content}"
+    print-output "${type}" "${target}" "${content}"
   done
 
   exit ${exit_code}

data/bin/bash_wrapper.sh.erb

@@ -5,8 +5,8 @@
 ) 2> <%=stderr_output_path%>
 command_exit_code=$?
 
-/usr/bin/env bash <<EOF
+command bash <<EOF
   grep -v "readonly function" <%=stderr_output_path%> >&2
 EOF
 
-exit ${command_exit_code}
+command exit ${command_exit_code}

data/bin/ruby_stub.rb

@@ -17,16 +17,16 @@ sock.close_read
 
 exit 0 if conf_from_server.empty?
 
-(conf_from_server[:outputs] || []).each do |data|
-  if data[:target] == :stdout
+(conf_from_server[:outputs] || []).each do |target, data|
+  if target == :stdout
     $stdout.print data[:content]
     next
   end
-  if data[:target] == :stderr
+  if target == :stderr
     $stderr.print data[:content]
     next
   end
-  Pathname.new(data[:target]).open('w') do |f|
+  Pathname.new(target).open('w') do |f|
     f.print data[:content]
   end
 end

data/lib/rspec/bash/command/call_configuration.rb

@@ -16,9 +16,11 @@ module Rspec
 
       def add_output(content, target, args = [])
         current_conf = create_or_get_conf(args)
-        current_conf[:outputs] << {
+        type = determine_output_type(target)
+        current_conf[:outputs][target] = {
           target: target,
-          content: content
+          type: type,
+          content: content.to_s
         }
       end
 
@@ -27,7 +29,7 @@ module Rspec
         best_call_conf = call_conf_arg_matcher.get_best_call_conf(args)
         remove_args_from_conf(
           interpolate_output_targets(
-            best_call_conf,
+            copy_conf(best_call_conf),
             args
           )
         )
@@ -37,8 +39,13 @@ module Rspec
 
       def interpolate_output_targets(conf, args)
         return conf if conf.empty?
-        conf[:outputs].each do |output|
-          output[:target] = interpolate_target(output[:target], args)
+        conf[:outputs].keys.each do |target|
+          interpolated_target = interpolate_target(target, args)
+          next if interpolated_target == target
+
+          conf[:outputs][interpolated_target] = conf[:outputs][target]
+          conf[:outputs][interpolated_target][:target] = interpolated_target
+          conf[:outputs].delete(target)
         end
         conf
       end
@@ -58,19 +65,29 @@ module Rspec
       end
 
       def remove_args_from_conf(conf)
-        conf.select { |key| ![:args].include?(key) }
+        conf.delete(:args)
+        conf
       end
 
       def create_or_get_conf(args)
         new_conf = {
           args: args,
           exitcode: 0,
-          outputs: []
+          outputs: {}
         }
         current_conf = @call_configuration.select { |conf| conf[:args] == args }
         @call_configuration << new_conf if current_conf.empty?
         current_conf.first || new_conf
       end
+
+      def copy_conf(configuration)
+        Marshal.load(Marshal.dump(configuration))
+      end
+
+      def determine_output_type(target)
+        is_a_file_target = !([:stdout, :stderr].include? target)
+        is_a_file_target ? :file : target
+      end
     end
   end
 end

data/lib/rspec/bash/stubbed_env.rb

@@ -32,13 +32,13 @@ module Rspec
       end
 
       def execute(command, env_vars = {})
-        script_runner = "source #{command}"
+        script_runner = "command source #{command}"
         script_wrapper = wrap_script(script_runner)
         execute_script(env_vars, script_wrapper)
       end
 
       def execute_function(script, command, env_vars = {})
-        script_runner = "source #{script}\n#{command}"
+        script_runner = "command source #{script}\n#{command}"
         script_wrapper = wrap_script(script_runner)
         execute_script(env_vars, script_wrapper)
       end
@@ -62,7 +62,7 @@ module Rspec
         RUBY_STUB => RubyStubScript,
         BASH_STUB => BashStubScript
       }.freeze
-      DISALLOWED_COMMANDS = %w(/usr/bin/env bash readonly function).freeze
+      DISALLOWED_COMMANDS = %w(command function).freeze
 
       def create_tcp_server
         tcp_server = TCPServer.new('localhost', 0)

data/lib/rspec/bash/wrapper/stub_function.rb

@@ -11,7 +11,7 @@ module Rspec
       end
 
       def footer(name)
-        "}\nreadonly -f #{name} &> /dev/null"
+        "}\ncommand readonly -f #{name} &> /dev/null"
       end
 
       def body(name)

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.2.1'
+  spec.version       = '0.3.0'
   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/classes/command/call_configuration_spec.rb

@@ -12,7 +12,7 @@ describe 'CallConfiguration' do
             {
               args: %w(first_argument second_argument),
               exitcode: 1,
-              outputs: []
+              outputs: {}
             }
           ]
         end
@@ -28,13 +28,13 @@ describe 'CallConfiguration' do
             {
               args: %w(first_argument),
               exitcode: 1,
-              outputs: []
+              outputs: {}
             },
             {
 
               args: %w(first_argument second_argument),
               exitcode: 1,
-              outputs: []
+              outputs: {}
             }
           ]
         end
@@ -43,7 +43,7 @@ describe 'CallConfiguration' do
             {
               args: %w(first_argument),
               exitcode: 1,
-              outputs: []
+              outputs: {}
             }
           ]
         end
@@ -58,7 +58,7 @@ describe 'CallConfiguration' do
             {
               args: %w(first_argument second_argument),
               exitcode: 1,
-              outputs: []
+              outputs: {}
             }
           ]
         end
@@ -67,7 +67,7 @@ describe 'CallConfiguration' do
             {
               args: %w(first_argument second_argument),
               exitcode: 2,
-              outputs: []
+              outputs: {}
             }
           ]
         end
@@ -81,18 +81,40 @@ describe 'CallConfiguration' do
   end
   context '#add_output' do
     context 'with any setup' do
+      context 'regardless of existing or non-existing configuration' do
+        let(:expected_conf) do
+          [
+            {
+              args: %w(first_argument second_argument),
+              exitcode: 0,
+              outputs: {
+                stderr: {
+                  target: :stderr,
+                  type: :stderr,
+                  content: '2'
+                }
+              }
+            }
+          ]
+        end
+        it 'updates the internal configuration but converts output to a string' do
+          subject.add_output(2, :stderr, %w(first_argument second_argument))
+          expect(subject.call_configuration).to eql expected_conf
+        end
+      end
       context 'with no existing configuration' do
         let(:expected_conf) do
           [
             {
               args: %w(first_argument second_argument),
               exitcode: 0,
-              outputs: [
-                {
+              outputs: {
+                stderr: {
                   target: :stderr,
+                  type: :stderr,
                   content: 'new_content'
                 }
-              ]
+              }
             }
           ]
         end
@@ -107,22 +129,24 @@ describe 'CallConfiguration' do
             {
               args: %w(first_argument),
               exitcode: 1,
-              outputs: [
-                {
+              outputs: {
+                stdout: {
                   target: :stdout,
+                  type: :stdout,
                   content: 'different_content'
                 }
-              ]
+              }
             },
             {
               args: %w(first_argument second_argument),
               exitcode: 0,
-              outputs: [
-                {
+              outputs: {
+                stderr: {
                   target: :stderr,
+                  type: :stderr,
                   content: 'new_content'
                 }
-              ]
+              }
             }
           ]
         end
@@ -131,12 +155,13 @@ describe 'CallConfiguration' do
             {
               args: %w(first_argument),
               exitcode: 1,
-              outputs: [
-                {
+              outputs: {
+                stdout: {
                   target: :stdout,
+                  type: :stdout,
                   content: 'different_content'
                 }
-              ]
+              }
             }
           ]
         end
@@ -151,16 +176,18 @@ describe 'CallConfiguration' do
             {
               args: %w(first_argument second_argument),
               exitcode: 1,
-              outputs: [
-                {
+              outputs: {
+                stdout: {
                   target: :stdout,
+                  type: :stdout,
                   content: 'old_content'
                 },
-                {
+                stderr: {
                   target: :stderr,
+                  type: :stderr,
                   content: 'new_content'
                 }
-              ]
+              }
             }
           ]
         end
@@ -169,12 +196,13 @@ describe 'CallConfiguration' do
             {
               args: %w(first_argument second_argument),
               exitcode: 1,
-              outputs: [
-                {
+              outputs: {
+                stdout: {
                   target: :stdout,
+                  type: :stdout,
                   content: 'old_content'
                 }
-              ]
+              }
             }
           ]
         end
@@ -182,6 +210,22 @@ describe 'CallConfiguration' do
           subject.add_output('new_content', :stderr, %w(first_argument second_argument))
           expect(subject.call_configuration).to eql expected_conf
         end
+        it 'replaces the outputs conf for the matching target' do
+          subject.add_output('new_content', :stdout, %w(first_argument second_argument))
+          expect(subject.call_configuration).to eql [
+            {
+              args: %w(first_argument second_argument),
+              exitcode: 1,
+              outputs: {
+                stdout: {
+                  target: :stdout,
+                  type: :stdout,
+                  content: 'new_content'
+                }
+              }
+            }
+          ]
+        end
       end
     end
   end
@@ -199,7 +243,7 @@ describe 'CallConfiguration' do
             {
               args: %w(first_argument),
               exitcode: 1,
-              outputs: []
+              outputs: {}
             }
           ]
         end
@@ -212,10 +256,17 @@ describe 'CallConfiguration' do
         let(:expected_conf) do
           {
             exitcode: 2,
-            outputs: [
-              target: 'first_argument-something-second_argument-another.txt',
-              content: 'dynamically generated file name contents'
-            ]
+            outputs: {
+              'first_argument-something-second_argument-another.txt' => {
+                target: 'first_argument-something-second_argument-another.txt',
+                type: :file,
+                content: 'dynamically generated file name contents'
+              },
+              stdout: {
+                target: :stdout,
+                content: 'stdout content'
+              }
+            }
           }
         end
         before do
@@ -223,15 +274,27 @@ describe 'CallConfiguration' do
             {
               args: %w(first_argument second_argument),
               exitcode: 2,
-              outputs: [
-                target: [
+              outputs: {
+                [
                   :arg1,
                   '-something-',
                   :arg2,
                   '-another.txt'
-                ],
-                content: 'dynamically generated file name contents'
-              ]
+                ] => {
+                  target: [
+                    :arg1,
+                    '-something-',
+                    :arg2,
+                    '-another.txt'
+                  ],
+                  type: :file,
+                  content: 'dynamically generated file name contents'
+                },
+                stdout: {
+                  target: :stdout,
+                  content: 'stdout content'
+                }
+              }
             }
           ]
         end
@@ -240,6 +303,12 @@ describe 'CallConfiguration' do
           call_conf = subject.get_best_call_conf(%w(first_argument second_argument))
           expect(call_conf).to eql expected_conf
         end
+
+        it 'returns a copy of the conf it found' do
+          call_conf = subject.get_best_call_conf(%w(first_argument second_argument))
+          expect(call_conf.object_id)
+            .to_not eql subject.call_configuration[0].object_id
+        end
       end
     end
   end