lino 3.2.0.pre.8 → 3.2.0.pre.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da0833b0822fedee12bfa81350d5e87a69ef51bb9b4abc7f9f4537d5b851d3fe
-  data.tar.gz: f3bc82e3a0f6af9b1ae512a8db77b01626b39b089616371a35bb523a625a3551
+  metadata.gz: 7cb69956b6fc3389deb0f7747c7ab5023225e95bee92ec99d1f7492d1a9020c4
+  data.tar.gz: 4fb9eeea0d1be41bae1d8864cbf0893c0dcfa9f654e5730b69ffd0d396c2106c
 SHA512:
-  metadata.gz: e901b165f5fa1da7678057e04217b90558f7ef19f788b575e1dd3e1a5af825615e46040c33c24135899af5fa1ca1d8b150b83f225aeff568facc3498a2092f95
-  data.tar.gz: 9bd2103be29ad1026863b39df46a33d2a9618343d06ce517a01558087d6f18a85501c9a3a12fb04ab526ac6a22b56a9d8f29f0ee4269cf5b4ba013da3c5a1b58
+  metadata.gz: aa736d59d32a7358972e4940035f4767c077e2d1af7edf6630c144cb07b9235788f086c22589d64bfd4f00f0e7ddf02dc01d5bf1976bac496b4c696a90a4a8ed
+  data.tar.gz: aff892172f4752f99f0b4d7d68075aa60ba20a6e5069ee8adb59a32c0d0cc7b6c7784420d7a7910ba97f8022614523642d9d6ef75bf00bb9392abf2fb86c4b01

data/Gemfile.lock

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

data/lib/lino/executors/mock.rb

@@ -11,7 +11,7 @@ module Lino
       end
 
       def execute(command_line, opts = {})
-        execution = { command_line:, opts:, exit_code: @exit_code }
+        execution = Execution.new(command_line:, opts:, exit_code: @exit_code)
         execution = process_streams(execution, opts)
 
         @executions << execution
@@ -53,7 +53,7 @@ module Lino
       def process_stdout(execution, stdout)
         if stdout && stdout_contents
           stdout.write(stdout_contents)
-          return execution.merge(stdout_contents:)
+          return execution.with_stdout_contents(stdout_contents)
         end
 
         execution
@@ -62,17 +62,82 @@ module Lino
       def process_stderr(execution, stderr)
         if stderr && stderr_contents
           stderr.write(stderr_contents)
-          return execution.merge(stderr_contents:)
+          return execution.with_stderr_contents(stderr_contents)
         end
 
         execution
       end
 
       def process_stdin(execution, stdin)
-        return execution.merge(stdin_contents: stdin.read) if 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
 end

data/lib/lino/model/argument.rb

@@ -10,12 +10,12 @@ module Lino
       end
 
       def string
-        argument
+        argument.to_s
       end
       alias to_s string
 
       def array
-        [argument]
+        [argument.to_s]
       end
       alias to_a string
 

data/lib/lino/model/command_line.rb

@@ -100,7 +100,7 @@ module Lino
       def formatted_components(format)
         {
           environment_variables: @environment_variables.map(&format),
-          command: @command,
+          command: @command.to_s,
           options: @options
             .group_by(&:placement)
             .map { |p, o| [p, o.map(&format)] },

data/lib/lino/model/environment_variable.rb

@@ -26,7 +26,7 @@ module Lino
       alias to_s string
 
       def array
-        [name, value]
+        [name.to_s, value.to_s]
       end
       alias to_a array
 

data/lib/lino/model/flag.rb

@@ -13,12 +13,12 @@ module Lino
       end
 
       def string
-        flag
+        flag.to_s
       end
       alias to_s string
 
       def array
-        [flag]
+        [flag.to_s]
       end
       alias to_a string
 

data/lib/lino/model/option.rb

@@ -29,7 +29,7 @@ module Lino
 
       def array
         if separator == ' '
-          [option, value]
+          [option.to_s, value.to_s]
         else
           ["#{option}#{separator}#{value}"]
         end

data/lib/lino/model/subcommand.rb

@@ -12,12 +12,12 @@ module Lino
       end
 
       def string
-        [@subcommand, @options.map(&:string)].reject(&:empty?).join(' ')
+        [@subcommand.to_s, @options.map(&:string)].reject(&:empty?).join(' ')
       end
       alias to_s string
 
       def array
-        [@subcommand, @options.map(&:array)].flatten
+        [@subcommand.to_s, @options.map(&:array)].flatten
       end
       alias to_a array
 

data/lib/lino/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lino
 version: !ruby/object:Gem::Version
-  version: 3.2.0.pre.8
+  version: 3.2.0.pre.10
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-08 00:00:00.000000000 Z
+date: 2024-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess