avm-eac_redmine_base0 0.13.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39da16425fa7ccfa3501da84353c3cb37525f8933756cd610acf95b73a9ead98
-  data.tar.gz: 471b560946e13ca892df86c66f43ca33e6c3e95f27c25cb58ac2f55d1aa3e629
+  metadata.gz: 8b0062b4f8d1bea44ec567461cbee96a017d3cd070b8fe773d4dcb69fa5c8966
+  data.tar.gz: 8338fc718b9740f62102b7a7a81d9b6a936a293bb9dd2e9b9645601184628212
 SHA512:
-  metadata.gz: 5330c3b5f6106e116ecc727b8a65c674ea97447376cde71fc9b6367e952c003ff73051894aded1b4a55f2afb9a1e8ad77fe58ef8ebe30b00ebc04a24ba14dab0
-  data.tar.gz: a525d4d4f7a1e0b49775bd77ba2218950dac786804767d16bce3c72f7eada11c707f7a5209ee8d5e8e739c2e526df598470bdf126afdf91bffe583d7a9357ecd
+  metadata.gz: 32608264f08bff25804ccd35434f8ee1b14e95a0b7bc6bea6e5ce3e0441dd947a026b7d6d71ee37cddb7aaf6be29a63dd9d33e54e68e3a5cd31b0707393ff6d3
+  data.tar.gz: c6395a3dd175f38e32b739a45f46250657675fd9c5d2d1eedf8abcc465a67227f49bc785c8515173158aa594ab5ae415f85764281062730b0a6b75f97831c400

