avm-eac_redmine_base0 0.11.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc3f9ed24509bdb9d12267d26e46aabdf4b60d52516d2454d3088312ff7f65f0
-  data.tar.gz: 1584417896075ecd7700e018de8af719aa8243abb807fd7007628cf71c754564
+  metadata.gz: 7425583147edb8c6c206c691c7ae1216339050c06ef126885ae3bf6a7c697233
+  data.tar.gz: 126f5ef1b4b620f2e9a8dce516f58f80194f337ed48d28da4ac566ffeb60d945
 SHA512:
-  metadata.gz: 54c6e8b25c180fd62087847b18e430035c17d6b49d8fec11a659d26f62b9e014b3daa9182def68d5f7e887eed31514cb509f21ac85f902af0b974ed817a11352
-  data.tar.gz: 83f6f2f3a5f154f67e8da0e9b9d713eefda78cb4db9ead7c31342328a8087d6a56a9ec37f7f2fed693eff46ea574fc9441771078dd0866a0e3aa8a120c793756
+  metadata.gz: ec5263e7f9d24bb614d30820415b6490c9b6c3b605cd4079181d27ee02cca49eeddfc34d424559b87f327e029c739f4debf2db047076176829673593e5830c23
+  data.tar.gz: 37566904f6580506a5e6b086cbff4d7d3890cfe210f53871a8097992bb1f6e2e533e4bbb7d663c507534b348faf85e6bd2809ec2727ddd70ee82887a3e5eaa94

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

@@ -1,13 +1,57 @@
 # frozen_string_literal: true
 
-require 'avm/instances/base'
-require 'avm/eac_redmine_base0/instances/runners'
-require 'eac_ruby_utils/core_ext'
+require 'addressable/uri'
+require 'avm/eac_redmine_base0/data_unit'
+require 'avm/eac_redmine_base0/instances/docker_image'
+require 'avm/eac_redmine_base0/rest_api'
+require 'avm/eac_rails_base1/instances/base'
 
 module Avm
   module EacRedmineBase0
     module Instances
-      class Base < ::Avm::Instances::Base
+      class Base < ::Avm::EacRailsBase1::Instances::Base
+        enable_simple_cache
+
+        FILES_UNITS = { files: 'files' }.freeze
+
+        def docker_image_class
+          ::Avm::EacRedmineBase0::Instances::DockerImage
+        end
+
+        def docker_run_arguments
+          [
+            '--volume',
+            "#{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"
+          ]
+        end
+
+        def data_package
+          @data_package ||= ::Avm::Data::Instance::Package.new(
+            self,
+            units: {
+              all: ::Avm::EacRedmineBase0::DataUnit.new(self)
+            }
+          )
+        end
+
+        # @return [Addressable::URI]
+        def root_url
+          r = ::Addressable::URI.parse(read_entry(::Avm::Instances::EntryKeys::WEB_URL))
+          r.query_values = nil
+          r
+        end
+
+        private
+
+        # @return [Avm::EacRedmineBase0::RestApi]
+        def rest_api_uncached
+          url = root_url
+          url.query_values = { key: read_entry('api.key') }
+          ::Avm::EacRedmineBase0::RestApi.new(url)
+        end
       end
     end
   end

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/deploy'
+require 'eac_ruby_utils/ruby'
+
+module Avm
+  module EacRedmineBase0
+    module Instances
+      class Deploy < ::Avm::EacWebappBase0::Deploy
+        set_callback :assert_instance_branch, :after, :run_installer
+
+        def run_installer
+          infom 'Running installer'
+          ::EacRubyUtils::Ruby.on_clean_environment do
+            installer_command.system!
+          end
+        end
+
+        def installer_command
+          instance.host_env.command(installer_path, install_task)
+        end
+
+        def installer_path
+          ::File.join(instance.install_path, 'plugins', 'redmine_installer', 'installer', 'run.sh')
+        end
+
+        def install_task
+          if instance.web_path_optional.present?
+            'redmine_as_apache_path'
+          else
+            'redmine_as_apache_base'
+          end
+        end
+      end
+    end
+  end
+end

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/instances.rb

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

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'avm/eac_redmine_base0/instance'
-require 'avm/eac_redmine_base0/deploy'
+require 'avm/eac_redmine_base0/instances/base'
+require 'avm/eac_redmine_base0/instances/deploy'
 require 'avm/eac_redmine_base0/apache_host'
 require 'avm/eac_rails_base1/runner'
 require 'eac_ruby_utils/core_ext'

data/lib/avm/eac_redmine_base0/runners.rb

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

data/lib/avm/eac_redmine_base0/sources.rb

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

