lino 3.2.0.pre.7 → 3.2.0.pre.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 316b2b5ecae6178261c4b76fedfe0c5797ae50355a94a939f02c115507ba2a37
-  data.tar.gz: 7ee4b662f7c3b1b5fa7ca3b6aca9d1e2597c5804d12732822bf766cfad2d228f
+  metadata.gz: beea9421552cd298e9e5cd1147018e9f441d4d1125a4f0a62b92153d73977420
+  data.tar.gz: 041531edbe469e0e33bd2c4f2c88bc725dd9562dbbc3718dba9ee645f7afdd45
 SHA512:
-  metadata.gz: 152d8164ab1b7b00deaae2538d18559d872a5fb8800231728d238a34fa0393658134fc41244134288e7b2a6cff8b8962bb48bb5c151104a24aadb798da9149cd
-  data.tar.gz: b2549104ac5496bb688b3cb61c8b4229bc99af00be5071871dbabd018007603734940f610658f20a8c62a9bd0638d1923e0f3b8631dc873819c812de54084deb
+  metadata.gz: a30f3228f4a66df89fb8e9d0f55e7dbfa02aaf81cd5f241103130ca27d2c26463618b95dda82cb13c53c6c7b71312afff7ef0940c6a98a31d4f330aee34a7f3e
+  data.tar.gz: 6bcf014ce80d9a2e302978be707f33b1f493d37bef77e360fd30928681dbacce8cb1c19948d759265a920440a6c5bb240fd3f30d2ba3c556ecf37d44bbae22ff

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lino (3.2.0.pre.7)
+    lino (3.2.0.pre.9)
       childprocess (~> 5.0.0)
       hamster (~> 3.0)
       open4 (~> 1.3)

data/lib/lino/executors/childprocess.rb

@@ -39,7 +39,8 @@ module Lino
       def start_process(process, opts)
         process.duplex = true if opts[:stdin]
         process.start
-        process.io.stdin.write(opts[:stdin]) if opts[:stdin]
+        process.io.stdin.write(opts[:stdin].read) if opts[:stdin]
+        process.io.stdin.close if opts[:stdin]
       end
 
       def set_output_streams(process, opts)

data/lib/lino/executors/mock.rb

@@ -3,7 +3,7 @@
 module Lino
   module Executors
     class Mock
-      attr_reader :calls
+      attr_reader :executions, :stdout_contents, :stderr_contents
       attr_accessor :exit_code
 
       def initialize
@@ -11,7 +11,10 @@ module Lino
       end
 
       def execute(command_line, opts = {})
-        @calls << { command_line:, opts:, exit_code: @exit_code }
+        execution = Execution.new(command_line:, opts:, exit_code: @exit_code)
+        execution = process_streams(execution, opts)
+
+        @executions << execution
 
         return if @exit_code.zero?
 
@@ -20,9 +23,120 @@ module Lino
         )
       end
 
+      def fail_all_executions
+        self.exit_code = 1
+      end
+
+      def write_to_stdout(contents)
+        @stdout_contents = contents
+      end
+
+      def write_to_stderr(contents)
+        @stderr_contents = contents
+      end
+
       def reset
-        @calls = []
+        @executions = []
         @exit_code = 0
+        @stdout_contents = nil
+        @stderr_contents = nil
+      end
+
+      private
+
+      def process_streams(execution, opts)
+        execution = process_stdout(execution, opts[:stdout])
+        execution = process_stderr(execution, opts[:stderr])
+        process_stdin(execution, opts[:stdin])
+      end
+
+      def process_stdout(execution, stdout)
+        if stdout && stdout_contents
+          stdout.write(stdout_contents)
+          return execution.with_stdout_contents(stdout_contents)
+        end
+
+        execution
+      end
+
+      def process_stderr(execution, stderr)
+        if stderr && stderr_contents
+          stderr.write(stderr_contents)
+          return execution.with_stderr_contents(stderr_contents)
+        end
+
+        execution
+      end
+
+      def process_stdin(execution, stdin)
+        return execution.with_stdin_contents(stdin.read) if stdin
+
+        execution
+      end
+
+      class Execution
+        attr_reader :command_line,
+                    :opts,
+                    :exit_code,
+                    :stdin_contents,
+                    :stdout_contents,
+                    :stderr_contents
+
+        def initialize(state)
+          @command_line = state[:command_line]
+          @opts = state[:opts]
+          @exit_code = state[:exit_code]
+          @stdin_contents = state[:stdin_contents]
+          @stdout_contents = state[:stdout_contents]
+          @stderr_contents = state[:stderr_contents]
+        end
+
+        def with_stdin_contents(contents)
+          Execution.new(state_hash.merge(stdin_contents: contents))
+        end
+
+        def with_stdout_contents(contents)
+          Execution.new(state_hash.merge(stdout_contents: contents))
+        end
+
+        def with_stderr_contents(contents)
+          Execution.new(state_hash.merge(stderr_contents: contents))
+        end
+
+        def ==(other)
+          self.class == other.class &&
+            state_array == other.state_array
+        end
+
+        alias eql? ==
+
+        def hash
+          [self.class, state_array].hash
+        end
+
+        protected
+
+        def state_array
+          [
+            @command_line,
+            @opts,
+            @exit_code,
+            @stdin_contents,
+            @stdout_contents,
+            @stderr_contents
+          ]
+        end
+
+        def state_hash
+          {
+            command_line: @command_line,
+            opts: @opts,
+            exit_code: @exit_code,
+            stdin_contents: @stdin_contents,
+            stdout_contents: @stdout_contents,
+            stderr_contents: @stderr_contents
+          }
+        end
       end
     end
   end

data/lib/lino/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lino
-  VERSION = '3.2.0.pre.7'
+  VERSION = '3.2.0.pre.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lino
 version: !ruby/object:Gem::Version
-  version: 3.2.0.pre.7
+  version: 3.2.0.pre.9
 platform: ruby
 authors:
 - InfraBlocks Maintainers