avm-tools 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15042971f9c97791f18e9e663ddc0bc3294280e1efba45d7f14ac3c6af60e63e
-  data.tar.gz: 06ff3ac5fa18b309c36372c52cf551c7e2da7059c716087ab6b82739c7ecc48b
+  metadata.gz: 9cc8ec766645c9ba79f3bbee342a271a47dfbc9921b433b0de06c2dbdac82470
+  data.tar.gz: f2efe1291c604c06320b386de40ab0035641017c040ebc0fa3ff5a56a1b57b3b
 SHA512:
-  metadata.gz: 753715c0040270d6fc3e1cf4cc212bca06397e4dd21312e3d148d1575071272ad7b489cbef53872df3919d29b11220ea82a829e54bf315e4257022ccd639576a
-  data.tar.gz: 59a989fe98205a556e301b8dbe7d5a90f00d075809cd9db6e6a7511b789a256126e43b606431b3344ff632c8a2d61d24cdddd12c380c6822d503c2c9e0ca32f0
+  metadata.gz: 31f9530c35e93e73fa80ea12e25c1301dadeda7028624cea0ca58253b201f7c3f7b4f3c015f6e9bc6f4fd7db183010be9adb6c89fe8d858f3e38e97d600e90d7
+  data.tar.gz: 3aaa766a741baf3d4e3dd5d33219bc1342fe9c0683802e33ca79472327d7b7909c0e45c4d1fde482fbae3a3f817d9a5315958dac26a02ee9e534b02b23fb10e0

data/lib/avm/docker/container.rb

@@ -22,13 +22,13 @@ module Avm
         if instance.docker_container_exist?
           run_start
         else
-          run_run
+          run_run(options)
         end
       end
 
-      def run_run
+      def run_run(options)
         infom "\"docker run #{instance.docker_container_name}...\""
-        ::Avm::Executables.docker.command.append(run_run_arguments).system!
+        ::Avm::Executables.docker.command.append(run_run_arguments(options)).system!
       end
 
       def run_start
@@ -36,9 +36,10 @@ module Avm
         ::Avm::Executables.docker.command.append(run_start_arguments).system!
       end
 
-      def run_run_arguments
+      def run_run_arguments(options)
+        entrypoint_args = options[:entrypoint_args].if_present([])
         ['run', '-it', '--name', instance.docker_container_name] + instance.docker_run_arguments +
-          [instance.docker_image.tag]
+          [instance.docker_image.tag] + entrypoint_args
       end
 
       def run_start_arguments

data/lib/avm/docker/registry.rb

@@ -7,7 +7,7 @@ module Avm
     class Registry
       class << self
         def default
-          @default ||= new(::Avm.configs.read_entry('docker.registry.name'))
+          @default ||= new(::Avm.configs.read_entry('self.docker.registry.name'))
         end
       end
 

data/lib/avm/docker/runner.rb

@@ -14,7 +14,7 @@ module Avm
         Manipulate Docker images.
 
         Usage:
-          __PROGRAM__ [options] [-B <build-arg>...]
+          __PROGRAM__ [options] [-B <build-arg>...] [-E <run-arg>...]
           __PROGRAM__ -h | --help
 
         Options:
@@ -23,6 +23,7 @@ module Avm
           -p --push     Push the image to Docker registry.
           -r --run      Run or start a container with builded image.
           -B --build-arg=<build-arg>  Argument for "docker build".
+          -E --entrypoint-arg=<run-arg>    Argument for entrypoint on "docker run"
           -c --clear  Remove container if exist before run.
       DOCOPT
 
@@ -44,6 +45,7 @@ module Avm
         infov 'Registry name', registry
         infov 'Image name', instance.docker_image.tag
         infov 'Build arguments', build_args
+        infov 'Entrypoint arguments', entrypoint_args
       end
 
       def build
@@ -54,12 +56,21 @@ module Avm
         options.fetch('--build-arg')
       end
 
+      def entrypoint_args
+        options.fetch('--entrypoint-arg')
+      end
+
       def push
         instance.docker_image.push if options.fetch('--push')
       end
 
       def container_run
-        instance.docker_container.run(clear: options.fetch('--clear')) if options.fetch('--run')
+        return unless options.fetch('--run')
+
+        instance.docker_container.run(
+          entrypoint_args: entrypoint_args,
+          clear: options.fetch('--clear')
+        )
       end
 
       def registry_uncached

data/lib/avm/git/commit/deploy.rb

@@ -4,7 +4,7 @@ require 'addressable'
 require 'eac_ruby_utils/simple_cache'
 require 'eac_ruby_utils/require_sub'
 ::EacRubyUtils.require_sub(__FILE__)
