avm-tools 0.123.0 → 0.126.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96767c8dbc616d4e1166263ebe047b23bc3eb1cae43fd65c855a947a5917d95c
-  data.tar.gz: 6448c5cf800a4570db21975f553963f8099e20d32ba53e7f98b164ff0feeadcf
+  metadata.gz: 5ca5230a46a057172eeb3466c0a663732ce38a3619ed6969629ed9f490ada86f
+  data.tar.gz: fe8d5b1796b9d427ab3642607785e8eb911f81266295f35238858469a679394c
 SHA512:
-  metadata.gz: 4dfc6dfac366d17373285126d681067cf6143ce92030fb938ebf0c8bc8d7841daa4c032fe95344a8041b341d73df074fa62fb2c55c55ce4b3d6ec988c79e51cb
-  data.tar.gz: 7d5625ba838dd89125fed9d6b0e0c3d2ba8e833537c618410c1b102313374f95bd11361fcfa2f043d43d760a75375b43211ddc29c9a40444ee498feeeaf0c241
+  metadata.gz: abe3b7dbe5b630ff0fb2ac15e867139728d08aedc24df9f46401222b093ec2c7d948f0bced59cf99ff960aaa169e1b46f86344fc1ea86a9331d2af395ad3a43c
+  data.tar.gz: b4334483e8cf90a20d72ebb3efc4c3fa35d83a8ccd37f3b03176ab640706b0ae61699d214c45bb010d7c76512ae1c52de06d3a584ca418281df43017ee0a3c35

data/lib/avm/tools/runner/instance/info.rb

@@ -22,6 +22,7 @@ module Avm
           def base_banner
             infov 'ID', instance.id
             infov 'Application ID', instance.application.id
+            infov 'Application stereotype', instance.application.stereotype
             infov 'Suffix', instance.suffix
           end
 

data/lib/avm/tools/runner/instance.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/instances/base'
+require 'avm/registry'
 require 'eac_cli/core_ext'
 
 module Avm
@@ -14,10 +15,14 @@ module Avm
           subcommands
         end
 
+        def extra_available_subcommands
+          instance.if_present({}, &:extra_available_subcommands)
+        end
+
         private
 
         def instance_uncached
-          ::Avm::Instances::Base.by_id(parsed.instance_id)
+          ::Avm::Registry.instances.detect(parsed.instance_id)
         end
       end
     end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.123.0'
+    VERSION = '0.126.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.123.0
+  version: 0.126.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-22 00:00:00.000000000 Z
+date: 2022-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -58,40 +58,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.4
-- !ruby/object:Gem::Dependency
-  name: avm-eac_rails_base0
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-- !ruby/object:Gem::Dependency
-  name: avm-eac_redmine_base0
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: avm-eac_ruby_base1
   requirement: !ruby/object:Gem::Requirement
@@ -376,10 +342,6 @@ files:
 - lib/avm/tools/runner/config.rb
 - lib/avm/tools/runner/config/load_path.rb
 - lib/avm/tools/runner/eac_asciidoctor_base0.rb
-- lib/avm/tools/runner/eac_redmine_base0.rb
-- lib/avm/tools/runner/eac_redmine_base0/dev_docker.rb
-- lib/avm/tools/runner/eac_redmine_base0/docker.rb
-- lib/avm/tools/runner/eac_redmine_base0/project_rename.rb
 - lib/avm/tools/runner/eac_webapp_base0.rb
 - lib/avm/tools/runner/eac_wordpress_base0.rb
 - lib/avm/tools/runner/eac_writings_base0.rb
@@ -552,28 +514,6 @@ files:
 - sub/avm-git/spec/lib/avm/git/scms/git_subrepo_spec.rb
 - sub/avm-git/spec/rubocop_spec.rb
 - sub/avm-git/spec/spec_helper.rb
