eac_tools 0.46.0 → 0.47.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42d2af3ec5802d3d4deaef86b0e225332d92bb079767121a8601d0d7a9765418
-  data.tar.gz: 062b466f4a749f6094769ede0583d1bd574f73ae05ffa30e0aeaa8a167e6ea2b
+  metadata.gz: 3418d6903a368e33472395b53a332d45ba663fef893c5e657f68ccb5bfc22c17
+  data.tar.gz: 53b2d9b4c6a88ae9371176752c14bcaa623537f685f9400080c61ec274cee36e
 SHA512:
-  metadata.gz: ae897ed254a4902dd543c1644015ee6f4ed269bd401949594cd8c5bfc764d9abce299cdbe4a9c6a04de72ec8f0870c93e617d36b39e7c83b202058970dd5f94b
-  data.tar.gz: 349afc035604be730dec4bc4a1ebf9ef670dc15c27364f2abe4a752d853c8a2f4a689493f087f86598434d886900d0d81cb26409970dba895f8e7028c92d7869
+  metadata.gz: 37e4b8af6160ac8056ad0c724639b304260ce2c4b47fb405488a8fa529d01d3535264b0b28a06bff17f4adfd62eb47253f4d81c20e52e77637100ff05937aa05
+  data.tar.gz: 1c72ca7d308189e28abc9bd8b1f01ff7d02a74841bffe80374f43fd9da5be792c6c90fce48ceef451bff95f56117fe95f5dde5d3869393696d2d8ae4dece2edf

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.46.0)
-      avm (~> 0.57)
+    eac_tools (0.47.0)
+      avm (~> 0.58)
       avm-eac_asciidoctor_base0 (~> 0.12)
       avm-eac_generic_base0 (~> 0.8)
       avm-eac_latex_base0 (~> 0.3)
-      avm-eac_php_base0 (~> 0.3)
+      avm-eac_php_base0 (~> 0.4)
       avm-eac_rails_base0 (~> 0.8, >= 0.8.1)
       avm-eac_rails_base1 (~> 0.7, >= 0.7.1)
       avm-eac_redmine_base0 (~> 0.17)
@@ -15,7 +15,7 @@ PATH
       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.107, >= 0.107.1)
+      eac_ruby_utils (~> 0.108)
 
 PATH
   remote: sub/aranha-parsers
@@ -58,9 +58,10 @@ PATH
 PATH
   remote: sub/avm-eac_php_base0
   specs:
-    avm-eac_php_base0 (0.3.0)
-      avm-eac_generic_base0 (~> 0.7)
-      eac_ruby_utils (~> 0.106)
+    avm-eac_php_base0 (0.4.0)
+      avm-eac_generic_base0 (~> 0.8)
+      avm-eac_webapp_base0 (~> 0.12, >= 0.12.3)
+      eac_ruby_utils (~> 0.108)
 
 PATH
   remote: sub/avm-eac_postgresql_base0
@@ -152,11 +153,11 @@ PATH
 PATH
   remote: sub/avm-git
   specs:
-    avm-git (0.10.0)
-      avm (~> 0.54)
+    avm-git (0.10.1)
+      avm (~> 0.57)
       avm-files (~> 0.6)
-      eac_git (~> 0.13)
-      eac_ruby_utils (~> 0.106, >= 0.106.1)
+      eac_git (~> 0.14)
+      eac_ruby_utils (~> 0.108)
       git (~> 1.12)
 
 PATH
@@ -242,7 +243,7 @@ PATH
 PATH
   remote: sub/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.107.1)
+    eac_ruby_utils (0.108.0)
       activesupport (>= 4, < 7)
       addressable (~> 2.8, >= 2.8.1)
       bundler
@@ -337,7 +338,7 @@ GEM
     parslet (2.0.0)
     public_suffix (5.0.0)
     racc (1.6.0)
-    rack (3.0.0)
+    rack (3.0.1)
     rainbow (3.1.1)
     rchardet (1.8.0)
     rexml (3.2.5)

data/lib/eac_tools/version.rb

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

data/sub/avm-eac_php_base0/avm-eac_php_base0.gemspec

