eac_ruby_utils 0.108.0 → 0.109.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e29ceb1b90c374898bd5a0ef48d3852bbd9704ecc46de6964610fec9aeb7e2f
-  data.tar.gz: 9dbb473fa3b24ac1354846da01f9c705f037fd59f4380500af97040953b8b69d
+  metadata.gz: f49997c361144d891925c3596cdc2ca37bcc485aa26aa287c4f7bfe529f3c553
+  data.tar.gz: 50f784d1c96e7432f5bcec9823899cb4407d1e2fe7465aee7bd605a6dfbfe6ea
 SHA512:
-  metadata.gz: 13f74153fe16267d97f6edaa7aec5bef46d82f38fd17736b735bee01ae4669f71870b1da4c33f0827014a2dfb29c7eca8b59e44e71ebd2b89b8e1d7ae8243aab
-  data.tar.gz: 6ace755da4832ffcd7586dab3cb16d4ff6ef582bd8a3a3907cb16b7c773fcc708ffbd0e3ec39b5df48b47fb26253541158a4ee7594a38847826ee0219106f73c
+  metadata.gz: 2cee869d6232e3b1b7027dc0a0927c9d3ae272e0177d4c90718ebaa279374b60cf42171006eae06df51a0c09967019ba7e9b175fd5635051ed196c4cc012bed8
+  data.tar.gz: fc6b4ed8fb837382ed816326d8930ce6fbb04a90fad68d5c48acf3516bd30f51eb4570ae04216129aa870627c8551500f480855a11981726e4dbb1ff05023cff

data/lib/eac_ruby_utils/envs/{command → base_command}/append_command_options.rb

@@ -5,7 +5,7 @@ require 'shellwords'
 
 module EacRubyUtils
   module Envs
-    class Command
+    module BaseCommand
       class AppendCommandOptions
         enable_method_class
         common_constructor :command, :command_line, :options

data/lib/eac_ruby_utils/envs/{command → base_command}/concat.rb

@@ -4,17 +4,18 @@ require 'eac_ruby_utils/struct'
 
 module EacRubyUtils
   module Envs
-    class Command
+    module BaseCommand
       module Concat
         AND_OPERATOR = '&&'
         BEFORE_OPERATOR = ';'
         OR_OPERATOR = '||'
         PIPE_OPERATOR = '|'
 
+        # @param operator [Symbol]
+        # @return [EacRubyUtils::Envs::CompositeCommand]
         def concat(operator, other_command)
-          duplicate_by_extra_options(concat: ::EacRubyUtils::Struct.new(
-            operator: operator, command: other_command
-          ))
+          require 'eac_ruby_utils/envs/composite_command'
+          ::EacRubyUtils::Envs::CompositeCommand.new(operator, self, other_command)
         end
 
         # @return [EacRubyUtils::Envs::Command]
@@ -34,14 +35,6 @@ module EacRubyUtils
         def pipe(other_command)
           concat(PIPE_OPERATOR, other_command)
         end
-
-        private
-
-        def append_concat(command)
-          extra_options[:concat].if_present(command) do |v|
-            "#{command} #{v.operator} #{v.command.command}"
-          end
-        end
       end
     end
   end

data/lib/eac_ruby_utils/envs/{command → base_command}/debugging.rb

@@ -2,7 +2,7 @@
 
 module EacRubyUtils
   module Envs
-    class Command
+    module BaseCommand
       module Debugging
         def debug?
           ENV['DEBUG'].to_s.strip != ''

data/lib/eac_ruby_utils/envs/{command → base_command}/execution.rb

@@ -8,7 +8,7 @@ require 'pp'
 
 module EacRubyUtils
   module Envs
-    class Command
+    module BaseCommand
       module Execution
         def execute!(options = {})
           options[:exit_outputs] = status_results.merge(options[:exit_outputs].presence || {})

data/lib/eac_ruby_utils/envs/base_command/extra_options.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/hash/indifferent_access'
+require 'active_support/core_ext/object/blank'
+require 'shellwords'
+
+module EacRubyUtils
+  module Envs
+    module BaseCommand
+      module ExtraOptions
+        # @return [ActiveSupport::HashWithIndifferentAccess]
+        def extra_options
+          @extra_options ||= {}.with_indifferent_access
+        end
+
+        def status_result(status_code, result)
+          duplicate_by_extra_options(status_results: status_results.merge(status_code => result))
+        end
+
+        private
+
+        def status_results
+          extra_options[:status_results] ||= {}.with_indifferent_access
+        end
+      end
+    end
+  end
+end

data/lib/eac_ruby_utils/envs/base_command.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'shellwords'
+
+module EacRubyUtils
+  module Envs
+    module BaseCommand
+      require_sub __FILE__
+
+      common_concern do
+        enable_abstract_methods
+        include ::EacRubyUtils::Envs::BaseCommand::Concat
+        include ::EacRubyUtils::Envs::BaseCommand::Debugging
+        include ::EacRubyUtils::Envs::BaseCommand::Execution
+        include ::EacRubyUtils::Envs::BaseCommand::ExtraOptions
+      end
+
+      # @return [EacRubyUtils::Envs::BaseEnv]
+      def env
+        raise_abstract_method __method__
+      end
+
+      def command(options = {})
+        append_command_options(
+          env.command_line(command_line_without_env),
+          options
+        )
+      end
+
+      # @return [String]
+      def command_line_without_env(_options = {})
+        raise_abstract_method __method__
+      end
+
+      private
+
+      def escape(arg)
+        arg = arg.to_s
+        m = /^\@ESC_(.+)$/.match(arg)
+        m ? m[1] : Shellwords.escape(arg)
+      end
+    end
+  end
+end

