avm-tools 0.27.0 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26cf030a3f42c0f5fdf7942b2971bec85421f8df517011ab391a1fb95d224312
-  data.tar.gz: 0c257ee1e27f65c8dd0f4f92d1e2b7c53859a572d030485a9c99a3647a1f3b20
+  metadata.gz: e9056924dbceab142648a79e5da4b931c3391e2138fdf10196e0b0b7f79a529f
+  data.tar.gz: b09f24e9e27940bfc314a9e4d236470ff6d0c0fd2e4d5b42f80b78f37848cf0b
 SHA512:
-  metadata.gz: 20162f7cb80187392299e43eeadb1e7fb02df97eb38fcdceccffec660d7a450d2cbc3abb342e4d60b87779e5143f89170ff3699d5e68f1dc385406bb4ddf82b8
-  data.tar.gz: 2933f9e4acda6314ef99b431f5181323695336026d76978271191f2c3d5ed90cbe43ff20d4cadf9838fc1a86c0b33c9a92361933fd8ccd2e83d0405af08bdd61
+  metadata.gz: 52a94ce93193368d76c1985d691672470699a54febfa7f957f0c48c1c0983bbc78e7b5d985c144a0678a9320577215f3be5a68a401678c708def8ba2f2dd3ccd
+  data.tar.gz: 644e16d5d4bfc5d74b0410cad8ad382ceabb0cae1a9822dd1b9650fa9c711deab8060fd3566176e82b4baaf669a49c1473d2ab4859d7756c24f3fe8ce4cb7327

data/lib/avm/path_string.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/object/blank'
+
+module Avm
+  # String with paths like PATH variable.
+  # Note: the separator is not system dependent.
+  class PathString < String
+    SEPARATOR = ':'
+
+    class << self
+      # Shortcut for [Avm::Paths.new(string).paths].
+      def paths(string)
+        new(string).paths
+      end
+    end
+
+    def initialize(string = nil)
+      super(string.to_s)
+    end
+
+    # @return [Array] List of paths. Blank paths are rejected.
+    def paths
+      split(SEPARATOR).reject(&:blank?)
+    end
+  end
+end

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

@@ -14,17 +14,28 @@ module Avm
       class Deploy
         include ::ActiveSupport::Callbacks
 
+        require_relative 'deploy/_appended_directories'
+
+        DEFAULT_REFERENCE = 'HEAD'
+
         enable_console_speaker
         enable_simple_cache
 
         JOBS = %w[git_deploy setup_files_units assert_instance_branch request_test].freeze
         define_callbacks(*JOBS)
 
-        attr_reader :instance, :git_reference
+        attr_reader :instance, :options
 
-        def initialize(instance, git_reference)
+        def initialize(instance, options = {})
           @instance = instance
-          @git_reference = git_reference
+          @options = options
+        end
+
+        def build_git_commit
+          ::Avm::Git::Commit.new(git, commit_sha1).deploy_to_env_path(
+            instance.host_env,
+            instance.read_entry(:fs_path)
+          ).variables_source_set(instance)
         end
 
         def run
@@ -45,14 +56,18 @@ module Avm
           infov 'Git remote name', git_remote_name
           infov 'Git reference (Found)', git_reference_found
           infov 'Git commit SHA1', commit_sha1
+          infov 'Appended directories', appended_directories
         end
 
         def git_deploy
           infom 'Deploying source code and appended content...'
-          ::Avm::Git::Commit.new(git, commit_sha1).deploy_to_env_path(
-            instance.host_env,
-            instance.read_entry(:fs_path)
-          ).append_directory(template.path).variables_source_set(instance).run
+          build_git_commit.append_directory(template.path).append_directories(
+            appended_directories
+          ).run
+        end
+
+        def git_reference
+          options[:reference] || DEFAULT_REFERENCE
         end
 
         def setup_files_units
@@ -122,40 +137,6 @@ module Avm
         def remote_branch(name)
           git_remote_hashs.key?("refs/heads/#{name}") ? "#{git_remote_name}/#{name}" : nil
         end
-
-        class FilesUnit < ::SimpleDelegator
-          attr_reader :data_key, :fs_path_subpath
-
-          def initialize(deploy, data_key, fs_path_subpath)
-            super(deploy)
-            @data_key = data_key
-            @fs_path_subpath = fs_path_subpath
-          end
-
-          def run
-            assert_source_directory
-            link_source_target
-          end
-
-          def assert_source_directory
-            infom "Asserting \"#{data_key}\" source directory..."
-            instance.host_env.command('mkdir', '-p', source_path).execute!
-          end
-
-          def source_path
-            ::File.join(instance.read_entry(:data_fs_path), data_key.to_s)
-          end
-
-          def target_path
-            ::File.join(instance.read_entry(:fs_path), fs_path_subpath.to_s)
-          end
-
-          def link_source_target
-            infom "Linking \"#{data_key}\" directory..."
-            instance.host_env.command('rm', '-rf', target_path).execute!
-            instance.host_env.command('ln', '-s', source_path, target_path).execute!
-          end
-        end
       end
     end
   end