-- sub/eac_docker/Gemfile
-- sub/eac_docker/eac_docker.gemspec
-- sub/eac_docker/lib/eac_docker.rb
-- sub/eac_docker/lib/eac_docker/container.rb
-- sub/eac_docker/lib/eac_docker/debug.rb
-- sub/eac_docker/lib/eac_docker/executables.rb
-- sub/eac_docker/lib/eac_docker/images.rb
-- sub/eac_docker/lib/eac_docker/images/base.rb
-- sub/eac_docker/lib/eac_docker/images/coded.rb
-- sub/eac_docker/lib/eac_docker/images/named.rb
-- sub/eac_docker/lib/eac_docker/images/templatized.rb
-- sub/eac_docker/lib/eac_docker/registry.rb
-- sub/eac_docker/lib/eac_docker/rspec.rb
-- sub/eac_docker/lib/eac_docker/rspec/setup.rb
-- sub/eac_docker/lib/eac_docker/version.rb
-- sub/eac_docker/spec/lib/eac_docker/executables_spec.rb
-- sub/eac_docker/spec/lib/eac_docker/images/coded_spec.rb
-- sub/eac_docker/spec/lib/eac_docker/images/coded_spec_files/image1/Dockerfile
-- sub/eac_docker/spec/lib/eac_docker/images/templatized_spec.rb
-- sub/eac_docker/spec/lib/eac_docker/images/templatized_spec_files/stub_docker_image/Dockerfile
-- sub/eac_docker/spec/rubocop_spec.rb
-- sub/eac_docker/spec/spec_helper.rb
 - sub/eac_git/Gemfile
 - sub/eac_git/eac_git.gemspec
 - sub/eac_git/lib/eac_git.rb

data/lib/avm/tools/runner/eac_redmine_base0/dev_docker.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/docker/runner'
-
-module Avm
-  module Tools
-    class Runner
-      class EacRedmineBase0 < ::Avm::EacRailsBase1::Runner
-        class DevDocker < ::Avm::Docker::Runner
-          def docker_image
-            ::Avm::EacUbuntuBase0::DockerImage
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/tools/runner/eac_redmine_base0/docker.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/docker/runner'
-
-module Avm
-  module Tools
-    class Runner
-      class EacRedmineBase0 < ::Avm::EacRailsBase1::Runner
-        class Docker < ::Avm::Docker::Runner
-          def use_default_registry?
-            false
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/tools/runner/eac_redmine_base0/project_rename.rb

@@ -1,56 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_cli/core_ext'
-require 'avm/eac_rails_base1/runner/code_runner'
-
-module Avm
-  module Tools
-    class Runner
-      class EacRedmineBase0 < ::Avm::EacRailsBase1::Runner
-        class ProjectRename
-          runner_with ::Avm::EacRailsBase1::RunnerWith::Bundle do
-            pos_arg :from
-            pos_arg :to
-          end
-
-          def run
-            bundle_run
-          end
-
-          def start_banner
-            infov 'From', from
-            infov 'To', to
-          end
-
-          delegate :from, :to, to: :parsed
-
-          def bundle_args
-            %w[exec rails runner] + [code]
-          end
-
-          def code
-            <<~CODE
-              from_arg = '#{from}'
-              to_arg = '#{to}'
-              project = ::Project.where(identifier: from_arg).first
-              if project.present?
-                puts "Project found: \#{project}"
-                puts "Renaming..."
-                project.update_column(:identifier, to_arg)
-                puts "Renamed. Testing..."
-                project = ::Project.where(identifier: to_arg).first
-                if project
-                  puts "Project found: \#{project}"
-                else
-                  fail "After rename: project not found with identifier \\"\#{to_arg}\\""
-                end
-              else
-                fail "Before rename: project not found with identifier \\"\#{from_arg}\\""
-              end
-            CODE
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avm/tools/runner/eac_redmine_base0.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/eac_rails_base1/runner'
-require 'avm/eac_redmine_base0'
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module Tools
-    class Runner
-      class EacRedmineBase0 < ::Avm::EacRailsBase1::Runner
-        require_sub __FILE__
-      end
-    end
-  end
-end

data/sub/eac_docker/Gemfile

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-gemspec

data/sub/eac_docker/eac_docker.gemspec

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-$LOAD_PATH.push File.expand_path('lib', __dir__)
-
-require 'eac_docker/version'
-
-Gem::Specification.new do |s|
-  s.name        = 'eac_docker'
-  s.version     = EacDocker::VERSION
-  s.authors     = ['Put here the authors']
-  s.summary     = 'Put here de description.'
-
-  s.files = Dir['{lib}/**/*']
-
-  s.add_dependency 'eac_ruby_utils', '~> 0.74'
-  s.add_dependency 'eac_templates', '~> 0.1'
-
-  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.3', '>= 0.3.3'
-end

data/sub/eac_docker/lib/eac_docker/container.rb

