avm-eac_redmine_base0 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc3f9ed24509bdb9d12267d26e46aabdf4b60d52516d2454d3088312ff7f65f0
-  data.tar.gz: 1584417896075ecd7700e018de8af719aa8243abb807fd7007628cf71c754564
+  metadata.gz: c8fa7c719db88b96a30baf106e560ce0b21d7c748583efa754983ef24ff3a87d
+  data.tar.gz: 91a7b5123f125f04ca230265f54818b238987e070f882394c502776bb7c1b7a5
 SHA512:
-  metadata.gz: 54c6e8b25c180fd62087847b18e430035c17d6b49d8fec11a659d26f62b9e014b3daa9182def68d5f7e887eed31514cb509f21ac85f902af0b974ed817a11352
-  data.tar.gz: 83f6f2f3a5f154f67e8da0e9b9d713eefda78cb4db9ead7c31342328a8087d6a56a9ec37f7f2fed693eff46ea574fc9441771078dd0866a0e3aa8a120c793756
+  metadata.gz: d816931a22c6c53467cca882e5a50076d25c3f49bd29e097430c193a8cbbd7eaa87517fadaa411a8fdc460c3c80b524be587851d6c7e5360a435e135a020179d
+  data.tar.gz: b7862539baf05431911a5dc267080715a45257cf3e822f5b811768f059b12d7d6c383afc5fdb3240522ecccbfbe8335719504c6187ca822a0045d01e4d57773f

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',
+            "#{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

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,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/eac_redmine_base0/instance'
+require 'avm/eac_redmine_base0/instances/base'
 require 'avm/eac_redmine_base0/deploy'
 require 'avm/eac_redmine_base0/apache_host'
 require 'avm/eac_rails_base1/runner'

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.12.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.12.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-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,48 +16,48 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.29'
+        version: '0.35'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.35.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.29'
+        version: '0.35'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.35.1
 - !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.5'
   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.5'
 - !ruby/object:Gem::Dependency
   name: avm-eac_ubuntu_base0
   requirement: !ruby/object:Gem::Requirement
@@ -77,6 +77,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 +87,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 +101,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 +111,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 +138,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.95'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.95.2
+        version: '0.98'
   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.98'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -171,14 +171,16 @@ files:
 - 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/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

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