data/lib/avm/stereotypes/eac_webapp_base0/deploy/_appended_directories.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'avm/path_string'
+
+module Avm
+  module Stereotypes
+    module EacWebappBase0
+      class Deploy
+        APPENDED_DIRECTORIES_ENTRY_KEY = 'deploy.appended_directories'
+
+        def appended_directories
+          appended_directories_from_instance_entry + appended_directories_from_options
+        end
+
+        def appended_directories_from_instance_entry
+          ::Avm::PathString.paths(instance.read_entry_optional(APPENDED_DIRECTORIES_ENTRY_KEY))
+        end
+
+        def appended_directories_from_options
+          options[:appended_directories] || []
+        end
+      end
+    end
+  end
+end

data/lib/avm/stereotypes/eac_webapp_base0/deploy/file_unit.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Avm
+  module Stereotypes
+    module EacWebappBase0
+      class Deploy
+        class FilesUnit < ::SimpleDelegator
+          attr_reader :data_key, :fs_path_subpath
+
+          def initialize(deploy, data_key, fs_path_subpath)
+            super(deploy)
+            @data_key = data_key
+            @fs_path_subpath = fs_path_subpath
+          end
+
+          def run
+            assert_source_directory
+            link_source_target
+          end
+
+          def assert_source_directory
+            infom "Asserting \"#{data_key}\" source directory..."
+            instance.host_env.command('mkdir', '-p', source_path).execute!
+          end
+
+          def source_path
+            ::File.join(instance.read_entry(:data_fs_path), data_key.to_s)
+          end
+
+          def target_path
+            ::File.join(instance.read_entry(:fs_path), fs_path_subpath.to_s)
+          end
+
+          def link_source_target
+            infom "Linking \"#{data_key}\" directory..."
+            instance.host_env.command('rm', '-rf', target_path).execute!
+            instance.host_env.command('ln', '-s', source_path, target_path).execute!
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -4,6 +4,7 @@ require 'avm/instances/base'
 require 'avm/stereotypes/postgresql/instance_with'
 require 'avm/data/instance/files_unit'
 require 'avm/data/instance/package'
+require 'avm/stereotypes/eac_webapp_base0/deploy/file_unit'
 
 module Avm
   module Stereotypes

data/lib/avm/stereotypes/eac_webapp_base0/runner/deploy.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/path_string'
 require 'eac_ruby_utils/console/docopt_runner'
 require 'eac_ruby_utils/console/speaker'
 
@@ -20,6 +21,7 @@ module Avm
             Options:
               -h --help                       Show this screen.
               -r --reference=<git-reference>  Git reference to deploy.
+              -a --append-dirs=<append-dirs>  Append directories to deploy (List separated by ":").
           DOCOPT
           def initialize(settings = {})
             super settings.merge(doc: DOC.gsub('%%STEREOTYPE_NAME%%', stereotype_name))
@@ -38,13 +40,18 @@ module Avm
           end
 
           def run
-            result = deploy_class.new(context(:instance), options.fetch('--reference')).run
+            result = deploy_class.new(context(:instance), deploy_options).run
             if result.error?
               fatal_error result.to_s
             else
               infov 'Result', result.label
             end
           end
+
+          def deploy_options
+            { reference: options.fetch('--reference'),
+              appended_directories: ::Avm::PathString.paths(options.fetch('--append-dirs')) }
+          end
         end
       end
     end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.27.0'
+    VERSION = '0.28.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.28.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-22 00:00:00.000000000 Z
+date: 2020-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -222,6 +222,7 @@ files:
 - lib/avm/patches.rb
 - lib/avm/patches/eac_launcher_git_base.rb
 - lib/avm/patches/object/template.rb
+- lib/avm/path_string.rb
 - lib/avm/result.rb
 - lib/avm/self.rb
 - lib/avm/self/docker_image.rb
@@ -241,6 +242,8 @@ files:
 - lib/avm/stereotypes/eac_webapp_base0.rb
 - lib/avm/stereotypes/eac_webapp_base0/apache_host.rb
 - lib/avm/stereotypes/eac_webapp_base0/deploy.rb
+- lib/avm/stereotypes/eac_webapp_base0/deploy/_appended_directories.rb
+- lib/avm/stereotypes/eac_webapp_base0/deploy/file_unit.rb
 - lib/avm/stereotypes/eac_webapp_base0/instance.rb
 - lib/avm/stereotypes/eac_webapp_base0/runner/deploy.rb
 - lib/avm/stereotypes/eac_wordpress_base0/apache_host.rb