avm-tools 0.87.1 → 0.92.0

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

@@ -2,16 +2,13 @@
 
 require 'avm/instances/base'
 require 'eac_cli/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
     class Runner
-      class Instance < ::EacRubyUtils::Console::DocoptRunner
+      class Instance
         require_sub __FILE__
-        runner_with
-
-        runner_definition do
+        runner_with :help, :subcommands do
           desc 'Utilities for generic instances.'
           pos_arg :instance_id
           subcommands
@@ -20,7 +17,7 @@ module Avm
         private
 
         def instance_uncached
-          ::Avm::Instances::Base.by_id(options['<instance_id>'])
+          ::Avm::Instances::Base.by_id(parsed.instance_id)
         end
       end
     end

data/lib/avm/tools/runner/instance/info.rb

@@ -2,16 +2,13 @@
 
 require 'avm/instances/entry_keys'
 require 'eac_cli/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Tools
     class Runner
-      class Instance < ::EacRubyUtils::Console::DocoptRunner
-        class Info < ::EacRubyUtils::Console::DocoptRunner
-          runner_with
-
-          runner_definition do
+      class Instance
+        class Info
+          runner_with :help do
             desc 'Show info about a instance.'
           end
 
@@ -35,7 +32,7 @@ module Avm
           end
 
           def instance
-            context(:instance)
+            runner_context.call(:instance)
           end
         end
       end

data/lib/avm/tools/runner/local_project/{eac_writings_base1.rb → eac_asciidoctor_base0.rb}

@@ -7,11 +7,11 @@ module Avm
   module Tools
     class Runner
       class LocalProject
-        class EacWritingsBase1
+        class EacAsciidoctorBase0
           require_sub __FILE__
 
           runner_with :help, :subcommands do
-            desc 'EacWritingsBase0 utitilies for local projects.'
+            desc 'EacAsciidoctorBase0 utitilies for local projects.'
             subcommands
           end
 

data/lib/avm/tools/runner/local_project/{eac_writings_base1 → eac_asciidoctor_base0}/build.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'avm/eac_writings_base1/build'
-require 'avm/eac_writings_base1/project'
+require 'avm/eac_asciidoctor_base0/build'
+require 'avm/eac_asciidoctor_base0/project'
 require 'eac_cli/core_ext'
 require 'eac_ruby_utils/console/docopt_runner'
 
@@ -9,7 +9,7 @@ module Avm
   module Tools
     class Runner
       class LocalProject
-        class EacWritingsBase1
+        class EacAsciidoctorBase0
           class Build
             runner_with :help do
               desc 'Build the project'
@@ -24,8 +24,8 @@ module Avm
             private
 
             def build_uncached
-              ::Avm::EacWritingsBase1::Build.new(runner_context.call(:project),
-                                                 target_directory: parsed.target_dir)
+              ::Avm::EacAsciidoctorBase0::Build.new(runner_context.call(:project),
+                                                    target_directory: parsed.target_dir)
             end
 
             def default_target_directory
@@ -36,10 +36,6 @@ module Avm
               runner_context.call(:project_banner)
               infov 'Target directory', build.target_directory
             end
-            #
-            #            def target_directory_uncached
-            #              .if_present(default_target_directory).to_pathname
-            #            end
           end
         end
       end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.87.1'
+    VERSION = '0.92.0'
   end
 end

data/vendor/eac_cli/lib/eac_cli/definition/argument_option.rb

@@ -8,6 +8,14 @@ module EacCli
       def argument?
         true
       end
+
+      def build_value(new_value, previous_value)
+        repeat? ? previous_value + [new_value] : new_value
+      end
+
+      def default_value
+        repeat? ? [] : nil
+      end
     end
   end
 end

data/vendor/eac_cli/lib/eac_cli/definition/base_option.rb

@@ -8,7 +8,8 @@ module EacCli
       DEFAULT_REQUIRED = false
 
       enable_listable
-      lists.add_symbol :option, :optional, :usage, :required
+      enable_abstract_methods :build_value, :default_value
+      lists.add_symbol :option, :optional, :usage, :repeat, :required
       attr_reader :short, :long, :description, :options
 
       def initialize(short, long, description, options = {})
@@ -23,6 +24,10 @@ module EacCli
         long.to_s.variableize.to_sym
       end
 
+      def repeat?
+        options[OPTION_REPEAT]
+      end
+
       def required?
         return true if options.key?(:required) && options.fetch(:required)
         return false if options.key?(:optional) && options.fetch(:optional)

data/vendor/eac_cli/lib/eac_cli/definition/boolean_option.rb

@@ -8,6 +8,14 @@ module EacCli
       def argument?
         false
       end
+
+      def build_value(_new_value, previous_value)
+        repeat? ? previous_value + 1 : true
+      end
+
+      def default_value
+        repeat? ? 0 : false
+      end
     end
   end
 end

data/vendor/eac_cli/lib/eac_cli/definition/positional_argument.rb

@@ -13,6 +13,18 @@ module EacCli
         options.assert_valid_keys(self.class.lists.option.values)
       end
 
