redmine_with_git 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 227848bb0360b030b61906957dd3993d45d378caab57e2e45368c669d219f17e
-  data.tar.gz: 17fbc54eb715c7258dae921d60ca4eac2c67967795d8e09775561379417d61de
+  metadata.gz: 3c597d5c06d8ff60d9ba67d13d4b06ce51a391c647bafc17f3fd3e8bc88707a8
+  data.tar.gz: b9d49e4e77549319b28bfcc669b767b6d2e34b649cc548d2f029062e0b6cf8f5
 SHA512:
-  metadata.gz: ae84d8259e5eca44fb0458af5dd84daa9d504732e886cfcfafc567fdfcf4639d5825c0cb7cd49343a095a687eab8fef75f929eba52bd5a061253510e10834a61
-  data.tar.gz: 600b6b07fb630d7d3cb7cf23ead77fb8877c3fb69e146f90dcfcdd1d2fd95b2462df9c2ae8192a8a7bb797a68b97d8b4db650a33f2b2925f16685dfc7c1b5e77
+  metadata.gz: eb787e09c78accb903648b6ac2ee649ac573fa6a4b7fdc2831bc9fa628089c90f1ea1635695c443f50b85a128cbd43024393fc3d7d5fdfba37d1c984c50fead9
+  data.tar.gz: 796da71dce6836904c4f73604d6057799b105aaac6b4195a833b1af769e1a5766dc7a3769b96c648f42f61114d0a841dff3c7ca507b1514e467de41dfca25813