data/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/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
@@ -21,7 +22,7 @@ module Avm
         def docker_run_arguments
           [
             '--volume',
-            "#{read_entry(::Avm::Instances::EntryKeys::FS_PATH)}:/home/myuser/eac_redmine_base0",
+            "#{install_path}:/home/myuser/eac_redmine_base0",
             '--publish', "#{read_entry(:ssh_port)}:22",
             '--publish', "#{read_entry(:http_port)}:80",
             '--publish', "#{read_entry(:https_port)}:443"
@@ -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/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/lib/avm/eac_redmine_base0/instances/deploy.rb

@@ -21,7 +21,7 @@ module Avm
         end
 
         def installer_path
-          ::File.join(instance.fs_path, 'plugins', 'redmine_installer', 'installer', 'run.sh')
+          ::File.join(instance.install_path, 'plugins', 'redmine_installer', 'installer', 'run.sh')
         end
 
         def install_task

data/lib/avm/eac_redmine_base0/instances/docker_image.rb

@@ -77,7 +77,7 @@ module Avm
         end
 
         def git_repo_uncached
-          ::EacGit::Local.new(instance.source_instance.fs_path)
+          ::EacGit::Local.new(instance.source_instance.install_path)
         end
 
         def redmine_source_git_id

data/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/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/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'
 

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

@@ -0,0 +1,120 @@
+# frozen_string_literal: true
+
+require 'avm/eac_redmine_base0/sources/core_update'
+require 'avm/sources/base/configuration'
+require 'avm/sync'
+require 'eac_fs/cached_download'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedmineBase0
+    module Sources
+      class CoreUpdate
+        enable_speaker
+        enable_simple_cache
+        common_constructor :source, :version, :url
+
+        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 = ::Avm::Sources::Base::Configuration::CONFIGURATION_FILENAMES
+                        .map { |b| "/#{b}" } + %w[/Gemfile.lock].freeze
+
+        def run
+          ::EacRubyUtils::Fs::Temp.on_directory do |dir|
+            @tempdir = dir
+            assert_source_package
+            extract_package_to_tempdir
+            sync_content
+            change_git_ignore
+            validate_empty_dir
+          end
+          git_commit
+          success 'Done!'
+        end
+
+        def assert_source_package
+          infom 'Asserting source package...'
+          source_package.assert
+          infov 'Package cache path', source_package.path
+          infov 'Package size', source_package.path.size
+        end
+
+        def fs_object_id
+          [source.path, version].join('_').variableize
+        end
+
+        private
+
+        attr_reader :tempdir
+
+        def change_git_ignore
+          file = target_path.join('.gitignore')
+          file.write(
+            (file.read.each_line.map(&:strip).reject { |line| GITIGNORE_DEL.include?(line) } +
+                ['', '#eac_redmine_base0'] + GITIGNORE_ADD).map { |line| "#{line}\n" }.join
+          )
+        end
+
+        def extract_package_to_tempdir
+          infom "Extracting package to tempdir #{tempdir}..."
+          ::EacRubyUtils::Envs.local.command(
+            'tar', '-xf', source_package.path.to_path, '-C', tempdir.to_path,
+            '--strip-components', '1'
+          ).execute!
+        end
+
+        def git_commit
+          if git_repo.dirty?
+            infom 'Git commiting...'
+            git_repo.command('add', '--', target_path).execute!
+            git_repo.command('commit', '-m', git_commit_message, '--', target_path).execute!
+          else
+            infom 'Nothing to commit'
+          end
+        end
+
+        def git_commit_message
+          i18n_translate(__method__, version: version, __locale: source.locale)
+        end
+
+        def git_repo_uncached
+          ::EacGit::Local.new(target_path)
+        end
+
+        def sync_content
+          ::Avm::Sync.new(source_path, target_path)
+            .add_exclude('/*').add_includes(*target_files_to_remove).move_mode(true).run
+        end
+
+        # @return [EacFs::CachedDownload]
+        def source_package_uncached
+          ::EacFs::CachedDownload.new(url, fs_cache)
+        end
+
+        def validate_empty_dir
+          if source_path.children.empty?
+            infom 'No content left in source directory'
+          else
+            fatal_error 'Found entries in source directory: ' +
+                        source_path.children.map { |c| c.basename.to_path }.join(', ')
+          end
+        end
+
+        def source_path_uncached
+          ::Pathname.new(tempdir.to_path)
+        end
+
+        def target_files_to_remove
+          git_repo.command('ls-files').execute!
+            .each_line.map { |v| "/#{v.strip}" }
+            .without(*TARGET_KEEP)
+        end
+
+        def target_path_uncached
+          source.path
+        end
+      end
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/eac_rails_base1/sources/base'
-require 'avm/eac_redmine_base0/core_update'
+require 'avm/eac_redmine_base0/sources/core_update'
 require 'eac_cli/core_ext'
 
 module Avm
@@ -29,7 +29,8 @@ module Avm
           end
 
           def update
-            ::Avm::EacRedmineBase0::CoreUpdate.new(runner_context.call(:subject), version, url).run
+            ::Avm::EacRedmineBase0::Sources::CoreUpdate
+              .new(runner_context.call(:subject), version, url).run
           end
 
           def url

data/lib/avm/eac_redmine_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.13.0'
+    VERSION = '0.15.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_redmine_base0
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-18 00:00:00.000000000 Z
+date: 2022-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.39'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.39.1
+        version: '0.43'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.39'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.39.1
+        version: '0.43'
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
@@ -50,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: avm-eac_ubuntu_base0
   requirement: !ruby/object:Gem::Requirement
@@ -138,14 +132,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.102'
+        version: '0.103'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.102'
+        version: '0.103'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -167,21 +161,21 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/avm/eac_redmine_base0.rb
-- lib/avm/eac_redmine_base0/apache_host.rb
-- lib/avm/eac_redmine_base0/core_update.rb
-- lib/avm/eac_redmine_base0/data_unit.rb
 - lib/avm/eac_redmine_base0/instances.rb
+- lib/avm/eac_redmine_base0/instances/apache_host.rb
 - lib/avm/eac_redmine_base0/instances/base.rb
+- lib/avm/eac_redmine_base0/instances/data_unit.rb
 - lib/avm/eac_redmine_base0/instances/deploy.rb
 - lib/avm/eac_redmine_base0/instances/docker_image.rb
+- lib/avm/eac_redmine_base0/instances/rest_api.rb
 - lib/avm/eac_redmine_base0/instances/runners.rb
 - lib/avm/eac_redmine_base0/instances/runners/docker.rb
 - lib/avm/eac_redmine_base0/instances/runners/project_rename.rb
-- lib/avm/eac_redmine_base0/rest_api.rb
 - lib/avm/eac_redmine_base0/runners.rb
 - lib/avm/eac_redmine_base0/runners/base.rb
 - lib/avm/eac_redmine_base0/sources.rb
 - lib/avm/eac_redmine_base0/sources/base.rb
+- lib/avm/eac_redmine_base0/sources/core_update.rb
 - lib/avm/eac_redmine_base0/sources/runners.rb
 - lib/avm/eac_redmine_base0/sources/runners/core_update.rb
 - lib/avm/eac_redmine_base0/sources/runners/docker.rb

data/lib/avm/eac_redmine_base0/core_update.rb

@@ -1,118 +0,0 @@
-# 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'
-
-module Avm
-  module EacRedmineBase0
-    class CoreUpdate
-      enable_speaker
-      enable_simple_cache
-      common_constructor :source, :version, :url
-
-      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 = ::Avm::Sources::Base::Configuration::CONFIGURATION_FILENAMES
-                      .map { |b| "/#{b}" } + %w[/Gemfile.lock].freeze
-
-      def run
-        ::EacRubyUtils::Fs::Temp.on_directory do |dir|
-          @tempdir = dir
-          assert_source_package
-          extract_package_to_tempdir
-          sync_content
-          change_git_ignore
-          validate_empty_dir
-        end
-        git_commit
-        success 'Done!'
-      end
-
-      def assert_source_package
-        infom 'Asserting source package...'
-        source_package.assert
-        infov 'Package cache path', source_package.path
-        infov 'Package size', source_package.path.size
-      end
-
-      def fs_object_id
-        [source.path, version].join('_').variableize
-      end
-
-      private
-
-      attr_reader :tempdir
-
-      def change_git_ignore
-        file = target_path.join('.gitignore')
-        file.write(
-          (file.read.each_line.map(&:strip).reject { |line| GITIGNORE_DEL.include?(line) } +
-            ['', '#eac_redmine_base0'] + GITIGNORE_ADD).map { |line| "#{line}\n" }.join
-        )
-      end
-
-      def extract_package_to_tempdir
-        infom "Extracting package to tempdir #{tempdir}..."
-        ::EacRubyUtils::Envs.local.command(
-          'tar', '-xf', source_package.path.to_path, '-C', tempdir.to_path,
-          '--strip-components', '1'
-        ).execute!
-      end
-
-      def git_commit
-        if git_repo.dirty?
-          infom 'Git commiting...'
-          git_repo.command('add', '--', target_path).execute!
-          git_repo.command('commit', '-m', git_commit_message, '--', target_path).execute!
-        else
-          infom 'Nothing to commit'
-        end
-      end
-
-      def git_commit_message
-        i18n_translate(__method__, version: version, __locale: source.locale)
-      end
-
-      def git_repo_uncached
-        ::EacGit::Local.new(target_path)
-      end
-
-      def sync_content
-        ::Avm::Sync.new(source_path, target_path)
-          .add_exclude('/*').add_includes(*target_files_to_remove).move_mode(true).run
-      end
-
-      # @return [EacFs::CachedDownload]
-      def source_package_uncached
-        ::EacFs::CachedDownload.new(url, fs_cache)
-      end
-
-      def validate_empty_dir
-        if source_path.children.empty?
-          infom 'No content left in source directory'
-        else
-          fatal_error 'Found entries in source directory: ' +
-                      source_path.children.map { |c| c.basename.to_path }.join(', ')
-        end
-      end
-
-      def source_path_uncached
-        ::Pathname.new(tempdir.to_path)
-      end
-
-      def target_files_to_remove
-        git_repo.command('ls-files').execute!
-          .each_line.map { |v| "/#{v.strip}" }
-          .without(*TARGET_KEEP)
-      end
-
-      def target_path_uncached
-        source.path
-      end
-    end
-  end
-end

data/lib/avm/eac_redmine_base0/data_unit.rb

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/data/instance/unit'
-require 'eac_ruby_utils/core_ext'
-require 'curb'
-require 'open-uri'
-
-module Avm
-  module EacRedmineBase0
-    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