avm-tools 0.76.1 → 0.81.0

data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/struct_spec.rb

@@ -3,7 +3,8 @@
 require 'eac_ruby_utils/struct'
 
 RSpec.describe ::EacRubyUtils::Struct do
-  let(:instance) { described_class.new(a: 1, b: '') }
+  let(:instance) { described_class.new('a' => 1, b: '') }
+  let(:other) { described_class.new('a' => 'm1', c: 'm2') }
 
   describe '#[]' do
     it { expect(instance[:a]).to eq(1) }
@@ -35,6 +36,12 @@ RSpec.describe ::EacRubyUtils::Struct do
     it { expect { instance.fetch('c?') }.to raise_error(::KeyError) }
   end
 
+  describe '#merge' do
+    let(:merged) { instance.merge(other) }
+
+    it { expect(merged.to_h).to eq(a: 'm1', b: '', c: 'm2') }
+  end
+
   describe '#property_method' do
     it { expect(instance.a).to eq(1) }
     it { expect(instance.a?).to eq(true) }
@@ -43,4 +50,8 @@ RSpec.describe ::EacRubyUtils::Struct do
     it { expect { instance.c }.to raise_error(::NoMethodError) }
     it { expect { instance.c? }.to raise_error(::NoMethodError) }
   end
+
+  describe '#to_h' do
+    it { expect(instance.to_h).to eq(a: 1, b: '') }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.76.1
+  version: 0.81.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-19 00:00:00.000000000 Z
+date: 2020-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -300,6 +300,7 @@ 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/rails_server.rb
 - lib/avm/eac_rails_base1/runner_with/bundle.rb
 - lib/avm/eac_redmine_base0.rb
 - lib/avm/eac_redmine_base0/core_update.rb
@@ -434,6 +435,7 @@ files:
 - lib/avm/local_projects.rb
 - lib/avm/local_projects/instance.rb
 - lib/avm/patches.rb
+- lib/avm/patches/class/i18n.rb
 - lib/avm/patches/eac_ruby_gems_utils/gem.rb
 - lib/avm/patches/i18n.rb
 - lib/avm/patches/object/i18n.rb
@@ -485,8 +487,6 @@ files:
 - lib/avm/tools/runner.rb
 - lib/avm/tools/runner/eac_rails_base0.rb
 - lib/avm/tools/runner/eac_rails_base0/apache_path.rb
-- lib/avm/tools/runner/eac_rails_base0/rails_server.rb
-- lib/avm/tools/runner/eac_rails_base0/runner.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
@@ -507,6 +507,8 @@ files:
 - lib/avm/tools/runner/git/revisions_test.rb
 - lib/avm/tools/runner/git/subrepo.rb
 - lib/avm/tools/runner/git/subrepo/check.rb
+- lib/avm/tools/runner/git/subrepo/clone.rb
+- lib/avm/tools/runner/git/subrepo/fix.rb
 - lib/avm/tools/runner/instance.rb
 - lib/avm/tools/runner/instance/info.rb
 - lib/avm/tools/runner/launcher.rb
@@ -598,31 +600,40 @@ files:
 - vendor/eac_cli/lib/eac_cli/core_ext.rb
 - vendor/eac_cli/lib/eac_cli/default_runner.rb
 - vendor/eac_cli/lib/eac_cli/definition.rb
+- vendor/eac_cli/lib/eac_cli/definition/alternative.rb
 - vendor/eac_cli/lib/eac_cli/definition/argument_option.rb
 - vendor/eac_cli/lib/eac_cli/definition/base_option.rb
 - vendor/eac_cli/lib/eac_cli/definition/boolean_option.rb
 - vendor/eac_cli/lib/eac_cli/definition/help_formatter.rb
 - vendor/eac_cli/lib/eac_cli/definition/positional_argument.rb
 - vendor/eac_cli/lib/eac_cli/docopt/doc_builder.rb
+- vendor/eac_cli/lib/eac_cli/docopt/doc_builder/alternative.rb
 - vendor/eac_cli/lib/eac_cli/docopt/runner_extension.rb
 - vendor/eac_cli/lib/eac_cli/parser.rb
+- vendor/eac_cli/lib/eac_cli/parser/alternative.rb
+- vendor/eac_cli/lib/eac_cli/parser/alternative/argv.rb
+- vendor/eac_cli/lib/eac_cli/parser/alternative/double_dash.rb
+- vendor/eac_cli/lib/eac_cli/parser/alternative/options.rb
+- vendor/eac_cli/lib/eac_cli/parser/alternative/positionals.rb
 - vendor/eac_cli/lib/eac_cli/parser/collector.rb
 - vendor/eac_cli/lib/eac_cli/parser/error.rb
