rspec-bash 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 840b1879e77a1e03bd1d2b0ee87e1ccc47126294
-  data.tar.gz: 73cc3d08c7cb46f4f85198f477aeb2417d7774ed
+  metadata.gz: 49d5aad81e5823b77cd475a99f803af8afc6f445
+  data.tar.gz: 8dbe7fb5dfb13c7cccc5b6b791318a4341afc53c
 SHA512:
-  metadata.gz: 853e2d1bcf90edcc2ce938269fd9360f225fc46f1a386f929955ad8544ea5de3b7e5bbd0da22b58a4bd0c402f8243901d49fad68e3d560569fd25c7051e00025
-  data.tar.gz: b1a371ab0fa15617d931ad5579d108189d7d0efe20087902dff1beb0ff3bdac136b21b43acba14dae73c7483e13088fbbb09d4926870e38546bb8b2b0633131a
+  metadata.gz: 956d35847b75501827d811a4453c1db3dd988baec17306aaa4bb8ee82dbd49f42b635ade5e19fe56da6ed82a98bff3fc7c1853db70b8e2e2d2b1b8fc2fbdf34d
+  data.tar.gz: 0a308ef87217a944f9bcbeda8444d797daf6f3ea3cd4d6f057d718179cea4fe198ce8a5da4b0aaad03fba0c3dca12362a001b5151bfa9ffef4512f1c429b1d45

data/README.md

