avm-tools 0.76.0 → 0.80.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 523777fd378f3ba655e65b12e452660f192e2875791439146808c472ee5cd982
-  data.tar.gz: 253dabfb78beaefa4b40dcfe6f669ae0e74761cb63a2e3418fda41ca8e107d2f
+  metadata.gz: '0517668b390f4bfcd0ade6b28b127de99e7b309e54633353bae6a0e558c36054'
+  data.tar.gz: d6cb8cb3880f9929fe7f5bea9ed794934a50e2aed96fccbe4c1f42c5cc2e2524
 SHA512:
-  metadata.gz: 7208ff787a4d219d9a66b9e6e978dbf51cb142ea6af94b4347f9fc7f56c478962113b775896d52351fc35bea6fad3b796c9d5387af70c491a56542cd42872d25
-  data.tar.gz: 77004875dc073ea43aca01a5a3c4bbbf178fed773056bae70206745ce6d677ebfdf797871a0e5a8196eac1fd30774ab49e0e6b7503009abc22e0f278e5e6aaf0
+  metadata.gz: f46b14fadb4d557a6e3af527649b9237b7e2281af7828bc646c031c326f9441d2720e07d878b161c42de90d0770edaf1df67b006b77b233b1a1b21352e346903
+  data.tar.gz: 8e2bf840b44027bfbe263607654e11ae4557d0bdbb0867e3cfad51f823f7e9427205c3ed296461c2c5414d354ad505d64e3a76a37256175d21bc5f947cbeaf8f

data/lib/avm/patches/class/i18n.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'avm/patches/i18n'
+
+class Class
+  TRANSLATE_LOCALE_KEY = :__locale
+
+  def translate(entry_suffix, values = {})
+    on_i18n_locale(values.delete(TRANSLATE_LOCALE_KEY)) do
+      ::I18n.translate(translate_entry_full(entry_suffix), values)
+    end
+  end
+
+  def translate_entry_full(entry_suffix)
+    "#{translate_entry_self_prefix}.#{entry_suffix}"
+  end
+
+  def translate_entry_self_prefix
+    name.underscore.gsub('/', '.')
+  end
+
+  def on_i18n_locale(locale)
+    old_locale = ::I18n.locale
+    begin
+      ::I18n.locale = locale
+      yield
+    ensure
+      ::I18n.locale = old_locale
+    end
+  end
+end

data/lib/avm/patches/object/i18n.rb

@@ -1,17 +1,9 @@
 # frozen_string_literal: true
 
-require 'avm/patches/i18n'
+require 'avm/patches/class/i18n'
 
 class Object
   def translate(entry_suffix, values = {})
-    ::I18n.translate(translate_entry_full(entry_suffix), values)
-  end
-
-  def translate_entry_full(entry_suffix)
-    "#{translate_entry_self_prefix}.#{entry_suffix}"
-  end
-
-  def translate_entry_self_prefix
-    self.class.name.underscore.gsub('/', '.')
+    self.class.translate(entry_suffix, values)
   end
 end

data/lib/avm/projects/stereotypes/ruby_gem/update.rb

@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
+require 'avm/patches/class/i18n'
 
 module Avm
   module Projects
     module Stereotypes
       class RubyGem
         class Update
+          TRANSLATE_CLASS = self
+
           enable_console_speaker
           common_constructor :instance
 
@@ -46,7 +49,7 @@ module Avm
           end
 
           def gemfile_lock_commit_message
-            'Todas as gems: atualiza.'
+            TRANSLATE_CLASS.translate(__method__, __locale: instance.locale)
           end
 
           def gemfile_lock_changed?

data/lib/avm/projects/stereotypes/ruby_gem/version_bump.rb

@@ -47,8 +47,7 @@ module Avm
           end
 
           def git_commit_message
-            ::I18n.default_locale = instance.locale
-            translate(__method__, version: target_version)
+            translate(__method__, version: target_version, __locale: instance.locale)
           end
 
           def changing_files

data/lib/avm/tools/runner/eac_redmine_base0/project_rename.rb

@@ -1,23 +1,20 @@
 # frozen_string_literal: true
 
+require 'eac_cli/core_ext'
 require 'avm/eac_rails_base1/runner/code_runner'
-require 'eac_cli/default_runner'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class EacRedmineBase0 < ::Avm::EacRailsBase1::Runner
-        class ProjectRename < ::Avm::EacRailsBase1::Runner::CodeRunner
-          include ::EacCli::DefaultRunner
-
-          runner_definition do
+        class ProjectRename
+          runner_with ::Avm::EacRailsBase1::RunnerWith::Bundle do
             pos_arg :from
             pos_arg :to
           end
 
           def run
