avm-eac_redmine_base0 0.6.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c261124725288404e3dd58493cb4a798594a3a16ae6a2f27896e68d0f16028ff
-  data.tar.gz: 8a921bff830b06d7d02eb9324653175d2f5d385dbfd0825029c35748d972e2c7
+  metadata.gz: 833a844a71acb9539e5c4be4451b4bbab083c7e47d0cab991d1881f5f62f5318
+  data.tar.gz: 71af1c7bd35fe0dbb428ebd5aabd207d99975e83480419e1da233bfdec42ff8d
 SHA512:
-  metadata.gz: f44a29e6480541745fa3e810f85e1e677adfb4cb37ae96093034e34f612fce3f4fb1b8e2cfcd58b7804437cd409d62c4f48e15cec8533c3635ec738fdf95fa18
-  data.tar.gz: fb3f6b90e94b07c240cc0826890201ba613906df7a7ab39d8106e9466cf2de3ce95da49f6f1d05a7e47f94d9df28618011bb1eca04e78d1b95f606b43bd9d89f
+  metadata.gz: 1b0c8d0b53bac0b8df9a4b5e3ca89e13769a9433adec00f2beb32c1ea4a2769e45c455c41302eb573543f8921f1ea7f7ad78bf4e5d37e9bceb3f599b9f00658e
+  data.tar.gz: '08c70056b0aec242fca08ab6a98801673c4dacd7c9f336b134e4f5ec2ad25ae659060b76a207baee4afec6ea75c93bfb55b1940be0a2282353b81abc380de9e5'

data/lib/avm/eac_redmine_base0/core_update.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/eac_redmine_base0/core_update'
+require 'avm/sources/base/configuration'
 require 'avm/sync'
 require 'eac_fs/cached_download'
 require 'eac_ruby_utils/core_ext'
@@ -10,11 +11,13 @@ module Avm
     class CoreUpdate
       enable_speaker
       enable_simple_cache
-      common_constructor :instance, :version, :url
+      common_constructor :source, :version, :url
 
-      GITIGNORE_ADD = %w[/public/assets/**/* /config/install.sh /log/**/*].freeze
+      GITIGNORE_ADD = %w[/public/assets/**/* /config/install.sh /config/secrets_key.txt
+                         /log/**/*].freeze
       GITIGNORE_DEL = %w[/Gemfile.lock /plugins/* /public/themes/*].freeze
-      TARGET_KEEP = %w[/Gemfile.lock].freeze
+      TARGET_KEEP = ::Avm::Sources::Base::Configuration::CONFIGURATION_FILENAMES
+                      .map { |b| "/#{b}" } + %w[/Gemfile.lock].freeze
 
       def run
         ::EacRubyUtils::Fs::Temp.on_directory do |dir|
@@ -37,7 +40,7 @@ module Avm
       end
 
       def fs_object_id
-        [instance.id, version].join('_').variableize
+        [source.path, version].join('_').variableize
       end
 
       private
@@ -71,7 +74,7 @@ module Avm
       end
 
       def git_commit_message
-        "Core: update to #{version}."
+        i18n_translate(__method__, version: version, __locale: source.locale)
       end
 
       def git_repo_uncached
@@ -108,7 +111,7 @@ module Avm
       end
 
       def target_path_uncached
-        instance.read_entry('fs_path').to_pathname
+        source.path
       end
     end
   end

data/lib/avm/eac_redmine_base0/sources/base.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/eac_rails_base1/sources/base'
+require 'avm/eac_redmine_base0/sources/runners'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -8,14 +9,14 @@ module Avm
     module Sources
       class Base < ::Avm::EacRailsBase1::Sources::Base
         REDMINE_LIB_SUBPATH = 'lib/redmine.rb'
-        SUBS_PATHS_DEFAULT = ['plugins/*'].freeze
+        SUBS_INCLUDE_PATHS_DEFAULT = ['plugins/*'].freeze
 
         def redmine_lib_path
           path.join(REDMINE_LIB_SUBPATH)
         end
 
-        def subs_paths_default
-          SUBS_PATHS_DEFAULT
+        def subs_include_paths_default
+          SUBS_INCLUDE_PATHS_DEFAULT
         end
 
         def valid?

data/lib/avm/eac_redmine_base0/sources/runners/core_update.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require 'avm/eac_redmine_base0/core_update'
+require 'eac_cli/core_ext'
+require 'avm/eac_rails_base1/sources/base'
+require 'avm/eac_redmine_base0/sources/runners'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedmineBase0
+    module Sources
+      module Runners
+        class CoreUpdate
+          runner_with :help do
+            arg_opt '-u', '--url', 'Core\'s package URL.'
+            arg_opt '-v', '--version', 'Core\'s version.'
+            desc 'Update instance\' core.'
+          end
+
+          def run
+            start_banner
+            validate
+            update
+          end
+
+          private
+
+          def start_banner
+            infov 'URL', url
+            infov 'Version', version
+          end
+
+          def update
+            ::Avm::EacRedmineBase0::CoreUpdate.new(runner_context.call(:subject), version, url).run
+          end
+
+          def url
+            parsed.url || url_by_version
+          end
+
+          def url_by_version
+            parsed.version.if_present do |v|
+              "https://www.redmine.org/releases/redmine-#{v}.tar.gz"
+            end
+          end
+
+          def validate
+            %w[url version].each do |attr|
+              fatal_error "\"#{attr}\" is blank. See avaiable options." if send(attr).blank?
+            end
+          end
+
+          def version
+            parsed.version || version_by_url
+          end
+
+          def version_by_url
+            parsed.url.if_present do |v|
+              /(\d+.\d+.\d+)/.if_match(v, false) { |m| m[1] }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_redmine_base0/sources/runners.rb

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

data/lib/avm/eac_redmine_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.6.0'
+    VERSION = '0.7.1'
   end
 end

data/locale/en.yml

@@ -0,0 +1,5 @@
+en:
+  avm:
+    eac_redmine_base0:
+      core_update:
+        git_commit_message: "Core: update to '%{version}'."

data/locale/pt-BR.yml

@@ -0,0 +1,5 @@
+pt-BR:
+  avm:
+    eac_redmine_base0:
+      core_update:
+        git_commit_message: "Core: atualiza para '%{version}'."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_redmine_base0
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-25 00:00:00.000000000 Z
+date: 2022-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm-eac_rails_base1
@@ -123,7 +123,11 @@ files:
 - lib/avm/eac_redmine_base0/instances/docker_image.rb
 - lib/avm/eac_redmine_base0/rest_api.rb
 - lib/avm/eac_redmine_base0/sources/base.rb
+- lib/avm/eac_redmine_base0/sources/runners.rb
+- lib/avm/eac_redmine_base0/sources/runners/core_update.rb
 - lib/avm/eac_redmine_base0/version.rb
+- locale/en.yml
+- locale/pt-BR.yml
 - template/avm/eac_redmine_base0/deploy/config/install.sh.template
 - template/avm/eac_redmine_base0/deploy/config/secrets.yml
 - template/avm/eac_redmine_base0/instances/docker_image/Dockerfile.template