eac_tools 0.46.0 → 0.47.1

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/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/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,134 +1,66 @@
 # 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'
+require 'eac_ruby_utils/envs/base_command'
 
 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
+      include ::EacRubyUtils::Envs::BaseCommand
+
+      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
+      # @return [String]
+      def command_line_without_env
+        c = args
         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)))
-          ),
-          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)
+        append_chdir(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
-      end
-
-      def escape(arg)
-        arg = arg.to_s
-        m = /^\@ESC_(.+)$/.match(arg)
-        m ? m[1] : Shellwords.escape(arg)
+        duplicate(args, extra_options.merge(set_extra_options))
       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/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.109.0'
 end

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

@@ -0,0 +1,100 @@
+# 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
+      assert_execute_result(ok_command.execute, true, ok_command_output)
+    end
+
+    it do
+      assert_execute_result(error_command.execute, false, '')
+    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 '#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
+      assert_execute_result(ok_command.or(error_command).execute, true, ok_command_output)
+    end
+
+    it do
+      assert_execute_result(error_command.or(ok_command).execute, true, ok_command_output)
+    end
+  end
+
+  describe '#pipe' do
+    it do
+      assert_execute_result(ok_command.pipe(error_command).execute, false, '')
+    end
+
+    it do
+      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.46.0
+  version: 0.47.1
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-16 00:00:00.000000000 Z
+date: 2022-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -72,14 +72,34 @@ 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_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_rails_base0
   requirement: !ruby/object:Gem::Requirement
@@ -217,7 +237,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,27 +247,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.107'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.107.1
+        version: '0.109'
   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.109'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -420,6 +434,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 +450,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
@@ -1590,14 +1614,20 @@ 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/concat.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/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
 - 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 +1773,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/concat.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/struct'
-
-module EacRubyUtils
-  module Envs
-    class Command
-      module Concat
-        def concat(operator, other_command)
-          duplicate_by_extra_options(concat: ::EacRubyUtils::Struct.new(
-            operator: operator, command: other_command
-          ))
-        end
-
-        def or(other_command)
-          concat('||', other_command)
-        end
-
-        def pipe(other_command)
-          concat('|', 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
-end

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