-            start_banner
-            command.system!
+            bundle_run
           end
 
           def start_banner
@@ -25,16 +22,10 @@ module Avm
             infov 'To', to
           end
 
-          def from
-            options.fetch('<from>')
-          end
-
-          def to
-            options.fetch('<to>')
-          end
+          delegate :from, :to, to: :parsed
 
-          def command
-            context(:instance).bundle('exec', 'rails', 'runner', code)
+          def bundle_args
+            %w[exec rails runner] + [code]
           end
 
           def code

data/lib/avm/tools/runner/git/subrepo/clone.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+require 'eac_git/local'
+require 'eac_ruby_utils/console/docopt_runner'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class Git < ::EacRubyUtils::Console::DocoptRunner
+        class Subrepo < ::EacRubyUtils::Console::DocoptRunner
+          class Clone
+            runner_with :help do
+              desc 'Clone git-subrepo repositories.'
+              arg_opt '-b', '--branch', 'Branch.'
+              arg_opt '-d', '--parent-dir', 'Target path\'s parent directory.'
+              pos_arg :url
+              pos_arg :target_path, optional: true
+            end
+
+            def run
+              start_banner
+              clean
+              clone
+            end
+
+            private
+
+            def start_banner
+              infov 'URL', url
+              infov 'Subpath', target_path
+              infov 'Branch', branch
+            end
+
+            def clean
+              infom 'Cleaning...'
+              git.command('subrepo', 'clean', '--all', '--force').system!
+            end
+
+            def clone
+              infom 'Cloning...'
+              infov 'Clone arguments', clone_args
+              git.command(*clone_args).system!
+            end
+
+            delegate :branch, :url, to: :parsed
+
+            def git_uncached
+              ::EacGit::Local.new('.')
+            end
+
+            def clone_args
+              ['subrepo'] + branch.if_present([]) { |v| ['--branch', v] } +
+                if ::File.exist?(target_path)
+                  ['init', target_path, '--remote', url]
+                else
+                  ['clone', url, target_path, '--message', clone_message, '--force']
+                end
+            end
+
+            def clone_message
+              "Subrepo \"#{target_path}\" (#{url})."
+            end
+
+            def repos_name_from_url
+              %r{/([^/]+)\z}.if_match(url, false) { |m| m[1].gsub(/\.git\z/, '') }
+            end
+
+            def target_path
+              parsed.target_path || target_path_from_parent_dir ||
+                fatal_error('No target path specified')
+            end
+
+            def target_path_from_parent_dir
+              return nil unless parsed.parent_dir && repos_name_from_url
+
+              ::File.join(parsed.parent_dir, repos_name_from_url)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/git/subrepo/fix.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+require 'eac_git/local'
+require 'eac_ruby_utils/console/docopt_runner'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class Git < ::EacRubyUtils::Console::DocoptRunner
+        class Subrepo < ::EacRubyUtils::Console::DocoptRunner
+          class Fix
+            runner_with :help do
+              desc 'Fix git-subrepos\' parent property.'
+            end
+
+            def run
+              loop do
+                break if fix
+
+                amend_each
+                rebase_fixup
+              end
+            end
+
+            private
+
+            def amend_each
+              infov 'Dirty files', local_repos.dirty_files.count
+              local_repos.dirty_files.each do |file|
+                infov '  * Ammending', file.path
+                ::Avm::Git::FileAutoFixup.new(runner_context.call(:git), file.path).run
+              end
+            end
+
+            def fix
+              infom 'Checking/fixing...'
+              c = new_check(true)
+              c.show_result
+              !c.result.error?
+            end
+
+            def new_check(fix_parent = false)
+              r = ::Avm::Git::SubrepoChecks.new(local_repos).add_all_subrepos
+              r.fix_parent = fix_parent
+              r
+            end
+
+            def local_repos_uncached
+              ::EacGit::Local.new(runner_context.call(:git))
+            end
+
+            def rebase_fixup
+              local_repos.command('rebase', '-i', 'origin/master', '--autosquash').envvar(
+                'GIT_SEQUENCE_EDITOR', 'true'
+              ).or(
+                local_repos.command('rebase', '--continue').envvar('GIT_SEQUENCE_EDITOR', 'true')
+              ).system!
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.76.0'
+    VERSION = '0.80.0'
   end
 end

