avm-tools 0.25.0 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b281c9ce7a6b01c3627f2176525badcb1e8da74db083a19e4a044183a81d5098
-  data.tar.gz: bed6e84f9f7ffbc8cb04f801d946bb3d121aa037b091d3eb7674a003608766e0
+  metadata.gz: 5cd4428c87bbb4fa7c5e7e49f2324bae1f9c34a63adad1790ca84dd3e44726bc
+  data.tar.gz: 0f658f19e437688c90766266a69f9aede92bde9036804eaed08562c8bd8bf2b7
 SHA512:
-  metadata.gz: a2f4351b55f7e26efa4db5e92f3c8d0cc559380cc17f38fc41881c202c57c6caec07ab357934cdf4bc46419c7881bea01f0fd7ddf17db9948339ef14a34ea81d
-  data.tar.gz: 18357869454f75bd31b70e098a624beb3caa00a289ccc0bb15533aca7cb2ed3ac206503c26babc56660d9c09ec1471a42bab51d48114209df86a9102919f7613
+  metadata.gz: cce720c19266b3441dfd04c469179bad41e42e71d984b57ef32677d0a247637b829e2674c53f8e20f17a62f280d52e131da103db9b55f75d39ddf7b64893bb72
+  data.tar.gz: 9ae68611ffa2d35623a553ffb7d3b89ec0cb04878c472275544f33b17b7014c1a7bfe49c357eb78ebaf3361e3776aa40b268e50b3872618f943c0458ce6f8800

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

@@ -21,7 +21,7 @@ module Avm
         def uri_to_env(uri)
           case uri.scheme
           when 'file' then ::EacRubyUtils::Envs.local
-          when 'ssh' then ::EacRubyUtils::Envs.ssh(uri.authority)
+          when 'ssh' then ::EacRubyUtils::Envs.ssh(uri)
           else "Invalid schema \"#{uri.schema}\" (URI: #{uri})"
           end
         end

data/lib/avm/instances/application.rb

@@ -12,6 +12,10 @@ module Avm
       def initialize(id)
         @id = id.to_s
       end
+
+      def instance(suffix)
+        ::Avm::Instances::Base.new(self, suffix)
+      end
     end
   end
 end

data/lib/avm/instances/base/auto_values.rb

@@ -10,7 +10,7 @@ module Avm
         extend ::ActiveSupport::Concern
 
         included do
-          %w[Access Admin Database Filesystem Source System Web].each do |class_name|
+          %w[Access Admin Database Filesystem Ruby Source System Web].each do |class_name|
             include const_get(class_name)
           end
         end

data/lib/avm/instances/base/auto_values/ruby.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Avm
+  module Instances
+    class Base
+      module AutoValues
+        module Ruby
+          def auto_ruby_version
+            inherited_entry_value(:host_id, 'ruby.version')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/instances/base/auto_values/web.rb

@@ -7,9 +7,35 @@ module Avm
     class Base
       module AutoValues
         module Web
+          def auto_web_authority
+            web_url_as_uri(&:authority)
+          end
+
           def auto_web_hostname
+            web_url_as_uri(&:host)
+          end
+
+          def auto_web_path
+            web_url_as_uri(&:path)
+          end
+
+          def auto_web_port
+            web_url_as_uri(&:port)
+          end
+
+          def auto_web_scheme
+            web_url_as_uri(&:scheme)
+          end
+
+          def auto_web_userinfo
+            web_url_as_uri(&:userinfo)
+          end
+
+          private
+
+          def web_url_as_uri
             read_entry_optional('web.url').if_present do |v|
-              ::Addressable::URI.parse(v).host
+              yield(::Addressable::URI.parse(v))
             end
           end
         end

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

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'avm/stereotypes/eac_webapp_base0/deploy'
+
+module Avm
+  module Stereotypes
+    module EacRedmineBase0
+      class Deploy < ::Avm::Stereotypes::EacWebappBase0::Deploy
+        set_callback :assert_instance_branch, :after, :run_installer
+
+        def run_installer
+          infom 'Running installer'
+          on_clean_ruby do
+            installer_command.system!
+          end
+        end
+
+        def installer_command
+          instance.host_env.command(installer_path, install_task)
+        end
+
+        def installer_path
+          ::File.join(instance.read_entry(:fs_path), 'plugins', 'redmine_installer', 'installer',
+                      'run.sh')
+        end
+
+        def install_task
+          if instance.read_entry_optional('web.path').present?
+            'redmine_as_apache_path'
+          else
+            'redmine_as_apache_base'
+          end
+        end
+
+        def on_clean_ruby
+          on_clear_envvars('BUNDLE', 'RUBY') { yield }
+        end
+
+        private
+
+        def on_clear_envvars(*start_with_vars)
+          old_values = envvars_starting_with(start_with_vars)
+          old_values.keys.each { |k| ENV.delete(k) }
+          yield
+        ensure
+          old_values&.each { |k, v| ENV[k] = v }
+        end
+
+        def envvars_starting_with(start_with_vars)
+          ENV.select { |k, _v| start_with_vars.any? { |var| k.start_with?(var) } }
+        end
+      end
+    end
+  end
+end

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

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
-require 'avm/instances/base'
 require 'avm/stereotypes/eac_ubuntu_base0/docker_image'
