avm-eac_webapp_base0 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 764428ae37bd892eec905f4a0f4d87e7981ec93b048204c97b892d09ec5ef766
-  data.tar.gz: 17b1c9cc789c99de8ff2bb71cc0652a8bb471762e3f4eaf5e17b5b7b453d8b32
+  metadata.gz: 8c92974822d086101ff3ba715fe859ea83e8b43521aefeee47d3b4be0b65fcb4
+  data.tar.gz: 15a0c7603c40084f2ae051ddd8b67098411b77ca25e8eb16f2a0b195b6752c06
 SHA512:
-  metadata.gz: 1412df638ba57ce1c40680424cd6c27e93d98d4a4d1d365e188987695ce17227e2e0273a505d1aec205732a7c037756bfa87c656eae24ae830d1f8b59858fb0f
-  data.tar.gz: c221049df209d0bdf10b0a15f299ba0a57fd26c321bbe6e26f0fb026ad4dc5ca568dfafb23edd5f18a256d16c534e60953bbdf6da75f199036d279afd5b9db20
+  metadata.gz: f8731a2d07e09056dabfec17ae0f8ede8eb9014c2c18143ed6f766e5292b271f097011573eea3df54a718ce5c9146c8bba99bce0b9988c54c5ab61562c62cab5
+  data.tar.gz: d2a835121410ce4030bb5a90479ce1440b4f5b16a9750ca7f0500b76bd210f1d4ab277f4ad627d490616e6f0409753c17c248a7153da2da0b62f7ff971104f05

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

@@ -15,18 +15,10 @@ module Avm
         include ::Avm::EacPostgresqlBase0::InstanceWith
         enable_simple_cache
 
-        def data_dump(argv = [])
-          run_subcommand(data_dump_runner_class, argv)
-        end
-
-        def data_dump_runner_class
-          ::Avm::EacWebappBase0::Instances::Runners::Data::Dump
-        end
-
         def run_subcommand(subcommand_class, argv)
           subcommand_class.create(
             argv: argv,
-            parent: ::Avm::EacWebappBase0::Instances::Base::SubcommandParent.new(self)
+            parent: ::Avm::Instances::Base::SubcommandParent.new(self)
           ).run
         end
 
@@ -41,7 +33,7 @@ module Avm
         end
 
         def database_unit
-          pg.data_unit
+          pg_data_unit
         end
 
         private

data/lib/avm/eac_webapp_base0/instances/runners/data/load.rb

@@ -33,7 +33,9 @@ module Avm
             end
 
             def source_instance_dump_path
-              runner_context.call(:instance).class.by_id(parsed.source_instance).data_dump
+              runner_context.call(:instance).class.by_id(parsed.source_instance).run_subcommand(
+                ::Avm::EacWebappBase0::Instances::Runners::Data::Dump, []
+              )
             end
 
             def load_dump

data/lib/avm/eac_webapp_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWebappBase0
-    VERSION = '0.16.0'
+    VERSION = '0.17.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_webapp_base0
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-10 00:00:00.000000000 Z
+date: 2023-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.69'
+        version: '0.70'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.69'
+        version: '0.70'
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     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_ubuntu_base0
   requirement: !ruby/object:Gem::Requirement
@@ -98,14 +98,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.113'
+        version: '0.114'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.113'
+        version: '0.114'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -139,7 +139,6 @@ files:
 - lib/avm/eac_webapp_base0/instances/apache_host.rb
 - lib/avm/eac_webapp_base0/instances/apache_path.rb
 - lib/avm/eac_webapp_base0/instances/base.rb
-- lib/avm/eac_webapp_base0/instances/base/subcommand_parent.rb
 - lib/avm/eac_webapp_base0/instances/deploy.rb
 - lib/avm/eac_webapp_base0/instances/deploy/appended_directories.rb
 - lib/avm/eac_webapp_base0/instances/deploy/build.rb
@@ -150,13 +149,7 @@ files:
 - lib/avm/eac_webapp_base0/instances/runners.rb
 - lib/avm/eac_webapp_base0/instances/runners/apache_host.rb
 - lib/avm/eac_webapp_base0/instances/runners/apache_path.rb
-- lib/avm/eac_webapp_base0/instances/runners/data.rb
-- lib/avm/eac_webapp_base0/instances/runners/data/dump.rb
 - lib/avm/eac_webapp_base0/instances/runners/data/load.rb
-- lib/avm/eac_webapp_base0/instances/runners/data/unit.rb
-- lib/avm/eac_webapp_base0/instances/runners/data/unit/clear.rb
-- lib/avm/eac_webapp_base0/instances/runners/data/unit/dump.rb
-- lib/avm/eac_webapp_base0/instances/runners/data/unit/load.rb
 - lib/avm/eac_webapp_base0/instances/runners/deploy.rb
 - lib/avm/eac_webapp_base0/sources.rb
 - lib/avm/eac_webapp_base0/sources/base.rb