+      def build_value(new_value, previous_value)
+        if previous_value.is_a?(::Array)
+          previous_value + [new_value]
+        else
+          new_value
+        end
+      end
+
+      def default_value
+        repeat? ? [] : nil
+      end
+
       def identifier
         name.to_s.variableize.to_sym
       end

data/vendor/eac_cli/lib/eac_cli/parser/collector.rb

@@ -24,11 +24,7 @@ module EacCli
       end
 
       def collect(option, value)
-        if data[option].is_a?(::Array)
-          data[option] << value
-        else
-          data[option] = value
-        end
+        data[option] = option.build_value(value, data[option])
       end
 
       def supplied?(option)
@@ -42,18 +38,8 @@ module EacCli
       end
 
       def default_values
-        definition.options.each { |option| data[option] = option_default_value(option) }
-        definition.positional.each do |positional|
-          data[positional] = positional_default_value(positional)
-        end
-      end
-
-      def option_default_value(option)
-        option.argument? ? nil : false
-      end
-
-      def positional_default_value(positional)
-        positional.repeat? ? [] : nil
+        definition.options.each { |option| data[option] = option.default_value }
+        definition.positional.each { |positional| data[positional] = positional.default_value }
       end
     end
   end

data/vendor/eac_cli/lib/eac_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacCli
-  VERSION = '0.12.6'
+  VERSION = '0.13.0'
 end

data/vendor/eac_cli/spec/lib/eac_cli/runner_spec.rb

@@ -12,6 +12,8 @@ RSpec.describe ::EacCli::Runner do
       runner_definition do
         arg_opt '-o', '--opt1', 'A arg option.'
         bool_opt '-p', '--opt2', 'A boolean option'
+        arg_opt '-q', '--opt4', 'A repeatable argument option.', repeat: true
+        bool_opt '-r', '--opt5', 'A repeatable boolean option', repeat: true
         pos_arg :pos1
         pos_arg :pos2, repeat: true, optional: true
         alt do
@@ -29,7 +31,7 @@ RSpec.describe ::EacCli::Runner do
   context 'when all args are supplied' do
     let(:argv) { %w[--opt1 aaa --opt2 bbb ccc ddd] }
     let(:parsed_expected) do
