smart_proxy_dynflow 0.9.1 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dbe59b9e06226b0bf592d09dc4de26afbb750182e539f0c6c718cac2a3b03de
-  data.tar.gz: 963d6a3dbbe3614d679bbe35670690565017c641c291902a1d4ba28997b48897
+  metadata.gz: f4cbd5ee3715ae77a996375dad27d44ef2eba5bde98687c01852b63f018de384
+  data.tar.gz: f4852c006912c4d80e9ddd1f3aa846d17845dfc46a34ae047ec0dad6887d6c93
 SHA512:
-  metadata.gz: 3cfcbeac72c226adc5cff8ac199651f1f3ca6ad1af498c0ea21109805e87513f41c94b6818e3dbeb9a6aa8ec7dda70ff80a991ba917198bb01f51d90125293cc
-  data.tar.gz: dfcc163c0b6e355a7fa73d1c5ad56cdf96c54633d30094f3de3bab64bce2b652d84bc8fc254d642e69fd251a02f4041c6beb7ec2dee00edc59847db2efb4aa32
+  metadata.gz: af596d7d35ec2d1231864f0982f4af90944a723998e6666343ad0cda0fd5b1c470e3ece13e7d89b4940c3ae4c22099d3f31dbd46e58dd8c5a56f90e40e408995
+  data.tar.gz: be433c2faeaf439e79ef77b05c36bec2c42b44f98e524b216cc0419b2097b32481a75977aa9c34f248b21c944b5ae71a98a71e1f6b5cccf786e3d12ad14d697a

data/lib/smart_proxy_dynflow/action/middleware/assemble_results.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Proxy::Dynflow::Action::Middleware
+  class AssembleResults < ::Dynflow::Middleware
+    def present
+      unless %i[error success skipped].include?(action.run_step&.state)
+        action.output[:result] = action.output_result
+      end
+      pass
+    end
+  end
+end

data/lib/smart_proxy_dynflow/action/runner.rb

@@ -2,12 +2,16 @@
 
 require 'smart_proxy_dynflow/action/shareable'
 require 'smart_proxy_dynflow/action/external_polling'
+require 'smart_proxy_dynflow/action/middleware/assemble_results'
+
 module Proxy::Dynflow
   module Action
     class Runner < Shareable
       include ::Dynflow::Action::Cancellable
       include ::Proxy::Dynflow::Action::WithExternalPolling
 
+      middleware.use ::Proxy::Dynflow::Action::Middleware::AssembleResults
+
       def run(event = nil)
         case event
         when nil

data/lib/smart_proxy_dynflow/helpers.rb

@@ -72,16 +72,10 @@ module Proxy
         end
       end
 
-      def expand_output(action)
-        hash = action.to_hash
-        hash[:output][:result] = action.output_result if action.is_a?(Proxy::Dynflow::Action::Runner)
-        hash
-      end
-
       def execution_plan_status(plan)
         actions = plan.actions.map do |action|
           refresh_output(plan, action)
-          expand_output(action)
+          action.to_hash
         end
         plan.to_hash.merge(:actions => actions)
       end

data/lib/smart_proxy_dynflow/io_buffer.rb

@@ -88,7 +88,7 @@ module Proxy
       def write_available!
         until @buffer.empty?
           n = @io.write_nonblock(@buffer)
-          @buffer = @buffer[n..-1]
+          @buffer = @buffer.bytes.drop(n).pack('c*')
         end
       rescue IO::WaitWritable # rubocop:disable Lint/SuppressedException
       rescue EOFError

data/lib/smart_proxy_dynflow/version.rb

@@ -2,6 +2,6 @@
 
 module Proxy
   module Dynflow
-    VERSION = '0.9.1'
+    VERSION = '0.9.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dynflow
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.3
 platform: ruby
 authors:
 - Ivan Nečas
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-20 00:00:00.000000000 Z
+date: 2024-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow
@@ -68,6 +68,7 @@ files:
 - lib/smart_proxy_dynflow/action/batch_callback.rb
 - lib/smart_proxy_dynflow/action/batch_runner.rb
 - lib/smart_proxy_dynflow/action/external_polling.rb
+- lib/smart_proxy_dynflow/action/middleware/assemble_results.rb
 - lib/smart_proxy_dynflow/action/output_collector.rb
 - lib/smart_proxy_dynflow/action/runner.rb
 - lib/smart_proxy_dynflow/action/shareable.rb
@@ -110,7 +111,7 @@ licenses:
 - GPL-3.0
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -128,8 +129,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Dynflow runtime for Foreman smart proxy
 test_files: []