avm-eac_redmine_base0 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8fa7c719db88b96a30baf106e560ce0b21d7c748583efa754983ef24ff3a87d
-  data.tar.gz: 91a7b5123f125f04ca230265f54818b238987e070f882394c502776bb7c1b7a5
+  metadata.gz: 39da16425fa7ccfa3501da84353c3cb37525f8933756cd610acf95b73a9ead98
+  data.tar.gz: 471b560946e13ca892df86c66f43ca33e6c3e95f27c25cb58ac2f55d1aa3e629
 SHA512:
-  metadata.gz: d816931a22c6c53467cca882e5a50076d25c3f49bd29e097430c193a8cbbd7eaa87517fadaa411a8fdc460c3c80b524be587851d6c7e5360a435e135a020179d
-  data.tar.gz: b7862539baf05431911a5dc267080715a45257cf3e822f5b811768f059b12d7d6c383afc5fdb3240522ecccbfbe8335719504c6187ca822a0045d01e4d57773f
+  metadata.gz: 5330c3b5f6106e116ecc727b8a65c674ea97447376cde71fc9b6367e952c003ff73051894aded1b4a55f2afb9a1e8ad77fe58ef8ebe30b00ebc04a24ba14dab0
+  data.tar.gz: a525d4d4f7a1e0b49775bd77ba2218950dac786804767d16bce3c72f7eada11c707f7a5209ee8d5e8e739c2e526df598470bdf126afdf91bffe583d7a9357ecd

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.fs_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/runners/base.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/eac_redmine_base0/instances/base'
-require 'avm/eac_redmine_base0/deploy'
+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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_redmine_base0
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-13 00:00:00.000000000 Z
+date: 2022-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.35'
+        version: '0.39'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.39.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.35'
+        version: '0.39'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.39.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
@@ -138,14 +138,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.98'
+        version: '0.102'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.98'
+        version: '0.102'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -170,9 +170,9 @@ 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/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
@@ -188,8 +188,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