@@ -12,8 +12,9 @@ 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 'avm-eac_webapp_base0', '~> 0.12', '>= 0.12.3'
+  s.add_dependency 'eac_ruby_utils', '~> 0.108'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5', '>= 0.5.1'
 end

data/sub/avm-eac_php_base0/lib/avm/eac_php_base0/instances/base.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/instances/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacPhpBase0
+    module Instances
+      class Base < ::Avm::EacWebappBase0::Instances::Base
+        FILES_UNITS = {}.freeze
+      end
+    end
+  end
+end

data/sub/avm-eac_php_base0/lib/avm/eac_php_base0/instances.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacPhpBase0
+    module Instances
+      require_sub __FILE__
+    end
+  end
+end

data/sub/avm-eac_php_base0/lib/avm/eac_php_base0/source_generators/base.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'avm/source_generators/base'
+require 'eac_templates/core_ext'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacPhpBase0
+    module SourceGenerators
+      class Base < ::Avm::SourceGenerators::Base
+        OPTIONS = {}.freeze
+
+        enable_speaker
+        enable_simple_cache
+
+        class << self
+          def option_list
+            OPTIONS.inject(super) { |a, e| a.option(*e) }
+          end
+        end
+
+        def perform
+          template.apply(self, target_path)
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_php_base0/lib/avm/eac_php_base0/source_generators.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacPhpBase0
+    module SourceGenerators
+      require_sub __FILE__
+    end
+  end
+end

data/sub/avm-eac_php_base0/lib/avm/eac_php_base0/sources/base.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/sources/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacPhpBase0
+    module Sources
+      class Base < ::Avm::EacWebappBase0::Sources::Base
+        # @return [Boolean]
+        def valid?
+          path.glob('*.php').any?(&:file?)
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_php_base0/lib/avm/eac_php_base0/sources.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacPhpBase0
+    module Sources
+      require_sub __FILE__
+    end
+  end
+end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacPhpBase0
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
 end

data/sub/avm-eac_php_base0/spec/lib/avm/eac_php_base0/source_generators/base_spec.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require 'avm/eac_php_base0/source_generators/base'
+require 'avm/source_generators/runner'
+
+RSpec.describe ::Avm::EacPhpBase0::SourceGenerators::Base do
+  include_examples 'avm_source_generated', __FILE__, 'EacPhpBase0'
+end

data/sub/avm-eac_php_base0/spec/lib/avm/eac_php_base0/sources/base_spec.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'avm/eac_php_base0/sources/base'
+
+::RSpec.describe ::Avm::EacPhpBase0::Sources::Base do
+  include_examples 'in_avm_registry', 'sources'
+end

data/sub/avm-git/avm-git.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'avm', '~> 0.54'
+  s.add_dependency 'avm', '~> 0.57'
   s.add_dependency 'avm-files', '~> 0.6'
-  s.add_dependency 'eac_git', '~> 0.13'
-  s.add_dependency 'eac_ruby_utils', '~> 0.106', '>= 0.106.1'
+  s.add_dependency 'eac_git', '~> 0.14'
+  s.add_dependency 'eac_ruby_utils', '~> 0.108'
   s.add_dependency 'git', '~> 1.12'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.8', '>= 0.8.5'

data/sub/avm-git/lib/avm/git/launcher/base/underlying.rb

@@ -23,7 +23,7 @@ module Avm
             define_method exec_type do |*args|
               begin
                 command(*args).send(exec_type)
-              rescue ::EacRubyUtils::Envs::Command::ExecError
+              rescue ::EacRubyUtils::Envs::ExecutionError
                 raise ::Avm::Git::Launcher::Error
               end
             end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Git
-    VERSION = '0.10.0'
+    VERSION = '0.10.1'
   end
 end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/envs/command/append_command_options.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'shellwords'
