avm-tools 0.85.0 → 0.88.0

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

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

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

@@ -11,7 +11,7 @@ RSpec.describe ::EacCli::Runner do
 
       runner_definition do
         arg_opt '-o', '--opt1', 'A arg option.'
-        bool_opt '-o', '--opt2', 'A boolean option'
+        bool_opt '-p', '--opt2', 'A boolean option'
         pos_arg :pos1
         pos_arg :pos2, repeat: true, optional: true
         alt do
@@ -40,6 +40,27 @@ RSpec.describe ::EacCli::Runner do
     it { expect(instance.parsed.pos2).to eq(%w[ccc ddd]) }
   end
 
+  context 'with long option and argument in same position' do
+    let(:argv) { %w[--opt1=aaa pos1] }
+
+    it { expect(instance.parsed.opt1).to eq('aaa') }
+  end
+
+  context 'with valid grouped short options' do
+    let(:argv) { %w[-po aaa pos1] }
+
+    it { expect(instance.parsed.opt1).to eq('aaa') }
+    it { expect(instance.parsed.opt2?).to eq(true) }
+  end
+
+  context 'with invalid grouped short options' do
+    let(:argv) { %w[-op aaa pos1] }
+
+    it do
+      expect { instance.parsed }.to raise_error(::EacCli::Parser::Error)
+    end
+  end
+
   context 'when only required args are supplied' do
     let(:argv) { %w[bbb] }
     let(:parsed_expected) { { opt1: nil, opt2: false, opt3: false, pos1: 'bbb', pos2: [] } }

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/application.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_gems_utils/gem'
 require 'eac_ruby_utils/core_ext'
 require 'eac_ruby_utils/filesystem_cache'
 

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/runner.rb

@@ -1,13 +1,16 @@
 # frozen_string_literal: true
 
-require 'eac_cli/default_runner'
+require 'eac_cli/runner_with/help'
+require 'eac_cli/runner_with/subcommands'
 require 'eac_ruby_utils/core_ext'
 
 module EacRubyBase0
   module Runner
     require_sub __FILE__
+    enable_console_speaker
     common_concern do
-      include ::EacCli::DefaultRunner
+      include ::EacCli::RunnerWith::Help
+      include ::EacCli::RunnerWith::Subcommands
       runner_definition do
         bool_opt '-q', '--quiet', 'Quiet mode.'
         bool_opt '-I', '--no-input', 'Fail if a input is requested.'
@@ -20,9 +23,9 @@ module EacRubyBase0
 
     def run
       on_speaker_node do |node|
-        node.stderr = ::StringIO.new if options.fetch('--quiet')
-        node.stdin = FailIfRequestInput.new if options.fetch('--no-input')
-        if options.fetch('--version')
+        node.stderr = ::StringIO.new if parsed.quiet?
+        node.stdin = FailIfRequestInput.new if parsed.no_input?
+        if parsed.version?
           show_version
         else
           run_with_subcommand
@@ -31,7 +34,7 @@ module EacRubyBase0
     end
 
     def application_version
-      context(:application).version.to_s
+      runner_context.call(:application).version.to_s
     end
 
     def show_version

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/runner/test_all.rb

@@ -1,17 +1,12 @@
 # frozen_string_literal: true
 
-require 'eac_cli/default_runner'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/core_ext'
+require 'eac_cli/core_ext'
 require 'eac_ruby_gems_utils/tests/multiple'
 
 module EacRubyBase0
   module Runner
-    class TestAll < ::EacRubyUtils::Console::DocoptRunner
-      require_sub __FILE__
-      include ::EacCli::DefaultRunner
-
-      runner_definition do
+    class TestAll
+      runner_with :help do
         desc 'Test core and local gems.'
       end
 
@@ -20,7 +15,7 @@ module EacRubyBase0
       end
 
       def tests_uncached
