eac_tools 0.47.0 → 0.47.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3418d6903a368e33472395b53a332d45ba663fef893c5e657f68ccb5bfc22c17
-  data.tar.gz: 53b2d9b4c6a88ae9371176752c14bcaa623537f685f9400080c61ec274cee36e
+  metadata.gz: 0d1686f4681d753bcc8fb8b0c40a99704ae171fe9cca28a0a6e639e7dc1ddde5
+  data.tar.gz: f3d0612fabd22de4d4e32df9d4b976550c5266c0c92930eca71cfd6882e84046
 SHA512:
-  metadata.gz: 37e4b8af6160ac8056ad0c724639b304260ce2c4b47fb405488a8fa529d01d3535264b0b28a06bff17f4adfd62eb47253f4d81c20e52e77637100ff05937aa05
-  data.tar.gz: 1c72ca7d308189e28abc9bd8b1f01ff7d02a74841bffe80374f43fd9da5be792c6c90fce48ceef451bff95f56117fe95f5dde5d3869393696d2d8ae4dece2edf
+  metadata.gz: 2616efcacfe0c154f8472dc90b6cdd04cfe14ed8e2ec97d37a6b7313e002f1d6dcc67c4e634b057d890d2e93a7c5c21b596364f33b4294ca3d8077c409c268ca
+  data.tar.gz: 452475bfa82a589cac04c8417704289e2422174b35a6d05966606d76408af1f97e8e1ed55ea866f1790b7efcee201d4d5b0c2fe2412fe94a50357c2ed9b20b2a

data/Gemfile.lock

@@ -1,21 +1,23 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.47.0)
-      avm (~> 0.58)
+    eac_tools (0.47.2)
+      avm (~> 0.57)
       avm-eac_asciidoctor_base0 (~> 0.12)
       avm-eac_generic_base0 (~> 0.8)
       avm-eac_latex_base0 (~> 0.3)
       avm-eac_php_base0 (~> 0.4)
+      avm-eac_postgresql_base0 (~> 0.2, >= 0.2.2)
+      avm-eac_python_base0 (~> 0.2, >= 0.2.1)
       avm-eac_rails_base0 (~> 0.8, >= 0.8.1)
       avm-eac_rails_base1 (~> 0.7, >= 0.7.1)
       avm-eac_redmine_base0 (~> 0.17)
       avm-eac_redmine_plugin_base0 (~> 0.4)
-      avm-eac_ruby_base1 (~> 0.27, >= 0.27.1)
+      avm-eac_ruby_base1 (~> 0.27, >= 0.27.3)
       avm-eac_webapp_base0 (~> 0.12, >= 0.12.3)
       avm-eac_wordpress_base0 (~> 0.2, >= 0.2.1)
-      avm-tools (~> 0.142, >= 0.142.6)
-      eac_ruby_utils (~> 0.108)
+      avm-tools (~> 0.142, >= 0.142.7)
+      eac_ruby_utils (~> 0.109)
 
 PATH
   remote: sub/aranha-parsers
@@ -66,16 +68,16 @@ PATH
 PATH
   remote: sub/avm-eac_postgresql_base0
   specs:
-    avm-eac_postgresql_base0 (0.2.1)
-      avm (~> 0.56, >= 0.56.1)
-      eac_ruby_utils (~> 0.107, >= 0.107.1)
+    avm-eac_postgresql_base0 (0.2.2)
+      avm (~> 0.57)
+      eac_ruby_utils (~> 0.108)
 
 PATH
   remote: sub/avm-eac_python_base0
   specs:
-    avm-eac_python_base0 (0.2.0)
-      avm-eac_generic_base0 (~> 0.7)
-      eac_ruby_utils (~> 0.106)
+    avm-eac_python_base0 (0.2.1)
+      avm-eac_generic_base0 (~> 0.8)
+      eac_ruby_utils (~> 0.109)
 
 PATH
   remote: sub/avm-eac_rails_base0
@@ -116,10 +118,10 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.27.1)
-      avm (~> 0.56)
+    avm-eac_ruby_base1 (0.27.3)
+      avm (~> 0.57)
       avm-eac_generic_base0 (~> 0.8)
-      eac_ruby_utils (~> 0.107, >= 0.107.1)
+      eac_ruby_utils (~> 0.109)
 
 PATH
   remote: sub/avm-eac_webapp_base0
