eac_tools 0.45.1 → 0.46.0

data/sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/instance_with.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'avm/instances/entry_keys'
+require 'avm/eac_postgresql_base0/instance'
+
+module Avm
+  module EacPostgresqlBase0
+    module InstanceWith
+      def pg
+        @pg ||= ::Avm::EacPostgresqlBase0::Instance.new(
+          host_env, user: read_entry(::Avm::Instances::EntryKeys::DATABASE_USERNAME),
+                    password: read_entry(::Avm::Instances::EntryKeys::DATABASE_PASSWORD),
+                    name: read_entry(::Avm::Instances::EntryKeys::DATABASE_NAME)
+        )
+      end
+    end
+  end
+end

data/sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0/version.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacPostgresqlBase0
+    VERSION = '0.2.1'
+  end
+end

data/sub/avm-eac_postgresql_base0/lib/avm/eac_postgresql_base0.rb

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

data/sub/avm-eac_postgresql_base0/spec/rubocop_spec.rb

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

data/sub/avm-eac_postgresql_base0/spec/spec_helper.rb

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

data/sub/avm-eac_rails_base1/avm-eac_rails_base1.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.45'
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.21'
-  s.add_dependency 'avm-eac_webapp_base0', '~> 0.9'
-  s.add_dependency 'eac_ruby_utils', '~> 0.104'
+  s.add_dependency 'avm', '~> 0.57'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.27', '>= 0.27.1'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.12', '>= 0.12.3'
+  s.add_dependency 'eac_ruby_utils', '~> 0.107', '>= 0.107.1'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm-eac_rails_base1/lib/avm/eac_rails_base1/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRailsBase1
-    VERSION = '0.7.0'
+    VERSION = '0.7.1'
   end
 end

data/sub/avm-eac_redmine_base0/avm-eac_redmine_base0.gemspec

@@ -12,14 +12,14 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.44'
-  s.add_dependency 'avm-eac_generic_base0', '~> 0.5'
-  s.add_dependency 'avm-eac_rails_base1', '~> 0.6'
+  s.add_dependency 'avm', '~> 0.57'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.8'
+  s.add_dependency 'avm-eac_rails_base1', '~> 0.7', '>= 0.7.1'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
   s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
-  s.add_dependency 'eac_fs', '~> 0.12', '>= 0.12.3'
+  s.add_dependency 'eac_fs', '~> 0.15'
   s.add_dependency 'eac_rest', '~> 0.6', '>= 0.6.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.104'
+  s.add_dependency 'eac_ruby_utils', '~> 0.107', '>= 0.107.1'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base/files.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'avm/eac_rails_base1/instances/base'
+require 'avm/instances/data/files_unit'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedmineBase0
+    module Instances
+      class Base < ::Avm::EacRailsBase1::Instances::Base
+        module Files
+          FILES_SUBPATH = 'files'
+
+          # @return [Avm::Instances::Data::FilesUnit]
+          def files_data_unit
+            ::Avm::Instances::Data::FilesUnit.new(self, FILES_SUBPATH)
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base/gitolite.rb

@@ -18,6 +18,12 @@ module Avm
             uri_components_entries_values GITOLITE_ENTRY_KEYS_PREFIX
           end
 
+          # @return [Avm::Instances::Data::FilesUnit]
+          def gitolite_data_unit
+            ::Avm::Instances::Data::FilesUnit.new(self, gitolite_repositories_path,
+                                                  sudo_user: entry('gitolite.username').value!)
+          end
+
           def gitolite_hostname_default_value
             DEFAULT_HOSTNAME
           end
@@ -28,6 +34,11 @@ module Avm
             end
           end
 
+          # @return [Pathname]
+          def gitolite_repositories_path
+            entry('gitolite.path').value!.to_pathname.join('repositories')
+          end
+
           def gitolite_scheme_default_value
             DEFAULT_SCHEME
           end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base/install.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'avm/eac_rails_base1/instances/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedmineBase0
