redmine_with_git 0.6.2 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0602cccc98ef16f5cfe8d3278a8a983b895e2325ba7aa5bba00e5acecb09786b
-  data.tar.gz: 52f67cb862e0aab5a89e2cf63e453c0c8ea928417667feca235ecd168abc5055
+  metadata.gz: 0042c0866a1c3837ee497d22bc60af1c308205aacfd5ed3dcbc1f8f5d18a1d55
+  data.tar.gz: 4900f7e85ee5f940d7a8fbe04a5d865c9b7fec47e86d47fd21a618d35df40493
 SHA512:
-  metadata.gz: 14c34bb2e8600f1683b50613472496660321c26b6f8c5976bf9948d93cd5a172e4883ec363df014fb6ffb36c59e3a0606bf863ddf2bd75bacc5551a59ed3dd07
-  data.tar.gz: f7ddc22f15b3ac8f6b0e2fc8e149b8eef10ad931b1690ea9116699f89e2f297896ccc4511cb97e5559a5edc5381170d17bf90da5baec551c330cf4d545f8471b
+  metadata.gz: 3f5f9e2047c92a341762015813cd34e6d375267a3db52c3a2ae6f60249c9b9efec82920dcf3ecc47309655e330e1f03eed6d2c283ec673e98fe3c4d1753e6b16
+  data.tar.gz: dae66e51c807e2c87df8242a8207f8f538320f14e0463029bca54d25679d00135a93e16aba1363bcb2f8e3f8ffba28df0cb1b252b7aa9f01f5f735d021dc2db2

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

@@ -2,10 +2,15 @@
 
 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.0')
+  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/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_installer
+  if ::Redmine::Plugin.registered_plugins.keys.include?(:redmine_installer)
+    requires_redmine_plugin(:redmine_installer, version_or_higher: '0.10.0')
+  end
 end

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

@@ -3,9 +3,6 @@
 require 'redmine'
 require 'redmine_with_git/version'
 
-require 'eac_rails_utils'
-require 'eac_ruby_utils'
-
 Redmine::Plugin.register :redmine_with_git do
   name 'RedmineWithGit'
   author 'Esquilo Azul Company'

data/installer/default_settings.sh

@@ -1,43 +1,7 @@
-# Auxilary functions
-function sanitize_boolean_var {
-  if [ "$1" != 'false' -a "$1" != 'true' ]; then
-    if [ -n "$1" ]; then
-      echo 'true'
-    else
-      echo 'false'
-    fi
-  else
-    echo "$1"
-  fi
-}
-
-function set_by_boolean {
-  local value="${!1}"
-  if [ "$(sanitize_boolean_var "$value")" == 'true' ]; then
-    export $2=$3
-  else
-    export $2=$4
-  fi
-}
-
-# Default settings
 export address_https=false
 export address_host=localhost
 export address_port=
-set_by_boolean address_https address_scheme https http
 export git_repositories_hierarchical_organisation=true
-set_by_boolean git_repositories_hierarchical_organisation git_repositories_unique_repo_identifier \
-  false true
 export gitolite_user=git
 export gitolite_user_home=/var/lib/git
 export redmine_git_hosting_ssh_key_name=redmine_git_hosting_id
-
-# Auxiliary settings
-export REDMINE_WITH_GIT_INSTALL_ROOT="$(dirname "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )")"
-export REDMINE_WITH_GIT_TEMPLATE_ROOT="${REDMINE_WITH_GIT_INSTALL_ROOT}/installer/template"
-
-# Redmine configuration
-if [ ! -v 'REDMINE_CONFIGURATION_EXTRA' ]; then
-  export REDMINE_CONFIGURATION_EXTRA=''
-fi
-export REDMINE_CONFIGURATION_EXTRA+="  scm_xiolite_command: /usr/bin/git"

data/installer/setup.sh

@@ -0,0 +1,35 @@
+# Auxiliary functions
+function sanitize_boolean_var {
+  if [ "$1" != 'false' -a "$1" != 'true' ]; then
+    if [ -n "$1" ]; then
+      echo 'true'
+    else
+      echo 'false'
+    fi
+  else
+    echo "$1"
+  fi
+}
+
+function set_by_boolean {
+  local value="${!1}"
+  if [ "$(sanitize_boolean_var "$value")" == 'true' ]; then
+    export $2=$3
+  else
+    export $2=$4
+  fi
+}
+
+set_by_boolean address_https address_scheme https http
+set_by_boolean git_repositories_hierarchical_organisation git_repositories_unique_repo_identifier \
+  false true
+
+# Auxiliary settings
+export REDMINE_WITH_GIT_INSTALL_ROOT="$(dirname "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )")"
+export REDMINE_WITH_GIT_TEMPLATE_ROOT="${REDMINE_WITH_GIT_INSTALL_ROOT}/installer/template"
+
+# Redmine configuration
+if [ ! -v 'REDMINE_CONFIGURATION_EXTRA' ]; then
+  export REDMINE_CONFIGURATION_EXTRA=''
+fi
+export REDMINE_CONFIGURATION_EXTRA+="  scm_xiolite_command: /usr/bin/git"

data/installer/tasks/redmine_enabled_scm_setting.sh

@@ -24,6 +24,5 @@ function task_condition {
 function task_fix {
   set -u
   set -e
-  local setting_value=$(enabled_scm_setting_template | programeiro /text/escape_single_quotes)
-  programeiro /redmine/set_setting_value 'enabled_scm' "$setting_value"
+  programeiro /redmine/set_setting_value '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_rc redmine_gitolite_sudoer redmine_git_hosting_settings apt_ruby python_two
+  echo gitolite_setup redmine_gitolite_sudoer redmine_git_hosting_settings apt_ruby python_two
 }

data/installer/tasks/redmine_git_hosting_settings.sh

@@ -23,7 +23,7 @@ function task_condition {
 }
 
 function task_fix {
-  local setting_value=$(redmine_git_hosting_setting_template | programeiro /text/escape_single_quotes)
-  programeiro /redmine/set_setting_value 'plugin_redmine_git_hosting' "$setting_value"
+  programeiro /redmine/set_setting_value 'plugin_redmine_git_hosting' \
+    "$(redmine_git_hosting_setting_template)"
   programeiro /redmine/installer/triggers/set 'redmine_git_hosting_rescue'
 }

data/lib/redmine_with_git.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'eac_rails_utils'
+require 'eac_ruby_utils'
+
+module RedmineWithGit
+end

data/lib/redmine_with_git/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_with_git
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.7
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-26 00:00:00.000000000 Z
+date: 2020-07-06 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.8'
+        version: '0.48'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.48'
 - !ruby/object:Gem::Dependency
   name: eac_rails_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: '0.35'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: '0.35'
 description: 
 email: 
 executables: []
@@ -84,6 +78,7 @@ files:
 - installer/programs/redmine/installer/triggers/list/redmine_git_hosting_rescue.sh
 - installer/programs/redmine_git_hosting/ssh_key.sh
 - installer/programs/text/diff_stdin_file.sh
+- installer/setup.sh
 - installer/tasks/_before_run.sh
 - installer/tasks/apt_ruby.sh
 - installer/tasks/gitolite.sh
@@ -102,6 +97,7 @@ files:
 - installer/template/redmine_enabled_scm_setting_value
 - installer/template/redmine_git_hosting_setting_value.sql
 - installer/template/redmine_user_sudoer
+- lib/redmine_with_git.rb
 - lib/redmine_with_git/dump/all.rb
 - lib/redmine_with_git/dump/base.rb
 - lib/redmine_with_git/dump/database.rb