avm-eac_webapp_base0 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f97830529c4a2b1f5f94205d6d52a0542bab6f4b2b59581d0989f7b9c9c40303
-  data.tar.gz: b556b1342ecd453a76b4d7bad035ee3b4861ff7f334f4f4cef1dd3f00cb3bf98
+  metadata.gz: d19706588763ddfb9486347626c14084ed45f6fef3456da2ba0a4c5f89075aed
+  data.tar.gz: 53a8ba40b77d924ed300e26c0d4436e90c565cd0882534a64e5b260c4a3e8e82
 SHA512:
-  metadata.gz: c02b1a013040e732b3c43a4f63cfd85a1230fcf6ba1eb5fc0663771bcd11be7b4d2adaa7084372b46ad5ac56e2bb6b7e4762672aff165b15eb8ab01632743e2e
-  data.tar.gz: 25abb60202acbded3da79b339e840f0538e0ec10c0a68cb78e1df434ffb6af1800108fa9f1018d03fa5f72d873fbfeadd5a0a4e0eafa44c04c49666fa506738f
+  metadata.gz: 2319d3ebf243fee42efe908daa895920e0c23cc9a0d2f1eb965a5e79581c6e1d860ff6a22acf907b847a48d648e32bc140890d44c99af53879b9fc5c543d40e7
+  data.tar.gz: f25dff84a1a0e9a6bb783201332465dc0a6e2830fbf578bd35c96e33d26d699ba77fa915489c39be7e42823d30c89e224a4b4f89c3dcc3f8b850a862343a17c5

data/lib/avm/eac_webapp_base0/apache_path.rb

@@ -15,7 +15,7 @@ module Avm
       end
 
       def document_root
-        instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
+        instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
       end
 
       def extra_content

data/lib/avm/eac_webapp_base0/deploy/file_unit.rb

@@ -27,7 +27,7 @@ module Avm
         end
 
         def target_path
-          ::File.join(instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH),
+          ::File.join(instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH),
                       fs_path_subpath.to_s)
         end
 

data/lib/avm/eac_webapp_base0/deploy/git_info.rb

@@ -38,7 +38,7 @@ module Avm
         end
 
         def git_repository_path
-          instance.source_instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
+          instance.source_instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
         end
 
         def git_uncached

data/lib/avm/eac_webapp_base0/deploy/write_on_target.rb

@@ -9,7 +9,7 @@ module Avm
         def write_on_target
           ::Avm::Files::Deploy.new(
             instance.host_env,
-            instance.read_entry(::Avm::Instances::EntryKeys::FS_PATH)
+            instance.read_entry(::Avm::Instances::EntryKeys::INSTALL_PATH)
           ).append_plain_directory(build_dir).run
         end
       end

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

@@ -23,13 +23,13 @@ module Avm
         end
 
         def data_dump_runner_class
-          "#{stereotype_namespace_module}::Runner::Data::Dump".constantize
+          ::Avm::EacWebappBase0::Instances::Runners::Data::Dump
         end
 
         def run_subcommand(subcommand_class, argv)
           subcommand_class.create(
             argv: argv,
-            parent: ::Avm::EacWebappBase0::Instance::SubcommandParent.new(self)
+            parent: ::Avm::EacWebappBase0::Instances::Base::SubcommandParent.new(self)
           ).run
         end
 

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      module Runners
+        class ApacheHost
+          runner_with :help do
+            desc 'Configure Apache virtual host for instance.'
+            bool_opt '-c', '--certbot', 'Install certbot.'
+          end
+
+          def run
+            result = stereotype_apache_host_class.new(runner_context.call(:instance),
+                                                      stereotype_apache_host_options).run
+            if result.error?
+              fatal_error result.to_s
+            else
+              infov 'Result', result.label
+            end
+          end
+
+          def stereotype_apache_host_class
+            "#{runner_context.call(:instance).class.name.deconstantize}::ApacheHost".constantize
+          end
+
+          def stereotype_apache_host_options
+            { certbot: parsed.certbot? }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      module Runners
+        class ApachePath
+          runner_with :help do
+            desc 'Configure Apache path configuration for instance.'
+          end
+
+          def run
+            if result.error?
+              fatal_error result.to_s
+            else
+              infov 'Result', result.label
+            end
+          end
+
+          private
+
+          def apache_path_uncached
+            stereotype_apache_path_class.new(runner_context.call(:instance))
+          end
+
+          def result_uncached
+            apache_path.run
+          end
+
+          def stereotype_apache_path_class
+            "#{runner_context.call(:instance).class.name.deconstantize}::ApachePath".constantize
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'avm/instances/runner'
+require 'avm/path_string'
+require 'eac_cli/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      module Runners
+        class Deploy
+          runner_with :help do
+            desc 'Deploy for instance.'
+            arg_opt '-r', '--reference', 'Git reference to deploy.'
+            arg_opt '-a', '--append-dirs', 'Append directories to deploy (List separated by ":").'
+            bool_opt '-T', '--no-request-test', 'Do not test web interface after deploy.'
+          end
+
+          def deploy_class
+            runner_context.call(:stereotype_module).const_get('Instances').const_get('Deploy')
+          rescue ::NameError
+            runner_context.call(:stereotype_module).const_get('Deploy')
+          end
+
+          def run
+            result = deploy_class.new(runner_context.call(:instance), deploy_options).run
+            if result.error?
+              fatal_error result.to_s
+            else
+              infov 'Result', result.label
+            end
+          end
+
+          def deploy_options
+            { reference: parsed.reference,
+              appended_directories: ::Avm::PathString.paths(parsed.append_dirs),
+              no_request_test: parsed.no_request_test? }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_webapp_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWebappBase0
-    VERSION = '0.5.0'
+    VERSION = '0.7.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_webapp_base0
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-18 00:00:00.000000000 Z
+date: 2022-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.39'
+        version: '0.41'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.39.1
+        version: 0.41.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.39'
+        version: '0.41'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.39.1
+        version: 0.41.1
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
@@ -79,6 +79,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.102'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.102.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -86,6 +89,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.102'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.102.1
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -119,13 +125,13 @@ files:
 - lib/avm/eac_webapp_base0/instances/base.rb
 - lib/avm/eac_webapp_base0/instances/base/subcommand_parent.rb
 - 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/deploy.rb
 - lib/avm/eac_webapp_base0/runner.rb