+
+module EacRubyUtils
+  module Envs
+    class Command
+      class AppendCommandOptions
+        enable_method_class
+        common_constructor :command, :command_line, :options
+
+        def result
+          r = command_line
+          r = input.command + ' | ' + r if input
+          r = "cat #{Shellwords.escape(input_file)} | #{r}" if input_file
+          r += ' > ' + Shellwords.escape(output_file) if output_file
+          r
+        end
+
+        # @return [EacRubyUtils::Envs::Command, nil]
+        def input
+          options[:input]
+        end
+
+        # @return [Pathname,  nil]
+        def input_file
+          options[:input_file].if_present(&:to_pathname)
+        end
+
+        # @return [Pathname, nil]
+        def output_file
+          options[:output_file].if_present(&:to_pathname)
+        end
+      end
+    end
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/envs/command/concat.rb

@@ -6,18 +6,33 @@ module EacRubyUtils
   module Envs
     class Command
       module Concat
+        AND_OPERATOR = '&&'
+        BEFORE_OPERATOR = ';'
+        OR_OPERATOR = '||'
+        PIPE_OPERATOR = '|'
+
         def concat(operator, other_command)
           duplicate_by_extra_options(concat: ::EacRubyUtils::Struct.new(
             operator: operator, command: other_command
           ))
         end
 
+        # @return [EacRubyUtils::Envs::Command]
+        def and(other_command)
+          concat(AND_OPERATOR, other_command)
+        end
+
+        # @return [EacRubyUtils::Envs::Command]
+        def before(other_command)
+          concat(BEFORE_OPERATOR, other_command)
+        end
+
         def or(other_command)
-          concat('||', other_command)
+          concat(OR_OPERATOR, other_command)
         end
 
         def pipe(other_command)
-          concat('|', other_command)
+          concat(PIPE_OPERATOR, other_command)
         end
 
         private

data/sub/eac_ruby_utils/lib/eac_ruby_utils/envs/command/debugging.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module EacRubyUtils
+  module Envs
+    class Command
+      module Debugging
+        def debug?
+          ENV['DEBUG'].to_s.strip != ''
+        end
+
+        # Print a message if debugging is enabled.
+        def debug_print(message)
+          message = message.to_s
+          puts message.if_respond(:light_red, message) if debug?
+        end
+      end
+    end
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/envs/command/envvars.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/core_ext'
+require 'shellwords'
+
 module EacRubyUtils
   module Envs
     class Command

data/sub/eac_ruby_utils/lib/eac_ruby_utils/envs/command/execution.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/envs/execution_error'
+require 'eac_ruby_utils/envs/execution_result'
+require 'eac_ruby_utils/envs/process'
+require 'eac_ruby_utils/envs/spawn'
+require 'pp'
+
+module EacRubyUtils
+  module Envs
+    class Command
+      module Execution
+        def execute!(options = {})
+          options[:exit_outputs] = status_results.merge(options[:exit_outputs].presence || {})
+          er = ::EacRubyUtils::Envs::ExecutionResult.new(execute(options), options)
+          return er.result if er.success?
+
+          raise ::EacRubyUtils::Envs::ExecutionError,
+                "execute! command failed: #{self}\n#{er.r.pretty_inspect}"
+        end
+
+        def execute(options = {})
+          c = command(options)
+          debug_print("BEFORE: #{c}")
+          t1 = Time.now
+          r = ::EacRubyUtils::Envs::Process.new(c).to_h
+          i = Time.now - t1
+          debug_print("AFTER [#{i}]: #{c}")
+          r
+        end
+
+        def spawn(options = {})
+          c = command(options)
+          debug_print("SPAWN: #{c}")
+          ::EacRubyUtils::Envs::Spawn.new(c)
+        end
+
+        def system!(options = {})
+          return if system(options)
+
+          raise ::EacRubyUtils::Envs::ExecutionError, "system! command failed: #{self}"
+        end
+
+        def system(options = {})
+          c = command(options)
+          debug_print(c)
+          Kernel.system(c)
+        end
+      end
+    end
+  end
+end

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

@@ -1,128 +1,72 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/envs/process'
-require 'eac_ruby_utils/envs/spawn'
-require 'pp'
 require 'shellwords'
 
 module EacRubyUtils
   module Envs
     class Command
