avm-tools 0.69.3 → 0.72.0

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

@@ -45,7 +45,7 @@ module EacCli
     module AfterClassMethods
       def create(*runner_context_args)
         r = new
-        r.runner_context = ::EacCli::Runner::Context.new(*runner_context_args)
+        r.runner_context = ::EacCli::Runner::Context.new(r, *runner_context_args)
         r
       end
 

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

@@ -5,13 +5,30 @@ require 'eac_ruby_utils/core_ext'
 module EacCli
   module Runner
     class Context
-      attr_reader :argv, :parent, :program_name
+      attr_reader :argv, :parent, :program_name, :runner
 
-      def initialize(*context_args)
+      def initialize(runner, *context_args)
         options = context_args.extract_options!
         @argv = (context_args[0] || options.delete(:argv) || ARGV).dup.freeze
         @parent = context_args[1] || options.delete(:parent)
         @program_name = options.delete(:program_name)
+        @runner = runner
+      end
+
+      # Call a method in the runner or in one of it ancestors.
+      def call(method_name, *args)
+        return runner.send(method_name, *args) if runner.respond_to?(method_name)
+        return parent_call(method_name, *args) if parent.present?
+
+        raise ::NameError, "No method \"#{method_name}\" found in #{runner} or in its ancestors"
+      end
+
+      protected
+
+      def parent_call(method_name, *args)
+        return parent.context(method_name, *args) if parent.respond_to?(:context)
+
+        parent.runner_context.call(method_name, *args)
       end
     end
   end

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

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

data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/gem.rb

@@ -11,8 +11,9 @@ module EacRubyGemsUtils
 
     GEMSPEC_EXTNAME = '.gemspec'
 
-    common_constructor :root do
+    common_constructor :root, :host_env, default: [nil] do
       @root = ::Pathname.new(root).expand_path
+      self.host_env ||= ::EacRubyUtils::Envs.local
     end
 
     def to_s

data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/gem/command.rb

@@ -11,7 +11,7 @@ module EacRubyGemsUtils
 
       def initialize(gem, command_args, extra_options = {})
         @gem = gem
-        super(command_args, extra_options)
+        super(command_args, extra_options.merge(host_env: gem.host_env))
       end
 
       # Changes current directory to the gem's directory.

data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/tests/multiple/decorated_gem.rb

@@ -12,14 +12,12 @@ module EacRubyGemsUtils
           log('running "bundle install"...')
           return if bundle('install').execute.fetch(:exit_code).zero?
 
-          if can_remove_gemfile_lock?
-            log('"bundle install" failed, removing Gemfile.lock and trying again...')
-            gemfile_lock_path.unlink if gemfile_lock_path.exist?
-            bundle('install').execute!
-          else
+          unless can_remove_gemfile_lock?
             raise '"bundle install" failed and the Gemfile.lock is part of gem' \
-              '(Should be changed by developer)'
+                '(Should be changed by developer)'
           end
+
+          prepare_with_removable_gemfile_lock
         end
 
         def tests
@@ -33,6 +31,12 @@ module EacRubyGemsUtils
           infov self, message
         end
 
+        def prepare_with_removable_gemfile_lock
+          log('"bundle install" failed, removing Gemfile.lock and trying again...')
+          gemfile_lock_path.unlink if gemfile_lock_path.exist?
+          bundle('install').execute!
+        end
+
         def can_remove_gemfile_lock?
           !files.include?(gemfile_lock_path.relative_path_from(root))
         end

data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyGemsUtils
-  VERSION = '0.7.2'
+  VERSION = '0.8.0'
 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.47.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.69.3
+  version: 0.72.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-04 00:00:00.000000000 Z
+date: 2020-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -291,12 +291,16 @@ files:
 - 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
@@ -380,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
@@ -421,6 +425,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
@@ -436,13 +441,11 @@ 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
 - 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_wordpress_base0/apache_host.rb
 - lib/avm/stereotypes/eac_wordpress_base0/deploy.rb
@@ -452,15 +455,16 @@ 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
 - 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
+- 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
@@ -489,6 +493,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
@@ -543,6 +549,7 @@ 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
@@ -832,10 +839,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

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

data/lib/avm/stereotypes/eac_ubuntu_base0/apache.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/require_sub'
-::EacRubyUtils.require_sub(__FILE__)
-
-module Avm
-  module Stereotypes
-    module EacUbuntuBase0
-      class Apache
-        common_constructor :host_env
-
-        def etc_root
-          '/etc/apache2'
-        end
-
-        def service(command)
-          host_env.command('sudo', 'service', 'apache2', command)
-        end
-
-        def site(name)
-          ::Avm::Stereotypes::EacUbuntuBase0::Apache::Site.new(self, name)
-        end
-      end
-    end
-  end
-end

data/lib/avm/stereotypes/eac_ubuntu_base0/apache/site.rb

@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module Stereotypes
-    module EacUbuntuBase0
-      class Apache
-        class Site
-          common_constructor :apache, :name
-
-          def available_path
-            ::File.join(apache.etc_root, 'sites-available', "#{name}.conf")
-          end
-
-          def available?
-            apache.host_env.file(available_path).exist?
-          end
-
-          def disable
-            apache.host_env.command('sudo', 'a2dissite', name).execute!
-          end
-
-          def enable
-            apache.host_env.command('sudo', 'a2ensite', name).execute!
-          end
-
-          def enabled_path
-            ::File.join(apache.etc_root, 'sites-enabled', "#{name}.conf")
-          end
-
-          def enabled?
-            apache.host_env.file(enabled_path).exist?
-          end
-
-          def remove
-            remove_disabled
-            remove_available
-          end
-
-          def remove_available
-            raise 'Remove enabled before' if enabled?
-
-            apache.host_env.command('sudo', 'rm', '-f', available_path).execute! if available?
-          end
-
-          def remove_disabled
-            disable if enabled?
-            apache.host_env.command('sudo', 'rm', '-f', enabled_path).execute! if enabled?
-          end
-
-          def write(content)
-            ::EacRubyUtils::Envs.local.command('echo', content).pipe(
-              apache.host_env.command('sudo', 'tee', available_path)
-            ).execute!
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/stereotypes/eac_ubuntu_base0/docker_image.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-require 'avm/docker/image'
-
-module Avm
-  module Stereotypes
-    module EacUbuntuBase0
-      class DockerImage < ::Avm::Docker::Image
-        def stereotype_tag
-          'eac_ubuntu_base0'
-        end
-      end
-    end
-  end
-end

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