@@ -1,78 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module EacDocker
-  class Container
-    enable_immutable
-    immutable_accessor :interactive, :temporary, :tty, type: :boolean
-    immutable_accessor :env, type: :hash
-    immutable_accessor :capability, :command_arg, :volume, type: :array
-    attr_reader :id
-    common_constructor :image
-
-    def immutable_constructor_args
-      [image]
-    end
-
-    alias immutable_volume volume
-
-    def hostname
-      ::EacDocker::Executables.docker.command(
-        'inspect', '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}',
-        id
-      ).execute!.strip
-    end
-
-    def on_detached
-      command = ::EacDocker::Executables.docker.command(*(%w[run --detach] + run_command_args))
-      self.id = command.execute!.strip
-      begin
-        yield(self)
-      ensure
-        stop
-      end
-    end
-
-    def volume(left_part, right_part = null)
-      immutable_volume(right_part.if_present(left_part) { |v| "#{left_part}:#{v}" })
-    end
-
-    def run_command
-      ::EacDocker::Executables.docker.command('run', *run_command_args)
-    end
-
-    def run_command_args
-      run_command_boolean_args + run_command_capabilities_args + run_command_envs_args +
-        run_command_volumes_args + [image.provide.id] + command_args
-    end
-
-    def stop
-      ::EacDocker::Executables.docker.command('stop', id).execute!
-    end
-
-    private
-
-    attr_writer :id
-
-    def run_command_boolean_args
-      r = []
-      r << '--interactive' if interactive?
-      r << '--tty' if tty?
-      r << '--rm' if temporary?
-      r
-    end
-
-    def run_command_capabilities_args
-      capabilities.flat_map { |capability| ['--cap-add', capability] }
-    end
-
-    def run_command_volumes_args
-      volumes.flat_map { |volume| ['--volume', volume] }
-    end
-
-    def run_command_envs_args
-      envs.flat_map { |name, value| ['--env', "#{name}=#{value}"] }
-    end
-  end
-end

data/sub/eac_docker/lib/eac_docker/debug.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/boolean'
-
-module EacDocker
-  module Debug
-    class << self
-      ENABLE_ENVVAR = 'EAC_DOCKER_DEBUG'
-
-      def enabled?
-        ::EacRubyUtils::Boolean.parse(ENV[ENABLE_ENVVAR])
-      end
-    end
-  end
-end

data/sub/eac_docker/lib/eac_docker/executables.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/envs'
-
-module EacDocker
-  module Executables
-    class << self
-      def env
-        ::EacRubyUtils::Envs.local
-      end
-
-      def docker
-        @docker ||= env.executable('docker', '--version')
-      end
-    end
-  end
-end

data/sub/eac_docker/lib/eac_docker/images/base.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-require 'eac_docker/container'
-
-module EacDocker
-  module Images
-    class Base
-      def container
-        ::EacDocker::Container.new(self)
-      end
-    end
-  end
-end

data/sub/eac_docker/lib/eac_docker/images/coded.rb

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_docker/debug'
-require 'eac_docker/executables'
-require 'eac_docker/images/base'
-require 'eac_ruby_utils/core_ext'
-
-module EacDocker
-  module Images
-    class Coded < ::EacDocker::Images::Base
-      enable_simple_cache
-      enable_immutable
-      immutable_accessor :tag
-      common_constructor :path do
-        self.path = path.to_pathname
-      end
-
-      def immutable_constructor_args
-        [path]
-      end
-
-      def provide
-        id
-        self
-      end
-
-      private
-
-      def id_uncached
-        if ::EacDocker::Debug.enabled?
-          ::EacDocker::Executables.docker.command(*build_args.excluding('--quiet')).system!
-        end
-        ::EacDocker::Executables.docker.command(*build_args).execute!.strip
-      end
-
-      def build_args
-        args = %w[build --quiet]
-        args += ['--tag', tag] if tag.present?
-        args + [path.to_path]
-      end
-    end
-  end
-end

data/sub/eac_docker/lib/eac_docker/images/named.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_docker/executables'
-require 'eac_docker/images/base'
-require 'eac_ruby_utils/core_ext'
-
-module EacDocker
-  module Images
-    class Named < ::EacDocker::Images::Base
-      common_constructor :source_tag
-
-      def id
-        source_tag
-      end
-
-      def provide
-        provide_command.execute!
-        self
-      end
-
-      def provide_command
-        ::EacDocker::Executables.docker.command(*docker_provide_args)
-      end
-
-      def docker_provide_args
-        ['pull', source_tag]
-      end
-    end
-  end
-end

