eac_tools 0.30.0 → 0.31.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc1385a1932c7e4a6b89b66db8ea6084663a9c690571b00ca73465b47421ddd2
-  data.tar.gz: 7dd2dab5f79240a7b8087532ee959accaf130ac12f4c6d9745b86a0ab85efd5f
+  metadata.gz: 892682917367f717a0f078304525d17496c7212c3830629384e476d4ccbaa5f3
+  data.tar.gz: 9f3e28c9c3c5a94ca9c110e0fcaac8d5e3158248bb00d27797eb1855c2cee7e3
 SHA512:
-  metadata.gz: 6b28b72f7c1eafb7ca609ab9b0450cc07254316756668ae980af135710fa01dcd364d18bc403c2912b50dd1c3e6c5832f220c59aa8aaac7b2366436801aebb4a
-  data.tar.gz: e6fcad611277f1d36707f180da96fed11a25a98139e5cc889bb5aa3e5728d42d3a9fa4667d70f1055fdff114291dbc364b099d4fb72615696d6d6be1e19a05fc
+  metadata.gz: f798e7f96fcb48382de6b4a17d83ded84ddaebc54a56636453821ee588749e1abec34eb74f1bd5d78a6399464db5a7c29f14365c2672538e3fa764caac5b4b91
+  data.tar.gz: 115edfd9cdd9b6e96bca831a1d3d984186665854422abbe24af41b653f2130b6ac1c6750b8faa6365b079f6e75065b05005b85cd7fa415417438b0d51e43cdc4

data/Gemfile.lock

@@ -1,20 +1,20 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.30.0)
-      avm (~> 0.43)
+    eac_tools (0.31.1)
+      avm (~> 0.44)
       avm-eac_asciidoctor_base0 (~> 0.7)
       avm-eac_generic_base0 (~> 0.5)
       avm-eac_latex_base0 (~> 0.2)
       avm-eac_rails_base0 (~> 0.8)
       avm-eac_rails_base1 (~> 0.6)
-      avm-eac_redmine_base0 (~> 0.14)
+      avm-eac_redmine_base0 (~> 0.15)
       avm-eac_redmine_plugin_base0 (~> 0.3)
       avm-eac_ruby_base1 (~> 0.21)
       avm-eac_webapp_base0 (~> 0.8)
       avm-eac_wordpress_base0 (~> 0.2)
-      avm-tools (~> 0.136, >= 0.136.1)
-      eac_ruby_utils (~> 0.103)
+      avm-tools (~> 0.136, >= 0.136.2)
+      eac_ruby_utils (~> 0.104)
 
 PATH
   remote: sub/avm-eac_asciidoctor_base0
@@ -60,15 +60,15 @@ PATH
 PATH
   remote: sub/avm-eac_redmine_base0
   specs:
-    avm-eac_redmine_base0 (0.14.0)
-      avm (~> 0.41)
+    avm-eac_redmine_base0 (0.15.0)
+      avm (~> 0.43)
       avm-eac_generic_base0 (~> 0.5)
       avm-eac_rails_base1 (~> 0.6)
       avm-eac_ubuntu_base0 (~> 0.3)
       curb (~> 0.9, >= 0.9.11)
       eac_fs (~> 0.12, >= 0.12.3)
       eac_rest (~> 0.6, >= 0.6.1)
-      eac_ruby_utils (~> 0.102)
+      eac_ruby_utils (~> 0.103)
 
 PATH
   remote: sub/avm-eac_redmine_plugin_base0
@@ -106,7 +106,7 @@ PATH
 PATH
   remote: sub/avm-files
   specs:
-    avm-files (0.4.0)
+    avm-files (0.4.1)
       avm (~> 0.43)
       eac_cli (~> 0.28)
       eac_fs (~> 0.12, >= 0.12.3)
@@ -116,12 +116,12 @@ PATH
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.136.1)
+    avm-tools (0.136.2)
       aranha-parsers (~> 0.14, >= 0.14.3)
