avm-tools 0.57.0 → 0.58.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0b0b4e4d80b6961f0eac94d2698535f0fbf5f4cd09fd15bb2ed5db238cb472b
-  data.tar.gz: a359c6044ceefd1c61296bf3a3c6ea32eeeee3c5a79c5a120d4b07306185e1aa
+  metadata.gz: ea1f70fc2f9b43dd584ccf4519299ccf687b44ac69f0984a996ba26dc8255964
+  data.tar.gz: 4fdec7c63f7ec4f48f4e44fff60f5a901119a919e4f4884a90df9a436bae4368
 SHA512:
-  metadata.gz: bd03f841630fa15e5b8b996db616944fc170c32aedcc2a8146e23edc9b709617149bce6c1b795d5253057bc7a029bdc977ce491bfd06d3a9aef1022bdd1a70f5
-  data.tar.gz: a2787bc3227940b3c1649883e12ddec48ac76add691f86f33a574168eb5c3b13389941b965e1d02f2984a8965e0df697792b2aa3629668ba5076d68a92c5bd5f
+  metadata.gz: 620de198f99a3acb3d798f73af83cb85d48f428d1d012a3c99cf5a7ac0a4688c5ec51a927c9fe955e1605f6298f1dd05b1422e57f96220ee6f7cfe666ad229d5
+  data.tar.gz: a5ac202f489c02e73a8c4d0ca00102fbc35a687d8b180798d5538f4c2abe875388da0992ea4b4462cd38d25596697205dc0120b1c0f19ac2b50b7aa5d434cbbb

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.57.0'
+    VERSION = '0.58.0'
   end
 end

data/vendor/eac_docker/Gemfile

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

data/vendor/eac_docker/eac_docker.gemspec

@@ -0,0 +1,18 @@
+# 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.36'
+
+  s.add_development_dependency 'eac_ruby_gem_support', '~> 0.1', '>= 0.1.1'
+end

data/vendor/eac_docker/lib/eac_docker.rb

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

data/vendor/eac_docker/lib/eac_docker/container.rb

@@ -0,0 +1,74 @@
+# 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 :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_envs_args + run_command_volumes_args + [image.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_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/vendor/eac_docker/lib/eac_docker/executables.rb

@@ -0,0 +1,18 @@
+# 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/vendor/eac_docker/lib/eac_docker/images.rb

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

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

@@ -0,0 +1,14 @@
+# 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/vendor/eac_docker/lib/eac_docker/images/coded.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+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
+        ::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/vendor/eac_docker/lib/eac_docker/images/named.rb

@@ -0,0 +1,30 @@
+# 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/vendor/eac_docker/lib/eac_docker/images/templatized.rb

@@ -0,0 +1,26 @@
+# 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'
+
+module EacDocker
+  module Images
+    class Templatized < ::EacDocker::Images::Base
+      enable_immutable
+      immutable_accessor :tag
+
+      def provide
+        ::EacRubyUtils::Fs::Temp.on_directory do |provide_dir|
+          template.apply(self, provide_dir)
+          coded_image(provide_dir).tag(tag).provide
+        end
+      end
+
+      def coded_image(provide_dir)
+        ::EacDocker::Images::Coded.new(provide_dir)
+      end
+    end
+  end
+end

data/vendor/eac_docker/lib/eac_docker/registry.rb

@@ -0,0 +1,17 @@
+# 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/vendor/eac_docker/lib/eac_docker/rspec.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/rspec/conditional'
+require 'eac_docker/executables'
+
+module EacDocker
+  module Rspec
+    class << self
+      def configure
+        ::EacRubyUtils::Rspec::Conditional.default.add(:docker) do
+          ::EacDocker::Executables.docker.validate
+        end
+        RSpec.configure { |config| ::EacRubyUtils::Rspec::Conditional.default.configure(config) }
+      end
+    end
+  end
+end

data/vendor/eac_docker/lib/eac_docker/version.rb

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

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

