redmine_with_git 0.7.0 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad334021b2ed9f85e6ffe0a9903d1d660271fb25ad66a080fe35679c89d14489
-  data.tar.gz: 237a9c00566a1bf59f94914047b0f43d51b895a49e1f72c8e33ff97afa9389ed
+  metadata.gz: 2219380d4334bafe782080437e1bcd84ebff15941299c8bbaf2f2771864083e9
+  data.tar.gz: 228fe248d3a5e5d9e9d023aee75579a5d0485b3686cf5fac3055129db9437267
 SHA512:
-  metadata.gz: 27845700bf01636bbe3321023d307c46694d697870ced4ecba062d7ebdbc585d15ceead4c329c8f878e3838f9f78c84f1febe3717989b263b972892e683375ad
-  data.tar.gz: d090756bbffc58cdc438aa7b34ecebfd39ec95a647b7c4ceb404b151f7cd360828c24ee00161c936cd94c7c25b78efedceb4a5f35542f589af5d8cd4bdaae10c
+  metadata.gz: 1b347512823f7c5851d9657ae37ea6723a045b6416207e2d483aebd1a0f68abe9778e9262a979e331c88cc94e7fe93592e62380806d5145d00bbb482eb64a6db
+  data.tar.gz: cfe10d54564b08047d5b5d5147c0e1730906f5eb2e1a4f80c8698c82aa1dcdd378e697ea11cefe82827a9ff40a2f8f76e1cbad6c55bf2e7654c4820e4722f854

data/config/initializers/000_dependencies.rb

@@ -3,14 +3,23 @@
 Redmine::Plugin.post_register :redmine_with_git do
   # Source: https://github.com/esquilo-azul/redmine_nonproject_modules
   requires_redmine_plugin(:redmine_nonproject_modules, version_or_higher: '0.3.1')
-  # Source: https://github.com/jbox-web/redmine_bootstrap_kit.git
-  # Note: redmine_bootstrap_kit is a redmine_git_hosting's dependency.
-  requires_redmine_plugin(:redmine_bootstrap_kit, version_or_higher: '0.2.5')
-  # Source: https://github.com/esquilo-azul/redmine_git_hosting
-  requires_redmine_plugin(:redmine_git_hosting, version_or_higher: '1.2.3.1')
+
+  if ::Redmine::VERSION.to_s < '4'
+    # Source: https://github.com/jbox-web/redmine_bootstrap_kit.git
+    # Note: redmine_bootstrap_kit is a redmine_git_hosting's dependency.
+    requires_redmine_plugin(:redmine_bootstrap_kit, version_or_higher: '0.2.5')
+    # Source: https://github.com/jbox-web/redmine_git_hosting.git
+    requires_redmine_plugin(:redmine_git_hosting, version_or_higher: '1.2.3.1')
+  else
+    # Source: https://github.com/jbox-web/additionals
+    # Note: additionals is a redmine_git_hosting's dependency.
+    requires_redmine_plugin(:additionals, version_or_higher: '2.0.24')
+    # Source: https://github.com/jbox-web/redmine_git_hosting.git
+    requires_redmine_plugin(:redmine_git_hosting, version_or_higher: '4.0.1.1')
+  end
 
   # Source: https://github.com/esquilo-azul/redmine_installer
   if ::Redmine::Plugin.registered_plugins.keys.include?(:redmine_installer)
-    requires_redmine_plugin(:redmine_installer, version_or_higher: '0.10.0')
+    requires_redmine_plugin(:redmine_installer, version_or_higher: '0.15.0')
   end
 end

data/installer/programs/redmine/installer/triggers/list/redmine_git_hosting_rescue.sh

@@ -3,4 +3,6 @@
 set -u
 set -e
 
+if bool_r "$SKIP_DATABASE"; then exit 0; fi
+
 programeiro /rails/rake redmine_with_git:rescue

data/installer/setup.sh

@@ -33,3 +33,7 @@ if [ ! -v 'REDMINE_CONFIGURATION_EXTRA' ]; then
   export REDMINE_CONFIGURATION_EXTRA=''
 fi
 export REDMINE_CONFIGURATION_EXTRA+="  scm_xiolite_command: /usr/bin/git"
+
+# SSH Server
+export SSH_SERVER_PACKAGE="openssh-server"
+export SSH_SERVER_SERVICE="ssh"

data/installer/tasks/_before_run.sh

