avm-tools 0.68.0 → 0.70.0

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

@@ -14,6 +14,12 @@ module EacRubyUtils
     class DocoptRunner
       include ::EacRubyUtils::Contextualizable
 
+      class << self
+        def create(settings = {})
+          new(settings)
+        end
+      end
+
       attr_reader :settings
 
       def initialize(settings = {})

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner/_class_methods.rb

@@ -7,7 +7,7 @@ module EacRubyUtils
 
       class << self
         def run(options = {})
-          new(options).send(:run)
+          create(options).send(:run)
         rescue Docopt::Exit => e
           STDERR.write(e.message + "\n")
           ::Kernel.exit(DOCOPT_ERROR_EXIT_CODE) # rubocop:disable Rails/Exit

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner/_subcommands.rb

@@ -25,6 +25,8 @@ module EacRubyUtils
       end
 
       module SubcommandsSupport
+        EXTRA_AVAILABLE_SUBCOMMANDS_METHOD_NAME = :extra_available_subcommands
+
         def check_subcommands_arg
           if subcommand_arg_as_list?
             singleton_class.include(SubcommandsSupport::SubcommandArgAsList)
@@ -43,7 +45,7 @@ module EacRubyUtils
         end
 
         def subcommand
-          @subcommand ||= subcommand_class_name(subcommand_name).constantize.new(
+          @subcommand ||= subcommand_class_name(subcommand_name).constantize.create(
             argv: subcommand_args,
             program_name: subcommand_program,
             parent: self
@@ -77,7 +79,11 @@ module EacRubyUtils
         end
 
         def available_subcommands
-          (setting_value(:subcommands, false) || auto_available_subcommands).sort
+          r = ::Set.new(setting_value(:subcommands, false) || auto_available_subcommands)
+          if respond_to?(EXTRA_AVAILABLE_SUBCOMMANDS_METHOD_NAME, true)
+            r += send(EXTRA_AVAILABLE_SUBCOMMANDS_METHOD_NAME)
+          end
+          r.sort
         end
 
         def auto_available_subcommands

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+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
+        m = VARIABLE_NAME_PATTERN.match(r)
+        return r if m
+
+        raise ::ArgumentError, "Invalid variable name \"#{r}\" was generated " \
+          "from string \"#{string}\""
+      end
+    end
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/listable/value.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/inflector'
+
 module EacRubyUtils
   module Listable
     class Value
@@ -16,8 +18,7 @@ module EacRubyUtils
       end
 
       def constant_name
-        "#{@list.item}_#{@key}".gsub(/[^a-z0-9_]/, '_').gsub(/_+/, '_')
-                               .gsub(/(?:\A_|_\z)/, '').upcase
+        ::EacRubyUtils::Inflector.variableize("#{@list.item}_#{@key}").upcase
       end
 
       def label

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/string.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/string/inflector.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/inflector'
+
+class String
+  def variableize
+    ::EacRubyUtils::Inflector.variableize(self)
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/simple_cache.rb

@@ -21,8 +21,12 @@ module EacRubyUtils
       end
     end
 
-    def reset_cache
-      @cache_keys = nil
+    def reset_cache(*keys)
+      if keys.any?
+        keys.each { |key| cache_keys.delete(key) }
+      else
+        @cache_keys = nil
+      end
     end
 
     private

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/struct.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'active_support/hash_with_indifferent_access'
+require 'active_support/core_ext/object/blank'
+
+module EacRubyUtils
+  class Struct
+    def initialize(initial_data = {})
+      self.data = ::ActiveSupport::HashWithIndifferentAccess.new(initial_data)
+    end
+
+    def [](key)
+      key, bool = parse_key(key)
+      bool ? self[key].present? : data[key]
+    end
+
+    def fetch(key)
+      key, bool = parse_key(key)
+      bool ? fetch(key).present? : data.fetch(key)
+    end
+
+    def method_missing(method_name, *arguments, &block)
+      property_method?(method_name) ? fetch(method_name) : super
+    end
+
+    def respond_to_missing?(method_name, include_private = false)
+      property_method?(method_name) || super
+    end
+
+    def to_h
+      data.dup
+    end
+
+    delegate :to_s, to: :data
+
+    private
+
+    attr_accessor :data
+
+    def parse_key(key)
+      m = /\A(.+)\?\z/.match(key.to_s)
+      [(m ? m[1] : key.to_s).to_sym, m ? true : false]
+    end
+
+    def property_method?(key)
+      property_methods.include?(key.to_sym)
+    end
+
+    def property_methods
+      data.keys.flat_map { |k| [k.to_sym, "#{k}?".to_sym] }
+    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.44.0'
+  VERSION = '0.46.0'
 end

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/inflector'
+
+RSpec.describe ::EacRubyUtils::Inflector do
+  describe '#variableize' do
+    {
+      '_A_variableName' => 'a_variablename'
+    }.each do |source, expected|
+      context "when source is \"#{source}\"" do
+        it { expect(described_class.variableize(source)).to eq(expected) }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/struct'
+
+RSpec.describe ::EacRubyUtils::Struct do
+  let(:instance) { described_class.new(a: 1, b: '') }
+
+  describe '#[]' do
+    it { expect(instance[:a]).to eq(1) }
+    it { expect(instance['a']).to eq(1) }
+    it { expect(instance[:a?]).to eq(true) }
+    it { expect(instance['a?']).to eq(true) }
+    it { expect(instance[:b]).to eq('') }
+    it { expect(instance['b']).to eq('') }
+    it { expect(instance[:b?]).to eq(false) }
+    it { expect(instance['b?']).to eq(false) }
+    it { expect(instance[:c]).to eq(nil) }
+    it { expect(instance['c']).to eq(nil) }
+    it { expect(instance[:c?]).to eq(false) }
+    it { expect(instance['c?']).to eq(false) }
+  end
+
+  describe '#fetch' do
+    it { expect(instance.fetch(:a)).to eq(1) }
+    it { expect(instance.fetch('a')).to eq(1) }
+    it { expect(instance.fetch(:a?)).to eq(true) }
+    it { expect(instance.fetch('a?')).to eq(true) }
+    it { expect(instance.fetch(:b)).to eq('') }
+    it { expect(instance.fetch('b')).to eq('') }
+    it { expect(instance.fetch(:b?)).to eq(false) }
+    it { expect(instance.fetch('b?')).to eq(false) }
+    it { expect { instance.fetch(:c) }.to raise_error(::KeyError) }
+    it { expect { instance.fetch('c') }.to raise_error(::KeyError) }
+    it { expect { instance.fetch(:c?) }.to raise_error(::KeyError) }
+    it { expect { instance.fetch('c?') }.to raise_error(::KeyError) }
+  end
+
+  describe '#property_method' do
+    it { expect(instance.a).to eq(1) }
+    it { expect(instance.a?).to eq(true) }
+    it { expect(instance.b).to eq('') }
+    it { expect(instance.b?).to eq(false) }
+    it { expect { instance.c }.to raise_error(::NoMethodError) }
+    it { expect { instance.c? }.to raise_error(::NoMethodError) }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.68.0
+  version: 0.70.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-03 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -290,10 +290,29 @@ files:
 - lib/avm/docker/image.rb
 - lib/avm/docker/registry.rb
 - lib/avm/docker/runner.rb
+- lib/avm/eac_rails_base0/apache_host.rb
+- lib/avm/eac_rails_base0/apache_path.rb
+- lib/avm/eac_rails_base0/deploy.rb
+- lib/avm/eac_rails_base0/instance.rb
 - lib/avm/eac_redmine_base0/core_update.rb
 - lib/avm/eac_redmine_base0/data_unit.rb
 - lib/avm/eac_redmine_base0/deploy.rb
 - lib/avm/eac_redmine_base0/instance.rb
+- lib/avm/eac_ubuntu_base0/apache.rb
+- lib/avm/eac_ubuntu_base0/apache/resource.rb
+- lib/avm/eac_ubuntu_base0/docker_image.rb
+- lib/avm/eac_webapp_base0/apache_host.rb
+- lib/avm/eac_webapp_base0/deploy.rb
+- lib/avm/eac_webapp_base0/deploy/appended_directories.rb
+- lib/avm/eac_webapp_base0/deploy/file_unit.rb
+- lib/avm/eac_webapp_base0/deploy/git_info.rb
+- lib/avm/eac_webapp_base0/deploy/version.rb
+- lib/avm/eac_webapp_base0/instance.rb
+- lib/avm/eac_webapp_base0/runner/apache_host.rb
+- lib/avm/eac_webapp_base0/runner/data.rb
+- lib/avm/eac_webapp_base0/runner/data/dump.rb
+- lib/avm/eac_webapp_base0/runner/data/load.rb
+- lib/avm/eac_webapp_base0/runner/deploy.rb
 - lib/avm/executables.rb
 - lib/avm/files.rb
 - lib/avm/files/formatter.rb
@@ -365,7 +384,7 @@ files:
 - lib/avm/instances/configuration/_rubocop.rb
 - lib/avm/instances/configuration/_tests.rb
 - lib/avm/instances/entries.rb
-- lib/avm/instances/entries/entry_reader.rb
+- lib/avm/instances/entry.rb
 - lib/avm/instances/entry_keys.rb
 - lib/avm/launcher/context/instance_manager.rb
 - lib/avm/launcher/context/instance_manager/cached_instance.rb
@@ -423,26 +442,9 @@ files:
 - lib/avm/self/instance/entry_keys.rb
 - lib/avm/stereotypes.rb
 - lib/avm/stereotypes/eac_rails_base0.rb
-- lib/avm/stereotypes/eac_rails_base0/apache_host.rb
-- lib/avm/stereotypes/eac_rails_base0/deploy.rb
-- lib/avm/stereotypes/eac_rails_base0/instance.rb
 - lib/avm/stereotypes/eac_redmine_base0.rb
 - lib/avm/stereotypes/eac_ubuntu_base0.rb
-- lib/avm/stereotypes/eac_ubuntu_base0/apache.rb
-- lib/avm/stereotypes/eac_ubuntu_base0/apache/site.rb
-- lib/avm/stereotypes/eac_ubuntu_base0/docker_image.rb
 - lib/avm/stereotypes/eac_webapp_base0.rb
-- lib/avm/stereotypes/eac_webapp_base0/apache_host.rb
-- lib/avm/stereotypes/eac_webapp_base0/deploy.rb
-- lib/avm/stereotypes/eac_webapp_base0/deploy/appended_directories.rb
-- lib/avm/stereotypes/eac_webapp_base0/deploy/file_unit.rb
-- lib/avm/stereotypes/eac_webapp_base0/deploy/git_info.rb
-- lib/avm/stereotypes/eac_webapp_base0/deploy/version.rb
-- lib/avm/stereotypes/eac_webapp_base0/instance.rb
-- lib/avm/stereotypes/eac_webapp_base0/runner/data.rb
-- lib/avm/stereotypes/eac_webapp_base0/runner/data/dump.rb
-- lib/avm/stereotypes/eac_webapp_base0/runner/data/load.rb
-- lib/avm/stereotypes/eac_webapp_base0/runner/deploy.rb
 - lib/avm/stereotypes/eac_wordpress_base0/apache_host.rb
 - lib/avm/stereotypes/eac_wordpress_base0/deploy.rb
 - lib/avm/stereotypes/eac_wordpress_base0/instance.rb
@@ -457,6 +459,7 @@ files:
 - lib/avm/tools/runner.rb
 - lib/avm/tools/runner/eac_rails_base0.rb
 - lib/avm/tools/runner/eac_rails_base0/apache_host.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/data.rb
 - lib/avm/tools/runner/eac_rails_base0/deploy.rb
@@ -542,8 +545,11 @@ files:
 - lib/eac_launcher/vendor.rb
 - lib/eac_launcher/vendor/github.rb
 - lib/eac_launcher/version.rb
+- template/avm/eac_rails_base0/apache_path/default.conf
+- template/avm/eac_rails_base0/deploy/config/database.yml.template
 - template/avm/eac_redmine_base0/deploy/config/install.sh.template
 - template/avm/eac_redmine_base0/deploy/config/secrets.yml
+- template/avm/eac_webapp_base0/apache_host/no_ssl.conf
 - template/avm/ruby/gems/generator/gemspec.template
 - template/avm/ruby/gems/generator/root_lib.template
 - template/avm/ruby/gems/generator/static/Gemfile
@@ -552,10 +558,38 @@ files:
 - template/avm/ruby/gems/generator/version.template
 - template/avm/self/docker_image/Dockerfile
 - template/avm/self/docker_image/entrypoint.sh
-- template/avm/stereotypes/eac_rails_base0/deploy/config/database.yml.template
 - template/avm/stereotypes/eac_ubuntu_base0/docker_image/Dockerfile
-- template/avm/stereotypes/eac_webapp_base0/apache_host/no_ssl.conf
 - template/avm/stereotypes/eac_wordpress_base0/deploy/wp-config.php.template
+- vendor/eac_cli/Gemfile
+- vendor/eac_cli/eac_cli.gemspec
+- vendor/eac_cli/lib/eac_cli.rb
+- 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/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/positional_argument.rb
+- vendor/eac_cli/lib/eac_cli/docopt/doc_builder.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/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_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/version.rb
+- vendor/eac_cli/spec/lib/eac_cli/runner_spec.rb
+- vendor/eac_cli/spec/rubocop_spec.rb
+- vendor/eac_cli/spec/spec_helper.rb
 - vendor/eac_docker/Gemfile
 - vendor/eac_docker/eac_docker.gemspec
 - vendor/eac_docker/lib/eac_docker.rb
@@ -797,8 +831,12 @@ files:
 - vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/tests/base.rb
 - vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/tests/minitest.rb
 - vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/tests/multiple.rb
+- vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/tests/multiple/decorated_gem.rb
+- vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/tests/multiple/result.rb
 - vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/tests/rspec.rb
 - vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/version.rb
+- vendor/eac_ruby_gems_utils/spec/lib/eac_ruby_gems_utils/gem/version_file_spec.rb
+- vendor/eac_ruby_gems_utils/spec/lib/eac_ruby_gems_utils/gem/version_file_spec_files/a_version_file.rb
 - vendor/eac_ruby_gems_utils/spec/lib/eac_ruby_gems_utils/gem_spec.rb
 - vendor/eac_ruby_gems_utils/spec/rubocop_check_spec.rb
 - vendor/eac_ruby_gems_utils/spec/spec_helper.rb
@@ -867,6 +905,7 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/immutable/common_accessor.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/immutable/hash_accessor.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/immutable/instance_methods.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/inflector.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/listable.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/listable/class_methods.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/listable/instance_methods.rb
@@ -905,6 +944,8 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname/basename_sub.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/regexp.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/regexp/if_match.rb
+- 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/patches/time/local_time_zone.rb
@@ -918,6 +959,7 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/ruby/on_clean_environment.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/settings_provider.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/simple_cache.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/struct.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/templates.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/templates/directory.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/templates/file.rb
@@ -944,6 +986,7 @@ files:
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/fs/extname_spec.rb
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/fs/temp/temp_spec.rb
 - 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/options_consumer_spec.rb
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/enumerable/boolean_combinations_spec.rb
@@ -963,6 +1006,7 @@ files:
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/ruby_spec.rb
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/settings_provider_spec.rb
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/simple_cache_spec.rb
+- vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/struct_spec.rb
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/templates/file_spec.rb
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/templates/file_spec_files/expected_content
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/templates/file_spec_files/source.template

data/lib/avm/instances/entries/entry_reader.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module Instances
-    module Entries
-      class EntryReader
-        common_constructor :parent, :suffix, :options
-
-        def auto_value
-          parent.respond_to?(auto_value_method, true) ? parent.send(auto_value_method) : nil
-        end
-
-        def auto_value_method
-          "auto_#{suffix.to_s.gsub('.', '_')}"
-        end
-
-        def full_path
-          (parent.path_prefix + suffix_as_array).join('.')
-        end
-
-        def optional_value
-          read(required: false, noinput: true) || auto_value
-        end
-
-        def read(extra_options = {})
-          ::Avm.configs.read_entry(full_path, options.merge(extra_options))
-        end
-
-        def suffix_as_array
-          if suffix.is_a?(::Array)
-            suffix.dup
-          else
-            ::EacRubyUtils::PathsHash.parse_entry_key(suffix.to_s)
-          end
-        end
-
-        def value
-          optional_value || read
-        end
-      end
-    end
-  end
-end