+require 'avm/stereotypes/eac_webapp_base0/instance'
 
 module Avm
   module Stereotypes
     module EacRedmineBase0
-      class Instance < ::Avm::Instances::Base
+      class Instance < ::Avm::Stereotypes::EacWebappBase0::Instance
+        FILES_UNITS = { files: 'files' }.freeze
+
         def docker_image_class
           ::Avm::Stereotypes::EacUbuntuBase0::DockerImage
         end

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

@@ -51,7 +51,7 @@ module Avm
           ::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
+          ).append_directory(template.path).variables_source_set(instance).run
         end
 
         def setup_files_units

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

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_ruby_utils/console/speaker'
+
+module Avm
+  module Stereotypes
+    module EacWebappBase0
+      module Runner
+        class Deploy < ::EacRubyUtils::Console::DocoptRunner
+          include ::EacRubyUtils::Console::Speaker
+
+          DOC = <<~DOCOPT
+            Deploy for %%STEREOTYPE_NAME%% instance.
+
+            Usage:
+              __PROGRAM__ [options]
+              __PROGRAM__ -h | --help
+
+            Options:
+              -h --help                       Show this screen.
+              -r --reference=<git-reference>  Git reference to deploy.
+          DOCOPT
+          def initialize(settings = {})
+            super settings.merge(doc: DOC.gsub('%%STEREOTYPE_NAME%%', stereotype_name))
+          end
+
+          def deploy_class
+            stereotype_module.const_get('Deploy')
+          end
+
+          def stereotype_module
+            "Avm::Stereotypes::#{stereotype_name}".constantize
+          end
+
+          def stereotype_name
+            self.class.name.deconstantize.demodulize
+          end
+
+          def run
+            result = deploy_class.new(context(:instance), options.fetch('--reference')).run
+            if result.error?
+              fatal_error result.to_s
+            else
+              infov 'Result', result.label
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/eac_rails_base0/deploy.rb

@@ -1,39 +1,13 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/console/speaker'
 require 'avm/stereotypes/eac_rails_base0/deploy'
+require 'avm/stereotypes/eac_webapp_base0/runner/deploy'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class EacRailsBase0 < ::EacRubyUtils::Console::DocoptRunner
-        class Deploy < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacRubyUtils::Console::Speaker
-
-          DOC = <<~DOCOPT
-            Deploy for EacRailsBase0 instance.
-
-            Usage:
-              __PROGRAM__ [options]
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help                       Show this screen.
-              -r --reference=<git-reference>  Git reference to deploy.
-          DOCOPT
-
-          def run
-            result = ::Avm::Stereotypes::EacRailsBase0::Deploy.new(
-              context(:instance),
-              options.fetch('--reference')
-            ).run
-            if result.error?
-              fatal_error result.to_s
-            else
-              infov 'Result', result.label
-            end
-          end
+        class Deploy < ::Avm::Stereotypes::EacWebappBase0::Runner::Deploy
         end
       end
     end

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'avm/stereotypes/eac_redmine_base0/deploy'
+require 'avm/stereotypes/eac_webapp_base0/runner/deploy'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class EacRedmineBase0 < ::EacRubyUtils::Console::DocoptRunner
+        class Deploy < ::Avm::Stereotypes::EacWebappBase0::Runner::Deploy
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/eac_wordpress_base0/deploy.rb

@@ -1,39 +1,13 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/console/speaker'
+require 'avm/stereotypes/eac_webapp_base0/runner/deploy'
 require 'avm/stereotypes/eac_wordpress_base0/deploy'
 
 module Avm
   module Tools
     class Runner < ::EacRubyUtils::Console::DocoptRunner
       class EacWordpressBase0 < ::EacRubyUtils::Console::DocoptRunner
-        class Deploy < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacRubyUtils::Console::Speaker
-
-          DOC = <<~DOCOPT
-            Deploy for EacWordpressBase0 instance.
-
-            Usage:
-              __PROGRAM__ [options]
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help                       Show this screen.
-              -r --reference=<git-reference>  Git reference to deploy.
-          DOCOPT
-
-          def run
-            result = ::Avm::Stereotypes::EacWordpressBase0::Deploy.new(
-              context(:instance),
-              options.fetch('--reference')
-            ).run
-            if result.error?
-              fatal_error result.to_s
-            else
-              infov 'Result', result.label
-            end
-          end
+        class Deploy < ::Avm::Stereotypes::EacWebappBase0::Runner::Deploy
         end
       end
     end

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

