redmine_with_git 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0602cccc98ef16f5cfe8d3278a8a983b895e2325ba7aa5bba00e5acecb09786b
-  data.tar.gz: 52f67cb862e0aab5a89e2cf63e453c0c8ea928417667feca235ecd168abc5055
+  metadata.gz: 6edac773f07d5b57e925df9c50728a3b334bfe7fa3049cc13f9f80dcc35a7ac4
+  data.tar.gz: cad8b33dcf3caf410cb74bd98acd3796af224cb9651ae77cb96548de2cb38f12
 SHA512:
-  metadata.gz: 14c34bb2e8600f1683b50613472496660321c26b6f8c5976bf9948d93cd5a172e4883ec363df014fb6ffb36c59e3a0606bf863ddf2bd75bacc5551a59ed3dd07
-  data.tar.gz: f7ddc22f15b3ac8f6b0e2fc8e149b8eef10ad931b1690ea9116699f89e2f297896ccc4511cb97e5559a5edc5381170d17bf90da5baec551c330cf4d545f8471b
+  metadata.gz: 346a42525dad1fb27a2bd5096c56b3c5a62fd4a7567f4f7e275eb1f584f87c2d0e20d4e5070c8c06351b351fe15da7a5449cd2f14ea33838f5a3406fd160bf91
+  data.tar.gz: 68b8f63798f0eed8ffcbd0def8b298dfc4cd60403ce3648344ec4376060db7f024a32e8e69e27f024871059bd775c952638e9570a04fab9fda812b01f1aff5ac

data/config/initializers/000_dependencies.rb

@@ -8,4 +8,9 @@ Redmine::Plugin.post_register :redmine_with_git do
   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.9.0')
+  end
 end

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RedmineWithGit
-  VERSION = '0.6.2'
+  VERSION = '0.6.3'
 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.3
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-26 00:00:00.000000000 Z
+date: 2020-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm-tools
@@ -84,6 +84,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