@@ -163,13 +165,13 @@ PATH
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.142.6)
+    avm-tools (0.142.7)
       aranha-parsers (~> 0.14, >= 0.14.4)
-      avm (~> 0.56)
+      avm (~> 0.57)
       avm-eac_ruby_base1 (~> 0.27, >= 0.27.1)
       avm-eac_ubuntu_base0 (~> 0.3)
       avm-files (~> 0.6)
-      avm-git (~> 0.10)
+      avm-git (~> 0.10, >= 0.10.1)
       clipboard (~> 1.3, >= 1.3.6)
       curb (~> 0.9, >= 0.9.11)
       eac_git (~> 0.14)
@@ -219,7 +221,7 @@ PATH
 PATH
   remote: sub/eac_fs
   specs:
-    eac_fs (0.15.0)
+    eac_fs (0.16.0)
       content-type (~> 0.0, >= 0.0.2)
       eac_ruby_utils (~> 0.107, >= 0.107.1)
       ruby-filemagic (~> 0.7, >= 0.7.3)
@@ -243,7 +245,7 @@ PATH
 PATH
   remote: sub/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.108.0)
+    eac_ruby_utils (0.109.0)
       activesupport (>= 4, < 7)
       addressable (~> 2.8, >= 2.8.1)
       bundler
@@ -333,12 +335,12 @@ GEM
     os (1.1.4)
     parallel (1.22.1)
     parseconfig (1.1.2)
-    parser (3.1.2.1)
+    parser (3.1.3.0)
       ast (~> 2.4.1)
     parslet (2.0.0)
     public_suffix (5.0.0)
-    racc (1.6.0)
-    rack (3.0.1)
+    racc (1.6.1)
+    rack (3.0.2)
     rainbow (3.1.1)
     rchardet (1.8.0)
     rexml (3.2.5)
@@ -411,4 +413,4 @@ DEPENDENCIES
   eac_tools!
 
 BUNDLED WITH
-   2.3.20
+   2.3.26

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.47.0'
+  VERSION = '0.47.2'
 end

data/sub/avm-eac_postgresql_base0/avm-eac_postgresql_base0.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'avm', '~> 0.56', '>= 0.56.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.107', '>= 0.107.1'
+  s.add_dependency 'avm', '~> 0.57'
+  s.add_dependency 'eac_ruby_utils', '~> 0.108'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.4'
 end

data/sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/instance.rb

@@ -27,12 +27,18 @@ module Avm
            .envvar('PGPASSWORD', password)
       end
 
+      # @return [EacRubyUtils::Envs::Command]
       def dump_gzip_command
-        dump_command.append(['@ESC_|', 'gzip', '-9', '-c'])
+        dump_command.pipe(env.command('gzip', '-9', '-c'))
+      end
+
+      # @return [String]
+      def password_command_argument
+        "@ESC_PGPASSWORD=#{password}"
       end
 
       def psql_command(database = true)
-        env.command("@ESC_PGPASSWORD=#{password}", 'psql', *common_command_args(database))
+        env.command(password_command_argument, 'psql', *common_command_args(database))
       end
 
       def psql_command_command(sql, database = true)

data/sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/instance_with.rb

@@ -8,9 +8,11 @@ module Avm
     module InstanceWith
       def pg
         @pg ||= ::Avm::EacPostgresqlBase0::Instance.new(
-          host_env, user: read_entry(::Avm::Instances::EntryKeys::DATABASE_USERNAME),
-                    password: read_entry(::Avm::Instances::EntryKeys::DATABASE_PASSWORD),
-                    name: read_entry(::Avm::Instances::EntryKeys::DATABASE_NAME)
+          host_env, host: database_hostname,
+                    port: database_port,
+                    user: database_username,
+                    password: database_password,
+                    name: database_name
         )
       end
     end

data/sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacPostgresqlBase0
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'
   end
 end

data/sub/avm-eac_python_base0/avm-eac_python_base0.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm-eac_generic_base0', '~> 0.7'
-  s.add_dependency 'eac_ruby_utils', '~> 0.106'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.8'
+  s.add_dependency 'eac_ruby_utils', '~> 0.109'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5', '>= 0.5.1'
 end

data/sub/avm-eac_python_base0/lib/avm/eac_python_base0/file_formats/base.rb

@@ -8,7 +8,7 @@ module Avm
     module FileFormats
       class Base < ::Avm::EacGenericBase0::FileFormats::Base
         VALID_BASENAMES = %w[*.py].freeze