-      avm (~> 0.42)
+      avm (~> 0.44)
       avm-eac_ruby_base1 (~> 0.21)
       avm-eac_ubuntu_base0 (~> 0.3)
-      avm-files (~> 0.4)
+      avm-files (~> 0.4, >= 0.4.1)
       avm-git (~> 0.4)
       clipboard (~> 1.3, >= 1.3.6)
       curb (~> 0.9, >= 0.9.11)
@@ -134,13 +134,13 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.43.0)
-      eac_cli (~> 0.27, >= 0.27.8)
+    avm (0.44.0)
+      eac_cli (~> 0.28)
       eac_config (~> 0.11, >= 0.11.1)
       eac_docker (~> 0.4, >= 0.4.2)
       eac_git (~> 0.12, >= 0.12.2)
-      eac_ruby_utils (~> 0.103)
-      eac_templates (~> 0.3, >= 0.3.1)
+      eac_ruby_utils (~> 0.104)
+      eac_templates (~> 0.3, >= 0.3.2)
       filesize (~> 0.2)
       htmlbeautifier (~> 1.4, >= 1.4.2)
       minitar (~> 0.9)
@@ -175,6 +175,13 @@ PATH
       eac_ruby_utils (~> 0.70)
       ruby-filemagic
 
+PATH
+  remote: sub/eac_git
+  specs:
+    eac_git (0.12.3)
+      eac_ruby_utils (~> 0.103)
+      parseconfig (~> 1.1, >= 1.1.2)
+
 PATH
   remote: sub/eac_ruby_base0
   specs:
@@ -187,9 +194,9 @@ PATH
 PATH
   remote: sub/eac_ruby_utils
   specs:
-    eac_ruby_utils (0.103.0)
+    eac_ruby_utils (0.104.0)
       activesupport (>= 4, < 7)
-      addressable (~> 2.8)
+      addressable (~> 2.8, >= 2.8.1)
       bundler
       filesize (~> 0.2)
       net-ssh (~> 4.2)
@@ -234,9 +241,6 @@ GEM
       parslet (~> 2.0)
     curb (0.9.11)
     diff-lcs (1.5.0)
-    eac_git (0.12.2)
-      eac_ruby_utils (~> 0.83)
-      parseconfig (~> 1.0, >= 1.0.8)
     eac_rest (0.6.1)
       eac_ruby_utils (~> 0.70)
     eac_ruby_gem_support (0.5.1)
@@ -362,6 +366,7 @@ DEPENDENCIES
   eac_config!
   eac_docker!
   eac_fs!
+  eac_git!
   eac_ruby_base0!
   eac_ruby_gem_support (~> 0.5.1)
   eac_ruby_utils!

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.30.0'
+  VERSION = '0.31.1'
 end

data/sub/avm/avm.gemspec

@@ -12,12 +12,12 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'eac_cli', '~> 0.27', '>= 0.27.8'
+  s.add_dependency 'eac_cli', '~> 0.28'
   s.add_dependency 'eac_config', '~> 0.11', '>= 0.11.1'
   s.add_dependency 'eac_docker', '~> 0.4', '>= 0.4.2'
   s.add_dependency 'eac_git', '~> 0.12', '>= 0.12.2'
-  s.add_dependency 'eac_ruby_utils', '~> 0.103'
-  s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.104'
+  s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.2'
   s.add_dependency 'filesize', '~> 0.2'
   s.add_dependency 'htmlbeautifier', '~> 1.4', '>= 1.4.2'
   s.add_dependency 'minitar', '~> 0.9'