-- vendor/eac_cli/lib/eac_cli/parser/options_collection.rb
-- vendor/eac_cli/lib/eac_cli/parser/parse_result.rb
-- vendor/eac_cli/lib/eac_cli/parser/positional_collection.rb
 - vendor/eac_cli/lib/eac_cli/patches.rb
 - vendor/eac_cli/lib/eac_cli/patches/object.rb
 - vendor/eac_cli/lib/eac_cli/patches/object/runner_with.rb
 - vendor/eac_cli/lib/eac_cli/runner.rb
 - vendor/eac_cli/lib/eac_cli/runner/context.rb
+- vendor/eac_cli/lib/eac_cli/runner/exit.rb
 - vendor/eac_cli/lib/eac_cli/runner_with.rb
 - vendor/eac_cli/lib/eac_cli/runner_with/help.rb
 - vendor/eac_cli/lib/eac_cli/runner_with/output_file.rb
 - vendor/eac_cli/lib/eac_cli/runner_with/subcommands.rb
 - vendor/eac_cli/lib/eac_cli/version.rb
+- vendor/eac_cli/spec/lib/eac_cli/definition/alternative_spec.rb
 - vendor/eac_cli/spec/lib/eac_cli/docopt/runner_extension_spec.rb
+- vendor/eac_cli/spec/lib/eac_cli/parser/alternative_spec.rb
 - vendor/eac_cli/spec/lib/eac_cli/runner_spec.rb
+- vendor/eac_cli/spec/lib/eac_cli/runner_with/help_spec.rb
+- vendor/eac_cli/spec/lib/eac_cli/runner_with/output_file_spec.rb
 - vendor/eac_cli/spec/lib/eac_cli/runner_with/subcommands_spec.rb
 - vendor/eac_cli/spec/rubocop_spec.rb
 - vendor/eac_cli/spec/spec_helper.rb
@@ -888,18 +899,24 @@ files:
 - vendor/eac_ruby_utils/README.rdoc
 - vendor/eac_ruby_utils/eac_ruby_utils.gemspec
 - vendor/eac_ruby_utils/lib/eac_ruby_utils.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/abstract_methods.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/arguments_consumer.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/blank_not_blank.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/boolean.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/by_reference.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/common_concern.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/common_concern/class_setup.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/common_concern/module_setup.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/common_constructor.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/configs.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/configs/base.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/configs/file.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/console.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/console/configs.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/console/configs/entry_reader.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/console/configs/password_entry_reader.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/console/configs/read_entry_options.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/console/configs/store_passwords_entry_reader.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner/_class_methods.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner/_doc.rb
@@ -916,6 +933,8 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/envs.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/base_env.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/command.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/command/concat.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/command/envvars.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/command/extra_options.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/executable.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/file.rb
@@ -970,6 +989,7 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/hash/options_consumer.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/hash/sym_keys_hash.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/abstract_methods.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/common_concern.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/console_speaker.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/immutable.rb
@@ -1019,6 +1039,7 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/templates/variable_providers/hash.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/version.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/yaml.rb
+- vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/abstract_methods_spec.rb
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/arguments_consumer_spec.rb
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/blank_not_blank_spec.rb
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/common_concern_spec.rb

data/lib/avm/tools/runner/eac_rails_base0/rails_server.rb

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/eac_rails_base1/runner_with/bundle'
-require 'avm/instances/entry_keys'
-require 'eac_cli/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'shellwords'
-
-module Avm
-  module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class EacRailsBase0 < ::Avm::EacRailsBase1::Runner
-        class RailsServer
-          DEFAULT_RAILS_ENVIRONMENT = 'development'
-          runner_with ::Avm::EacRailsBase1::RunnerWith::Bundle
-          runner_definition do
-            desc 'Run the embbeded Rails web server.'
-          end
-
-          def run
-            infov 'Environment', rails_environment
-            infov 'Bundle args', ::Shellwords.join(bundle_args)
-            infov 'Result', bundle_command.system
-          end
-
-          protected
-
-          def bundle_args
-            ['exec', 'rails', 'server', '--port',
-             runner_context.call(:instance).read_entry(::Avm::Instances::EntryKeys::WEB_PORT)]
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/eac_rails_base1/runner/code_runner'
-
-module Avm
-  module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class EacRailsBase0 < ::Avm::EacRailsBase1::Runner
-        class Runner < ::Avm::EacRailsBase1::Runner::CodeRunner
-        end
-      end
-    end
-  end
-end

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