-require 'avm/templates/directory'
+require 'avm/patches/object/template'
 
 module Avm
   module Git
@@ -92,7 +92,7 @@ module Avm
         def copy_appended_directory(directory)
           raise 'Variables source not set' if variables_source.blank?
 
-          ::Avm::Templates::Directory.new(directory).apply(variables_source, build_dir)
+          ::EacRubyUtils::Templates::Directory.new(directory).apply(variables_source, build_dir)
         end
 
         def mkdir_target

data/lib/avm/patches/object/template.rb

@@ -1,24 +1,7 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/string/inflections'
-require 'avm/templates'
+require 'eac_ruby_utils/patches/object/template'
 
-class Object
-  class << self
-    def template
-      @template ||= ::Avm::Templates.template(name.underscore)
-    end
-
-    def template_path
-      @template_path ||= ::Avm::Templates.template_path(name.underscore)
-    end
-  end
-
-  def template
-    self.class.template
-  end
-
-  def template_path
-    self.class.template_path
-  end
-end
+::EacRubyUtils::Templates::Searcher.default.included_paths << ::File.expand_path(
+  ('../' * 4) + 'template', __dir__
+)

data/lib/avm/self.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+require 'avm/instances/base'
+
+module Avm
+  module Self
+    ::EacRubyUtils.require_sub(__FILE__)
+
+    class << self
+      def instance
+        @instance ||= ::Avm::Self::Instance.by_id('avm-tools_self')
+      end
+    end
+  end
+end

data/lib/avm/self/docker_image.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'avm/docker/image'
+
+module Avm
+  module Self
+    class DockerImage < ::Avm::Docker::Image
+      common_constructor :registry
+
+      def tag
+        registry.name
+      end
+    end
+  end
+end

data/lib/avm/self/instance.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'avm/instances/base'
+require 'avm/self/docker_image'
+require 'avm/stereotypes/eac_ubuntu_base0/docker_image'
+
+module Avm
+  module Self
+    class Instance < ::Avm::Instances::Base
+      def docker_image_class
+        ::Avm::Self::DockerImage
+      end
+
+      def docker_run_arguments
+        ['-e', "LOCAL_USER_ID=#{::Process.uid}"]
+      end
+    end
+  end
+end

data/lib/avm/stereotypes/eac_webapp_base0/apache_host.rb

@@ -3,7 +3,7 @@
 require 'eac_ruby_utils/core_ext'
 require 'avm/patches/object/template'
 require 'avm/stereotypes/eac_ubuntu_base0/apache'
-require 'avm/templates/file'
+require 'avm/patches/object/template'
 
 module Avm
   module Stereotypes
@@ -25,9 +25,8 @@ module Avm
         end
 
         def no_ssl_site_content
-          ::Avm::Templates::File.new(
-            ::File.join(::Avm::Stereotypes::EacWebappBase0::ApacheHost.template_path, 'no_ssl.conf')
-          ).apply(EntriesReader.new(self, instance))
+          ::Avm::Stereotypes::EacWebappBase0::ApacheHost.template.child('no_ssl.conf')
+                                                        .apply(EntriesReader.new(self, instance))
         end
 
         private

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_ruby_utils/require_sub'
+require 'avm/self'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class Self < ::EacRubyUtils::Console::DocoptRunner
+        ::EacRubyUtils.require_sub(__FILE__)
+
+        DOC = <<~DOCOPT
+          Utilities for self avm-tools.
+
+          Usage:
+            __PROGRAM__ [options] __SUBCOMMANDS__
+            __PROGRAM__ -h | --help
+
+          Options:
+            -h --help             Show this screen.
+        DOCOPT
+
+        def instance
+          ::Avm::Self.instance
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'avm/docker/runner'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class Self < ::EacRubyUtils::Console::DocoptRunner
+        class Docker < ::Avm::Docker::Runner
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.22.0'
+    VERSION = '0.23.0'
   end
 end

data/template/avm/self/docker_image/Dockerfile

@@ -0,0 +1,17 @@
+FROM ruby:2.4
+RUN gem install avm-tools
+
+RUN apt-get update && apt-get -y --no-install-recommends install \
+    ca-certificates \
+    curl
+
+RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4
+RUN curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/1.4/gosu-$(dpkg --print-architecture)" \
+    && curl -o /usr/local/bin/gosu.asc -SL "https://github.com/tianon/gosu/releases/download/1.4/gosu-$(dpkg --print-architecture).asc" \
+    && gpg --verify /usr/local/bin/gosu.asc \
+    && rm /usr/local/bin/gosu.asc \
+    && chmod +x /usr/local/bin/gosu
+COPY entrypoint.sh /usr/local/bin/entrypoint.sh
+RUN chmod +x /usr/local/bin/entrypoint.sh
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+CMD []

