avm-tools 0.77.0 → 0.82.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3345f4afdd4f7bb8cb968848675bc6b1d5c91e5833b17e90c43a01eae82a95c3
-  data.tar.gz: 5e032e2b459e3c1fe3bf5c42e054d89491736c8e181b17a988a079068728b526
+  metadata.gz: 168c054cba584a1c2d268e08f1c89d38768fab0c72696b69480db37b0392b605
+  data.tar.gz: 43eea0c69bbdf91f0cc7e30a9cf631461ae3023028c6b8191b5631ea5f5c562b
 SHA512:
-  metadata.gz: eccb5df2cf88efda09388fdcbf6a363ad32d49772980b57a58865d5b322c49848cfbaacbd572d4c7c9f9fa2af486ee5efb32b6632b91ead052546e76aa3be51d
-  data.tar.gz: a28d9a27d6c22363d021dad5c1bee61cff8785139c9f69cf131762a6702f988d478ae15880845eb6294941b99e0e391496f4298e99864455543ebad80f8e8866
+  metadata.gz: 95bc36c2b16d6b625d4400a98e89a05f53a478cc2e78378e917de85ef0ba0833216c48104f7ad5aab779ecc462bbd972444580cf4a244b1c700949dcbfd460c6
+  data.tar.gz: 884b8fa7d13e6d590b61c71fa512986ba37d22630c55ea7bad36fecb475f9a5a2c2249535e9b28b3366215f32ae117a57ebb30b13a92d2e0526c2b620d90671e

data/lib/avm/data/unit.rb

@@ -12,11 +12,12 @@ module Avm
       enable_console_speaker
 
       %w[dump load].each do |action|
+        method_name = "#{action}_command"
         class_eval <<~CODE, __FILE__, __LINE__ + 1
           # Should be overrided.
           # @return [EacRubyUtils::Envs::Command]
-          def #{action}_command
-            fail "Abstract method. Override in #{singleton_class}."
+          def #{method_name}
+            fail "\\"#{method_name}\\" is a abstract method. Override in #{singleton_class}."
           end
         CODE
 
@@ -69,7 +70,7 @@ module Avm
       def load(data_path)
         run_callbacks :load do
           infom "Loading unit \"#{name}\" from \"#{data_path}\"..."
-          load_command.execute!(input_file: data_path)
+          do_load(data_path)
         end
       end
 
@@ -79,6 +80,10 @@ module Avm
         dump_command.execute!(output_file: data_path)
       end
 
+      def do_load(data_path)
+        load_command.execute!(input_file: data_path)
+      end
+
       private
 
       def unit_on_directory_path(directory, identifier)

data/lib/avm/eac_rails_base1/runner/code_runner.rb

@@ -8,8 +8,7 @@ module Avm
   module EacRailsBase1
     class Runner < ::Avm::EacWebappBase0::Runner
       class CodeRunner
-        runner_with ::Avm::EacRailsBase1::RunnerWith::Bundle
-        runner_definition do
+        runner_with :help, ::Avm::EacRailsBase1::RunnerWith::Bundle do
           desc 'Runs a Ruby code with "rails runner".'
           pos_arg :code
         end

data/lib/avm/eac_rails_base1/runner/rails_server.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'avm/eac_rails_base1/runner_with/bundle'
+require 'avm/instances/entry_keys'
+require 'eac_cli/core_ext'
+require 'eac_ruby_utils/console/docopt_runner'
+require 'shellwords'
+
+module Avm
+  module EacRailsBase1
+    class Runner < ::Avm::EacWebappBase0::Runner
+      class RailsServer
+        DEFAULT_RAILS_ENVIRONMENT = 'development'
+        runner_with :help, ::Avm::EacRailsBase1::RunnerWith::Bundle do
+          desc 'Run the embbeded Rails web server.'
+        end
+
+        def run
+          infov 'Environment', rails_environment
+          infov 'Bundle args', ::Shellwords.join(bundle_args)
+          infov 'Result', bundle_command.system
+        end
+
+        protected
+
+        def bundle_args
+          ['exec', 'rails', 'server', '--port',
+           runner_context.call(:instance).read_entry(::Avm::Instances::EntryKeys::WEB_PORT)]
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_redmine_base0/data_unit.rb