data/lib/avm/eac_webapp_base0/instances/base/subcommand_parent.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module EacWebappBase0
-    module Instances
-      class Base < ::Avm::Instances::Base
-        class SubcommandParent
-          enable_simple_cache
-          common_constructor :instance
-
-          private
-
-          def runner_context_uncached
-            ::EacCli::Runner::Context.new(self, argv: runner_argv)
-          end
-
-          def runner_argv
-            [instance.class.name.split('::')[-2].dasherize, instance.id]
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/eac_webapp_base0/instances/runners/data/dump.rb

@@ -1,65 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/data/package/dump'
-require 'eac_cli/core_ext'
-
-module Avm
-  module EacWebappBase0
-    module Instances
-      module Runners
-        class Data
-          class Dump
-            DUMP_EXPIRE_TIME = 1.day
-            DEFAULT_DUMP_PATH_ENTRY_SUFFIX = 'data.default_dump_path'
-            NO_DUMP_MESSAGE = 'Dump "%s" already exist and rewrite options was no setted nor ' \
-              'dump was expired.'
-
-            runner_with :help do
-              desc 'Dump utility for EacRailsBase instance.'
-              bool_opt '-w', '--rewrite', 'Forces dump overwrite.'
-              arg_opt '-p', '--dump-path', 'Set DUMP_PATH variable.'
-            end
-
-            def run
-              infov 'Instance to dump', "#{instance} (#{instance.class})"
-              if package_dump.runnable?
-                package_dump.run
-              else
-                warn(package_dump.cannot_run_reason)
-              end
-              success("Dump path: \"#{dump_path}\"")
-              dump_path
-            end
-
-            private
-
-            def instance
-              runner_context.call(:instance)
-            end
-
-            def package_dump_uncached
-              instance
-                .data_package.dump(dump_path, existing: package_dump_existing)
-            end
-
-            def dump_path
-              parsed.dump_path || default_dump_path
-            end
-
-            def default_dump_path
-              instance.read_entry(DEFAULT_DUMP_PATH_ENTRY_SUFFIX)
-            end
-
-            def package_dump_existing
-              if parsed.rewrite?
-                ::Avm::Data::Package::Dump::EXISTING_ROTATE
-              else
-                ::Avm::Data::Package::Dump::EXISTING_ROTATE_EXPIRED
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/eac_webapp_base0/instances/runners/data/unit/clear.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/core_ext'
-
-module Avm
-  module EacWebappBase0
-    module Instances
-      module Runners
-        class Data
-          class Unit
-            class Clear
-              runner_with :help
-
-              def run
-                runner_context.call(:data_unit).clear
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/eac_webapp_base0/instances/runners/data/unit/dump.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/core_ext'
-
-module Avm
-  module EacWebappBase0
-    module Instances
-      module Runners
-        class Data
-          class Unit
-            class Dump
-              runner_with :help do
-                pos_arg :dump_path
-              end
-
-              def run
-                nyi
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/eac_webapp_base0/instances/runners/data/unit/load.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/core_ext'
-
-module Avm
-  module EacWebappBase0
-    module Instances
-      module Runners
-        class Data
-          class Unit
-            class Load
-              runner_with :help do
-                pos_arg :dump_path
-              end
-
-              def run
-                nyi
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/eac_webapp_base0/instances/runners/data/unit.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/core_ext'
-
-module Avm
-  module EacWebappBase0
-    module Instances
-      module Runners
-        class Data
-          class Unit
-            require_sub __FILE__
-            runner_with :help, :subcommands do
-              pos_arg :identifier
-              subcommands
-            end
-
-            # @return [Enumerable<String>]
-            def available_units_ids
-              data_package.units_ids
-            end
-
-            # @return [Avm::Instances::Data::Package]
-            def data_package
-              runner_context.call(:instance).data_package
-            end
-
-            # @return [Avm::Instances::Data::Unit]
-            def data_unit
-              data_package.unit(parsed.identifier)
-            end
-
-            # @return [Hash<String, Enumerable<String>]
-            def help_extra_text
-              super.merge('Available units' => available_units_ids)
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/eac_webapp_base0/instances/runners/data.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/core_ext'
-
-module Avm
-  module EacWebappBase0
-    module Instances
-      module Runners
-        class Data
-          require_sub __FILE__
-          runner_with :help, :subcommands do
-            desc 'Data utilities for EacRailsBase0 instances.'
-            subcommands
-          end
-        end
-      end
-    end
-  end
-end