data/template/avm/self/docker_image/entrypoint.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Add local user
+# Either use the LOCAL_USER_ID if passed in at runtime or
+# fallback
+
+USER_ID=${LOCAL_USER_ID:-9001}
+
+echo "Starting with UID : $USER_ID"
+useradd --shell /bin/bash -u $USER_ID -o -c "" -m user
+export HOME=/home/user
+exec /usr/local/bin/gosu user avm "$@"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-14 00:00:00.000000000 Z
+date: 2019-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -76,14 +76,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
@@ -222,6 +222,9 @@ files:
 - lib/avm/patches/eac_launcher_git_base.rb
 - lib/avm/patches/object/template.rb
 - lib/avm/result.rb
+- lib/avm/self.rb
+- lib/avm/self/docker_image.rb
+- lib/avm/self/instance.rb
 - lib/avm/stereotypes.rb
 - lib/avm/stereotypes/eac_rails_base0.rb
 - lib/avm/stereotypes/eac_rails_base0/apache_host.rb
@@ -244,9 +247,6 @@ files:
 - lib/avm/stereotypes/postgresql/instance.rb
 - lib/avm/stereotypes/postgresql/instance/data_unit.rb
 - lib/avm/stereotypes/postgresql/instance_with.rb
-- lib/avm/templates.rb
-- lib/avm/templates/directory.rb
-- lib/avm/templates/file.rb
 - lib/avm/tools.rb
 - lib/avm/tools/git.rb
 - lib/avm/tools/runner.rb
@@ -270,7 +270,11 @@ files:
 - lib/avm/tools/runner/git/dirty_files.rb
 - lib/avm/tools/runner/git/issue.rb
 - lib/avm/tools/runner/git/issue/complete.rb
+- lib/avm/tools/runner/self.rb
+- lib/avm/tools/runner/self/docker.rb
 - lib/avm/tools/version.rb
+- 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

data/lib/avm/templates.rb

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/require_sub'
-::EacRubyUtils.require_sub(__FILE__)
-
-module Avm
-  module Templates
-    class << self
-      def template(subpath, required = true)
-        path = template_path(subpath)
-        if path.blank?
-          return nil unless required
-
-          raise "Template not found for subpath \"#{subpath}\" (Included paths: #{included_paths})"
-        end
-        return ::Avm::Templates::File.new(path) if ::File.file?(path)
-        return ::Avm::Templates::Directory.new(path) if ::File.directory?(path)
-
-        raise 'Invalid branching'
-      end
-
-      # @return The absolute path of template if found, +nil+ otherwise.
-      def template_path(subpath)
-        included_paths.each do |included_path|
-          r = search_template_in_included_path(included_path, subpath)
-          return r if r
-        end
-        nil
-      end
-
-      def included_paths
-        @included_paths ||= ::Set.new([::File.expand_path('../../template', __dir__)])
-      end
-
-      private
-
-      def search_template_in_included_path(included_path, subpath)
-        path = ::File.join(included_path, subpath)
-        dir = ::File.dirname(path)
-        Dir.entries(dir).each do |entry|
-          next if %w[. ..].include?(entry)
-          return path if template_basename(entry) == ::File.basename(subpath)
-        end
-      end
-
-      def template_basename(entry)
-        entry.gsub(/(?:\.[a-z0-9]+)+\z/i, '')
-      end
-    end
-  end
-end

data/lib/avm/templates/directory.rb