@@ -2,6 +2,7 @@
 
 require 'avm/data/instance/unit'
 require 'eac_ruby_utils/core_ext'
+require 'curb'
 require 'open-uri'
 
 module Avm
@@ -17,8 +18,35 @@ module Avm
         end
       end
 
+      def do_load(data_path)
+        do_load_by_web(data_path) || do_load_by_rake(data_path) || raise('Failed to load')
+      end
+
+      def do_load_by_web(data_path)
+        c = Curl::Easy.new(import_url)
+        c.multipart_form_post = true
+        c.http_post(Curl::PostField.file('redmine_with_git_tableless_load[path]', data_path))
+        c.perform
+        true
+      rescue Curl::Err::ConnectionFailedError
+        false
+      end
+
+      def do_load_by_rake(data_path)
+        instance.bundle('exec', 'rake', "redmine_with_git:load:all[#{data_path}]").system
+        true
+      end
+
       def export_url
-        uri = ::Addressable::URI.parse(instance.read_entry('web.url')) + '/backup/export'
+        url('/backup/export')
+      end
+
+      def import_url
+        url('/backup/import.json')
+      end
+
+      def url(path)
+        uri = ::Addressable::URI.parse(instance.read_entry('web.url')) + path
         uri.query_values = { key: instance.read_entry('admin.api_key') }
         uri.to_s
       end

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/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.77.0'
+    VERSION = '0.82.0'
   end
 end

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.50'
+  s.add_dependency 'eac_ruby_utils', '~> 0.55'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.1', '>= 0.1.2'
 end

data/vendor/eac_cli/lib/eac_cli/parser.rb

@@ -12,12 +12,14 @@ module EacCli
 
     def parsed_uncached
       raise 'Definition has no alternatives' if alternatives.empty?
+      raise first_error unless alternatives.select(&:success?).any?
 
-      alternatives.each do |alt_parser|
-        return alt_parser.parsed unless alt_parser.error?
-      end
+      alternatives_parsed(true).merge(alternatives_parsed(false))
+    end
 
-      raise first_error
+    def alternatives_parsed(error)
+      alternatives.select { |a| error == a.error? }.map(&:parsed).reverse
+                  .inject(::EacRubyUtils::Struct.new) { |a, e| a.merge(e) }
     end
 
     def alternatives_uncached

data/vendor/eac_cli/lib/eac_cli/parser/alternative.rb

@@ -22,6 +22,10 @@ module EacCli
         error.present?
       end
 
+      def success?
+        !error?
+      end
+
       def parsed
         @parsed ||= collector.to_data.freeze
       end

data/vendor/eac_cli/lib/eac_cli/runner.rb

@@ -44,6 +44,8 @@ module EacCli
       extend AfterClassMethods
       include InstanceMethods
       ::EacCli::Docopt::RunnerExtension.check(self)
+      include ActiveSupport::Callbacks
+      define_callbacks :run
     end
 
     module AfterClassMethods
@@ -55,8 +57,7 @@ module EacCli
 
       def run(*runner_context_args)
         r = create(*runner_context_args)
-        r.parsed
-        r.run
+        r.run_run
         r
       end
 
@@ -72,6 +73,13 @@ module EacCli
     end
 
     module InstanceMethods
+      def run_run
+        parsed
+        run_callbacks(:run) { run }
+      rescue ::EacCli::Runner::Exit # rubocop:disable Lint/SuppressedException
+        # Do nothing
+      end
+
       def runner_context
         return @runner_context if @runner_context