avm-tools 0.88.0 → 0.89.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39cd843842c1fc4981f71fe88945db68e140b1aa6a7bdddeddd8b344c4215501
-  data.tar.gz: 1fbe73dc1d4e2854e637fc6b697880e6ad192ecb62b4cad5d81612b1e8c22e88
+  metadata.gz: 9acbf7ad72627c97018d603c65da21c1875efea79caa7569059d5fd1aeb083e2
+  data.tar.gz: 8d0bb06826ece8223ed806348cf91f36c8117ebba3ceb05247b6947b54da44f0
 SHA512:
-  metadata.gz: eba623387eb4320e93facda684c544565c2a3b1b0abca7902793df59416506068df6a3b6e0359e4ded1c40897cccb80629f23802dbbe9cc101e637726bf55297
-  data.tar.gz: 4d9b78c8924c5879811517ba7089b74aa8aa5b60a35a99d00e57330431da9141a44123c68c62c191210d9df584cbb02bd881d3067302cc09f2ae3fcc893d3f32
+  metadata.gz: f249739403ccc5346e161f6481acd020d369a02b00b01da1b6c80addc6bcce58d2dc7724cf923929e146e3cac1b8e5e557e82f66cb9f501da8e44f30f358b5c8
+  data.tar.gz: a47f7c215bedfe5f870ba8a6bbbaf2e579c0c31b017546894c43e0421d75362b366dace3cfcd2bb9f72df7a3037866385b9c928e9389d558d0c39c1939928ea1

data/lib/avm/eac_webapp_base0/deploy.rb

@@ -17,10 +17,16 @@ module Avm
 
       enable_console_speaker
       enable_simple_cache
-      common_constructor :instance, :options, default: [{}]
+      enable_listable
+      lists.add_symbol :option, :appended_directories, :no_request_test, :reference
+      common_constructor :instance, :options, default: [{}] do
+        self.options = ::Avm::EacWebappBase0::Deploy.lists.option
+                                                    .hash_keys_validate!(options.symbolize_keys)
+      end
 
-      JOBS = %w[create_build_dir build_content append_instance_content write_on_target
-                setup_files_units assert_instance_branch request_test].freeze
+      REQUEST_TEST_JOB = 'request_test'
+      JOBS = (%w[create_build_dir build_content append_instance_content write_on_target
+                 setup_files_units assert_instance_branch] + [REQUEST_TEST_JOB]).freeze
       define_callbacks(*JOBS)
 
       def run
@@ -67,8 +73,14 @@ module Avm
 
       private
 
+      def jobs
+        r = JOBS.dup
+        r.delete(REQUEST_TEST_JOB) if options[OPTION_NO_REQUEST_TEST]
+        r
+      end
+
       def run_jobs
-        JOBS.each do |job|
+        jobs.each do |job|
           run_callbacks job do
             send(job)
           end

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

@@ -17,7 +17,7 @@ module Avm
         end
 
         def appended_directories_from_options
-          options[:appended_directories] || []
+          options[OPTION_APPENDED_DIRECTORIES] || []
         end
       end
     end

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

@@ -18,7 +18,7 @@ module Avm
         end
 
         def git_reference
-          options[:reference] || DEFAULT_REFERENCE
+          options[OPTION_REFERENCE] || DEFAULT_REFERENCE
         end
 
         def git_reference_found_uncached

data/lib/avm/eac_webapp_base0/instance.rb

@@ -11,6 +11,8 @@ module Avm
     class Instance < ::Avm::Instances::Base
       include ::Avm::Postgresql::InstanceWith
 
+      FILES_UNITS = [].freeze
+
       def stereotype_name
         self.class.name.desconstantize.demodulize
       end

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

@@ -2,34 +2,25 @@
 
 require 'avm/instances/runner'
 require 'avm/path_string'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/console/speaker'
+require 'eac_cli/core_ext'
 
 module Avm
   module EacWebappBase0
     class Runner < ::Avm::Instances::Runner
-      class Deploy < ::EacRubyUtils::Console::DocoptRunner
-        include ::EacRubyUtils::Console::Speaker
-
-        DOC = <<~DOCOPT
-          Deploy for instance.
-
-          Usage:
-            __PROGRAM__ [options]
-            __PROGRAM__ -h | --help
-
-          Options:
-            -h --help                       Show this screen.
-            -r --reference=<git-reference>  Git reference to deploy.
-            -a --append-dirs=<append-dirs>  Append directories to deploy (List separated by ":").
-        DOCOPT
+      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
-          context(:stereotype_module).const_get('Deploy')
+          runner_context.call(:stereotype_module).const_get('Deploy')
         end
 
         def run
-          result = deploy_class.new(context(:instance), deploy_options).run
+          result = deploy_class.new(runner_context.call(:instance), deploy_options).run
           if result.error?
             fatal_error result.to_s
           else
@@ -38,8 +29,9 @@ module Avm
         end
 
         def deploy_options
-          { reference: options.fetch('--reference'),
-            appended_directories: ::Avm::PathString.paths(options.fetch('--append-dirs')) }
+          { reference: parsed.reference,
+            appended_directories: ::Avm::PathString.paths(parsed.append_dirs),
+            no_request_test: parsed.no_request_test? }
         end
       end
     end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/runner'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Tools
+    class Runner
+      class EacWebappBase0 < ::Avm::EacWebappBase0::Runner
+        require_sub __FILE__
+      end
+    end
+  end
+end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.88.0'
+    VERSION = '0.89.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.88.0
+  version: 0.89.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-06 00:00:00.000000000 Z
+date: 2021-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -504,6 +504,7 @@ files:
 - lib/avm/tools/runner/eac_redmine_base0/core_update.rb
 - lib/avm/tools/runner/eac_redmine_base0/docker.rb
 - lib/avm/tools/runner/eac_redmine_base0/project_rename.rb
+- lib/avm/tools/runner/eac_webapp_base0.rb
 - lib/avm/tools/runner/eac_wordpress_base0.rb
 - lib/avm/tools/runner/eac_writings_base0.rb
 - lib/avm/tools/runner/eac_writings_base1.rb