@@ -1,96 +0,0 @@
-# frozen_string_literal: true
-
-require 'avm/templates/file'
-
-module Avm
-  module Templates
-    class Directory
-      TEMPLATE_EXTNAME = '.template'
-
-      attr_reader :path
-
-      def initialize(path)
-        @path = path
-      end
-
-      def apply(variables_source, directory)
-        TemplateNode.new(self, '.', directory, variables_source).apply
-      end
-
-      private
-
-      def apply_fs_object(source_relative, target)
-        if ::File.directory?(source_absolute(source_relative))
-          apply_directory(source_relative, target)
-        elsif ::File.file?(source_absolute(source_relative))
-        end
-      end
-
-      def source_absolute(source_relative)
-        ::File.expand_path(source_relative, path)
-      end
-
-      class TemplateNode
-        attr_reader :source_directory, :source_relative, :target_root_directory, :variables_source
-
-        def initialize(source_directory, source_relative, target_root_directory, variables_source)
-          @source_directory = source_directory
-          @source_relative = source_relative
-          @target_root_directory = target_root_directory
-          @variables_source = variables_source
-        end
-
-        def apply
-          if file?
-            apply_file
-          elsif directory?
-            apply_directory
-          else
-            raise "Unknown filesystem type: #{source_absolute}"
-          end
-        end
-
-        private
-
-        def apply_directory
-          ::FileUtils.mkdir_p(target_absolute)
-          Dir.entries(source_absolute).each do |entry|
-            child(entry).apply unless %w[. ..].include?(entry)
-          end
-        end
-
-        def apply_file
-          if ::File.extname(source_absolute) == TEMPLATE_EXTNAME
-            ::Avm::Templates::File.new(source_absolute).apply_to_file(
-              variables_source, target_absolute
-            )
-          else
-            ::FileUtils.cp(source_absolute, target_absolute)
-          end
-        end
-
-        def child(entry)
-          TemplateNode.new(source_directory, ::File.join(source_relative, entry),
-                           target_root_directory, variables_source)
-        end
-
-        def file?
-          ::File.file?(source_absolute)
-        end
-
-        def directory?
-          ::File.directory?(source_absolute)
-        end
-
-        def source_absolute
-          ::File.expand_path(source_relative, source_directory.path)
-        end
-
-        def target_absolute
-          ::File.expand_path(source_relative, target_root_directory)
-                .gsub(/#{::Regexp.quote(TEMPLATE_EXTNAME)}\z/, '')
-        end
-      end
-    end
-  end
-end

data/lib/avm/templates/file.rb

@@ -1,101 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_support/core_ext/hash/indifferent_access'
-require 'eac_ruby_utils/simple_cache'
-
-module Avm
-  module Templates
-    class File
-      include ::EacRubyUtils::SimpleCache
-
-      VARIABLE_DELIMITER = ::Regexp.quote('%%')
-      VARIABLE_PATTERN = /#{VARIABLE_DELIMITER}([a-z0-9\._]*)#{VARIABLE_DELIMITER}/i.freeze
-
-      attr_reader :path
-
-      def initialize(path)
-        @path = path
-      end
-
-      # +variables_provider+ A [Hash] or object which responds to +read_entry(entry_name)+.
-      def apply(variables_source)
-        variables_provider = build_variables_provider(variables_source)
-        variables.inject(content) do |a, e|
-          a.gsub(variable_pattern(e), variables_provider.variable_value(e).to_s)
-        end
-      end
-
-      def apply_to_file(variables_source, output_file_path)
-        ::File.write(output_file_path, apply(variables_source))
-      end
-
-      private
-
-      def variables_uncached
-        content.scan(VARIABLE_PATTERN).map(&:first).map do |name|
-          sanitize_variable_name(name)
-        end.to_set
-      end
-
-      def content_uncached
-        ::File.read(path)
-      end
-
-      def sanitize_variable_name(variable_name)
-        variable_name.to_s.downcase
-      end
-
-      def build_variables_provider(variables_source)
-        return HashVariablesProvider.new(variables_source) if variables_source.is_a?(::Hash)
-        return EntriesReaderVariablesProvider.new(variables_source) if
-        variables_source.respond_to?(:read_entry)
-
-        raise "Variables provider not found for #{variables_source}"
-      end
-
-      def variable_pattern(name)
-        /#{VARIABLE_DELIMITER}#{::Regexp.quote(name)}#{VARIABLE_DELIMITER}/i
-      end
-
-      class BaseVariablesProvider
-        attr_reader :source
-
-        def initialize(source)
-          @source = source
-        end
-
-        def variable_value(name)
-          return variable_fetch(name) if variable_exist?(name)
-
-          raise VariableNotFoundError, "Variable \"#{name}\" not found in #{source}"
-        end
-      end
-
-      class HashVariablesProvider < BaseVariablesProvider
-        def initialize(source)
-          super(source.with_indifferent_access)
-        end
-
-        def variable_exist?(name)
-          source.key?(name)
-        end
-
-        def variable_fetch(name)
-          source.fetch(name)
-        end
-      end
-
-      class EntriesReaderVariablesProvider < BaseVariablesProvider
-        def variable_exist?(_name)
-          true
-        end
-
-        def variable_fetch(name)
-          source.read_entry(name)
-        end
-      end
-
-      class VariableNotFoundError < StandardError; end
-    end
-  end
-end