-        ::EacRubyGemsUtils::Tests::Multiple.new(context(:application).all_gems)
+        ::EacRubyGemsUtils::Tests::Multiple.new(runner_context.call(:application).all_gems)
       end
     end
   end

data/vendor/eac_ruby_base0/lib/eac_ruby_base0/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyBase0
-  VERSION = '0.3.1'
+  VERSION = '0.3.3'
 end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/fs/traverser.rb

@@ -57,8 +57,6 @@ module EacRubyUtils
           user_check_file(path)
         elsif path.directory?
           inner_check_directory(path, level)
-        else
-          raise "Unknown filesystem object: #{path}"
         end
       end
 

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/inflector.rb

@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 
+require 'active_support/inflector'
+
 module EacRubyUtils
   class Inflector
     class << self
       VARIABLE_NAME_PATTERN = /[_a-z][_a-z0-9]*/i.freeze
 
       def variableize(string)
-        r = string.gsub(/[^_a-z0-9]/i, '_').gsub(/_+/, '_').gsub(/_\z/, '').gsub(/\A_/, '').downcase
+        r = ::ActiveSupport::Inflector.transliterate(string).gsub(/[^_a-z0-9]/i, '_')
+                                      .gsub(/_+/, '_').gsub(/_\z/, '').gsub(/\A_/, '').downcase
         m = VARIABLE_NAME_PATTERN.match(r)
         return r if m
 

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/object/blank'
+require 'active_support/values/time_zone'
+
+module EacRubyUtils
+  module LocalTimeZone
+    DEBIAN_CONFIG_PATH = '/etc/timezone'
+
+    class << self
+      TIMEDATECTL_TIMEZONE_LINE_PATTERN = %r{\s*Time zone:\s*(\S+/\S+)\s}.freeze
+
+      def auto
+        %w[tz_env debian_config offset].lazy.map { |s| send("by_#{s}") }.find(&:present?)
+      end
+
+      def by_debian_config
+        path = ::Pathname.new(DEBIAN_CONFIG_PATH)
+        path.exist? ? path.read.strip.presence : nil
+      end
+
+      def by_offset
+        ::ActiveSupport::TimeZone[::Time.now.getlocal.gmt_offset].name
+      end
+
+      def by_timedatectl
+        executable = ::EacRubyUtils::Envs.local.executable('timedatectl', '--version')
+        return nil unless executable.exist?
+
+        TIMEDATECTL_TIMEZONE_LINE_PATTERN.if_match(executable.command.execute!) { |m| m[1] }
+      end
+
+      def by_tz_env
+        ENV['TZ'].presence
+      end
+    end
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/kernel.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+::EacRubyUtils.require_sub(__FILE__)

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/kernel/nyi.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Kernel
+  # Raise exception with text "Not yet implemented".
+  def nyi
+    raise "Not yet implemented (Called in #{caller.first})"
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/template.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/string/inflections'
+require 'eac_ruby_utils/templates/searcher'
+
+class Module
+  def template
+    @template ||= ::EacRubyUtils::Templates::Searcher.default.template(name.underscore)
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/template.rb

@@ -1,15 +1,8 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/string/inflections'
-require 'eac_ruby_utils/templates/searcher'
+require 'eac_ruby_utils/patches/module/template'
 
 class Object
-  class << self
-    def template
-      @template ||= ::EacRubyUtils::Templates::Searcher.default.template(name.underscore)
-    end
-  end
-
   def template
     self.class.template
   end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/time/default_time_zone_set.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/patches/time/local_time_zone'
+require 'active_support/core_ext/time/zones'
+require 'eac_ruby_utils/local_time_zone'
 
-::Time.zone = ::Time.local_time_zone
+::Time.zone = ::EacRubyUtils::LocalTimeZone.auto

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

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

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/yaml.rb

@@ -14,10 +14,18 @@ module EacRubyUtils
         ::YAML.dump(sanitize(object))
       end
 