@@ -1,68 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-require 'optparse'
-
-module EacCli
-  class Parser
-    class OptionsCollection
-      enable_simple_cache
-      common_constructor(:definition, :argv, :collector) { collect }
-      attr_reader :arguments
-
-      def options_first?
-        definition.options_first? || definition.subcommands?
-      end
-
-      private
-
-      def check_required_options
-        definition.options.each do |option|
-          next unless option.required?
-          next if collector.supplied?(option)
-
-          raise ::EacCli::Parser::Error.new(
-            definition, argv, "Option \"#{option}\" is required and a value was not supplied"
-          )
-        end
-      end
-
-      def collect
-        build_banner
-        build_options
-        parse_argv
-        check_required_options
-      end
-
-      def option_parser_uncached
-        ::OptionParser.new
-      end
-
-      def parse_argv
-        @arguments = options_first? ? option_parser.order(argv) : option_parser.parse(argv)
-      rescue ::OptionParser::InvalidOption => e
-        raise ::EacCli::Parser::Error.new(definition, argv, e.message)
-      end
-
-      def build_banner
-        option_parser.banner = definition.help_formatter.to_banner
-      end
-
-      def build_options
-        definition.options.each do |option|
-          build_option(option)
-        end
-      end
-
-      def build_option(option)
-        option_parser.on(
-          *[::EacCli::Definition::HelpFormatter.option_short(option),
-            ::EacCli::Definition::HelpFormatter.option_long(option),
-            option.description].reject(&:blank?)
-        ) do |value|
-          collector.collect(option, value)
-        end
-      end
-    end
-  end
-end

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

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/parser/error'
-require 'eac_ruby_utils/core_ext'
-
-module EacCli
-  class Parser
-    class ParseResult
-      common_constructor :definition, :argv
-
-      def result
-        result_or_error = parse(definition)
-        return result_or_error unless result_or_error.is_a?(::Exception)
-
-        definition.alternatives.each do |alternative|
-          alt_result_or_error = parse(alternative)
-          return alt_result_or_error unless alt_result_or_error.is_a?(::Exception)
-        end
-
-        raise result_or_error
-      end
-
-      private
-
-      def parse(definition)
-        ::EacCli::Parser::Collector.to_data(definition) do |collector|
-          ::EacCli::Parser::PositionalCollection.new(
-            definition,
-            ::EacCli::Parser::OptionsCollection.new(definition, argv, collector).arguments,
-            collector
-          )
-        end
-      rescue ::EacCli::Parser::Error => e
-        e
-      end
-    end
-  end
-end

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

@@ -1,77 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-require 'eac_cli/parser/error'
-
-module EacCli
-  class Parser
-    class PositionalCollection
-      common_constructor(:definition, :argv, :collector) { collect }
-
-      private
-
-      def argv_enum
-        @argv_enum ||= argv.each
-      end
-
-      def argv_pending?
-        argv_enum.ongoing?
-      end
-
-      def argv_pending_check
-        return unless argv_pending?
-        return unless positional_enum.stopped?
-
-        raise ::EacCli::Parser::Error.new(
-          definition, argv, "No positional left for argv \"#{argv_enum.current}\""
-        )
-      end
-
-      def collected
-        @collected ||= ::Set.new
-      end
-
-      def collect
-        loop do
-          break unless enums('pending?').any?
-
-          enums('pending_check')
-          collect_argv_value
-        end
-      end
-
-      def collect_argv_value
-        collector.collect(*enums('enum', &:peek))
-        collected << positional_enum.peek
-        positional_enum.next unless positional_enum.peek.repeat?
-        argv_enum.next
-      end
-
-      def enums(method_suffix, &block)
-        %w[positional argv].map do |method_prefix|
-          v = send("#{method_prefix}_#{method_suffix}")
-          block ? block.call(v) : v
-        end
-      end
-
-      def positional_enum
-        @positional_enum ||= definition.positional.each
-      end
-
-      def positional_pending?
-        !(positional_enum.stopped? || positional_enum.current.optional? ||
-            collected.include?(positional_enum.current))
-      end
-
-      def positional_pending_check
-        return unless positional_pending?
-        return unless argv_enum.stopped?
-
-        raise ::EacCli::Parser::Error.new(
-          definition, argv, 'No value for required positional ' \
-            "\"#{positional_enum.current.identifier}\""
-        )
-      end
-    end
-  end
-end