-- lib/avm/eac_webapp_base0/runner/apache_host.rb
-- lib/avm/eac_webapp_base0/runner/apache_path.rb
-- lib/avm/eac_webapp_base0/runner/deploy.rb
 - lib/avm/eac_webapp_base0/sources.rb
 - lib/avm/eac_webapp_base0/sources/base.rb
 - lib/avm/eac_webapp_base0/version.rb

data/lib/avm/eac_webapp_base0/runner/apache_host.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/instances/runner'
-require 'eac_cli/core_ext'
-
-module Avm
-  module EacWebappBase0
-    class Runner < ::Avm::Instances::Runner
-      class ApacheHost
-        runner_with :help do
-          desc 'Configure Apache virtual host for instance.'
-          bool_opt '-c', '--certbot', 'Install certbot.'
-        end
-
-        def run
-          result = stereotype_apache_host_class.new(runner_context.call(:instance),
-                                                    stereotype_apache_host_options).run
-          if result.error?
-            fatal_error result.to_s
-          else
-            infov 'Result', result.label
-          end
-        end
-
-        def stereotype_apache_host_class
-          "#{runner_context.call(:instance).class.name.deconstantize}::ApacheHost".constantize
-        end
-
-        def stereotype_apache_host_options
-          { certbot: parsed.certbot? }
-        end
-      end
-    end
-  end
-end

data/lib/avm/eac_webapp_base0/runner/apache_path.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/core_ext'
-require 'avm/instances/runner'
-require 'avm/eac_webapp_base0/runner/apache_host'
-require 'avm/eac_rails_base0/apache_path'
-
-module Avm
-  module EacWebappBase0
-    class Runner < ::Avm::Instances::Runner
-      class ApachePath
-        runner_with :help do
-          desc 'Configure Apache path configuration for instance.'
-        end
-
-        def run
-          if result.error?
-            fatal_error result.to_s
-          else
-            infov 'Result', result.label
-          end
-        end
-
-        private
-
-        def apache_path_uncached
-          stereotype_apache_path_class.new(runner_context.call(:instance))
-        end
-
-        def result_uncached
-          apache_path.run
-        end
-
-        def stereotype_apache_path_class
-          "#{runner_context.call(:instance).class.name.deconstantize}::ApachePath".constantize
-        end
-      end
-    end
-  end
-end

data/lib/avm/eac_webapp_base0/runner/deploy.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/instances/runner'
-require 'avm/path_string'
-require 'eac_cli/core_ext'
-
-module Avm
-  module EacWebappBase0
-    class Runner < ::Avm::Instances::Runner
-      class Deploy
-        runner_with :help do
-          desc 'Deploy for instance.'
-          arg_opt '-r', '--reference', 'Git reference to deploy.'
-          arg_opt '-a', '--append-dirs', 'Append directories to deploy (List separated by ":").'
-          bool_opt '-T', '--no-request-test', 'Do not test web interface after deploy.'
-        end
-
-        def deploy_class
-          runner_context.call(:stereotype_module).const_get('Instances').const_get('Deploy')
-        rescue ::NameError
-          runner_context.call(:stereotype_module).const_get('Deploy')
-        end
-
-        def run
-          result = deploy_class.new(runner_context.call(:instance), deploy_options).run
-          if result.error?
-            fatal_error result.to_s
-          else
-            infov 'Result', result.label
-          end
-        end
-
-        def deploy_options
-          { reference: parsed.reference,
-            appended_directories: ::Avm::PathString.paths(parsed.append_dirs),
-            no_request_test: parsed.no_request_test? }
-        end
-      end
-    end
-  end
-end