data/lib/avm/eac_redmine_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.11.0'
+    VERSION = '0.14.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_redmine_base0
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-26 00:00:00.000000000 Z
+date: 2022-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,48 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.29'
+        version: '0.41'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.29'
+        version: '0.41'
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: avm-eac_rails_base1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: avm-eac_ubuntu_base0
   requirement: !ruby/object:Gem::Requirement
@@ -77,6 +71,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.11
   type: :runtime
@@ -84,6 +81,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.11
 - !ruby/object:Gem::Dependency
@@ -95,7 +95,7 @@ dependencies:
         version: '0.12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.12.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -105,7 +105,7 @@ dependencies:
         version: '0.12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.12.3
 - !ruby/object:Gem::Dependency
   name: eac_rest
   requirement: !ruby/object:Gem::Requirement
@@ -132,20 +132,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.95'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.95.2
+        version: '0.102'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.95'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.95.2
+        version: '0.102'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -170,15 +164,17 @@ files:
 - 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/deploy.rb
-- lib/avm/eac_redmine_base0/instance.rb
+- lib/avm/eac_redmine_base0/instances.rb
 - lib/avm/eac_redmine_base0/instances/base.rb
+- lib/avm/eac_redmine_base0/instances/deploy.rb
 - lib/avm/eac_redmine_base0/instances/docker_image.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/runners.rb
 - lib/avm/eac_redmine_base0/sources/runners/core_update.rb
@@ -186,8 +182,8 @@ files:
 - 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/deploy/config/install.sh.template
+- template/avm/eac_redmine_base0/instances/deploy/config/secrets.yml
 - template/avm/eac_redmine_base0/instances/docker_image/Dockerfile.template
 - template/avm/eac_redmine_base0/instances/docker_image/Dockerfile_apache_setup
 - template/avm/eac_redmine_base0/instances/docker_image/apache_http_virtualhost.conf.template

data/lib/avm/eac_redmine_base0/deploy.rb

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/eac_webapp_base0/deploy'
-require 'eac_ruby_utils/ruby'
-
-module Avm
-  module EacRedmineBase0
-    class Deploy < ::Avm::EacWebappBase0::Deploy
-      set_callback :assert_instance_branch, :after, :run_installer
-
-      def run_installer
-        infom 'Running installer'
-        ::EacRubyUtils::Ruby.on_clean_environment do
-          installer_command.system!
-        end
-      end
-
-      def installer_command
-        instance.host_env.command(installer_path, install_task)
-      end
-
-      def installer_path
-        ::File.join(instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH), 'plugins',
-                    'redmine_installer', 'installer', 'run.sh')
-      end
-
-      def install_task
-        if instance.read_entry_optional('web.path').present?
-          'redmine_as_apache_path'
-        else
-          'redmine_as_apache_base'
-        end
-      end
-    end
-  end
-end

data/lib/avm/eac_redmine_base0/instance.rb

@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-require 'addressable/uri'
-require 'avm/eac_redmine_base0/data_unit'
-require 'avm/eac_redmine_base0/instances/docker_image'
-require 'avm/eac_redmine_base0/rest_api'
-require 'avm/eac_webapp_base0/instance'
-require 'avm/eac_rails_base1/instance'
-
-module Avm
-  module EacRedmineBase0
-    class Instance < ::Avm::EacRailsBase1::Instance
-      enable_simple_cache
-
-      FILES_UNITS = { files: 'files' }.freeze
-
-      def docker_image_class
-        ::Avm::EacRedmineBase0::Instances::DockerImage
-      end
-
-      def docker_run_arguments
-        [
-          '--volume',
-          "#{read_entry(::Avm::Instances::EntryKeys::FS_PATH)}:/home/myuser/eac_redmine_base0",
-          '--publish', "#{read_entry(:ssh_port)}:22",
-          '--publish', "#{read_entry(:http_port)}:80",
-          '--publish', "#{read_entry(:https_port)}:443"
-        ]
-      end
-
-      def data_package
-        @data_package ||= ::Avm::Data::Instance::Package.new(
-          self,
-          units: {
-            all: ::Avm::EacRedmineBase0::DataUnit.new(self)
-          }
-        )
-      end
-
-      # @return [Addressable::URI]
-      def root_url
-        r = ::Addressable::URI.parse(read_entry(::Avm::Instances::EntryKeys::WEB_URL))
-        r.query_values = nil
-        r
-      end
-
-      private
-
-      # @return [Avm::EacRedmineBase0::RestApi]
-      def rest_api_uncached
-        url = root_url
-        url.query_values = { key: read_entry('api.key') }
-        ::Avm::EacRedmineBase0::RestApi.new(url)
-      end
-    end
-  end
-end