avm-eac_redmine_base0 0.3.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9daf2df205e9d703cf516938c642d525084d35fb3437b22229d2bf55718dbd8c
-  data.tar.gz: 8b4ec0d4fc6906e204e6c599801097e29be8b71c97d54281d1f43f22279fbc24
+  metadata.gz: 5667c3c6f10b76812ba085734ad08b16976a8506960eeb8a4fbfba1efb7c8292
+  data.tar.gz: ca54244f4a414e4dd374b1b73aab33ef48ba518d8b1beecbc81a14a8b6bf31cd
 SHA512:
-  metadata.gz: 933a04ed3fe842bb9ac5f90ecbfc52c618d8b3f0819bfd2dadf41fe22d3b4c1a70129d0a0258952d89c966e0cde3f38b933630687867ca85e114461ccb5d653c
-  data.tar.gz: 55bf5505eb04d117eba59b1e6d51adc57113a70e7fe254e2fac5eec30ba2f561c48724bada6e2b6d64ff3dda2d5c6556b847e48f6cd45c74ee1c1323536832f9
+  metadata.gz: e27d0a8b096151f3744aae1bfdfd6883ed36f53cc0b99b3885126e2f3e96d9dd7669c7402b998e944a8a07dde0ca255c4d747ca139ad7abb895cad20e4a4d616
+  data.tar.gz: 140ae0189029862567373276c78de8d3a05b8125239900523cf8a5fd5b53c154a857c489862aed141e4200cb9984840af8ae4dd9eca749619a28f3ea6802b088

data/lib/avm/eac_redmine_base0/data_unit.rb

@@ -10,11 +10,13 @@ module Avm
     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 << URI.parse(export_url).read
+          file << export_request.response.body_data_or_raise
         end
       end
 
@@ -37,18 +39,12 @@ module Avm
         true
       end
 
-      def export_url
-        url('/backup/export')
+      def export_request
+        instance.rest_api.request(EXPORT_PATH)
       end
 
       def import_url
-        url('/backup/import.json')
-      end
-
-      def url(path)
-        uri = ::Addressable::URI.parse(instance.read_entry('web.url')) + path
-        uri.query_values = { key: instance.read_entry('admin.api_key') }
-        uri.to_s
+        instance.rest_api.build_service_url(IMPORT_PATH).to_s
       end
     end
   end

data/lib/avm/eac_redmine_base0/instance.rb

@@ -1,13 +1,17 @@
 # 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
@@ -32,6 +36,22 @@ module Avm
           }
         )
       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/rest_api.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_rest/api'
+
+module Avm
+  module EacRedmineBase0
+    class RestApi < ::EacRest::Api
+    end
+  end
+end

data/lib/avm/eac_redmine_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.3.1'
+    VERSION = '0.5.0'
   end
 end

data/template/avm/eac_redmine_base0/deploy/config/install.sh.template

@@ -18,9 +18,9 @@ export git_repositories_hierarchical_organisation=false
 export smtp_server='%%MAILER.SMTP.ADDRESS%%'
 export smtp_port='%%MAILER.SMTP.PORT%%'
 export smtp_domain='%%MAILER.SMTP.DOMAIN%%'
-export smtp_tls='%%MAILER_SMTP_TLS%%'
-export smtp_enable_starttls_auto='%%MAILER_SMTP_STARTTLS_AUTO%%'
-export smtp_openssl_verify_mode='%%MAILER_SMTP_OPENSSL_VERIFY_MODE%%'
+export smtp_tls='%%MAILER.SMTP.TLS%%'
+export smtp_enable_starttls_auto='%%MAILER.SMTP.STARTTLS_AUTO%%'
+export smtp_openssl_verify_mode='%%MAILER.SMTP.OPENSSL_VERIFY_MODE%%'
 export smtp_authentication='%%MAILER.SMTP.AUTHENTICATION%%'
 export smtp_username='%%MAILER.SMTP.USERNAME%%'
 export smtp_password='%%MAILER.SMTP.PASSWORD%%'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_redmine_base0
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-11 00:00:00.000000000 Z
+date: 2022-04-08 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.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: avm-eac_ubuntu_base0
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: eac_rest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +121,7 @@ files:
 - lib/avm/eac_redmine_base0/deploy.rb
 - 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/version.rb
 - template/avm/eac_redmine_base0/deploy/config/install.sh.template
 - template/avm/eac_redmine_base0/deploy/config/secrets.yml