+    module Instances
+      class Base < ::Avm::EacRailsBase1::Instances::Base
+        module Install
+          def run_installer
+            ::EacRubyUtils::Ruby.on_clean_environment do
+              installer_command.system!
+            end
+          end
+
+          def installer_command
+            host_env.command(installer_path, install_task)
+          end
+
+          def installer_path
+            ::File.join(install_path, 'plugins', 'redmine_installer', 'installer',
+                        'run.sh')
+          end
+
+          def install_task
+            if web_path_optional.present?
+              'redmine_as_apache_path'
+            else
+              'redmine_as_apache_base'
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'addressable/uri'
-require 'avm/eac_redmine_base0/instances/data_unit'
+require 'avm/eac_redmine_base0/instances/data_package'
 require 'avm/eac_redmine_base0/instances/docker_image'
 require 'avm/eac_redmine_base0/instances/runners'
 require 'avm/eac_redmine_base0/instances/rest_api'
@@ -14,8 +14,6 @@ module Avm
         require_sub __FILE__, include_modules: true
         enable_simple_cache
 
-        FILES_UNITS = { files: 'files' }.freeze
-
         def docker_image_class
           ::Avm::EacRedmineBase0::Instances::DockerImage
         end
@@ -30,13 +28,9 @@ module Avm
           ]
         end
 
+        # @return [Avm::EacRedmineBase0::Instances::DataPackage]
         def data_package
-          @data_package ||= ::Avm::Data::Instance::Package.new(
-            self,
-            units: {
-              all: ::Avm::EacRedmineBase0::Instances::DataUnit.new(self)
-            }
-          )
+          @data_package ||= ::Avm::EacRedmineBase0::Instances::DataPackage.new(self)
         end
 
         # @return [Addressable::URI]

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/data_package.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'avm/instances/data/package'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedmineBase0
+    module Instances
+      class DataPackage < ::Avm::Instances::Data::Package
+        after_load :run_installer
+
+        def initialize(instance, options = {})
+          super(instance, options.merge(units: options[:units].if_present({}).merge(
+            database: instance.database_unit, files: instance.files_data_unit,
+            gitolite: instance.gitolite_data_unit
+          )))
+        end
+
+        delegate :run_installer, to: :instance
+      end
+    end
+  end
+end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/deploy.rb

@@ -11,25 +11,7 @@ module Avm
 
         def run_installer
           infom 'Running installer'
-          ::EacRubyUtils::Ruby.on_clean_environment do
-            installer_command.system!
-          end
-        end
-
-        def installer_command
-          instance.host_env.command(installer_path, install_task)
-        end
-
-        def installer_path
-          ::File.join(instance.install_path, 'plugins', 'redmine_installer', 'installer', 'run.sh')
-        end
-
-        def install_task
-          if instance.web_path_optional.present?
-            'redmine_as_apache_path'
-          else
-            'redmine_as_apache_base'
-          end
+          instance.run_installer
         end
       end
     end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.16.0'
+    VERSION = '0.17.0'
   end
 end

data/sub/avm-eac_redmine_base0/template/avm/eac_redmine_base0/instances/deploy/config/install.sh.template

@@ -22,8 +22,8 @@ export address_path='%%WEB.PATH%%'
 
 # Git
 export git_repositories_hierarchical_organisation=false
-export gitolite_user='%%GIT.USERNAME%%'
-export gitolite_user_home="/var/lib/${gitolite_user}"
+export gitolite_user='%%GITOLITE.USERNAME%%'
+export gitolite_user_home='%%GITOLITE.PATH%%'
 export redmine_git_hosting_ssh_key_name=redmine_git_hosting_id
 
 # Mail settings

data/sub/avm-eac_redmine_plugin_base0/avm-eac_redmine_plugin_base0.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.11'
-  s.add_dependency 'eac_ruby_utils', '~> 0.95', '>= 0.95.1'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.27', '>= 0.27.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.107', '>= 0.107.1'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5', '>= 0.5.1'
 end

