redmine_with_git 0.6.9 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b43eef6bc04197831758a646547a33e6b05cede8338e4b21b50df8989db4d7ae
-  data.tar.gz: 321682d144c93839a38055228e53b914e437cd918673a9a1d27dde5bdc2f5f4f
+  metadata.gz: 8bd14037ae44be933908581d3ff3dd0cb0b1008e1965d14a65ea0dc172f51c10
+  data.tar.gz: 2a35c43a7c6a14e976bd0bea49466f01199aa810fbab2a524b9ed12f36a0840b
 SHA512:
-  metadata.gz: 356f4795423a7a23cb9c2d6d2c4440a3a30517fafe6b22952175b8c9e135f31360992a52f94c5cdf1841191c18a19b670530c85ceea952937af2c62774484dd5
-  data.tar.gz: fa7026bf5fd45db0658d613492d0a43edaad2e70886a5560040588ce54b7353506d6cd7f48aecd7cc5325c5bcd05a53863409b2750e9b8311a6f44d34cb0bec9
+  metadata.gz: 89608f63346fca9895526c8c7c14dece8e2bac40759dee6a2a091fcf43881bb3df611485ea55b8bd939254caaddf620452246c5d24cd68193949870a4f12a71a
+  data.tar.gz: 62fd747190aaa0a9643fd04db0d9673fbc2dc780cbea37065204fb2d8edc859772416eb816d5ff327b3217ce369422988ee4a4d7ceeab4be5a57851b3243d6a6

data/config/initializers/000_dependencies.rb

@@ -11,6 +11,6 @@ Redmine::Plugin.post_register :redmine_with_git do
 
   # 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.sh

@@ -8,5 +8,5 @@ function task_condition {
 }
 
 function task_dependencies {
-  echo gitolite_setup redmine_gitolite_sudoer redmine_git_hosting_settings apt_ruby python_two
+  echo gitolite_setup redmine_gitolite_sudoer redmine_git_hosting_settings apt_ruby
 }

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/version.rb

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

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: redmine_with_git
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.7.2
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-26 00:00:00.000000000 Z
+date: 2022-05-24 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
@@ -87,13 +87,14 @@ files:
 - installer/tasks/gitolite_setup.sh
 - installer/tasks/gitolite_user.sh
 - installer/tasks/gitolite_user_home.sh
-- installer/tasks/python_two.sh
 - installer/tasks/redmine_enabled_scm_setting.sh
 - installer/tasks/redmine_git_hosting.sh
 - installer/tasks/redmine_git_hosting_settings.sh
 - 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
@@ -136,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Additional features for RedmineGitHosting.

data/installer/tasks/python_two.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -u
-set -e
-
-export PYTHON2_PACKAGE='python-minimal'
-
-function task_condition {
-  return $(programeiro /apt/installed "$PYTHON2_PACKAGE")
-}
-
-function task_fix {
-  programeiro /apt/assert_installed "$PYTHON2_PACKAGE"
-}