-        VALID_TYPES = ['x-python'].freeze
+        VALID_TYPES = ['x-python', 'x-script.python'].freeze
 
         def internal_apply(files)
           ::Avm::EacPythonBase0::Executables.yapf.command.append(['--in-place', *files]).system!

data/sub/avm-eac_python_base0/lib/avm/eac_python_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacPythonBase0
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

data/sub/avm-eac_ruby_base1/avm-eac_ruby_base1.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.56'
+  s.add_dependency 'avm', '~> 0.57'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.8'
-  s.add_dependency 'eac_ruby_utils', '~> 0.107', '>= 0.107.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.109'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.1'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/launcher_stereotypes/base/publish.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'curb'
 require 'json'
 require 'eac_ruby_utils/simple_cache'
 require 'rubygems'
 require 'eac_cli/speaker'
+require 'aranha/parsers/source_address'
 require 'avm/launcher/publish/base'
 require 'avm/launcher/publish/check_result'
 require 'avm/eac_ruby_base1/launcher/gem'
@@ -98,11 +98,11 @@ module Avm
           end
 
           def gem_versions_uncached
-            http = Curl.get("https://rubygems.org/api/v1/versions/#{gem_spec.name}.json")
-            return JSON.parse!(http.body_str) if /\A2/ =~ http.status
-            return [] if /\A4/ =~ http.status
-
-            raise "#{http} code error: #{http.status}"
+            ::JSON.parse!(
+              ::Aranha::Parsers::SourceAddress.detect_sub(
+                "https://rubygems.org/api/v1/versions/#{gem_spec.name}.json"
+              ).content
+            )
           end
 
           def gem_version_max_uncached

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.27.1'
+    VERSION = '0.27.3'
   end
 end

data/sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/runners/base/rubocop_spec.rb

@@ -10,6 +10,10 @@ require 'avm/eac_ruby_base1/sources/base'
   let(:dir3) { dir1.join('dir3') }
   let(:dir4) { fixtures_root.join('dir4') }
 