data/sub/avm/lib/avm/entries/base/uri_components_entries_values/component_factory.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Base
+      class UriComponentsEntriesValues
+        class ComponentFactory
+          enable_method_class
+          common_constructor :owner, :component
+
+          def result
+            component_class.new(owner, component)
+          end
+
+          def component_class
+            specific_class || generic_class
+          end
+
+          def generic_class
+            parent_class.const_get('GenericComponent')
+          end
+
+          def parent_class
+            ::Avm::Entries::Base::UriComponentsEntriesValues
+          end
+
+          def specific_class
+            return nil unless parent_class.const_defined?(specific_class_basename)
+
+            parent_class.const_get(specific_class_basename)
+          end
+
+          def specific_class_basename
+            [component, 'component'].join('_').camelize
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/entries/base/uri_components_entries_values/generic_component.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'avm/entries/uri_builder'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Base
+      class UriComponentsEntriesValues
+        class GenericComponent
+          common_constructor :owner, :component
+          delegate :entries_provider_class, :prefix, to: :owner
+
+          def auto_method_name
+            ['auto', component_method_name].join('_')
+          end
+
+          def component_method_name
+            [prefix, component].join('_')
+          end
+
+          def define_auto_method(&block)
+            entries_provider_class.define_method(auto_method_name, &block)
+          end
+
+          def define_inherited_value_proc_method(&block)
+            entries_provider_class.define_method(inherited_value_proc_name, &block)
+          end
+
+          def entry_key_path
+            ::EacConfig::EntryPath.assert([prefix, component])
+          end
+
+          def id_component
+            @id_component ||= owner.component_factory('id')
+          end
+
+          def inherited_value_proc_name
+            [component_method_name, 'inherited_value_proc'].join('_')
+          end
+
+          def setup
+            outer_self = self
+            define_auto_method do
+              uri_component_entry_value(outer_self.entry_key_path.to_string)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/entries/base/uri_components_entries_values/path_component.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'avm/entries/base/uri_components_entries_values/generic_component'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Base
+      class UriComponentsEntriesValues
+        class PathComponent < ::Avm::Entries::Base::UriComponentsEntriesValues::GenericComponent
+          def setup
+            super
+            define_inherited_value_proc_method { |value| value + '/' + id }
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/entries/base/uri_components_entries_values/url_component.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'avm/entries/base/uri_components_entries_values/generic_component'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Base
+      class UriComponentsEntriesValues
+        class UrlComponent < ::Avm::Entries::Base::UriComponentsEntriesValues::GenericComponent
+          def setup
+            outer_self = self
+            define_auto_method do
+              inherited_entry_value(outer_self.id_component.entry_key_path.to_string,
+                                    outer_self.entry_key_path.to_string) ||
+                outer_self.auto_install_url_by_parts(self)
+            end
+          end
+
+          def auto_install_url_by_parts(entries_provider)
+            require 'avm/entries/auto_values/uri_entry'
+            ::Avm::Entries::AutoValues::UriEntry.new(entries_provider, 'install').value
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/entries/base/uri_components_entries_values.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'avm/entries/uri_builder'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    module Base
+      class UriComponentsEntriesValues
+        require_sub __FILE__
+        common_constructor :entries_provider_class, :prefix, :extra_fields
+
+        ENTRIES_FIELDS = ::Avm::Entries::UriBuilder::ENTRIES_FIELDS + %w[url]
+
+        def fields
+          ENTRIES_FIELDS + extra_fields
+        end
+
+        def result
+          fields.map { |field| component_factory(field).setup }
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/entries/base.rb

@@ -7,6 +7,13 @@ module Avm
   module Entries
     module Base
       require_sub __FILE__, require_dependency: true
+      common_concern
+
+      module ClassMethods
+        def uri_components_entries_values(prefix, extra_fields = [])
+          ::Avm::Entries::Base::UriComponentsEntriesValues.new(self, prefix, extra_fields).result
+        end
+      end
 
       def entries_provider_id
         id