@@ -0,0 +1,9 @@
+# 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/vendor/eac_docker/spec/lib/eac_docker/images/coded_spec.rb

@@ -0,0 +1,12 @@
+# 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/vendor/eac_docker/spec/lib/eac_docker/images/coded_spec_files/image1/Dockerfile

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

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'eac_docker/images/templatized'
+
+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
+    ::EacRubyUtils::Templates::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/vendor/eac_docker/spec/lib/eac_docker/images/templatized_spec_files/stub_docker_image/Dockerfile

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

data/vendor/eac_docker/spec/rubocop_spec.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_gem_support/spec/examples/rubocop_check'
+
+RSpec.describe ::RuboCop, slow: true do
+  include_examples 'rubocop_check', ::File.expand_path('..', __dir__)
+end

data/vendor/eac_docker/spec/spec_helper.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause
+# this file to always be loaded, without a need to explicitly require it in any
+# files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need
+# it.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+  # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
+  # have no way to turn it off -- the option exists only for backwards
+  # compatibility in RSpec 3). It causes shared context metadata to be
+  # inherited by the metadata hash of host groups and examples, rather than
+  # triggering implicit auto-inclusion in groups with matching metadata.
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+
+  # The settings below are suggested to provide a good initial experience
+  # with RSpec, but feel free to customize to your heart's content.
+  #   # This allows you to limit a spec run to individual examples or groups
+  #   # you care about by tagging them with `:focus` metadata. When nothing
+  #   # is tagged with `:focus`, all examples get run. RSpec also provides
+  #   # aliases for `it`, `describe`, and `context` that include `:focus`
+  #   # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  #   config.filter_run_when_matching :focus
+  #
+  #   # Allows RSpec to persist some state between runs in order to support
+  #   # the `--only-failures` and `--next-failure` CLI options. We recommend
+  #   # you configure your source control system to ignore this file.
+  #   config.example_status_persistence_file_path = "spec/examples.txt"
+  #
+  #   # Limits the available syntax to the non-monkey patched syntax that is
+  #   # recommended. For more details, see:
+  #   #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
+  #   #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
+  #   config.disable_monkey_patching!
+  #
+  #   # This setting enables warnings. It's recommended, but in some cases may
+  #   # be too noisy due to issues in dependencies.
+  #   config.warnings = true
+  #
+  #   # Many RSpec users commonly either run the entire suite or an individual
+  #   # file, and it's useful to allow more verbose output when running an
+  #   # individual spec file.
+  #   if config.files_to_run.one?
+  #     # Use the documentation formatter for detailed output,
+  #     # unless a formatter has already been configured
+  #     # (e.g. via a command-line flag).
+  #     config.default_formatter = "doc"
+  #   end
+  #
+  #   # Print the 10 slowest examples and example groups at the
+  #   # end of the spec run, to help surface which specs are running
+  #   # particularly slow.
+  #   config.profile_examples = 10
+  #
+  #   # Run specs in random order to surface order dependencies. If you find an
+  #   # order dependency and want to debug it, you can fix the order by providing
+  #   # the seed, which is printed after each run.
+  #   #     --seed 1234
+  #   config.order = :random
+  #
+  #   # Seed global randomization in this process using the `--seed` CLI option.
+  #   # Setting this allows you to use `--seed` to deterministically reproduce
+  #   # test failures related to randomization by passing the same `--seed` value
+  #   # as the one that triggered the failure.
+  #   Kernel.srand config.seed
+end
+
+require 'eac_docker/rspec'
+::EacDocker::Rspec.configure

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/ssh_env.rb

@@ -2,12 +2,14 @@
 
 require 'addressable'
 require 'eac_ruby_utils/envs/base_env'
+require 'eac_ruby_utils/patches/object/if_present'
 require 'net/ssh'
 require 'shellwords'
 
 module EacRubyUtils
   module Envs
     class SshEnv < ::EacRubyUtils::Envs::BaseEnv