+  before do
+    ::Avm::EacRubyBase1::Sources::Base.new(dir3).bundle.execute!
+  end
+
   {
     dir1: '0.48.1',
     dir2: ::Avm::EacRubyBase1::Sources::Base.new(::File.expand_path('../../../../../..', __dir__))
@@ -21,10 +25,6 @@ require 'avm/eac_ruby_base1/sources/base'
       let(:dir) { send(dir_name) }
       let(:thegem) { ::Avm::EacRubyBase1::Sources::Base.new(dir) }
 
-      before do
-        thegem.bundle.system! if thegem.gemfile_path.exist?
-      end
-
       it "return #{rubocop_version} as Rubocop version" do
         argv = ['-C', dir.to_s, '--', '--version']
         expect { described_class.run(argv: argv) }.to(

data/sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/runners/base/rubocop_spec_files/dir1/dir3/Gemfile.lock

@@ -0,0 +1,27 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.2)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
+    powerpack (0.1.3)
+    rainbow (2.2.2)
+      rake
+    rake (13.0.6)
+    rubocop (0.48.1)
+      parser (>= 2.3.3.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.11.0)
+    unicode-display_width (1.8.0)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  rubocop (= 0.48.1)
+
+BUNDLED WITH
+   2.3.26

data/sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/sources/base/bundler_spec.rb

@@ -6,6 +6,10 @@ require 'avm/eac_ruby_base1/sources/base'
   let(:mygem_path) { ::Pathname.new(__dir__).join('bundler_spec_files', 'mygem') }
   let(:mygem) { described_class.new(mygem_path) }
 
+  before do
+    mygem.bundle.execute!
+  end
+
   describe '#bundle' do
     specify do
       expect(mygem.bundle('exec', 'myrunner').execute!).to include('My Runner')

data/sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/sources/base/bundler_spec_files/mygem/Gemfile.lock

@@ -0,0 +1,19 @@
+PATH
+  remote: .
+  specs:
+    mygem (1.0.0)
+      rake
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    rake (13.0.6)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  mygem!
+
+BUNDLED WITH
+   2.3.17

data/sub/avm-tools/avm-tools.gemspec

@@ -15,11 +15,11 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
   s.add_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.4'
-  s.add_dependency 'avm', '~> 0.56'
+  s.add_dependency 'avm', '~> 0.57'
   s.add_dependency 'avm-eac_ruby_base1', '~> 0.27', '>= 0.27.1'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
   s.add_dependency 'avm-files', '~> 0.6'
-  s.add_dependency 'avm-git', '~> 0.10'
+  s.add_dependency 'avm-git', '~> 0.10', '>= 0.10.1'
   s.add_dependency 'clipboard', '~> 1.3', '>= 1.3.6'
   s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
   s.add_dependency 'eac_git', '~> 0.14'

data/sub/avm-tools/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.142.6'
+    VERSION = '0.142.7'
   end
 end

data/sub/eac_fs/lib/eac_fs/storage_tree.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/yaml'
 require 'fileutils'
 
 module EacFs
@@ -33,12 +34,30 @@ module EacFs
       read
     end
 
+    # @return [Object]
+    def read_or_store_yaml(use_cache = true)
+      write_yaml(yield) unless stored? && use_cache
+
+      read_yaml
+    end
+
+    # @return [Object, nil]
+    def read_yaml
+      r = read
+      r.nil? ? nil : ::EacRubyUtils::Yaml.load(r)
+    end
+
     def write(value)
       assert_directory_on_path
       ::File.write(content_path, value)
       value
     end
 
+    def write_yaml(object)
+      write(::EacRubyUtils::Yaml.dump(object))
+      object
+    end
+
     def child(*child_path_parts)
       self.class.new(path, *child_path_parts)
     end

data/sub/eac_fs/lib/eac_fs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacFs
-  VERSION = '0.15.0'
+  VERSION = '0.16.0'
 end

data/sub/eac_ruby_utils/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/sub/eac_ruby_utils/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/sub/eac_ruby_utils/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/sub/eac_ruby_utils/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/sub/eac_ruby_utils/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/sub/eac_ruby_utils/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/sub/eac_ruby_utils/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/sub/eac_ruby_utils/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/sub/eac_ruby_utils/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/sub/eac_ruby_utils/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

data/sub/eac_ruby_utils/spec/lib/eac_ruby_utils/envs/command_spec.rb

@@ -19,16 +19,11 @@ RSpec.describe ::EacRubyUtils::Envs::Command do
 
   describe '#execute' do
     it do
-      expect(ok_command.execute).to(
-        eq({ command: 'echo -n THE\\ OUTPUT', stdout: ok_command_output, stderr: '', exit_code: 0 })
-      )
+      assert_execute_result(ok_command.execute, true, ok_command_output)
     end
 
     it do
-      expect(error_command.execute).to(
-        eq({ command: 'cat a_file_that_not_exists', stdout: '',
-             stderr: "cat: a_file_that_not_exists: No such file or directory\n", exit_code: 256 })
-      )
+      assert_execute_result(error_command.execute, false, '')
     end
   end
 
@@ -57,37 +52,49 @@ RSpec.describe ::EacRubyUtils::Envs::Command do
     end
   end
 
+  describe '#and' do
+    it do
+      assert_execute_result(ok_command.and(error_command).execute, false, ok_command_output)
+    end
+
+    it do
+      assert_execute_result(error_command.and(ok_command).execute, false, '')
+    end
+  end
+
+  describe '#before' do
+    it do
+      assert_execute_result(ok_command.before(error_command).execute, false, ok_command_output)
+    end
+
+    it do
+      assert_execute_result(error_command.before(ok_command).execute, false, '')
+    end
+  end
+
   describe '#or' do
     it do
-      expect(ok_command.or(error_command).execute).to(
-        eq({ command: 'echo -n THE\\ OUTPUT || cat a_file_that_not_exists',
-             stdout: ok_command_output, stderr: '', exit_code: 0 })
-      )
+      assert_execute_result(ok_command.or(error_command).execute, true, ok_command_output)
     end
 
     it do
-      expect(error_command.or(ok_command).execute).to(
-        eq({ command: 'cat a_file_that_not_exists || echo -n THE\\ OUTPUT',
-             stdout: ok_command_output,
-             stderr: "cat: a_file_that_not_exists: No such file or directory\n", exit_code: 0 })
-      )
+      assert_execute_result(error_command.or(ok_command).execute, true, ok_command_output)
     end
   end
 
   describe '#pipe' do
     it do
-      expect(ok_command.pipe(error_command).execute).to(
-        eq({ command: 'echo -n THE\\ OUTPUT | cat a_file_that_not_exists', stdout: '',
-             stderr: "cat: a_file_that_not_exists: No such file or directory\n", exit_code: 256 })
-      )
+      assert_execute_result(ok_command.pipe(error_command).execute, false, '')
     end
 
     it do
-      expect(error_command.pipe(ok_command).execute).to(
-        eq({ command: 'cat a_file_that_not_exists | echo -n THE\\ OUTPUT',
-             stdout: ok_command_output,
-             stderr: "cat: a_file_that_not_exists: No such file or directory\n", exit_code: 0 })
-      )
+      assert_execute_result(error_command.pipe(ok_command).execute, false, ok_command_output)
     end
   end
+
+  def assert_execute_result(actual, expected_successful, expected_stdout)
+    expect(successful: actual.fetch(:exit_code).zero?, stdout: actual.fetch(:stdout)).to(
+      eq(successful: expected_successful, stdout: expected_stdout)
+    )
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.47.0
+  version: 0.47.2
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-23 00:00:00.000000000 Z
+date: 2022-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.58'
+        version: '0.57'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.58'
+        version: '0.57'
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,46 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: avm-eac_postgresql_base0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+- !ruby/object:Gem::Dependency
+  name: avm-eac_python_base0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_rails_base0
   requirement: !ruby/object:Gem::Requirement
@@ -157,7 +197,7 @@ dependencies:
         version: '0.27'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.27.1
+        version: 0.27.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -167,7 +207,7 @@ dependencies:
         version: '0.27'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.27.1
+        version: 0.27.3
 - !ruby/object:Gem::Dependency
   name: avm-eac_webapp_base0
   requirement: !ruby/object:Gem::Requirement
@@ -217,7 +257,7 @@ dependencies:
         version: '0.142'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.142.6
+        version: 0.142.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -227,21 +267,21 @@ dependencies:
         version: '0.142'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.142.6
+        version: 0.142.7
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.108'
+        version: '0.109'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.108'
+        version: '0.109'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -686,6 +726,7 @@ files:
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/rubygems/version_file_spec_files/a_version_file.rb
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/runners/base/rubocop_spec.rb
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/runners/base/rubocop_spec_files/dir1/dir3/Gemfile
+- sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/runners/base/rubocop_spec_files/dir1/dir3/Gemfile.lock
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/runners/base/rubocop_spec_files/dir2/empty.rb
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/runners/base/rubocop_spec_files/dir4/false_command.rb
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_generators/base_spec.rb
@@ -707,6 +748,7 @@ files:
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_generators/base_spec_files/mygem/spec/spec_helper.rb
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/sources/base/bundler_spec.rb
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/sources/base/bundler_spec_files/mygem/Gemfile
+- sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/sources/base/bundler_spec_files/mygem/Gemfile.lock
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/sources/base/bundler_spec_files/mygem/Rakefile
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/sources/base/bundler_spec_files/mygem/exe/myrunner
 - sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/sources/base/bundler_spec_files/mygem/lib/mygem.rb
@@ -1594,14 +1636,17 @@ files:
 - sub/eac_ruby_utils/lib/eac_ruby_utils/custom_format.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/enum.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/envs.rb
+- sub/eac_ruby_utils/lib/eac_ruby_utils/envs/base_command.rb
+- sub/eac_ruby_utils/lib/eac_ruby_utils/envs/base_command/append_command_options.rb
+- sub/eac_ruby_utils/lib/eac_ruby_utils/envs/base_command/concat.rb
+- sub/eac_ruby_utils/lib/eac_ruby_utils/envs/base_command/debugging.rb
+- sub/eac_ruby_utils/lib/eac_ruby_utils/envs/base_command/execution.rb
+- sub/eac_ruby_utils/lib/eac_ruby_utils/envs/base_command/extra_options.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/envs/base_env.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/envs/command.rb
-- sub/eac_ruby_utils/lib/eac_ruby_utils/envs/command/append_command_options.rb
-- sub/eac_ruby_utils/lib/eac_ruby_utils/envs/command/concat.rb
-- sub/eac_ruby_utils/lib/eac_ruby_utils/envs/command/debugging.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/envs/command/envvars.rb
-- sub/eac_ruby_utils/lib/eac_ruby_utils/envs/command/execution.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/envs/command/extra_options.rb
+- sub/eac_ruby_utils/lib/eac_ruby_utils/envs/composite_command.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/envs/executable.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/envs/execution_error.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/envs/execution_result.rb