data/lib/eac_ruby_utils/envs/command/extra_options.rb

@@ -12,18 +12,8 @@ module EacRubyUtils
           duplicate_by_extra_options(chdir: dir)
         end
 
-        def status_result(status_code, result)
-          duplicate_by_extra_options(status_results: status_results.merge(status_code => result))
-        end
-
         private
 
-        attr_reader :extra_options
-
-        def status_results
-          extra_options[:status_results] ||= {}.with_indifferent_access
-        end
-
         def append_chdir(command)
           extra_options[:chdir].present? ? "(cd '#{extra_options[:chdir]}' ; #{command} )" : command
         end

data/lib/eac_ruby_utils/envs/command.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
-require 'shellwords'
+require 'eac_ruby_utils/envs/base_command'
 
 module EacRubyUtils
   module Envs
     class Command
       require_sub __FILE__, include_modules: true, require_dependency: true
+      include ::EacRubyUtils::Envs::BaseCommand
 
       class << self
         # @param command [Array]
@@ -39,18 +40,11 @@ module EacRubyUtils
         "#{args} [ENV: #{env}]"
       end
 
-      def command(options = {})
-        append_command_options(
-          env.command_line(command_line_without_env),
-          options
-        )
-      end
-
       # @return [String]
       def command_line_without_env
         c = args
         c = c.map { |x| escape(x) }.join(' ') if c.is_a?(Enumerable)
-        append_chdir(append_concat(append_envvars(c)))
+        append_chdir(append_envvars(c))
       end
 
       protected
@@ -68,12 +62,6 @@ module EacRubyUtils
       def duplicate_by_extra_options(set_extra_options)
         duplicate(args, extra_options.merge(set_extra_options))
       end
-
-      def escape(arg)
-        arg = arg.to_s
-        m = /^\@ESC_(.+)$/.match(arg)
-        m ? m[1] : Shellwords.escape(arg)
-      end
     end
   end
 end

data/lib/eac_ruby_utils/envs/composite_command.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/envs/base_command'
+
+module EacRubyUtils
+  module Envs
+    class CompositeCommand
+      include ::EacRubyUtils::Envs::BaseCommand
+
+      enable_listable
+      lists.add_string :operator, '&&' => :and, ';' => :before, '||' => :or, '|' => :pipe
+
+      common_constructor :operator, :left_command, :right_command do
+        self.operator = self.class.lists.operator.value_validate!(operator.to_s)
+      end
+
+      # @return [EacRubyUtils::Envs::BaseEnv]
+      delegate :env, to: :left_command
+
+      # @return [String]
+      def command_line_without_env(_options = {})
+        ::Shellwords.join(['bash', '-c', bash_command])
+      end
+
+      # @return [String]
+      def bash_command
+        ['set', '-euo', 'pipefail', OPERATOR_BEFORE, left_command.command, operator,
+         right_command.command].join(' ')
+      end
+    end
+  end
+end

data/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.108.0'
+  VERSION = '0.109.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_ruby_utils
 version: !ruby/object:Gem::Version
-  version: 0.108.0
+  version: 0.109.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-23 00:00:00.000000000 Z
+date: 2022-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -139,14 +139,17 @@ files:
 - lib/eac_ruby_utils/custom_format.rb
 - lib/eac_ruby_utils/enum.rb
 - lib/eac_ruby_utils/envs.rb
+- lib/eac_ruby_utils/envs/base_command.rb
+- lib/eac_ruby_utils/envs/base_command/append_command_options.rb
+- lib/eac_ruby_utils/envs/base_command/concat.rb
+- lib/eac_ruby_utils/envs/base_command/debugging.rb
+- lib/eac_ruby_utils/envs/base_command/execution.rb
+- lib/eac_ruby_utils/envs/base_command/extra_options.rb
 - lib/eac_ruby_utils/envs/base_env.rb
 - lib/eac_ruby_utils/envs/command.rb
-- lib/eac_ruby_utils/envs/command/append_command_options.rb
-- lib/eac_ruby_utils/envs/command/concat.rb
-- lib/eac_ruby_utils/envs/command/debugging.rb
 - lib/eac_ruby_utils/envs/command/envvars.rb
-- lib/eac_ruby_utils/envs/command/execution.rb
 - lib/eac_ruby_utils/envs/command/extra_options.rb
+- lib/eac_ruby_utils/envs/composite_command.rb
 - lib/eac_ruby_utils/envs/executable.rb
 - lib/eac_ruby_utils/envs/execution_error.rb
 - lib/eac_ruby_utils/envs/execution_result.rb