+      IDENTITITY_FILE_OPTION = 'IdentityFile'
       USER_PATTERN = /[a-z_][a-z0-9_-]*/.freeze
       HOSTNAME_PATTERN = /[^@]+/.freeze
       USER_HOSTNAME_PATTERN = /\A(?:(#{USER_PATTERN})@)?(#{HOSTNAME_PATTERN})\z/.freeze
@@ -51,6 +53,7 @@ module EacRubyUtils
       def ssh_command_line
         r = %w[ssh]
         r += ['-p', uri.port] if uri.port.present?
+        ssh_identity_file.if_present { |v| r += ['-i', v] }
         r += ssh_command_line_options
         r << user_hostname_uri
         r.map { |a| Shellwords.escape(a) }.join(' ')
@@ -58,7 +61,9 @@ module EacRubyUtils
 
       def ssh_command_line_options
         r = []
-        uri.query_values&.each { |k, v| r += ['-o', "#{k}=#{v}"] }
+        uri.query_values&.each do |k, v|
+          r += ['-o', "#{k}=#{v}"] unless k == IDENTITITY_FILE_OPTION
+        end
         r
       end
 
@@ -67,6 +72,12 @@ module EacRubyUtils
         r = "#{uri.user}@#{r}" if uri.user.present?
         r
       end
+
+      def ssh_identity_file
+        uri.query_values.if_present do |v|
+          v[IDENTITITY_FILE_OPTION]
+        end
+      end
     end
   end
 end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/immutable/array_accessor.rb

@@ -18,6 +18,10 @@ module EacRubyUtils
         end
       end
 
+      def immutable_value_get(object)
+        super || []
+      end
+
       def immutable_value_set(object, value)
         duplicate_object(object) do |old_value|
           (old_value || []) + [value]

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/immutable/hash_accessor.rb

@@ -11,6 +11,10 @@ module EacRubyUtils
         apply_set(klass)
       end
 
+      def immutable_value_get(object)
+        super || {}
+      end
+
       def immutable_value_set(object, key, value)
         duplicate_object(object) do |old_value|
           (old_value || {}).merge(key => value)

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.57.0
+  version: 0.58.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2020-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -106,6 +106,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: eac_docker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: eac_git
   requirement: !ruby/object:Gem::Requirement
@@ -140,28 +154,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.39'
+        version: '0.41'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.39'
+        version: '0.41'
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
@@ -503,6 +517,26 @@ files:
 - 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_docker/Gemfile
+- vendor/eac_docker/eac_docker.gemspec
+- vendor/eac_docker/lib/eac_docker.rb
+- vendor/eac_docker/lib/eac_docker/container.rb
+- vendor/eac_docker/lib/eac_docker/executables.rb
+- vendor/eac_docker/lib/eac_docker/images.rb
+- vendor/eac_docker/lib/eac_docker/images/base.rb
+- vendor/eac_docker/lib/eac_docker/images/coded.rb
+- vendor/eac_docker/lib/eac_docker/images/named.rb
+- vendor/eac_docker/lib/eac_docker/images/templatized.rb
+- vendor/eac_docker/lib/eac_docker/registry.rb
+- vendor/eac_docker/lib/eac_docker/rspec.rb
+- vendor/eac_docker/lib/eac_docker/version.rb
+- vendor/eac_docker/spec/lib/eac_docker/executables_spec.rb
+- vendor/eac_docker/spec/lib/eac_docker/images/coded_spec.rb
+- vendor/eac_docker/spec/lib/eac_docker/images/coded_spec_files/image1/Dockerfile
+- vendor/eac_docker/spec/lib/eac_docker/images/templatized_spec.rb
+- vendor/eac_docker/spec/lib/eac_docker/images/templatized_spec_files/stub_docker_image/Dockerfile
+- vendor/eac_docker/spec/rubocop_spec.rb
+- vendor/eac_docker/spec/spec_helper.rb
 - vendor/eac_git/Gemfile
 - vendor/eac_git/eac_git.gemspec
 - vendor/eac_git/lib/eac_git.rb