+      def dump_file(path, object)
+        ::File.write(path.to_s, dump(object))
+      end
+
       def load(string)
         ::YAML.safe_load(string, permitted_classes)
       end
 
+      def load_file(path)
+        load(::File.read(path.to_s))
+      end
+
       def permitted_classes
         DEFAULT_PERMITTED_CLASSES
       end

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

@@ -5,7 +5,8 @@ require 'eac_ruby_utils/inflector'
 RSpec.describe ::EacRubyUtils::Inflector do
   describe '#variableize' do
     {
-      '_A_variableName' => 'a_variablename'
+      '_A_variableName' => 'a_variablename',
+      'àéíöũ' => 'aeiou'
     }.each do |source, expected|
       context "when source is \"#{source}\"" do
         it { expect(described_class.variableize(source)).to eq(expected) }

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/local_time_zone'
+
+RSpec.describe(::EacRubyUtils::LocalTimeZone) do
+  describe '#auto' do
+    context 'when TZ environment variable is set' do
+      let(:expected_time_zone) { 'America/Sao_Paulo' }
+
+      before do
+        ENV['TZ'] = expected_time_zone
+      end
+
+      it { expect(described_class.auto).to eq(expected_time_zone) }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.85.0
+  version: 0.88.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-28 00:00:00.000000000 Z
+date: 2021-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -301,8 +301,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
@@ -460,6 +462,8 @@ files:
 - lib/avm/projects/stereotypes/git.rb
 - lib/avm/projects/stereotypes/git/local_project_mixin.rb
 - lib/avm/projects/stereotypes/git/publish.rb
+- lib/avm/projects/stereotypes/git/update.rb
+- lib/avm/projects/stereotypes/git/update/subrepo.rb
 - lib/avm/projects/stereotypes/git/warp.rb
 - lib/avm/projects/stereotypes/git_subrepo.rb
 - lib/avm/projects/stereotypes/git_subrepo/publish.rb
@@ -620,21 +624,27 @@ files:
 - 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_context_replacement.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/long_options.rb
+- vendor/eac_cli/lib/eac_cli/parser/alternative/option_argument.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/alternative/short_options.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/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/after_class_methods.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/instance_methods.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
@@ -989,6 +999,7 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/listable/string_list.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/listable/symbol_list.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/listable/value.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/local_time_zone.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/on_clean_ruby_environment.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/options_consumer.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patch.rb
@@ -1003,6 +1014,8 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/hash.rb
 - 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/kernel.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/kernel/nyi.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
@@ -1012,6 +1025,7 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/patch.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/require_sub.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/simple_cache.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/template.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/asserts.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/debug.rb
@@ -1027,7 +1041,6 @@ files:
 - 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/patches/time/local_time_zone.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
@@ -1072,6 +1085,7 @@ files:
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/fs/temp_spec.rb
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/inflector_spec.rb
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/listable_spec.rb
+- vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/local_time_zone_spec.rb
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/options_consumer_spec.rb
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/enumerable/boolean_combinations_spec.rb
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/enumerator/current_spec.rb

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

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_support/core_ext/time/zones'
-require 'eac_ruby_utils/envs'
-
-class Time
-  class << self
-    TIMEDATECTL_TIMEZONE_LINE_PATTERN = %r{\s*Time zone:\s*(\S+/\S+)\s}.freeze
-
-    def local_time_zone
-      local_time_zone_by_timedatectl || local_time_zone_by_offset
-    end
-
-    def local_time_zone_by_timedatectl
-      executable = ::EacRubyUtils::Envs.local.executable('timedatectl', '--version')
-      return nil unless executable.exist?
-
-      TIMEDATECTL_TIMEZONE_LINE_PATTERN.if_match(executable.command.execute!) { |m| m[1] }
-    end
-
-    def local_time_zone_by_offset
-      ::ActiveSupport::TimeZone[::Time.now.getlocal.gmt_offset].name
-    end
-  end
-end