avm-tools 0.87.0 → 0.87.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df3208595cdaefa7e6f51a5a14518064df146b2081e32365e3ad746326e844bb
-  data.tar.gz: 367b039c49b3ff3e9a8083bafe1c889656e924403014efbeec2f3032ccfe0247
+  metadata.gz: 39b5ee493e22bb4e2eb77a9e62067e0de6dd23b3d3d4dd62ba2eeadedf183d22
+  data.tar.gz: 0d528d18932807487721a84c32a6c4d1f2906a015840ac360921fcbca78b493c
 SHA512:
-  metadata.gz: 1e1aa08cda713c6600a551681f4f2d986e939675ba41bd5f270497f9dba564213906ae71890ce9ea00285a289d8edc626d70bd91aa31e2a381524bc19404d58b
-  data.tar.gz: 25c272f9097b2d48cf1d88ece314eef1361527644942c3b0e1e862709f60e155ac4db9a31b823432f72abd478eaec9f4218503932228a8bf0c44c30b3a3ee46b
+  metadata.gz: 4a7a88618b900c728d17a3ef9f492f1b0f42d74313190f8de7d532ebda8f89e27866eb9edbdee7043cfadfd075b71b44390d8c190191b11341120baef2489fea
+  data.tar.gz: e209c17b18ab7d34483054cb5545da9e946212ca857ae52ec18fa87b00704c3a589697ab1e0dfa1ec8b093afe55a8f8ea5a1e61487bda8ca717196d4e0e47679

data/lib/avm/instances/base/auto_values/filesystem.rb

@@ -20,12 +20,24 @@ module Avm
           end
 
           def auto_fs_url
+            auto_fs_url_with_ssh || auto_fs_url_without_ssh
+          end
+
+          def auto_fs_url_with_ssh
             read_entry_optional('ssh.url').if_present do |ssh_url|
               read_entry_optional('fs_path').if_present do |fs_path|
                 "#{ssh_url}#{fs_path}"
               end
             end
           end
+
+          def auto_fs_url_without_ssh
+            return nil if read_entry_optional('ssh.url').present?
+
+            read_entry_optional('fs_path').if_present do |fs_path|
+              "file://#{fs_path}"
+            end
+          end
         end
       end
     end

data/lib/avm/instances/runner.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
 require 'eac_cli/core_ext'
-require 'eac_ruby_utils/console/docopt_runner'
 
 module Avm
   module Instances
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class << self
         def instance_class
           ::Avm.const_get(stereotype_name).const_get('Instance')
@@ -20,9 +19,8 @@ module Avm
         end
       end
 
-      runner_with
       description = "Utilities for #{stereotype_name} instances."
-      runner_definition do
+      runner_with :help, :subcommands do
         desc description
         pos_arg 'instance-id'
         subcommands

data/lib/avm/tools/runner/git/deploy.rb

@@ -15,7 +15,7 @@ module Avm
             arg_opt '-a', '--append-dirs', 'Append directories to deploy (List separated by ":").'
             arg_opt '-i', '--instance', 'Read entries from instance with id=<instance-id>.'
             arg_opt '-r', '--reference', "Reference (default: #{DEFAULT_REFERENCE})."
-            pos_arg :target_url
+            pos_arg :target_url, optional: true
           end
 
           def run

data/lib/avm/tools/version.rb

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

data/vendor/eac_cli/lib/eac_cli/runner.rb

@@ -47,53 +47,5 @@ module EacCli
       include ActiveSupport::Callbacks
       define_callbacks :run
     end
-
-    module AfterClassMethods
-      def create(*runner_context_args)
-        r = new
-        r.runner_context = ::EacCli::Runner::Context.new(r, *runner_context_args)
-        r
-      end
-
-      def run(*runner_context_args)
-        r = create(*runner_context_args)
-        r.run_run
-        r
-      end
-
-      def runner_definition(&block)
-        @runner_definition ||= super_runner_definition
-        @runner_definition.instance_eval(&block) if block
-        @runner_definition
-      end
-
-      def super_runner_definition
-        superclass.try(:runner_definition).if_present(&:dup) || ::EacCli::Definition.new
-      end
-    end
-
-    module InstanceMethods
-      def run_run
-        parsed
-        run_callbacks(:run) { run }
-      rescue ::EacCli::Runner::Exit # rubocop:disable Lint/SuppressedException
-        # Do nothing
-      end
-
-      def runner_context
-        return @runner_context if @runner_context
-
-        raise 'Context was required, but was not set yet'
-      end
-
-      def runner_context=(new_runner_context)
-        @runner_context = new_runner_context
-        @parsed = nil
-      end
-
-      def parsed
-        @parsed ||= ::EacCli::Parser.new(self.class.runner_definition, runner_context.argv).parsed
-      end
-    end
   end
 end

data/vendor/eac_cli/lib/eac_cli/runner/after_class_methods.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module EacCli
+  module Runner
+    module AfterClassMethods
+      def create(*runner_context_args)
+        r = new
+        r.runner_context = ::EacCli::Runner::Context.new(r, *runner_context_args)
+        r
+      end
+
+      def run(*runner_context_args)
+        r = create(*runner_context_args)
+        r.run_run
+        r
+      end
+
+      def runner_definition(&block)
+        @runner_definition ||= super_runner_definition
+        @runner_definition.instance_eval(&block) if block
+        @runner_definition
+      end
+
+      def super_runner_definition
+        superclass.try(:runner_definition).if_present(&:dup) || ::EacCli::Definition.new
+      end
+    end
+  end
+end

data/vendor/eac_cli/lib/eac_cli/runner/instance_methods.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module EacCli
+  module Runner
+    module InstanceMethods
+      def run_run
+        parsed
+        run_callbacks(:run) { run }
+      rescue ::EacCli::Parser::Error => e
+        $stderr.write("#{e}\n")
+      rescue ::EacCli::Runner::Exit # rubocop:disable Lint/SuppressedException
+        # Do nothing
+      end
+
+      def runner_context
+        return @runner_context if @runner_context
+
+        raise 'Context was required, but was not set yet'
+      end
+
+      def runner_context=(new_runner_context)
+        @runner_context = new_runner_context
+        @parsed = nil
+      end
+
+      def parsed
+        @parsed ||= ::EacCli::Parser.new(self.class.runner_definition, runner_context.argv).parsed
+      end
+    end
+  end
+end

data/vendor/eac_cli/lib/eac_cli/runner_with/subcommands.rb

@@ -40,7 +40,7 @@ module EacCli
       end
 
       def help_extra_text
-        (['Subcommands:'] + available_subcommands.keys.map { |s| "  #{s}" })
+        (['Subcommands:'] + available_subcommands.keys.sort.map { |s| "  #{s}" })
           .map { |v| "#{v}\n" }.join
       end
 

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

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

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/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.57.1'
+  VERSION = '0.58.0'
 end

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.87.0
+  version: 0.87.1
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-10 00:00:00.000000000 Z
+date: 2021-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -639,8 +639,10 @@ files:
 - 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
@@ -995,6 +997,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
@@ -1009,6 +1012,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
@@ -1034,7 +1039,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
@@ -1079,6 +1083,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