eac_tools 0.45.2 → 0.47.0

data/sub/avm-eac_redmine_plugin_base0/lib/avm/eac_redmine_plugin_base0/sources/init_file.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedminePluginBase0
+    module Sources
+      class InitFile
+        common_constructor :path
+
+        VERSION_LINE_PATTERN = /\A(\s*)version\s*[\'\"]([^\'\"]+)[\'\"](\s*)\z/.freeze
+
+        def version
+          path.read.each_line.lazy.map { |line| line_value(line) }.find { |v| v }
+        end
+
+        def version=(new_value)
+          path.write(new_value_content(new_value))
+        end
+
+        private
+
+        # @return Version found in line, nil otherwise.
+        def line_value(line)
+          VERSION_LINE_PATTERN.if_match(line.rstrip, false) { |m| ::Gem::Version.new(m[2]) }
+        end
+
+        def new_value_content(new_value)
+          path.read.each_line
+              .map { |line| new_value_line(line, new_value) }
+              .join
+        end
+
+        def new_value_line(line, new_value)
+          m = VERSION_LINE_PATTERN.match(line)
+          return line unless m
+
+          "#{m[1]}version '#{new_value}'"
+        end
+      end
+    end
+  end
+end

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

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

data/sub/avm-eac_redmine_plugin_base0/spec/lib/avm/eac_redmine_plugin_base0/sources/init_file_spec.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'avm/eac_redmine_plugin_base0/sources/init_file'
+
+::RSpec.describe ::Avm::EacRedminePluginBase0::Sources::InitFile do
+  let(:stubs_dir) { ::Pathname.new(__dir__).join('init_file_spec_files') }
+  let(:stub_file) { stubs_dir.join('a_init_file.rb') }
+  let(:instance) { described_class.new(stub_file) }
+  let(:target_version) { ::Gem::Version.new('0.16.0') }
+
+  describe '#version' do
+    it { expect(instance.version).to eq(target_version) }
+  end
+end

data/sub/avm-eac_redmine_plugin_base0/spec/lib/avm/eac_redmine_plugin_base0/sources/init_file_spec_files/a_init_file.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'redmine'
+
+Redmine::Plugin.register :redmine_installer do
+  name 'Redmine Installer'
+  author 'Eduardo Henrique Bogoni'
+  description 'Installer for Redmine.'
+  url 'https://github.com/esquilo-azul/redmine_installer'
+  author_url 'https://github.com/eduardobogoni/'
+  version '0.16.0'
+end

data/sub/avm-eac_webapp_base0/avm-eac_webapp_base0.gemspec

@@ -12,12 +12,12 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.54'
+  s.add_dependency 'avm', '~> 0.57'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.8'
-  s.add_dependency 'avm-eac_postgresql_base0', '~> 0.2'
+  s.add_dependency 'avm-eac_postgresql_base0', '~> 0.2', '>= 0.2.1'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
   s.add_dependency 'avm-files', '~> 0.6'
-  s.add_dependency 'eac_ruby_utils', '~> 0.106', '>= 0.106.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.107', '>= 0.107.1'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

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

@@ -2,8 +2,8 @@
 
 require 'avm/instances/base'
 require 'avm/eac_postgresql_base0/instance_with'
-require 'avm/data/instance/files_unit'
-require 'avm/data/instance/package'
+require 'avm/instances/data/files_unit'
+require 'avm/instances/data/package'
 require 'avm/eac_webapp_base0/instances/deploy/file_unit'
 require 'avm/eac_webapp_base0/instances/runners'
 require 'avm/eac_ubuntu_base0/instances/base'
@@ -34,7 +34,7 @@ module Avm
         end
 
         def data_package
-          @data_package ||= ::Avm::Data::Instance::Package.new(
+          @data_package ||= ::Avm::Instances::Data::Package.new(
             self, units: { database: database_unit }.merge(files_units)
           )
         end
@@ -52,7 +52,7 @@ module Avm
 
         def files_units
           self.class.const_get('FILES_UNITS').transform_values do |fs_path_subpath|
-            ::Avm::Data::Instance::FilesUnit.new(self, fs_path_subpath)
+            ::Avm::Instances::Data::FilesUnit.new(self, fs_path_subpath)
           end
         end
       end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWebappBase0
-    VERSION = '0.12.2'
+    VERSION = '0.12.3'
   end
 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