-      { opt1: 'aaa', opt2: true, opt3: false, pos1: 'bbb',
+      { opt1: 'aaa', opt2: true, opt3: false, opt4: [], opt5: 0, pos1: 'bbb',
         pos2: %w[ccc ddd] }
     end
 
@@ -63,7 +65,10 @@ RSpec.describe ::EacCli::Runner do
 
   context 'when only required args are supplied' do
     let(:argv) { %w[bbb] }
-    let(:parsed_expected) { { opt1: nil, opt2: false, opt3: false, pos1: 'bbb', pos2: [] } }
+    let(:parsed_expected) do
+      { opt1: nil, opt2: false, opt3: false, opt4: [], opt5: 0, pos1: 'bbb',
+        pos2: [] }
+    end
 
     it { expect(parsed_actual).to eq(parsed_expected) }
     it { expect(instance.parsed.opt1).to be_nil }
@@ -82,12 +87,25 @@ RSpec.describe ::EacCli::Runner do
 
   context 'when alternative args are supplied' do
     let(:argv) { %w[--opt3] }
-    let(:parsed_expected) { { opt1: nil, opt2: false, opt3: true, pos1: nil, pos2: [] } }
+    let(:parsed_expected) do
+      { opt1: nil, opt2: false, opt3: true, opt4: [], opt5: 0, pos1: nil,
+        pos2: [] }
+    end
 
     it { expect(parsed_actual).to eq(parsed_expected) }
     it { expect(instance.parsed.opt3?).to eq(true) }
   end
 
+  context 'when repeated options are supplied' do
+    let(:argv) { %w[--opt5 -rrr --opt4=A -q B --opt4 C AAA] }
+    let(:parsed_expected) do
+      { opt1: nil, opt2: false, opt3: false, opt4: %w[A B C], opt5: 4, pos1: 'AAA',
+        pos2: [] }
+    end
+
+    it { expect(parsed_actual).to eq(parsed_expected) }
+  end
+
   context 'when extra args are not supplied' do
     let(:runner_class) do
       the_module = described_class

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/local_time_zone.rb

@@ -14,6 +14,10 @@ module EacRubyUtils
         %w[tz_env debian_config offset].lazy.map { |s| send("by_#{s}") }.find(&:present?)
       end
 
+      def auto_set
+        ::Time.zone = auto
+      end
+
       def by_debian_config
         path = ::Pathname.new(DEBIAN_CONFIG_PATH)
         path.exist? ? path.read.strip.presence : nil

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.58.0'
+  VERSION = '0.58.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.87.1
+  version: 0.92.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-06 00:00:00.000000000 Z
+date: 2021-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -24,6 +24,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: asciidoctor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.12
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.12
 - !ruby/object:Gem::Dependency
   name: clipboard
   requirement: !ruby/object:Gem::Requirement
@@ -290,6 +310,13 @@ files:
 - lib/avm/docker/image.rb
 - lib/avm/docker/registry.rb
 - lib/avm/docker/runner.rb
+- lib/avm/eac_asciidoctor_base0.rb
+- lib/avm/eac_asciidoctor_base0/apache_host.rb
+- lib/avm/eac_asciidoctor_base0/build.rb
+- lib/avm/eac_asciidoctor_base0/build/file.rb
+- lib/avm/eac_asciidoctor_base0/deploy.rb
+- lib/avm/eac_asciidoctor_base0/instance.rb
+- lib/avm/eac_asciidoctor_base0/project.rb
 - lib/avm/eac_rails_base0.rb
 - lib/avm/eac_rails_base0/apache_host.rb
 - lib/avm/eac_rails_base0/apache_path.rb
@@ -301,8 +328,10 @@ files:
 - lib/avm/eac_rails_base1/runner.rb
 - lib/avm/eac_rails_base1/runner/bundle.rb
 - lib/avm/eac_rails_base1/runner/code_runner.rb
+- lib/avm/eac_rails_base1/runner/log.rb
 - lib/avm/eac_rails_base1/runner/rails_server.rb
 - lib/avm/eac_rails_base1/runner_with/bundle.rb
+- lib/avm/eac_rails_base1/runner_with/rails_environment.rb
 - lib/avm/eac_redmine_base0.rb
 - lib/avm/eac_redmine_base0/apache_host.rb
 - lib/avm/eac_redmine_base0/core_update.rb
@@ -346,13 +375,6 @@ files:
 - lib/avm/eac_writings_base0/project_build.rb
 - lib/avm/eac_writings_base0/project_build/chapters_content.rb
 - lib/avm/eac_writings_base0/project_build/copy_files.rb
-- lib/avm/eac_writings_base1.rb
-- lib/avm/eac_writings_base1/apache_host.rb
-- lib/avm/eac_writings_base1/build.rb
-- lib/avm/eac_writings_base1/build/file.rb
-- lib/avm/eac_writings_base1/deploy.rb
-- lib/avm/eac_writings_base1/instance.rb
-- lib/avm/eac_writings_base1/project.rb
 - lib/avm/executables.rb
 - lib/avm/files.rb
 - lib/avm/files/appendable.rb
@@ -378,6 +400,13 @@ files:
 - lib/avm/files/rotate.rb
 - lib/avm/fs_cache.rb
 - lib/avm/git.rb
+- lib/avm/git/auto_commit/commit_info.rb
+- lib/avm/git/auto_commit/rules.rb
+- lib/avm/git/auto_commit/rules/base.rb
+- lib/avm/git/auto_commit/rules/last.rb
+- lib/avm/git/auto_commit/rules/manual.rb
+- lib/avm/git/auto_commit/rules/nth.rb
+- lib/avm/git/auto_commit/rules/unique.rb
 - lib/avm/git/auto_commit_path.rb
 - lib/avm/git/auto_commit_path/ruby.rb
 - lib/avm/git/commit.rb
@@ -496,15 +525,16 @@ files:
 - lib/avm/sync.rb
 - lib/avm/tools.rb
 - lib/avm/tools/runner.rb
+- lib/avm/tools/runner/eac_asciidoctor_base0.rb
 - lib/avm/tools/runner/eac_rails_base0.rb
 - lib/avm/tools/runner/eac_rails_base0/apache_path.rb
 - lib/avm/tools/runner/eac_redmine_base0.rb
 - 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
 - lib/avm/tools/runner/files.rb
 - lib/avm/tools/runner/files/format.rb
 - lib/avm/tools/runner/files/rotate.rb
@@ -528,12 +558,12 @@ files:
 - lib/avm/tools/runner/launcher/projects.rb
 - lib/avm/tools/runner/launcher/publish.rb
 - lib/avm/tools/runner/local_project.rb
+- lib/avm/tools/runner/local_project/eac_asciidoctor_base0.rb
+- lib/avm/tools/runner/local_project/eac_asciidoctor_base0/build.rb
 - lib/avm/tools/runner/local_project/eac_writings_base0.rb
 - lib/avm/tools/runner/local_project/eac_writings_base0/build_chapters.rb
 - lib/avm/tools/runner/local_project/eac_writings_base0/build_single.rb
 - lib/avm/tools/runner/local_project/eac_writings_base0/info.rb
-- lib/avm/tools/runner/local_project/eac_writings_base1.rb
-- lib/avm/tools/runner/local_project/eac_writings_base1/build.rb
 - lib/avm/tools/runner/local_project/info.rb
 - lib/avm/tools/runner/local_project/ruby.rb
 - lib/avm/tools/runner/local_project/ruby/bundler.rb
@@ -1038,7 +1068,6 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/string.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/string/inflector.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/time.rb
-- vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/time/default_time_zone_set.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/paths_hash.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/paths_hash/entry_key_error.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/paths_hash/node.rb