data/config/initializers/001_patches.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
-require 'redmine_with_git/patches/redmine_git_hosting/gitolite_hook_patch'
+EacRubyUtils.patch_module(
+  RedmineGitHosting::GitoliteHook,
+  RedmineWithGit::Patches::RedmineGitHosting::GitoliteHookPatch
+)
 
 apply_patches_version_limit = Gem::Version.new('4.0.0')
 redmine_git_hosting_version = Gem::Version.new(
@@ -9,5 +12,10 @@ redmine_git_hosting_version = Gem::Version.new(
 
 return unless redmine_git_hosting_version < apply_patches_version_limit
 
-require 'redmine_with_git/patches/redmine_git_hosting/cache/database_patch'
-require 'redmine_with_git/patches/redmine_git_hosting/commands/git/git_patch'
+patch = RedmineWithGit::Patches::RedmineGitHosting::Cache::Database
+target = RedmineGitHosting::Cache::Database
+target.send(:include, patch) unless target.include?(patch)
+
+patch = RedmineWithGit::Patches::RedmineGitHosting::Commands::GitPatch
+target = RedmineGitHosting::Commands::Git
+target.send(:include, patch) unless target.include?(patch)

data/installer/default_settings.sh

@@ -1,6 +1,3 @@
-export address_https=false
-export address_host=localhost
-export address_port=
 export git_repositories_hierarchical_organisation=true
 export gitolite_user=git
 export gitolite_user_home=/var/lib/git

data/installer/programs/redmine_git_hosting/ssh_run.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+set -u
+
+var_set_by STRICT_HOST_KEY_CHECKING bool_s "$1" 'yes' 'no'
+shift
+
+sudo -u "$(programeiro /rails/user)" \
+  ssh -oBatchMode=yes "-oStrictHostKeyChecking=${STRICT_HOST_KEY_CHECKING}" \
+  -i "$(programeiro /redmine_git_hosting/ssh_key)" \
+  -p "$(programeiro /redmine_git_hosting/ssh_server_port)" \
+  -l "$gitolite_user" \
+  "$SSH_SERVER_HOST" \
+  "$@"

data/installer/programs/redmine_git_hosting/ssh_server_port.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -e
+set -u
+
+sudo ss -tlnp | awk '/"sshd"/ { port = $4; sub(/.*:/, "", port); print port; exit }'

data/installer/setup.sh

@@ -35,5 +35,6 @@ fi
 export REDMINE_CONFIGURATION_EXTRA+="  scm_xiolite_command: /usr/bin/git"
 
 # SSH Server
+export SSH_SERVER_HOST=127.0.0.1
 export SSH_SERVER_PACKAGE="openssh-server"
 export SSH_SERVER_SERVICE="ssh"

data/installer/tasks/_before_run.sh

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

data/installer/tasks/gitolite_setup.sh

@@ -4,11 +4,11 @@ set -u
 set -e
 
 function task_dependencies {
-  echo gitolite_rc gitolite redmine_git_hosting_ssh_key ssh_server_running
+  echo gitolite_rc gitolite redmine_git_hosting_ssh_key ssh_client_known_hosts ssh_server_running
 }
 
 function task_condition {
-  sudo -u "$(programeiro /rails/user)" ssh -oBatchMode=yes -oStrictHostKeyChecking=no -i "$(programeiro /redmine_git_hosting/ssh_key)" -l "$gitolite_user" localhost info
+  programeiro /redmine_git_hosting/ssh_run no info
 }
 
 function task_fix {

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
+  echo gitolite_setup redmine_gitolite_sudoer redmine_git_hosting_settings rugged_ssh_support
 }

data/installer/tasks/redmine_git_hosting_settings.sh

@@ -5,6 +5,7 @@ set -e
 
 function redmine_git_hosting_setting_template {
   export redmine_git_hosting_ssh_key=$(programeiro /redmine_git_hosting/ssh_key)
+  var_set_by SSH_SERVER_PORT programeiro /redmine_git_hosting/ssh_server_port
   template_apply "${REDMINE_WITH_GIT_TEMPLATE_ROOT}/redmine_git_hosting_setting_value.sql" -
 }
 export -f redmine_git_hosting_setting_template

data/installer/tasks/rugged_build_config.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -u
+set -e
+
+function task_condition {
+  programeiro /rails/bundle config get build.rugged --parseable | grep -qF -- '--with-ssh'
+}
+
+function task_fix {
+  programeiro /rails/bundle config set build.rugged --with-ssh
+}

data/installer/tasks/rugged_ssh_support.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -u
+set -e
+
+function task_dependencies {
+  echo redmine_bundle rugged_build_config
+}
+
+function task_condition {
+  programeiro /rails/bundle exec ruby -e "require 'rugged'; exit(Rugged.features.include?(:ssh) ? 0 : 1)"
+}
+
+function task_fix {
+  programeiro /rails/bundle pristine rugged
+  programeiro /redmine/installer/triggers/set 'restart_application'
+}

data/installer/tasks/ssh_client_known_hosts.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+
+set -u
+set -e
+
+function ssh_client_known_hosts_file {
+  printf '%s/known_hosts' "$(dirname "$(programeiro /redmine_git_hosting/ssh_key)")"
+}
+
+function ssh_client_known_hosts_spec {
+  var_set_by SSH_SERVER_PORT programeiro /redmine_git_hosting/ssh_server_port
+  if [ "$SSH_SERVER_PORT" == '22' ]; then
+    printf '%s' "$SSH_SERVER_HOST"
+  else
+    printf '[%s]:%s' "$SSH_SERVER_HOST" "$SSH_SERVER_PORT"
+  fi
+}
+
+function ssh_client_known_hosts_entries_count {
+  local known_hosts
+  known_hosts="$(ssh_client_known_hosts_file)"
+  [ -f "$known_hosts" ] || { echo 0; return; }
+  sudo -u "$(programeiro /rails/user)" \
+    ssh-keygen -F "$(ssh_client_known_hosts_spec)" -f "$known_hosts" | grep -vc '^#'
+}
+
+function ssh_client_known_hosts_connection_ok {
+  programeiro /redmine_git_hosting/ssh_run yes info >/dev/null 2>&1
+}
+
+function task_dependencies {
+  echo redmine_git_hosting_ssh_key ssh_server_running
+}
+
+function task_condition {
+  [ "$(ssh_client_known_hosts_entries_count)" == '1' ] && ssh_client_known_hosts_connection_ok
+}
+
+function task_fix {
+  local known_hosts
+  known_hosts="$(ssh_client_known_hosts_file)"
+  sudo -u "$(programeiro /rails/user)" \
+    ssh-keygen -R "$(ssh_client_known_hosts_spec)" -f "$known_hosts" >/dev/null 2>&1 || true
+  programeiro /redmine_git_hosting/ssh_run no info
+}

data/installer/tasks/ssh_server_running.sh

@@ -3,8 +3,10 @@
 set -u
 set -e
 
+PACKAGE_ARGS=('systemctl' "$SSH_SERVER_SERVICE")
+
 function task_condition {
-  programeiro /linux/service_running "$SSH_SERVER_SERVICE"
+  SUDO=t package_installed "${PACKAGE_ARGS[@]}"
 }
 
 function task_dependencies {
@@ -12,5 +14,5 @@ function task_dependencies {
 }
 
 function task_fix {
-  sudo service "$SSH_SERVER_SERVICE" start
+  SUDO=t package_assert "${PACKAGE_ARGS[@]}"
 }

data/installer/template/redmine_git_hosting_setting_value.sql

@@ -1,4 +1,4 @@
---- !ruby/hash:ActionController::Parameters
+--- !ruby/hash:ActiveSupport::HashWithIndifferentAccess
 all_projects_use_git: 'false'
 delete_git_repositories: 'true'
 download_revision_enabled: 'true'
@@ -34,8 +34,8 @@ gitolite_resync_all: 'false'
 gitolite_resync_all_projects: 'false'
 gitolite_resync_all_ssh_keys: 'false'
 gitolite_scripts_dir: ''
-gitolite_server_host: 127.0.0.1
-gitolite_server_port: '22'
+gitolite_server_host: '%%SSH_SERVER_HOST%%'
+gitolite_server_port: '%%SSH_SERVER_PORT%%'
 gitolite_ssh_private_key: "%%redmine_git_hosting_ssh_key%%"
 gitolite_ssh_public_key: "%%redmine_git_hosting_ssh_key%%.pub"
 gitolite_temp_dir: "/tmp/redmine_git_hosting_%%gitolite_user%%/"

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module RedmineWithGit
+  module Patches
+    module RedmineGitHosting
+      module Cache
+        module Database
+          def self.included(base)
+            base.prepend(InstanceMethods)
+          end
+
+          module InstanceMethods
+            def apply_cache_limit
+              return unless max_cache_elements >= 0 && GitCache.count > max_cache_elements
+
+              GitCache.order(created_at: :desc).last.destroy
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/redmine_with_git/patches/redmine_git_hosting/commands/{git/git_patch.rb → git_patch.rb}

@@ -22,7 +22,3 @@ module RedmineWithGit
     end
   end
 end
-
-patch = RedmineWithGit::Patches::RedmineGitHosting::Commands::GitPatch
-target = RedmineGitHosting::Commands::Git
-target.send(:include, patch) unless target.include?(patch)

data/lib/redmine_with_git/patches/redmine_git_hosting/gitolite_hook_patch.rb

@@ -85,8 +85,3 @@ module RedmineWithGit
     end
   end
 end
-
-EacRubyUtils.patch_module(
-  RedmineGitHosting::GitoliteHook,
-  RedmineWithGit::Patches::RedmineGitHosting::GitoliteHookPatch
-)

data/lib/redmine_with_git/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module RedmineWithGit
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 
   module Version
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redmine_with_git
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Esquilo Azul Company
@@ -15,20 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.102'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.102.4
+        version: '0.103'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.102'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.102.4
+        version: '0.103'
 - !ruby/object:Gem::Dependency
   name: eac_rails_utils
   requirement: !ruby/object:Gem::Requirement
@@ -49,42 +43,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.133'
+        version: '0.134'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.133'
+        version: '0.134'
 - !ruby/object:Gem::Dependency
-  name: html-pipeline
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +104,6 @@ files:
 - app/views/backup/_export.html.erb
 - app/views/backup/_import.html.erb
 - app/views/backup/index.html.erb
-- config/initializers/000_dependencies.rb
 - config/initializers/001_patches.rb
 - config/initializers/500_nonproject_modules.rb
 - config/locales/en.yml
@@ -135,6 +114,8 @@ files:
 - installer/programs/linux/sudo_file_exists.sh
 - installer/programs/linux/sudo_write.sh
 - installer/programs/redmine_git_hosting/ssh_key.sh
+- installer/programs/redmine_git_hosting/ssh_run.sh
+- installer/programs/redmine_git_hosting/ssh_server_port.sh
 - installer/programs/text/diff_stdin_file.sh
 - installer/programs/triggers/redmine_git_hosting_rescue.sh
 - installer/setup.sh
@@ -150,6 +131,9 @@ 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/rugged_build_config.sh
+- installer/tasks/rugged_ssh_support.sh
+- installer/tasks/ssh_client_known_hosts.sh
 - installer/tasks/ssh_server.sh
 - installer/tasks/ssh_server_running.sh
 - installer/template/gitolite.rc
@@ -172,8 +156,8 @@ files:
 - lib/redmine_with_git/load/database.rb
 - lib/redmine_with_git/load/files.rb
 - lib/redmine_with_git/load/git.rb
-- lib/redmine_with_git/patches/redmine_git_hosting/cache/database_patch.rb
-- lib/redmine_with_git/patches/redmine_git_hosting/commands/git/git_patch.rb
+- lib/redmine_with_git/patches/redmine_git_hosting/cache/database.rb
+- lib/redmine_with_git/patches/redmine_git_hosting/commands/git_patch.rb
 - lib/redmine_with_git/patches/redmine_git_hosting/gitolite_hook_patch.rb
 - lib/redmine_with_git/version.rb
 - lib/tasks/redmine_with_git.rake

data/config/initializers/000_dependencies.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-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')
-
-  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.21.0')
-  end
-end

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

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module RedmineGitHosting
-  module Cache
-    module DatabasePatch
-      def self.included(base)
-        base.prepend(InstanceMethods)
-      end
-
-      module InstanceMethods
-        def apply_cache_limit
-          return unless max_cache_elements >= 0 && GitCache.count > max_cache_elements
-
-          GitCache.order(created_at: :desc).last.destroy
-        end
-      end
-    end
-  end
-end
-
-patch = RedmineGitHosting::Cache::DatabasePatch
-target = RedmineGitHosting::Cache::Database
-target.send(:include, patch) unless target.include?(patch)