@@ -1,5 +1,6 @@
 [![Stories in Ready](https://badge.waffle.io/mdurban/rspec-bash.png?label=ready&title=Ready)](http://waffle.io/mdurban/rspec-bash)
 [![Build Status](https://travis-ci.org/mdurban/rspec-bash.svg?branch=master)](https://travis-ci.org/mdurban/rspec-bash)
+[![Dependency Status](https://gemnasium.com/badges/github.com/mdurban/rspec-bash.svg)](https://gemnasium.com/github.com/mdurban/rspec-bash)
 
 # Rspec::Bash
 

data/bin/bash_stub.sh

@@ -55,8 +55,12 @@ function send-to-server {
   echo -n "${2}" | nc localhost ${1}
 }
 
-function extract-properties {
-  echo -n "${1}" | sed -En "s/^\"${2}\":\"?([^,\"]*)\"?,?$/\1/gp"
+function extract-number-properties {
+  echo -n "${1}" | sed -En "s/^\"${2}\":([0-9]+),?$/\1/gp"
+}
+
+function extract-string-properties {
+  echo -n "${1}" | sed -En "s/^\"${2}\":\"(.*)\",?$/\1/gp"
 }
 
 function print-output {
@@ -76,9 +80,9 @@ function main {
   client_message=$(create-call-log "${@}")
   server_message=$(send-to-server "${2}" "${client_message}")
   IFS=$'\n'
-  target_list=( $(extract-properties "${server_message}" "outputs\..*\.target") )
-  content_list=( $(extract-properties "${server_message}" "outputs\..*\.content") )
-  exit_code=$(extract-properties "${server_message}" "exitcode")
+  target_list=( $(extract-string-properties "${server_message}" "outputs\..*\.target") )
+  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}]}

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.0'
+  spec.version       = '0.2.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/wrapper/bash_stub_script_spec.rb

@@ -159,25 +159,29 @@ describe 'BashStub' do
     end
   end
 
-  context '.extract-properties' do
+  context '.extract-*-properties' do
     context 'given a standard call conf message' do
       let(:call_conf) do
         JSON.pretty_generate(
           Sparsify.sparse(
             {
-              exitcode: 10,
+              exitcode: 10_000,
               outputs: [
                 {
                   target: 'stdout',
-                  content: "stdout\nstdout stdout"
+                  content: "stdout\nstdout,stdout"
+                },
+                {
+                  target: 'stdout',
+                  content: 1
                 },
                 {
                   target: 'stderr',
-                  content: "stderr stderr\nstderr"
+                  content: "stderr\" stderr\nstderr"
                 },
                 {
                   target: 'tofile',
-                  content: "tofile\ntofile tofile"
+                  content: "tofile\ntofile:\", tofile"
                 }
               ]
             }, sparse_array: true
@@ -188,18 +192,18 @@ describe 'BashStub' do
       it 'extracts a single value field' do
         stdout, = stubbed_env.execute_function(
           BashStubScript.path,
-          "extract-properties '#{call_conf}' 'exitcode'"
+          "extract-number-properties '#{call_conf}' 'exitcode'"
         )
-        expect(stdout.chomp).to eql '10'
+        expect(stdout.chomp).to eql '10000'
       end
 
       it 'extracts a multiple value field' do
         stdout, _stderr = stubbed_env.execute_function(
           BashStubScript.path,
-          "extract-properties '#{call_conf}' 'outputs\\..*\\.content'"
+          "extract-string-properties '#{call_conf}' 'outputs\\..*\\.content'"
         )
-        expect(stdout.chomp).to eql "stdout\\nstdout stdout\nstderr stderr\\nstderr" \
-        "\ntofile\\ntofile tofile"
+        expect(stdout.chomp).to eql "stdout\\nstdout,stdout\nstderr\\\" stderr\\nstderr" \
+        "\ntofile\\ntofile:\\\", tofile"
       end
     end
   end
@@ -318,19 +322,20 @@ describe 'BashStub' do
   context '.main' do
     context 'with stdin, command, port and arguments' do
       before(:all) do
-        stubbed_env = create_stubbed_env
-        @create_call_log = stubbed_env.stub_command('create-call-log').outputs('call log')
-        @send_to_server = stubbed_env.stub_command('send-to-server').outputs('call conf')
-        @extract_properties = stubbed_env.stub_command('extract-properties')
-        @print_output = stubbed_env.stub_command('print-output')
-
-        @extract_properties
+        stubbed_env                = create_stubbed_env
+        @create_call_log           = stubbed_env.stub_command('create-call-log').outputs('call log')
+        @send_to_server            = stubbed_env.stub_command('send-to-server').outputs('call conf')
+        @extract_string_properties = stubbed_env.stub_command('extract-string-properties')
+        @extract_number_properties = stubbed_env.stub_command('extract-number-properties')
+        @print_output              = stubbed_env.stub_command('print-output')
+
+        @extract_string_properties
           .with_args('call conf', 'outputs\..*\.target')
           .outputs("stdout\nstderr\ntofile\n")
-        @extract_properties
+        @extract_string_properties
           .with_args('call conf', 'outputs\..*\.content')
           .outputs("\\nstd out\\n\n\\nstd err\\n\n\\nto file\\n\n")
-        @extract_properties.with_args('call conf', 'exitcode').outputs("3\n")
+        @extract_number_properties.with_args('call conf', 'exitcode').outputs("3\n")
 
         _, _, @status = stubbed_env.execute_function(
           BashStubScript.path,
@@ -350,17 +355,17 @@ describe 'BashStub' do
         )
       end
       it 'extracts the target list from the call conf returned by the server' do
-        expect(@extract_properties).to be_called_with_arguments(
+        expect(@extract_string_properties).to be_called_with_arguments(
           'call conf', 'outputs\..*\.target'
         )
       end
       it 'extracts the content list from the call conf returned by the server' do
-        expect(@extract_properties).to be_called_with_arguments(
+        expect(@extract_string_properties).to be_called_with_arguments(
           'call conf', 'outputs\..*\.content'
         )
       end
       it 'extracts the exit code from the call conf returned by the server' do
-        expect(@extract_properties).to be_called_with_arguments(
+        expect(@extract_number_properties).to be_called_with_arguments(
           'call conf', 'exitcode'
         )
       end

data/spec/spec_helper.rb

@@ -10,3 +10,7 @@ require 'yaml'
 
 require 'helper/string_file_io'
 require 'helper/shared_tmpdir'
+
+RSpec.configure do |c|
+  c.include Rspec::Bash
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-bash
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ben Brewer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-15 00:00:00.000000000 Z
+date: 2017-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sparsify
@@ -121,7 +121,7 @@ files:
 - 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/edge_cases/long_command_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
@@ -177,7 +177,7 @@ test_files:
 - 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/edge_cases/long_command_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