-      require_sub __FILE__, include_modules: true
-
-      def initialize(env, command, extra_options = {})
-        @env = env
-        @extra_options = extra_options.with_indifferent_access
-        if command.count == 1 && command.first.is_a?(Array)
-          @command = command.first
-        elsif command.is_a?(Array)
-          @command = command
-        else
-          raise "Invalid argument command: #{command}|#{command.class}"
+      require_sub __FILE__, include_modules: true, require_dependency: true
+
+      class << self
+        # @param command [Array]
+        # @return [Array]
+        def sanitize_initialize_arguments(arguments)
+          if arguments.count == 1 && arguments.first.is_a?(Array)
+            arguments.first
+          elsif arguments.is_a?(Array)
+            arguments
+          else
+            raise "Invalid argument command: #{arguments}|#{arguments.class}"
+          end
         end
       end
 
-      def args
-        @command
+      common_constructor :env, :args, :extra_options, default: [{}] do
+        self.extra_options = extra_options.with_indifferent_access
+        self.args = self.class.sanitize_initialize_arguments(args)
       end
 
       def append(args)
-        duplicate_by_command(@command + args)
+        duplicate_by_command(self.args + args)
       end
 
       def prepend(args)
-        duplicate_by_command(args + @command)
+        duplicate_by_command(args + self.args)
       end
 
       def to_s
-        "#{@command} [ENV: #{@env}]"
+        "#{args} [ENV: #{env}]"
       end
 
       def command(options = {})
-        c = @command
-        c = c.map { |x| escape(x) }.join(' ') if c.is_a?(Enumerable)
         append_command_options(
-          @env.command_line(
-            append_chdir(append_concat(append_envvars(c)))
-          ),
+          env.command_line(command_line_without_env),
           options
         )
       end
 
-      def execute!(options = {})
-        options[:exit_outputs] = status_results.merge(options[:exit_outputs].presence || {})
-        er = ExecuteResult.new(execute(options), options)
-        return er.result if er.success?
-
-        raise ::EacRubyUtils::Envs::Command::ExecError,
-              "execute! command failed: #{self}\n#{er.r.pretty_inspect}"
-      end
-
-      def execute(options = {})
-        c = command(options)
-        debug_print("BEFORE: #{c}")
-        t1 = Time.now
-        r = ::EacRubyUtils::Envs::Process.new(c).to_h
-        i = Time.now - t1
-        debug_print("AFTER [#{i}]: #{c}")
-        r
-      end
-
-      def spawn(options = {})
-        c = command(options)
-        debug_print("SPAWN: #{c}")
-        ::EacRubyUtils::Envs::Spawn.new(c)
-      end
-
-      def system!(options = {})
-        return if system(options)
-
-        raise ::EacRubyUtils::Envs::Command::ExecError, "system! command failed: #{self}"
-      end
-
-      def system(options = {})
-        c = command(options)
-        debug_print(c)
-        Kernel.system(c)
+      # @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)))
       end
 
       protected
 
       def duplicate(command, extra_options)
-        self.class.new(@env, command, extra_options)
+        self.class.new(env, command, extra_options)
       end
 
       private
 
-      attr_reader :extra_options
-
       def duplicate_by_command(new_command)
-        duplicate(new_command, @extra_options)
+        duplicate(new_command, extra_options)
       end
 
       def duplicate_by_extra_options(set_extra_options)
-        duplicate(@command, @extra_options.merge(set_extra_options))
-      end
-
-      def debug?
-        ENV['DEBUG'].to_s.strip != ''
-      end
-
-      # Print a message if debugging is enabled.
-      def debug_print(message)
-        message = message.to_s
-        puts message.if_respond(:light_red, message) if debug?
-      end
-
-      def append_command_options(command, options)
-        command = options[:input].command + ' | ' + command if options[:input]
-        if options[:input_file]
-          command = "cat #{Shellwords.escape(options[:input_file])}" \
-            " | #{command}"
-        end
-        command += ' > ' + Shellwords.escape(options[:output_file]) if options[:output_file]
-        command
+        duplicate(args, extra_options.merge(set_extra_options))
       end
 
       def escape(arg)