@@ -18,11 +18,15 @@ module Avm
 
           Options:
             -h --help             Show this screen.
-            -C <path>                 Path to Git repository [default: .].
+            -C <path>             Path to Git repository.
         DOCOPT
 
         def repository_path
-          options.fetch('-C')
+          repository_path? ? options.fetch('-C') : '.'
+        end
+
+        def repository_path?
+          options.fetch('-C').present?
         end
 
         def git

data/lib/avm/tools/runner/git/deploy.rb

@@ -33,6 +33,7 @@ module Avm
             validate
             main_info_banner
             deploy
+            success 'Done'
           end
 
           private
@@ -65,7 +66,21 @@ module Avm
           end
 
           def git_uncached
-            ::EacLauncher::Git::Base.new(context(:repository_path))
+            ::EacLauncher::Git::Base.new(git_repository_path)
+          end
+
+          def git_repository_path
+            if context('repository_path?') || dev_instance_fs_path.blank?
+              return context(:repository_path)
+            end
+
+            dev_instance_fs_path
+          end
+
+          def dev_instance_fs_path
+            instance.if_present do |v|
+              v.application.instance('dev').read_entry_optional(:fs_path)
+            end
           end
 
           def deploy

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.25.0'
+    VERSION = '0.26.0'
   end
 end

data/template/avm/stereotypes/eac_redmine_base0/deploy/config/install.sh.template

@@ -0,0 +1,14 @@
+export postgresql_database='%%DATABASE.NAME%%'
+export postgresql_database_test='%%DATABASE.NAME%%_test'
+export postgresql_user='%%DATABASE.USERNAME%%'
+export postgresql_password='%%DATABASE.PASSWORD%%'
+export rvm_ruby='ruby-%%RUBY.VERSION%%'
+export redmine_git_hosting_ssh_key_name=redmine_git_hosting_id
+if [ '%%WEB.SCHEME%%' == 'https' ]; then
+  export address_https='true'
+else
+  export address_https='false'
+fi
+export address_host='%%WEB.AUTHORITY%%'
+export address_path='%%WEB.PATH%%'
+export git_repositories_hierarchical_organisation=false

data/template/avm/stereotypes/eac_redmine_base0/deploy/config/secrets.yml

@@ -0,0 +1,8 @@
+development:
+  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
+
+test:
+  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
+
+production:
+  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.26.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-21 00:00:00.000000000 Z
+date: 2019-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -212,6 +212,7 @@ files:
 - lib/avm/instances/base/auto_values/admin.rb
 - lib/avm/instances/base/auto_values/database.rb
 - lib/avm/instances/base/auto_values/filesystem.rb
+- lib/avm/instances/base/auto_values/ruby.rb
 - lib/avm/instances/base/auto_values/source.rb
 - lib/avm/instances/base/auto_values/system.rb
 - lib/avm/instances/base/auto_values/web.rb
@@ -231,6 +232,7 @@ files:
 - lib/avm/stereotypes/eac_rails_base0/deploy.rb
 - lib/avm/stereotypes/eac_rails_base0/instance.rb
 - lib/avm/stereotypes/eac_redmine_base0.rb
+- lib/avm/stereotypes/eac_redmine_base0/deploy.rb
 - lib/avm/stereotypes/eac_redmine_base0/instance.rb
 - lib/avm/stereotypes/eac_ubuntu_base0.rb
 - lib/avm/stereotypes/eac_ubuntu_base0/apache.rb
@@ -240,6 +242,7 @@ files:
 - lib/avm/stereotypes/eac_webapp_base0/apache_host.rb
 - lib/avm/stereotypes/eac_webapp_base0/deploy.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
 - lib/avm/stereotypes/eac_wordpress_base0/deploy.rb
 - lib/avm/stereotypes/eac_wordpress_base0/instance.rb
@@ -248,12 +251,12 @@ files:
 - lib/avm/stereotypes/postgresql/instance/data_unit.rb
 - lib/avm/stereotypes/postgresql/instance_with.rb
 - lib/avm/tools.rb
-- lib/avm/tools/git.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/deploy.rb
 - lib/avm/tools/runner/eac_redmine_base0.rb
+- lib/avm/tools/runner/eac_redmine_base0/deploy.rb
 - lib/avm/tools/runner/eac_redmine_base0/docker.rb
 - lib/avm/tools/runner/eac_wordpress_base0.rb
 - lib/avm/tools/runner/eac_wordpress_base0/apache_host.rb
@@ -276,6 +279,8 @@ files:
 - 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_redmine_base0/deploy/config/install.sh.template
+- template/avm/stereotypes/eac_redmine_base0/deploy/config/secrets.yml
 - 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

data/lib/avm/tools/git.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-module Avm
-  module Tools
-    module Git
-      require 'avm/tools/git/complete_issue'
-    end
-  end
-end