data/sub/avm-eac_redmine_plugin_base0/lib/avm/eac_redmine_plugin_base0/sources/base/init.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'avm/eac_redmine_plugin_base0/sources/init_file'
+require 'avm/eac_ruby_base1/sources/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedminePluginBase0
+    module Sources
+      class Base < ::Avm::EacRubyBase1::Sources::Base
+        module Init
+          INIT_SUBPATH = 'init.rb'
+
+          # @return [Avm::EacRedminePluginBase0::Sources::InitFile]
+          def init_file
+            ::Avm::EacRedminePluginBase0::Sources::InitFile.new(init_path)
+          end
+
+          # @return [String]
+          def init_path
+            path.join(INIT_SUBPATH)
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_redmine_plugin_base0/lib/avm/eac_redmine_plugin_base0/sources/base/parent.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'avm/eac_ruby_base1/sources/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedminePluginBase0
+    module Sources
+      class Base < ::Avm::EacRubyBase1::Sources::Base
+        module Parent
+          PARENT_RAKE_TASK_TEST_NAME = 'parent_rake_task'
+
+          # @return [String]
+          def parent_rake_test_task_name
+            [gem_name, 'test'].map(&:variableize).join(':')
+          end
+
+          # @return [Boolean]
+          def parent_rake_test_command?
+            ruby_parent.rake_task?(parent_rake_test_task_name)
+          end
+
+          # @return [EacRubyUtils::Envs::Command]
+          def parent_rake_test_command
+            ruby_parent.rake(parent_rake_test_task_name).chdir_root.envvar('RAILS_ENV', 'test')
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_redmine_plugin_base0/lib/avm/eac_redmine_plugin_base0/sources/base/rubocop.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'avm/eac_ruby_base1/sources/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedminePluginBase0
+    module Sources
+      class Base < ::Avm::EacRubyBase1::Sources::Base
+        module Rubocop
+          RUBOCOP_GEM_NAME = 'rubocop'
+          RUBOCOP_TEST_NAME = 'rubocop'
+
+          # @return [EacRubyUtils::Envs::Command]
+          def rubocop_test_command
+            bundle('exec', 'rubocop', '--ignore-parent-exclusion')
+              .envvar('RAILS_ENV', 'test')
+              .chdir_root
+          end
+
+          # @return [Boolean]
+          def rubocop_test_command?
+            gemfile_path.exist? && gemfile_lock_gem_version(RUBOCOP_GEM_NAME).present?
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_redmine_plugin_base0/lib/avm/eac_redmine_plugin_base0/sources/base/version.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'avm/eac_ruby_base1/sources/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedminePluginBase0
+    module Sources
+      class Base < ::Avm::EacRubyBase1::Sources::Base
+        module Version
+          # @return [Avm::VersionNumber]
+          def version
+            if version_file_path.exist?
+              super
+            else
+              init_file.version
+            end
+          end
+
+          def version=(value)
+            if version_file_path.exist?
+              super
+            else
+              init_file.version = value
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_redmine_plugin_base0/lib/avm/eac_redmine_plugin_base0/sources/base.rb

@@ -7,11 +7,9 @@ module Avm
   module EacRedminePluginBase0
     module Sources
       class Base < ::Avm::EacRubyBase1::Sources::Base
+        require_sub __FILE__, include_modules: true
+
         DEFAULT_GEMFILE_PATH = 'SelfGemfile'
-        RUBOCOP_GEM_NAME = 'rubocop'
-        RUBOCOP_TEST_NAME = 'rubocop'
-        PARENT_RAKE_TASK_TEST_NAME = 'parent_rake_task'
-        INIT_SUBPATH = 'init.rb'
 
         # @return [String]
         def default_gemfile_path
@@ -26,38 +24,6 @@ module Avm
           r
         end
 
-        # @return [String]
-        def init_path
-          path.join(INIT_SUBPATH)
-        end
-
-        # @return [String]
-        def parent_rake_test_task_name
-          [gem_name, 'test'].map(&:variableize).join(':')
-        end
-
-        # @return [Boolean]
-        def parent_rake_test_command?
-          ruby_parent.rake_task?(parent_rake_test_task_name)
-        end
-
-        # @return [EacRubyUtils::Envs::Command]
-        def parent_rake_test_command
-          ruby_parent.rake(parent_rake_test_task_name).chdir_root.envvar('RAILS_ENV', 'test')
-        end
-
-        # @return [EacRubyUtils::Envs::Command]
-        def rubocop_test_command
-          bundle('exec', 'rubocop', '--ignore-parent-exclusion')
-            .envvar('RAILS_ENV', 'test')
-            .chdir_root
-        end
-
-        # @return [Boolean]
-        def rubocop_test_command?
-          gemfile_path.exist? && gemfile_lock_gem_version(RUBOCOP_GEM_NAME).present?
-        end
-
         # @return [Boolean]
         def valid?
           init_path.exist?