data/sub/eac_ruby_utils/lib/eac_ruby_utils/envs/{command/exec_error.rb → execution_error.rb}

@@ -2,9 +2,7 @@
 
 module EacRubyUtils
   module Envs
-    class Command
-      class ExecError < ::RuntimeError
-      end
+    class ExecutionError < ::RuntimeError
     end
   end
 end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/envs/execution_result.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/envs/execution_error'
+
+module EacRubyUtils
+  module Envs
+    class ExecutionResult
+      attr_reader :r, :options
+
+      def initialize(result, options)
+        @r = result
+        @options = options
+      end
+
+      def result
+        return exit_code_zero_result if exit_code_zero?
+        return expected_error_result if expected_error?
+
+        raise ::EacRubyUtils::Envs::ExecutionError, 'Failed!'
+      end
+
+      def success?
+        exit_code_zero? || expected_error?
+      end
+
+      private
+
+      def exit_code_zero?
+        r[:exit_code]&.zero?
+      end
+
+      def exit_code_zero_result
+        r[options[:output] || :stdout]
+      end
+
+      def expected_error_result
+        options[:exit_outputs][r[:exit_code]]
+      end
+
+      def expected_error?
+        options[:exit_outputs].is_a?(Hash) && options[:exit_outputs].key?(r[:exit_code])
+      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.107.1'
+  VERSION = '0.108.0'
 end

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

@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/envs/command'
+require 'eac_ruby_utils/envs/executable'
+require 'eac_ruby_utils/envs/local_env'
+
+RSpec.describe ::EacRubyUtils::Envs::Command do
+  let(:env) { ::EacRubyUtils::Envs::LocalEnv.new }
+  let(:echo) { env.executable('echo', '--version') }
+  let(:cat) { env.executable('cat', '--version') }
+  let(:not_existing_file) { ::Pathname.new('a_file_that_not_exists') }
+  let(:ok_command) { echo.command('-n', ok_command_output) }
+  let(:ok_command_output) { 'THE OUTPUT' }
+  let(:error_command) { cat.command(not_existing_file) }
+
+  it { expect(echo).to exist }
+  it { expect(cat).to exist }
+  it { expect(not_existing_file).not_to exist }
+
+  describe '#execute' do
+    it do
+      expect(ok_command.execute).to(
+        eq({ command: 'echo -n THE\\ OUTPUT', stdout: ok_command_output, stderr: '', exit_code: 0 })
+      )
+    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 })
+      )
+    end
+  end
+
+  describe '#execute!' do
+    it { expect(ok_command.execute!).to eq(ok_command_output) }
+
+    it do
+      expect { error_command.execute! }.to(
+        raise_error(::EacRubyUtils::Envs::ExecutionError)
+      )
+    end
+  end
+
+  describe '#system' do
+    it { expect(ok_command.system).to eq(true) }
+    it { expect(error_command.system).to eq(false) }
+  end
+
+  describe '#system!' do
+    it { expect { ok_command.system! }.not_to raise_error }
+
+    it do
+      expect { error_command.system! }.to(
+        raise_error(::EacRubyUtils::Envs::ExecutionError)
+      )
+    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 })
+      )
+    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 })
+      )
+    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 })
+      )
+    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 })
+      )
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.46.0
+  version: 0.47.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-16 00:00:00.000000000 Z
+date: 2022-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.57'
+        version: '0.58'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.57'
+        version: '0.58'
 - !ruby/object:Gem::Dependency
   name: avm-eac_asciidoctor_base0
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: avm-eac_rails_base0
   requirement: !ruby/object:Gem::Requirement
@@ -234,20 +234,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.107'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.107.1
+        version: '0.108'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.107'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.107.1
+        version: '0.108'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -420,6 +414,12 @@ files:
 - sub/avm-eac_php_base0/lib/avm/eac_php_base0/executables.rb
 - sub/avm-eac_php_base0/lib/avm/eac_php_base0/file_formats.rb
 - sub/avm-eac_php_base0/lib/avm/eac_php_base0/file_formats/base.rb
