avm-tools 0.70.0 → 0.73.0

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/paths_hash/entry_key_error.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module EacRubyUtils
+  class PathsHash
+    class EntryKeyError < StandardError
+    end
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/paths_hash/node.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/paths_hash/entry_key_error'
+
+module EacRubyUtils
+  class PathsHash
+    class Node
+      PATH_SEARCH_UNENDED_ERROR_MESSAGE = 'Path search is not a Node and is not ended'
+
+      def initialize(source_hash)
+        source_hash.assert_argument(Hash, 'source_hash')
+        @data = source_hash.map { |k, v| [k.to_sym, v.is_a?(Hash) ? Node.new(v) : v] }.to_h
+      end
+
+      def entry?(path_search)
+        return false unless data.key?(path_search.cursor)
+        return true if path_search.ended?
+        return data.fetch(path_search.cursor).entry?(path_search.succeeding) if
+          data.fetch(path_search.cursor).is_a?(Node)
+
+        false # Paths continue and there is not available nodes
+      end
+
+      def fetch(path_search)
+        if data.key?(path_search.cursor)
+          node = data.fetch(path_search.cursor)
+          return (node.is_a?(Node) ? node.to_h : node) if path_search.ended?
+          return nil if node.blank?
+          return node.fetch(path_search.succeeding) if node.is_a?(Node)
+        end
+
+        path_search.raise_error(PATH_SEARCH_UNENDED_ERROR_MESSAGE)
+      end
+
+      def to_h
+        data.map { |k, v| [k, v.is_a?(Node) ? v.to_h : v] }.to_h
+      end
+
+      def read_entry(path_search)
+        node = data[path_search.cursor]
+        return (node.is_a?(Node) ? node.to_h : node) if path_search.ended?
+        return nil if node.blank?
+        return node.read_entry(path_search.succeeding) if node.is_a?(Node)
+
+        path_search.raise_error(PATH_SEARCH_UNENDED_ERROR_MESSAGE)
+      end
+
+      def write_entry(path_search, value)
+        if path_search.ended?
+          data[path_search.cursor] = value.is_a?(Hash) ? self.class.new(value) : value
+        else
+          assert_data_node(path_search.cursor).write_entry(path_search.succeeding, value)
+        end
+      end
+
+      private
+
+      attr_reader :data
+
+      def assert_data_node(key)
+        data[key] = self.class.new({}) unless data[key].is_a?(Node)
+        data[key]
+      end
+    end
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/paths_hash/path_search.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module EacRubyUtils
+  class PathsHash
+    class PathSearch
+      class << self
+        def parse_entry_key(string)
+          new(::EacRubyUtils::PathsHash.parse_entry_key(string), [])
+        end
+      end
+
+      common_constructor :current, :previous do
+        self.current = current.assert_argument(Array, 'current').freeze
+        self.previous = previous.assert_argument(Array, 'previous')
+        raise ::EacRubyUtils::PathsHash::EntryKeyError, 'Current is empty' if current.empty?
+      end
+
+      def cursor
+        current.first
+      end
+
+      def ended?
+        current.count <= 1
+      end
+
+      def raise_error(message)
+        raise ::EacRubyUtils::PathsHash::EntryKeyError, "#{message} (#{self})"
+      end
+
+      def succeeding
+        self.class.new(current[1..-1], previous + [cursor])
+      end
+
+      def to_s
+        "#{self.class}[Current: #{current}, Previous: #{previous}]"
+      end
+    end
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/ruby/command.rb

@@ -8,7 +8,8 @@ module EacRubyUtils
     # A [EacRubyUtils::Envs::Command] which runs in a clean Ruby environment.
     class Command < ::EacRubyUtils::Envs::Command
       def initialize(bundle_args, extra_options = {})
-        super(::EacRubyUtils::Envs.local, bundle_args, extra_options)
+        host_env = extra_options.delete(:host_env)
+        super(host_env || ::EacRubyUtils::Envs.local, bundle_args, extra_options)
       end
 
       %w[system execute].each do |method_prefix|

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

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

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/blank_not_blank'
+
+RSpec.describe ::EacRubyUtils::BlankNotBlank do
+  let(:instance) { described_class.instance }
+
+  it do
+    expect { described_class.new }.to raise_error(::NoMethodError)
+  end
+
+  it { expect(instance).to be_present }
+  it { expect(instance).not_to be_blank }
+  it { expect(instance).to be_truthy }
+  it { expect(instance).to eq('') }
+end

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

@@ -28,4 +28,19 @@ RSpec.describe ::EacRubyUtils::Configs do
 
     it { expect(::YAML.load_file(storage_path)).to eq(parent: { child: 'value1' }) }
   end
+
+  describe '#read' do
+    let(:present_key) { 'a.present.key' }
+    let(:blank_key) { 'a.blank.key' }
+
+    before do
+      instance[present_key] = 'A value'
+      instance[blank_key] = ''
+      instance.save
+      instance.load
+    end
+
+    it { expect(instance[present_key]).to be_present }
+    it { expect(instance[blank_key]).to be_present }
+  end
 end

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

@@ -3,20 +3,20 @@
 require 'eac_ruby_utils/paths_hash'
 
 RSpec.describe ::EacRubyUtils::PathsHash do