data/sub/avm-eac_redmine_plugin_base0/lib/avm/eac_redmine_plugin_base0/sources/init_file.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedminePluginBase0
+    module Sources
+      class InitFile
+        common_constructor :path
+
+        VERSION_LINE_PATTERN = /\A(\s*)version\s*[\'\"]([^\'\"]+)[\'\"](\s*)\z/.freeze
+
+        def version
+          path.read.each_line.lazy.map { |line| line_value(line) }.find { |v| v }
+        end
+
+        def version=(new_value)
+          path.write(new_value_content(new_value))
+        end
+
+        private
+
+        # @return Version found in line, nil otherwise.
+        def line_value(line)
+          VERSION_LINE_PATTERN.if_match(line.rstrip, false) { |m| ::Gem::Version.new(m[2]) }
+        end
+
+        def new_value_content(new_value)
+          path.read.each_line
+              .map { |line| new_value_line(line, new_value) }
+              .join
+        end
+
+        def new_value_line(line, new_value)
+          m = VERSION_LINE_PATTERN.match(line)
+          return line unless m
+
+          "#{m[1]}version '#{new_value}'"
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_redmine_plugin_base0/lib/avm/eac_redmine_plugin_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedminePluginBase0
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
 end

data/sub/avm-eac_redmine_plugin_base0/spec/lib/avm/eac_redmine_plugin_base0/sources/init_file_spec.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'avm/eac_redmine_plugin_base0/sources/init_file'
+
+::RSpec.describe ::Avm::EacRedminePluginBase0::Sources::InitFile do
+  let(:stubs_dir) { ::Pathname.new(__dir__).join('init_file_spec_files') }
+  let(:stub_file) { stubs_dir.join('a_init_file.rb') }
+  let(:instance) { described_class.new(stub_file) }
+  let(:target_version) { ::Gem::Version.new('0.16.0') }
+
+  describe '#version' do
+    it { expect(instance.version).to eq(target_version) }
+  end
+end

data/sub/avm-eac_redmine_plugin_base0/spec/lib/avm/eac_redmine_plugin_base0/sources/init_file_spec_files/a_init_file.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'redmine'
+
+Redmine::Plugin.register :redmine_installer do
+  name 'Redmine Installer'
+  author 'Eduardo Henrique Bogoni'
+  description 'Installer for Redmine.'
+  url 'https://github.com/esquilo-azul/redmine_installer'
+  author_url 'https://github.com/eduardobogoni/'
+  version '0.16.0'
+end

data/sub/avm-eac_webapp_base0/avm-eac_webapp_base0.gemspec

@@ -12,12 +12,12 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.54'
+  s.add_dependency 'avm', '~> 0.57'
   s.add_dependency 'avm-eac_generic_base0', '~> 0.8'
-  s.add_dependency 'avm-eac_postgresql_base0', '~> 0.2'
+  s.add_dependency 'avm-eac_postgresql_base0', '~> 0.2', '>= 0.2.1'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
   s.add_dependency 'avm-files', '~> 0.6'
-  s.add_dependency 'eac_ruby_utils', '~> 0.106', '>= 0.106.1'
+  s.add_dependency 'eac_ruby_utils', '~> 0.107', '>= 0.107.1'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/base.rb

@@ -2,8 +2,8 @@
 
 require 'avm/instances/base'
 require 'avm/eac_postgresql_base0/instance_with'
-require 'avm/data/instance/files_unit'
-require 'avm/data/instance/package'
+require 'avm/instances/data/files_unit'
+require 'avm/instances/data/package'
 require 'avm/eac_webapp_base0/instances/deploy/file_unit'
 require 'avm/eac_webapp_base0/instances/runners'
 require 'avm/eac_ubuntu_base0/instances/base'
@@ -34,7 +34,7 @@ module Avm
         end
 
         def data_package
-          @data_package ||= ::Avm::Data::Instance::Package.new(
+          @data_package ||= ::Avm::Instances::Data::Package.new(
             self, units: { database: database_unit }.merge(files_units)
           )
         end
@@ -52,7 +52,7 @@ module Avm
 
         def files_units
           self.class.const_get('FILES_UNITS').transform_values do |fs_path_subpath|
-            ::Avm::Data::Instance::FilesUnit.new(self, fs_path_subpath)
+            ::Avm::Instances::Data::FilesUnit.new(self, fs_path_subpath)
           end
         end
       end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWebappBase0
-    VERSION = '0.12.2'
+    VERSION = '0.12.3'
   end
 end