@@ -1,3 +1,3 @@
 # Task dependencies
 taskeiro_add_dependency redmine_bundle redmine_with_git_bundle_requirements
-taskeiro_add_dependency development redmine_git_hosting
+taskeiro_add_dependency redmine_base redmine_git_hosting

data/installer/tasks/gitolite_setup.sh

@@ -4,7 +4,7 @@ set -u
 set -e
 
 function task_dependencies {
-  echo gitolite_rc gitolite redmine_git_hosting_ssh_key
+  echo gitolite_rc gitolite redmine_git_hosting_ssh_key ssh_server_running
 }
 
 function task_condition {
@@ -14,8 +14,6 @@ function task_condition {
 function task_fix {
   set -u
   set -e
-  programeiro /apt/assert_installed openssh-server
-  sudo service ssh restart
   local tempdir=$(sudo -u "$(programeiro /rails/user)" mktemp -d)
   local publickey_temp="$tempdir/$(basename "$(programeiro /redmine_git_hosting/ssh_key)")".pub
   sudo -u "$(programeiro /rails/user)" chmod 777 "$tempdir" -R

data/installer/tasks/redmine_enabled_scm_setting.sh

@@ -9,7 +9,7 @@ function enabled_scm_setting_template {
 export -f enabled_scm_setting_template
 
 function enabled_scm_setting_current {
-  programeiro /redmine/get_setting_value 'enabled_scm'
+  programeiro /redmine/setting/read 'enabled_scm'
 }
 export -f enabled_scm_setting_current
 
@@ -18,11 +18,13 @@ function task_dependencies {
 }
 
 function task_condition {
+  if bool_r "$SKIP_DATABASE"; then return 0; fi
+
   return $(programeiro /text/diff_commands 'enabled_scm_setting_template' 'enabled_scm_setting_current')
 }
 
 function task_fix {
   set -u
   set -e
-  programeiro /redmine/set_setting_value 'enabled_scm' "$(enabled_scm_setting_template)"
+  programeiro /redmine/setting/write 'enabled_scm' "$(enabled_scm_setting_template)"
 }

data/installer/tasks/redmine_git_hosting_settings.sh

@@ -10,7 +10,7 @@ function redmine_git_hosting_setting_template {
 export -f redmine_git_hosting_setting_template
 
 function redmine_git_hosting_setting_current {
-  programeiro /redmine/get_setting_value 'plugin_redmine_git_hosting'
+  programeiro /redmine/setting/read 'plugin_redmine_git_hosting'
 }
 export -f redmine_git_hosting_setting_current
 
@@ -19,11 +19,13 @@ function task_dependencies {
 }
 
 function task_condition {
+  if bool_r "$SKIP_DATABASE"; then return 0; fi
+
   return $(programeiro /text/diff_commands 'redmine_git_hosting_setting_template' 'redmine_git_hosting_setting_current')
 }
 
 function task_fix {
-  programeiro /redmine/set_setting_value 'plugin_redmine_git_hosting' \
+  programeiro /redmine/setting/write 'plugin_redmine_git_hosting' \
     "$(redmine_git_hosting_setting_template)"
   programeiro /redmine/installer/triggers/set 'redmine_git_hosting_rescue'
 }

data/installer/tasks/redmine_git_hosting_ssh_key.sh

@@ -12,6 +12,7 @@ function task_condition {
 export -f task_condition
 
 function task_fix {
-  sudo -u "$redmine_user" -H ssh-keygen -t rsa -f "$ssh_key" -N ''
+  # https://github.com/libgit2/pygit2/issues/1013#issuecomment-679200156
+  sudo -u "$redmine_user" -H ssh-keygen  -m PEM -t rsa -b 2048 -t rsa -f "$ssh_key" -N ''
 }
 export -f task_fix

data/installer/tasks/ssh_server.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -u
+set -e
+
+PACKAGES=("$SSH_SERVER_PACKAGE")
+
+function task_condition {
+  programeiro /apt/installed "${PACKAGES[@]}"
+}
+
+function task_fix {
+  programeiro /apt/assert_installed "${PACKAGES[@]}"
+}

data/installer/tasks/ssh_server_running.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -u
+set -e
+
+function task_condition {
+  programeiro /linux/service_running "$SSH_SERVER_SERVICE"
+}
+
+function task_dependencies {
+  echo ssh_server
+}
+
+function task_fix {
+  sudo service "$SSH_SERVER_SERVICE" start
+}

data/lib/redmine_with_git/dump/base.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/files/rotate'
+require 'avm/data/rotate'
 require 'eac_ruby_utils/patches/object/asserts'
 require 'eac_ruby_utils/listable'
 
@@ -61,7 +61,7 @@ module RedmineWithGit
 
       def run_if_rotate
         if ::File.exist?(path) && overwrite == OVERWRITE_ROTATE
-          rotate = ::Avm::Files::Rotate.new(path, space_limit: space_limit)
+          rotate = ::Avm::Data::Rotate.new(path, space_limit: space_limit)
           ::Rails.logger.info "Rotating \"#{rotate.source_path}\"..."
           rotate.run
           ::Rails.logger.info "Rotated to \"#{rotate.target_path}\""

data/lib/redmine_with_git/dump/database.rb

@@ -8,11 +8,7 @@ module RedmineWithGit
       private
 
       def build_command
-        env.command(
-          [password_arg, 'pg_dump', '-x', '-c', '-O',
-           '-h', database_schema['host'], '-U', database_schema['username'], '-d',
-           database_schema['database'], '@ESC_|'] + compress_args
-        )
+        build_postgres_command('pg_dump', ['-x', '-c', '-O', '@ESC_|'] + compress_args)
       end
     end
   end

data/lib/redmine_with_git/dump_load/database.rb

@@ -3,6 +3,15 @@
 module RedmineWithGit
   module DumpLoad
     module Database
+      def build_postgres_command(command, args = [])
+        env.command(
+          [password_arg, command] + {
+            host: database_schema['host'], port: database_schema['port'],
+            username: database_schema['username'], dbname: database_schema['database']
+          }.flat_map { |k, v| ["--#{k}", v] } + args
+        )
+      end
+
       def database_schema
         Rails.configuration.database_configuration[Rails.env]
       end

data/lib/redmine_with_git/load/database.rb

@@ -31,11 +31,7 @@ module RedmineWithGit
       end
 
       def psql_command
-        env.command(
-          [password_arg, 'psql',
-           '-h', database_schema['host'], '-U', database_schema['username'], '-d',
-           database_schema['database']]
-        )
+        build_postgres_command('psql')
       end
 
       def psql_sql_command(sql)

data/lib/redmine_with_git/patches/redmine_git_hosting/cache/database_patch.rb

@@ -4,14 +4,11 @@ module RedmineGitHosting
   module Cache
     module DatabasePatch
       def self.included(base)
-        base.include(InstanceMethods)
-        base.class_eval do
-          alias_method_chain :apply_cache_limit, :redmine_with_git
-        end
+        base.prepend(InstanceMethods)
       end
 
       module InstanceMethods
-        def apply_cache_limit_with_redmine_with_git
+        def apply_cache_limit
           return unless max_cache_elements >= 0 && GitCache.count > max_cache_elements
 
           GitCache.order(created_at: :desc).last.destroy

data/lib/redmine_with_git/patches/redmine_git_hosting/commands/git/git_patch.rb

@@ -6,13 +6,12 @@ module RedmineWithGit
       module Commands
         module GitPatch
           def self.included(base)
-            base.send(:include, InstanceMethods)
-            base.alias_method_chain :git_version, :redmine_with_git
+            base.prepend(InstanceMethods)
           end
         end
 
         module InstanceMethods
-          def git_version_with_redmine_with_git
+          def git_version
             sudo_git('--version')
           rescue RedmineGitHosting::Error::GitoliteCommandException => e
             logger.error("Can't retrieve Git version: #{e.output}")

data/lib/redmine_with_git/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RedmineWithGit
-  VERSION = '0.7.0'
+  VERSION = '0.7.3'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: redmine_with_git
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.3
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-05 00:00:00.000000000 Z
+date: 2022-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: avm-tools
+  name: avm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.48'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.48'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: eac_rails_utils
   requirement: !ruby/object:Gem::Requirement
@@ -93,6 +93,8 @@ files:
 - installer/tasks/redmine_git_hosting_ssh_key.sh
 - installer/tasks/redmine_gitolite_sudoer.sh
 - installer/tasks/redmine_with_git_bundle_requirements.sh
+- installer/tasks/ssh_server.sh
+- installer/tasks/ssh_server_running.sh
 - installer/template/gitolite.rc
 - installer/template/redmine_enabled_scm_setting_value
 - installer/template/redmine_git_hosting_setting_value.sql
@@ -135,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Additional features for RedmineGitHosting.