data/sub/eac_docker/lib/eac_docker/images/templatized.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_docker/images/base'
-require 'eac_docker/images/coded'
-require 'eac_ruby_utils/core_ext'
-require 'eac_ruby_utils/fs/temp'
-require 'eac_templates/patches/object/template'
-
-module EacDocker
-  module Images
-    class Templatized < ::EacDocker::Images::Base
-      enable_immutable
-      immutable_accessor :tag
-      attr_reader :provide_dir
-
-      def id
-        tag
-      end
-
-      def provide
-        ::EacRubyUtils::Fs::Temp.on_directory do |provide_dir|
-          begin
-            self.provide_dir = provide_dir
-            template.apply(self, provide_dir)
-            coded_image(provide_dir).tag(tag).provide
-          ensure
-            self.provide_dir = nil
-          end
-        end
-      end
-
-      def coded_image(provide_dir)
-        ::EacDocker::Images::Coded.new(provide_dir)
-      end
-
-      private
-
-      attr_writer :provide_dir
-    end
-  end
-end

data/sub/eac_docker/lib/eac_docker/images.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module EacDocker
-  module Images
-    require_sub __FILE__
-  end
-end

data/sub/eac_docker/lib/eac_docker/registry.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module EacDocker
-  class Registry
-    common_constructor :name
-
-    def to_s
-      name
-    end
-
-    def sub(suffix)
-      self.class.new("#{name}#{suffix}")
-    end
-  end
-end

data/sub/eac_docker/lib/eac_docker/rspec/setup.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_docker/executables'
-
-module EacDocker
-  module Rspec
-    module Setup
-      def self.extended(obj)
-        obj.setup_conditional_docker_executable
-      end
-
-      def setup_conditional_docker_executable
-        conditional(:docker) { ::EacDocker::Executables.docker.validate }
-      end
-    end
-  end
-end

data/sub/eac_docker/lib/eac_docker/rspec.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module EacDocker
-  module Rspec
-    require_sub __FILE__
-  end
-end

data/sub/eac_docker/lib/eac_docker/version.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-module EacDocker
-  VERSION = '0.4.1'
-end

data/sub/eac_docker/lib/eac_docker.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module EacDocker
-  require_sub __FILE__
-end

data/sub/eac_docker/spec/lib/eac_docker/executables_spec.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_docker/executables'
-
-RSpec.describe(::EacDocker::Executables, docker: true) do
-  it 'output version' do
-    expect(described_class.docker.command('--version').execute!).to be_present
-  end
-end

data/sub/eac_docker/spec/lib/eac_docker/images/coded_spec.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_docker/images/coded'
-
-RSpec.describe(::EacDocker::Images::Coded, docker: true) do
-  let(:fixtures_dir) { ::Pathname.new('coded_spec_files').expand_path(__dir__) }
-  let(:instance) { described_class.new(fixtures_dir / 'image1') }
-
-  describe '#provide' do
-    it { expect { instance.provide }.not_to raise_error }
-  end
-end

data/sub/eac_docker/spec/lib/eac_docker/images/coded_spec_files/image1/Dockerfile

@@ -1 +0,0 @@
-from ubuntu:bionic

data/sub/eac_docker/spec/lib/eac_docker/images/templatized_spec.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_docker/images/templatized'
-require 'eac_templates/searcher'
-
-RSpec.describe(::EacDocker::Images::Templatized, docker: true) do
-  let(:fixtures_dir) { ::Pathname.new('templatized_spec_files').expand_path(__dir__) }
-  let(:instance) { StubDockerImage.new }
-
-  before do
-    ::EacTemplates::Searcher.default.included_paths << fixtures_dir
-    stub_const('StubDockerImage', Class.new(described_class))
-  end
-
-  describe '#provide' do
-    it { expect { instance.provide }.not_to raise_error }
-  end
-end

data/sub/eac_docker/spec/lib/eac_docker/images/templatized_spec_files/stub_docker_image/Dockerfile

@@ -1 +0,0 @@
-from ubuntu:bionic

data/sub/eac_docker/spec/rubocop_spec.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-::EacRubyUtils::Rspec.default_setup.describe_rubocop

data/sub/eac_docker/spec/spec_helper.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/rspec/default_setup'
-::EacRubyUtils::Rspec.default_setup_create(::File.expand_path('..', __dir__))