data/template/avm/eac_redmine_base0/deploy/config/install.sh.template

@@ -12,3 +12,15 @@ fi
 export address_host='%%WEB.AUTHORITY%%'
 export address_path='%%WEB.PATH%%'
 export git_repositories_hierarchical_organisation=false
+
+# Mail settings
+export smtp_server='%%MAILER.SMTP.ADDRESS%%'
+export smtp_port='%%MAILER.SMTP.PORT%%'
+export smtp_domain='%%MAILER.SMTP.DOMAIN%%'
+export smtp_tls='%%MAILER_SMTP_TLS%%'
+export smtp_enable_starttls_auto='%%MAILER_SMTP_STARTTLS_AUTO%%'
+export smtp_openssl_verify_mode='%%MAILER_SMTP_OPENSSL_VERIFY_MODE%%'
+export smtp_authentication='%%MAILER.SMTP.AUTHENTICATION%%'
+export smtp_username='%%MAILER.SMTP.USERNAME%%'
+export smtp_password='%%MAILER.SMTP.PASSWORD%%'
+export mail_from='%%MAILER.FROM%%'

data/vendor/eac_cli/eac_cli.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*', 'Gemfile']
 
-  s.add_dependency 'eac_ruby_utils', '~> 0.45'
+  s.add_dependency 'eac_ruby_utils', '~> 0.50'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.1', '>= 0.1.2'
 end

data/vendor/eac_cli/lib/eac_cli/definition.rb

@@ -8,57 +8,66 @@ require 'eac_ruby_utils/core_ext'
 module EacCli
   class Definition
     require_sub __FILE__
+
+    MAIN_ALTERNATIVE_KEY = :main
+    SUBCOMMAND_NAME_ARG = 'subcommand'
+    SUBCOMMAND_ARGS_ARG = 'subcommand_args'
+
     attr_accessor :description
-    attr_accessor :options_argument
 
     def initialize
       self.description = '-- NO DESCRIPTION SET --'
-      self.options_argument = true
+      alternatives_set[MAIN_ALTERNATIVE_KEY] = main_alternative
     end
 
     def alt(&block)
-      r = ::EacCli::Definition.new
+      r = ::EacCli::Definition::Alternative.new
       r.instance_eval(&block)
-      alternatives << r
+      alternatives_set[new_alternative_key] = r
       r
     end
 
     def alternatives
-      @alternatives ||= []
-    end
-
-    def arg_opt(short, long, description, option_options = {})
-      options << ::EacCli::Definition::ArgumentOption.new(
-        short, long, description, option_options
-      )
+      alternatives_set.values
     end
 
-    def bool_opt(short, long, description, option_options = {})
-      options << ::EacCli::Definition::BooleanOption.new(short, long, description, option_options)
+    def alternative(key)
+      alternatives_set.fetch(key)
     end
 
     def desc(description)
       self.description = description
     end
 
+    def help_formatter
+      @help_formatter ||= ::EacCli::Definition::HelpFormatter.new(self)
+    end
+
+    def main_alternative
+      @main_alternative ||= begin
+        r = ::EacCli::Definition::Alternative.new
+        r.options_argument(true)
+        r
+      end
+    end
+
     def options_arg(options_argument)
       self.options_argument = options_argument
     end
 
-    def options
-      @options ||= []
+    def options_argument
+      main_alternative.options_argument?
     end
 
-    def pos_arg(name, arg_options = {})
-      positional << ::EacCli::Definition::PositionalArgument.new(name, arg_options)
+    def options_argument=(enable)
+      main_alternative.options_argument(enable)
     end
 
-    def positional
-      @positional ||= []
-    end
+    delegate :arg_opt, :bool_opt, :options, :pos_arg,
+             :positional, :subcommands, to: :main_alternative
 
-    def subcommands
-      positional << ::EacCli::Definition::PositionalArgument.new('subcommand', subcommand: true)
+    def subcommands?
+      alternatives.any?(&:subcommands?)
     end
 
     def options_first(enable = true)
@@ -68,5 +77,23 @@ module EacCli
     def options_first?
       @options_first ? true : false
     end
+
+    private
+
+    def alternatives_set
+      @alternatives_set ||= ::ActiveSupport::HashWithIndifferentAccess.new
+    end
+
+    def new_alternative_key
+      @last_key ||= 0
+      loop do
+        @last_key += 1
+        break @last_key unless alternatives_set.key?(@last_key)
+      end
+    end
+
+    def pos_set
+      @pos_set ||= []
+    end
   end
 end