redmine_with_git 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c024ad45a9a2b919de7f27c795324af565befb0325eb0c7ddda575bd7872845
-  data.tar.gz: 2ed53ecebd90aa60cacf76e7d4015dfec8a827d87e548251ea6c157fc4dd42e4
+  metadata.gz: a288bce59f5ad5a3febee2b6ff4667becaf4844343a414b21bde5466810d30be
+  data.tar.gz: 3b700d17189b56e989468f82aec1f0c1b232ae0b3774dcc8ae8afcf775ca20bf
 SHA512:
-  metadata.gz: '09ea97b29dfb3633618bf02db12c8b1ec7bc9659d30d79d8d399abfae743e7feb73c791125185f7ec4f67a7366b12dfa63047173f8fb5138a46ee15cf154f171'
-  data.tar.gz: 9e082e5e462abb0980f993e52664b9381cf6e42890819c5b9f69a0a690b48435be06be02c12eaff83277f92aee1bf7494e89f894ba1dcb2fcfc9704a221de021
+  metadata.gz: b19ea725f939f3e19d058c6500103235da5fce6c111e43299ce16cdf03cbc9fda9826927c38298e793739f4d33ce546ca4dbca7415f35ca1618659b0c0d6b299
+  data.tar.gz: fc5970c1758e5994fd278dd938cb152143b4cc61eb4c0e70240b955a2360a5c5ab3983749cd2fd5b03530ec94872e311ef1e66d8b0b3cc7e36944187a11a517c

data/config/initializers/001_patches.rb

@@ -5,6 +5,11 @@ EacRubyUtils.patch_module(
   RedmineWithGit::Patches::RedmineGitHosting::GitoliteHook
 )
 
+EacRubyUtils.patch_module(
+  Repository::Xitolite,
+  RedmineWithGit::Patches::Repository::Xitolite
+)
+
 apply_patches_version_limit = Gem::Version.new('4.0.0')
 redmine_git_hosting_version = Gem::Version.new(
   Redmine::Plugin.registered_plugins[:redmine_git_hosting].version

data/installer/programs/gitolite/query_rc.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -u
+set -e
+
+sudo -u "$gitolite_user" -H gitolite query-rc "$1"

data/installer/tasks/gitolite_admin_base_hooks_clean.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+set -u
+set -e
+
+RESIDUAL_HOOKS=(post-receive post-receive.d lib)
+
+function gitolite_admin_base_hooks_dir {
+  printf '%s/hooks/common' "$(programeiro /gitolite/query_rc GL_ADMIN_BASE)"
+}
+
+function task_dependencies {
+  echo gitolite_setup
+}
+
+function task_condition {
+  local dir
+  dir="$(gitolite_admin_base_hooks_dir)"
+  for hook in "${RESIDUAL_HOOKS[@]}"; do
+    if sudo -u "$gitolite_user" test -e "$dir/$hook"; then
+      return 1
+    fi
+  done
+}
+
+function task_fix {
+  local dir
+  dir="$(gitolite_admin_base_hooks_dir)"
+  for hook in "${RESIDUAL_HOOKS[@]}"; do
+    sudo -u "$gitolite_user" rm -rf "$dir/$hook"
+  done
+  sudo -u "$gitolite_user" -H gitolite setup --hooks-only
+}

data/installer/tasks/gitolite_hooks_ruby.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+set -u
+set -e
+
+function gitolite_hook_path {
+  printf '%s/hooks/common/post-receive' "$(programeiro /gitolite/query_rc LOCAL_CODE)"
+}
+
+function task_dependencies {
+  echo gitolite_admin_base_hooks_clean redmine_bundle redmine_git_hosting_settings
+}
+
+function task_condition {
+  if bool_r "$SKIP_DATABASE"; then return 0; fi
+
+  local hook_path
+  hook_path="$(gitolite_hook_path)"
+  if ! sudo -u "$gitolite_user" test -f "$hook_path"; then return 0; fi
+  [ "$(sudo -u "$gitolite_user" head -n 1 "$hook_path")" == "#!$(programeiro /ruby/path)" ]
+}
+
+function task_fix {
+  programeiro /rails/rake redmine_git_hosting:install_hook_files
+}

data/installer/tasks/gitolite_ruby_access.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -u
+set -e
+
+function task_dependencies {
+  echo gitolite_user ruby
+}
+
+function task_condition {
+  sudo -u "$gitolite_user" "$(programeiro /ruby/path)" -v > /dev/null 2>&1
+}
+
+function task_fix {
+  local ruby_path
+  ruby_path="$(programeiro /ruby/path)"
+  infom "User \"$gitolite_user\" cannot execute \"$ruby_path\"" \
+    "(required by Gitolite hooks)."
+  infom "Grant traverse permission to the blocking directories. Run" \
+    "\"sudo -u $gitolite_user namei -l $ruby_path\" to find them."
+}

data/installer/tasks/redmine_git_hosting.sh

@@ -8,5 +8,7 @@ function task_condition {
 }
 
 function task_dependencies {
-  echo gitolite_setup redmine_gitolite_sudoer redmine_git_hosting_settings rugged_ssh_support
+  echo gitolite_admin_base_hooks_clean gitolite_ruby_access gitolite_setup \
+    redmine_gitolite_sudoer redmine_git_hosting_settings rugged_ssh_support \
+    gitolite_hooks_ruby
 }

data/lib/redmine_with_git/patches/repository/xitolite.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module RedmineWithGit
+  module Patches
+    module Repository
+      module Xitolite
+        def self.included(base)
+          base.prepend(InstanceMethods)
+        end
+
+        module InstanceMethods
+          # @param prev_db_heads [Array<String>]
+          # @param repo_heads [Array<String>]
+          # @return [void]
+          def save_revisions(prev_db_heads, repo_heads)
+            super(prev_db_heads.select { |head| commit_exist?(head) }, repo_heads)
+          end
+
+          private
+
+          # @param revision [String]
+          # @return [Boolean]
+          def commit_exist?(revision)
+            scm.rev_parse("#{revision}^{commit}").present?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/redmine_with_git/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redmine_with_git
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Esquilo Azul Company
@@ -108,6 +108,7 @@ files:
 - config/initializers/menu.rb
 - init.rb
 - installer/default_settings.sh
+- installer/programs/gitolite/query_rc.sh
 - installer/programs/linux/sudo_file_exists.sh
 - installer/programs/linux/sudo_write.sh
 - installer/programs/redmine_git_hosting/ssh_key.sh
@@ -118,7 +119,10 @@ files:
 - installer/setup.sh
 - installer/tasks/_before_run.sh
 - installer/tasks/gitolite.sh
+- installer/tasks/gitolite_admin_base_hooks_clean.sh
+- installer/tasks/gitolite_hooks_ruby.sh
 - installer/tasks/gitolite_rc.sh
+- installer/tasks/gitolite_ruby_access.sh
 - installer/tasks/gitolite_setup.sh
 - installer/tasks/gitolite_user.sh
 - installer/tasks/gitolite_user_home.sh
@@ -141,6 +145,7 @@ files:
 - lib/redmine_with_git/patches/redmine_git_hosting/cache/database.rb
 - lib/redmine_with_git/patches/redmine_git_hosting/commands/git.rb
 - lib/redmine_with_git/patches/redmine_git_hosting/gitolite_hook.rb
+- lib/redmine_with_git/patches/repository/xitolite.rb
 - lib/redmine_with_git/version.rb
 - lib/tasks/redmine_with_git.rake
 licenses: []