data/sub/avm/lib/avm/entries/keys_constants_set.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Entries
+    class KeysConstantsSet
+      common_constructor :entries_provider_class, :prefix, :suffixes
+
+      # @return [Array<String>]
+      def result
+        if suffixes.is_a?(::Hash)
+          keys_consts_set_from_hash
+        elsif suffixes.is_a?(::Enumerable)
+          keys_consts_set_from_enum
+        else
+          raise "Unmapped suffixes class: #{suffixes.class}"
+        end
+      end
+
+      private
+
+      # @return [String]
+      def key_const_set(prefix, suffix)
+        key = [prefix, suffix].reject(&:blank?).join('.')
+        entries_provider_class.const_set(key.gsub('.', '_').upcase, key)
+        key
+      end
+
+      # @return [Array<String>]
+      def keys_consts_set_from_enum
+        suffixes.map { |suffix| key_const_set(prefix, suffix) }
+      end
+
+      # @return [Array<String>]
+      def keys_consts_set_from_hash
+        suffixes.flat_map do |k, v|
+          self.class.new(entries_provider_class, prefix.to_s + (k.blank? ? '' : ".#{k}"), v).result
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/instances/base/install.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'avm/entries/uri_builder'
+require 'avm/instances/entry_keys'
+
+module Avm
+  module Instances
+    class Base
+      module Install
+        common_concern do
+          uri_components_entries_values 'install', %w[data_path email groupname]
+        end
+
+        def install_data_path_inherited_value_proc(value)
+          value + '/' + id
+        end
+
+        def install_groupname_default_value
+          read_entry_optional(::Avm::Instances::EntryKeys::INSTALL_USERNAME)
+        end
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/instances/base/web.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'addressable'
+require 'avm/instances/entry_keys'
+
+module Avm
+  module Instances
+    class Base
+      module Web
+        common_concern do
+          uri_components_entries_values 'web'
+        end
+      end
+    end
+  end
+end

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

@@ -12,8 +12,8 @@ module Avm
       enable_abstract_methods
       enable_listable
       enable_simple_cache
-      require_sub __FILE__, include_modules: true
       include ::Avm::Entries::Base
+      require_sub __FILE__, include_modules: true
       include ::Avm::With::ExtraSubcommands
       include ::Avm::With::ApplicationStereotype
 

data/sub/avm/lib/avm/instances/entry_keys.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/entries/keys_constants_set'
 require 'avm/entries/uri_builder'
 require 'eac_ruby_utils/core_ext'
 
@@ -14,19 +15,7 @@ module Avm
         end
 
         def keys_consts_set(prefix, suffixes)
-          if suffixes.is_a?(::Hash)
-            keys_consts_set_from_hash(prefix, suffixes)
-          elsif suffixes.is_a?(::Enumerable)
-            keys_consts_set_from_enum(prefix, suffixes)
-          else
-            raise "Unmapped suffixes class: #{suffixes.class}"
-          end
-        end
-
-        def key_const_set(prefix, suffix)
-          key = [prefix, suffix].reject(&:blank?).join('.')
-          const_set(key.gsub('.', '_').upcase, key)
-          all_keys << key
+          all_keys.merge(::Avm::Entries::KeysConstantsSet.new(self, prefix, suffixes).result)
         end
 
         private
@@ -34,14 +23,6 @@ module Avm
         def all_keys
           @all_keys ||= ::Set.new
         end