+- sub/avm-eac_php_base0/lib/avm/eac_php_base0/instances.rb
+- sub/avm-eac_php_base0/lib/avm/eac_php_base0/instances/base.rb
+- sub/avm-eac_php_base0/lib/avm/eac_php_base0/source_generators.rb
+- sub/avm-eac_php_base0/lib/avm/eac_php_base0/source_generators/base.rb
+- sub/avm-eac_php_base0/lib/avm/eac_php_base0/sources.rb
+- sub/avm-eac_php_base0/lib/avm/eac_php_base0/sources/base.rb
 - sub/avm-eac_php_base0/lib/avm/eac_php_base0/version.rb
 - sub/avm-eac_php_base0/spec/lib/avm/eac_php_base0/file_formats/base_spec.rb
 - sub/avm-eac_php_base0/spec/lib/avm/eac_php_base0/file_formats/base_spec_files/php_code.php.source
@@ -430,8 +430,12 @@ files:
 - sub/avm-eac_php_base0/spec/lib/avm/eac_php_base0/file_formats/base_spec_files/php_html_code.php.target
 - sub/avm-eac_php_base0/spec/lib/avm/eac_php_base0/file_formats/base_spec_files/php_iso88591_code.php.source
 - sub/avm-eac_php_base0/spec/lib/avm/eac_php_base0/file_formats/base_spec_files/php_iso88591_code.php.target
+- sub/avm-eac_php_base0/spec/lib/avm/eac_php_base0/source_generators/base_spec.rb
+- sub/avm-eac_php_base0/spec/lib/avm/eac_php_base0/source_generators/base_spec_files/no_options/index.php
+- sub/avm-eac_php_base0/spec/lib/avm/eac_php_base0/sources/base_spec.rb
 - sub/avm-eac_php_base0/spec/rubocop_spec.rb
 - sub/avm-eac_php_base0/spec/spec_helper.rb
+- sub/avm-eac_php_base0/template/avm/eac_php_base0/source_generators/base/index.php
 - sub/avm-eac_postgresql_base0/Gemfile
 - sub/avm-eac_postgresql_base0/avm-eac_postgresql_base0.gemspec
 - sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0.rb
@@ -1592,12 +1596,15 @@ files:
 - sub/eac_ruby_utils/lib/eac_ruby_utils/envs.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/exec_error.rb
-- sub/eac_ruby_utils/lib/eac_ruby_utils/envs/command/execute_result.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/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
 - sub/eac_ruby_utils/lib/eac_ruby_utils/envs/file.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/envs/local_env.rb
 - sub/eac_ruby_utils/lib/eac_ruby_utils/envs/process.rb
@@ -1743,6 +1750,7 @@ files:
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/compare_by_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/custom_format_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/enum_spec.rb
+- sub/eac_ruby_utils/spec/lib/eac_ruby_utils/envs/command_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/envs/executable_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/envs/ssh_env_spec.rb
 - sub/eac_ruby_utils/spec/lib/eac_ruby_utils/fs/extname_spec.rb

data/sub/eac_ruby_utils/lib/eac_ruby_utils/envs/command/execute_result.rb

@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/envs/command/exec_error'
-
-module EacRubyUtils
-  module Envs
-    class Command
-      class ExecuteResult
-        attr_reader :r, :options
-
-        def initialize(result, options)
-          @r = result
-          @options = options
-        end
-
-        def result
-          return exit_code_zero_result if exit_code_zero?
-          return expected_error_result if expected_error?
-
-          raise ::EacRubyUtils::Envs::Command::ExecError, 'Failed!'
-        end
-
-        def success?
-          exit_code_zero? || expected_error?
-        end
-
-        private
-
-        def exit_code_zero?
-          r[:exit_code]&.zero?
-        end
-
-        def exit_code_zero_result
-          r[options[:output] || :stdout]
-        end
-
-        def expected_error_result
-          options[:exit_outputs][r[:exit_code]]
-        end
-
-        def expected_error?
-          options[:exit_outputs].is_a?(Hash) && options[:exit_outputs].key?(r[:exit_code])
-        end
-      end
-    end
-  end
-end