redmine_with_git 0.6.5 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6eb1a4e50d99b1422eb0441528cdb8c6033999f6293f5d5aac88a7afac7e85b6
-  data.tar.gz: 651df1f8e0fae8d9c150819a818deb9e506c32086ad5ecf5e3cbf4336f07c4b3
+  metadata.gz: ad334021b2ed9f85e6ffe0a9903d1d660271fb25ad66a080fe35679c89d14489
+  data.tar.gz: 237a9c00566a1bf59f94914047b0f43d51b895a49e1f72c8e33ff97afa9389ed
 SHA512:
-  metadata.gz: 66bc964940d8fc4a33be04b2ec0b1d5877837bcc4ab28b6f149961d798b3376ef2a76013a7553f8f12d6b890ec9570ddb11d8698d8a8d62ead797d73f68a9716
-  data.tar.gz: dec5494b61db731241885d3ce6e46c3bab58ec0d55a50e8cbc1e94a9d4a2b6603a7145b315a7124cb96e9d68009e45d914157c34373ed628d1f1ff7758367f66
+  metadata.gz: 27845700bf01636bbe3321023d307c46694d697870ced4ecba062d7ebdbc585d15ceead4c329c8f878e3838f9f78c84f1febe3717989b263b972892e683375ad
+  data.tar.gz: d090756bbffc58cdc438aa7b34ecebfd39ec95a647b7c4ceb404b151f7cd360828c24ee00161c936cd94c7c25b78efedceb4a5f35542f589af5d8cd4bdaae10c

data/app/models/redmine_with_git/tableless/load.rb

@@ -2,7 +2,7 @@
 
 module RedmineWithGit
   module Tableless
-    class Load < ::EacRailsUtils::TablelessModel
+    class Load < ::EacRailsUtils::Models::Tableless
       attribute :path, String
 
       validates :path, presence: true

data/config/initializers/000_dependencies.rb

@@ -6,8 +6,8 @@ Redmine::Plugin.post_register :redmine_with_git do
   # 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')
+  # Source: https://github.com/esquilo-azul/redmine_git_hosting
+  requires_redmine_plugin(:redmine_git_hosting, version_or_higher: '1.2.3.1')
 
   # Source: https://github.com/esquilo-azul/redmine_installer
   if ::Redmine::Plugin.registered_plugins.keys.include?(:redmine_installer)

data/config/initializers/001_patches.rb

@@ -1,4 +1,11 @@
 # frozen_string_literal: true
 
+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
+)
+
+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'

data/installer/programs/linux/sudo_write.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+set -u
+
+if [ $# -lt 1 ]; then
+  printf "Usage: $0 <TARGET_FILE>"
+  exit 1
+fi
+
+if [ $(id -u) -eq 0 ]; then
+  TARGET_FILE="$1"
+  EDITOR='tee' visudo -f "$TARGET_FILE" <&0
+  chmod 440 "$TARGET_FILE"
+else
+  sudo "$0" "$@"
+fi

data/installer/tasks/redmine_git_hosting.sh

@@ -8,5 +8,5 @@ function task_condition {
 }
 
 function task_dependencies {
-  echo gitolite_rc 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_gitolite_sudoer.sh

@@ -7,13 +7,14 @@ SUFFIX=''
 if [ -n "$address_path" ]; then
   SUFFIX="_$(printf "$address_path" | sed -e 's/^\///')"
 fi
-SUDOER_FILE="/etc/sudoers.d/$(programeiro /rails/user)_redmine_with_git${SUFFIX}"
+export SUDOER_FILE_BASENAME="$(programeiro /rails/user)_redmine_with_git${SUFFIX}"
+export SUDOER_FILE="/etc/sudoers.d/${SUDOER_FILE_BASENAME}"
+export SUDOER_TMP_FILE="/tmp/${SUDOER_FILE_BASENAME}"
 
 function sudoers_file_copy_file() {
-  TMPFILE="$(mktemp)"
-  sudo cp "$SUDOER_FILE" "$TMPFILE"
-  sudo chmod og+r "$TMPFILE"
-  printf "$TMPFILE\n"
+  sudo cp "$SUDOER_FILE" "$SUDOER_TMP_FILE"
+  sudo chmod og+r "$SUDOER_TMP_FILE"
+  printf "$SUDOER_TMP_FILE\n"
 }
 
 function task_dependencies {
@@ -43,7 +44,7 @@ function task_fix {
   set -u
   set -e
   export rails_user="$(programeiro /rails/user)"
-  programeiro /template/apply "$REDMINE_WITH_GIT_TEMPLATE_ROOT/redmine_user_sudoer" | sudo tee "$SUDOER_FILE" > /dev/null
-  sudo chmod 440 "$SUDOER_FILE"
+  programeiro /template/apply "$REDMINE_WITH_GIT_TEMPLATE_ROOT/redmine_user_sudoer" | \
+    programeiro /linux/sudo_write "$SUDOER_FILE"
 }
 export -f task_fix

data/installer/template/redmine_user_sudoer

@@ -1,2 +1,6 @@
 Defaults:redmine !requiretty
 ${rails_user} ALL=(${gitolite_user}) NOPASSWD:ALL
+${rails_user} ALL=(root) NOPASSWD:/usr/bin/stat
+${rails_user} ALL=(root) NOPASSWD:/bin/cp ${SUDOER_FILE} ${SUDOER_TMP_FILE}
+${rails_user} ALL=(root) NOPASSWD:/bin/chmod og+r ${SUDOER_TMP_FILE}
+${rails_user} ALL=(root) NOPASSWD:/bin/rm -f ${SUDOER_TMP_FILE}

data/lib/redmine_with_git/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_with_git
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.7.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-26 00:00:00.000000000 Z
+date: 2021-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm-tools
@@ -16,48 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.28'
+        version: '0.48'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.28'
+        version: '0.48'
 - !ruby/object:Gem::Dependency
   name: eac_rails_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0.35'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0.35'
 description: 
 email: 
 executables: []
@@ -80,6 +74,7 @@ files:
 - init.rb
 - installer/default_settings.sh
 - installer/programs/linux/sudo_file_exists.sh
+- installer/programs/linux/sudo_write.sh
 - installer/programs/rails/user.sh
 - installer/programs/redmine/installer/triggers/list/redmine_git_hosting_rescue.sh
 - installer/programs/redmine_git_hosting/ssh_key.sh
@@ -92,7 +87,6 @@ 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
@@ -141,8 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.9
 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"
-}