-  describe '#[]' do
-    let(:source_hash) do
-      {
-        parent: {
-          child1: {
-            child1_1: 'v1_1',
-            child1_2: 'v1_2'
-          },
-          child2: 'v2'
-        }
+  let(:source_hash) do
+    {
+      parent: {
+        child1: {
+          child1_1: 'v1_1',
+          child1_2: 'v1_2'
+        },
+        child2: 'v2'
       }
-    end
-    let(:instance) { described_class.new(source_hash) }
+    }
+  end
+  let(:instance) { described_class.new(source_hash) }
 
+  describe '#[]' do
     {
       'parent.child1.child1_1' => 'v1_1',
       'parent.child1.child1_2' => 'v1_2',
@@ -38,7 +38,7 @@ RSpec.describe ::EacRubyUtils::PathsHash do
   end
 
   describe '#[]=' do
-    let(:instance) { described_class.new }
+    let(:source_hash) { {} }
 
     before do
       instance['a.b.c'] = '123'
@@ -46,4 +46,43 @@ RSpec.describe ::EacRubyUtils::PathsHash do
 
     it { expect(instance.to_h).to eq(a: { b: { c: '123' } }) }
   end
+
+  describe '#fetch' do
+    {
+      'parent.child1.child1_1' => 'v1_1',
+      'parent.child1.child1_2' => 'v1_2',
+      'parent.child1.child1_2.no_exist' => ::EacRubyUtils::PathsHash::EntryKeyError,
+      'parent.child1.child1_3' => ::EacRubyUtils::PathsHash::EntryKeyError,
+      'parent.child2' => 'v2',
+      'no_exist' => ::EacRubyUtils::PathsHash::EntryKeyError,
+      'parent.child1' => {
+        child1_1: 'v1_1',
+        child1_2: 'v1_2'
+      }
+    }.each do |entry_key, expected_value|
+      if expected_value.is_a?(::Class) && expected_value < ::Exception
+        it "raise error #{expected_value}" do
+          expect { instance.fetch(entry_key) }.to raise_error(expected_value)
+        end
+      else
+        it "\#fetch return \"#{expected_value}\"" do
+          expect(instance.fetch(entry_key)).to eq(expected_value)
+        end
+      end
+    end
+  end
+
+  describe '#key?' do
+    {
+      'parent.child1.child1_1' => true,
+      'parent.child1.child1_2' => true,
+      'parent.child1.child1_2.no_exist' => false,
+      'parent.child1.child1_3' => false,
+      'parent.child2' => true,
+      'no_exist' => false,
+      'parent.child1' => true
+    }.each do |entry_key, expected_value|
+      it { expect(instance.key?(entry_key)).to eq(expected_value) }
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.70.0
+  version: 0.73.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-08 00:00:00.000000000 Z
+date: 2020-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -374,6 +374,7 @@ files:
 - lib/avm/instances/base/auto_values/data.rb
 - lib/avm/instances/base/auto_values/database.rb
 - lib/avm/instances/base/auto_values/filesystem.rb
+- lib/avm/instances/base/auto_values/mailer.rb
 - lib/avm/instances/base/auto_values/ruby.rb
 - lib/avm/instances/base/auto_values/source.rb
 - lib/avm/instances/base/auto_values/system.rb
@@ -425,6 +426,7 @@ files:
 - lib/avm/projects/stereotypes/ruby_gem/update.rb
 - lib/avm/projects/stereotypes/ruby_gem/version_bump.rb
 - lib/avm/rails.rb
+- lib/avm/rails/instance.rb
 - lib/avm/rails/runners.rb
 - lib/avm/rails/runners/bundle.rb
 - lib/avm/rails/runners/runner.rb
@@ -440,6 +442,7 @@ files:
 - lib/avm/self/docker_image.rb
 - lib/avm/self/instance.rb
 - lib/avm/self/instance/entry_keys.rb
+- lib/avm/self/root.rb
 - lib/avm/stereotypes.rb
 - lib/avm/stereotypes/eac_rails_base0.rb
 - lib/avm/stereotypes/eac_redmine_base0.rb
@@ -453,7 +456,6 @@ files:
 - lib/avm/stereotypes/postgresql/instance/data_unit.rb
 - lib/avm/stereotypes/postgresql/instance_with.rb
 - lib/avm/stereotypes/rails.rb
-- lib/avm/stereotypes/rails/instance.rb
 - lib/avm/sync.rb
 - lib/avm/tools.rb
 - lib/avm/tools/runner.rb
@@ -463,6 +465,7 @@ files:
 - 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
+- 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/bundle.rb
@@ -491,6 +494,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/instance.rb
+- lib/avm/tools/runner/instance/info.rb
 - lib/avm/tools/runner/launcher.rb
 - lib/avm/tools/runner/launcher/instances.rb
 - lib/avm/tools/runner/launcher/projects.rb
@@ -547,6 +552,7 @@ files:
 - 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_rails_base0/deploy/config/envvars.d/email.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
@@ -835,10 +841,10 @@ files:
 - 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/code/rubocop_check_spec.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
 - vendor/eac_ruby_gems_utils/spec/support/mygem/Gemfile
 - vendor/eac_ruby_gems_utils/spec/support/mygem/Gemfile.lock
@@ -853,11 +859,13 @@ files:
 - 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/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_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
@@ -950,6 +958,9 @@ files:
 - 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
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/paths_hash/path_search.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/require_sub.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/rspec.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/rspec/conditional.rb
@@ -973,6 +984,7 @@ files:
 - 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/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
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/common_constructor_spec.rb
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/configs_spec.rb

data/lib/avm/stereotypes/rails/instance.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module Avm
-  module Stereotypes
-    module Rails
-      module Instance
-        def bundle(*args)
-          host_env.command('bundle', *args)
-                  .envvar('BUNDLE_GEMFILE', ::File.join(read_entry('fs_path'), 'Gemfile'))
-                  .envvar('RAILS_ENV', 'production')
-                  .chdir(read_entry('fs_path'))
-        end
-
-        def rake(*args)
-          bundle('exec', 'rake', *args)
-        end
-      end
-    end
-  end
-end