avm-eac_redmine_base0 0.5.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ce56b5622c90260decf0b4f031160caadea36dcfbee74e49def419fcb997822
-  data.tar.gz: 9208091f887c7e44c46da359a080a483ce97df9f80173b67da12bef2ef4807e3
+  metadata.gz: 9696d77e08ae4b3e1430ee69b85ee2815ff93d563968d2d209ece83a959f187b
+  data.tar.gz: 7120f0c052f9082e9fdb39b6992788676bffae4a568f30f8a7f23d7281076aae
 SHA512:
-  metadata.gz: ee04dff92fd93755ac98d2ce9371b9477a0ee42d88d6af1836a6cb1f8ac491884cba9f1de35499d8fb061d99e51c6e82de2236d49024553d4b6f326ca76dc717
-  data.tar.gz: 3d60edf86fce691eecbc6ed880e88312f9321a81d40e6234b08c5328d72a8e178b2e25bd621480d19b133577a18221ca7b65678ba54b99f97c04b498689180d3
+  metadata.gz: 153593e33012649c55762807fb2a1595218da50324b53a2c20630afe4ce1c5886b064738611d4e0c7ae92ae5632a8ee30770929767f442ae1484ad06ad8007f9
+  data.tar.gz: ccf1eb4978f51c5429cc8c1c6a5921509099aa3016735e1ad00b22b7da6f0fcde10cd0f2fc06f421ef6825bab6f7af8164529288d7fdefe20d9b56f68bad4300

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

@@ -0,0 +1,28 @@
+# 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
+  module EacRedmineBase0
+    module Sources
+      class Base < ::Avm::EacRailsBase1::Sources::Base
+        REDMINE_LIB_SUBPATH = 'lib/redmine.rb'
+        SUBS_INCLUDE_PATHS_DEFAULT = ['plugins/*'].freeze
+
+        def redmine_lib_path
+          path.join(REDMINE_LIB_SUBPATH)
+        end
+
+        def subs_include_paths_default
+          SUBS_INCLUDE_PATHS_DEFAULT
+        end
+
+        def valid?
+          super && redmine_lib_path.exist?
+        end
+      end
+    end
+  end
+end

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.5.2'
+    VERSION = '0.7.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_redmine_base0
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-21 00:00:00.000000000 Z
+date: 2022-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm-eac_rails_base1
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: avm-eac_ubuntu_base0
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,9 @@ files:
 - lib/avm/eac_redmine_base0/instance.rb
 - 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
 - template/avm/eac_redmine_base0/deploy/config/install.sh.template
 - template/avm/eac_redmine_base0/deploy/config/secrets.yml