avm-tools 0.75.0 → 0.75.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '061861b37a86551104e76e78c988fabd4e421dbdcaf223fd567e36aa725abf49'
-  data.tar.gz: e5b1a4bcd4cc716e9dfad2527143163a8e97528cabe7fa44ac01ed12a4fdbe6d
+  metadata.gz: 4600b008c9ecc3f3aaa220ec18cac2199559787186710d80e6cd1fda6f39cf97
+  data.tar.gz: a8f6c806934616363ef26f4acc6e486a0f3fd215867e013c588256c20e077086
 SHA512:
-  metadata.gz: 83feb6ab0a6519f2319650eac3a15305fbc46d088a80d7521e14347fda3db9ea3503fe0c5a474d8899f9359f0807685ff7e4a33ccac0c610ac08406a33e137fa
-  data.tar.gz: cb4f4ff1b6f0b7dad60530111f60a20acbef410a9edb2e6c865cfd0589808e5847bf21afc9e954f33092ab8faa1cefd084905fc1206d54c18d117c8bd5efbaec
+  metadata.gz: d10aa9242ee96189a7f43ab7ba1d1dc8cda2c7bb9961566ed7c2bf2a2a33d4c285eb1a42eb747342e2a6d2a1f5130e4681871dbc92cf9716978914216c922a12
+  data.tar.gz: 6eab4907c7e01156c4a7394e0ffa1503a1a8cdc3dce4e4f05aabd105b66c0576baecd6b30f0779e01565c78db3603614e8e75426b3cead19751d7bef2de582db

data/lib/avm/eac_rails_base1/runner/bundle.rb

@@ -8,7 +8,7 @@ require 'shellwords'
 module Avm
   module EacRailsBase1
     class Runner < ::Avm::EacWebappBase0::Runner
-      class Bundle < ::EacRubyUtils::Console::DocoptRunner
+      class Bundle
         runner_with ::Avm::EacRailsBase1::RunnerWith::Bundle
         runner_definition do
           desc 'Runs "bundle ...".'
@@ -20,7 +20,7 @@ module Avm
         end
 
         def bundle_args
-          options.fetch('<bundle-args>').reject { |arg| arg == '--' }
+          parsed.bundle_args.reject { |arg| arg == '--' }
         end
       end
     end

data/lib/avm/eac_rails_base1/runner/code_runner.rb

@@ -7,7 +7,7 @@ require 'eac_ruby_utils/console/docopt_runner'
 module Avm
   module EacRailsBase1
     class Runner < ::Avm::EacWebappBase0::Runner
-      class CodeRunner < ::EacRubyUtils::Console::DocoptRunner
+      class CodeRunner
         runner_with ::Avm::EacRailsBase1::RunnerWith::Bundle
         runner_definition do
           desc 'Runs a Ruby code with "rails runner".'
@@ -15,12 +15,12 @@ module Avm
         end
 
         def run
-          infov 'Environment', context(:instance).host_env
+          infov 'Environment', runner_context.call(:instance).host_env
           bundle_run
         end
 
         def bundle_args
-          %w[exec rails runner] + [options.fetch('<code>')]
+          %w[exec rails runner] + [parsed.code]
         end
       end
     end

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

@@ -17,7 +17,7 @@ module Avm
           ::Avm::Files::Appender
             .new
             .variables_source_set(variables_source)
-            .append_directory(template.path)
+            .append_templatized_directory(template.path)
             .append_templatized_directories(appended_directories)
             .append_file_content(version_target_path, version)
             .write_appended_on(build_dir)

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/instances/runner'
 require 'avm/path_string'
 require 'eac_ruby_utils/console/docopt_runner'
 require 'eac_ruby_utils/console/speaker'

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.75.0'
+    VERSION = '0.75.1'
   end
 end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/console/configs.rb

@@ -1,16 +1,13 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/common_constructor'
 require 'eac_ruby_utils/configs'
-require 'eac_ruby_utils/console/speaker'
-require 'eac_ruby_utils/options_consumer'
-require 'eac_ruby_utils/patches/object/asserts'
-require 'eac_ruby_utils/simple_cache'
+require 'eac_ruby_utils/core_ext'
 
 module EacRubyUtils
   module Console
     class Configs
-      include ::EacRubyUtils::Console::Speaker
+      require_sub __FILE__
+      enable_console_speaker
 
       class << self
         def entry_key_to_envvar_name(entry_key)
@@ -34,7 +31,7 @@ module EacRubyUtils
       end
 
       def read_password(entry_key, options = {})
-        options = options.merge(noecho: true)
+        options = ReadEntryOptions.new(options.merge(noecho: true))
         if store_passwords?
           read_entry(entry_key, options)
         else
@@ -101,38 +98,6 @@ module EacRubyUtils
         warn('Entered value is blank') if entry_value.blank?
         entry_value
       end
-
-      class ReadEntryOptions
-        include ::EacRubyUtils::SimpleCache
-        ::EacRubyUtils::CommonConstructor.new(:options).setup_class(self)
-
-        DEFAULT_VALUES = {
-          before_input: nil, bool: false, list: false, noecho: false, noenv: false, noinput: false,
-          required: true, validator: nil
-        }.freeze
-
-        def [](key)
-          values.fetch(key.to_sym)
-        end
-
-        def request_input_options
-          values.slice(:bool, :list, :noecho)
-        end
-
-        private
-
-        def values_uncached
-          consumer = ::EacRubyUtils::OptionsConsumer.new(options)
-          r = {}
-          DEFAULT_VALUES.each do |key, default_value|
-            value = consumer.consume(key)
-            value = default_value if value.nil?
-            r[key] = value
-          end
-          consumer.validate
-          r
-        end
-      end
     end
   end
 end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/console/configs/read_entry_options.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacRubyUtils
+  module Console
+    class Configs
+      class ReadEntryOptions
+        enable_simple_cache
+        common_constructor :options
+
+        DEFAULT_VALUES = {
+          before_input: nil, bool: false, list: false, noecho: false, noenv: false, noinput: false,
+          required: true, validator: nil
+        }.freeze
+
+        def [](key)
+          values.fetch(key.to_sym)
+        end
+
+        def request_input_options
+          values.slice(:bool, :list, :noecho)
+        end
+
+        private
+
+        def values_uncached
+          consumer = options.to_options_consumer
+          r = {}
+          DEFAULT_VALUES.each do |key, default_value|
+            value = consumer.consume(key)
+            value = default_value if value.nil?
+            r[key] = value
+          end
+          consumer.validate
+          r
+        end
+      end
+    end
+  end
+end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.75.0
+  version: 0.75.1
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-30 00:00:00.000000000 Z
+date: 2020-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -484,7 +484,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/bundle.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
@@ -895,6 +894,7 @@ files:
 - 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/read_entry_options.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

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

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