-
-        def keys_consts_set_from_enum(prefix, suffixes)
-          suffixes.each { |suffix| key_const_set(prefix, suffix) }
-        end
-
-        def keys_consts_set_from_hash(prefix, suffixes)
-          suffixes.each { |k, v| keys_consts_set(prefix.to_s + (k.blank? ? '' : ".#{k}"), v) }
-        end
       end
 
       {

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avm
-  VERSION = '0.43.0'
+  VERSION = '0.44.0'
 end

data/sub/avm/spec/lib/avm/instances/base_spec.rb

@@ -91,7 +91,7 @@ RSpec.describe ::Avm::Instances::Base do
 
           it do
             expect(described_class.ancestors.map(&:name)).to(
-              include('Avm::Instances::Base::AutoValues::Install')
+              include('Avm::Instances::Base::Install')
             )
           end
 

data/sub/avm-eac_redmine_base0/avm-eac_redmine_base0.gemspec

@@ -12,14 +12,14 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.41'
+  s.add_dependency 'avm', '~> 0.43'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.5'
   s.add_dependency 'avm-eac_rails_base1', '~> 0.6'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
   s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
   s.add_dependency 'eac_fs', '~> 0.12', '>= 0.12.3'
   s.add_dependency 'eac_rest', '~> 0.6', '>= 0.6.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.102'
+  s.add_dependency 'eac_ruby_utils', '~> 0.103'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/{apache_host.rb → instances/apache_host.rb}

@@ -4,7 +4,9 @@ require 'avm/eac_rails_base1/apache_host'
 
 module Avm
   module EacRedmineBase0
-    class ApacheHost < ::Avm::EacRailsBase1::ApacheHost
+    module Instances
+      class ApacheHost < ::Avm::EacRailsBase1::ApacheHost
+      end
     end
   end
 end

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

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 require 'addressable/uri'
-require 'avm/eac_redmine_base0/data_unit'
+require 'avm/eac_redmine_base0/instances/data_unit'
 require 'avm/eac_redmine_base0/instances/docker_image'
-require 'avm/eac_redmine_base0/rest_api'
+require 'avm/eac_redmine_base0/instances/runners'
+require 'avm/eac_redmine_base0/instances/rest_api'
 require 'avm/eac_rails_base1/instances/base'
 
 module Avm
@@ -32,7 +33,7 @@ module Avm
           @data_package ||= ::Avm::Data::Instance::Package.new(
             self,
             units: {
-              all: ::Avm::EacRedmineBase0::DataUnit.new(self)
+              all: ::Avm::EacRedmineBase0::Instances::DataUnit.new(self)
             }
           )
         end
@@ -46,11 +47,11 @@ module Avm
 
         private
 
-        # @return [Avm::EacRedmineBase0::RestApi]
+        # @return [Avm::EacRedmineBase0::Instances::RestApi]
         def rest_api_uncached
           url = root_url
           url.query_values = { key: read_entry('api.key') }
-          ::Avm::EacRedmineBase0::RestApi.new(url)
+          ::Avm::EacRedmineBase0::Instances::RestApi.new(url)
         end
       end
     end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/data_unit.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'avm/data/instance/unit'
+require 'eac_ruby_utils/core_ext'
+require 'curb'
+require 'open-uri'
+
+module Avm
+  module EacRedmineBase0
+    module Instances
+      class DataUnit < ::Avm::Data::Instance::Unit
+        common_constructor :instance
+
+        EXPORT_PATH = '/backup/export'
+        EXTENSION = '.tar'
+        IMPORT_PATH = '/backup/import.json'
+
+        def do_dump(data_path)
+          ::File.open(data_path, 'wb') do |file|
+            file << export_request.response.body_data_or_raise
+          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_request
+          instance.rest_api.request(EXPORT_PATH)
+        end
+
+        def import_url
+          instance.rest_api.build_service_url(IMPORT_PATH).to_s
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/{rest_api.rb → instances/rest_api.rb}

@@ -5,7 +5,9 @@ require 'eac_rest/api'
 
 module Avm
   module EacRedmineBase0
-    class RestApi < ::EacRest::Api
+    module Instances
+      class RestApi < ::EacRest::Api
+      end
     end
   end
 end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/runners/project_rename.rb

@@ -8,7 +8,7 @@ module Avm
     module Instances
       module Runners
         class ProjectRename
-          runner_with ::Avm::EacRailsBase1::RunnerWith::Bundle do
+          runner_with :help, ::Avm::EacRailsBase1::RunnerWith::Bundle do
             pos_arg :from
             pos_arg :to
           end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/runners/base.rb

@@ -2,7 +2,7 @@
 
 require 'avm/eac_redmine_base0/instances/base'
 require 'avm/eac_redmine_base0/instances/deploy'
-require 'avm/eac_redmine_base0/apache_host'
+require 'avm/eac_redmine_base0/instances/apache_host'
 require 'avm/eac_rails_base1/runner'
 require 'eac_ruby_utils/core_ext'