redmine-installer 2.3.2 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 562050e0ea7eb2b7d4539fd4e19ee1691de18e861a07ce25e052ef98eee70f1f
-  data.tar.gz: e5932bf820f693d20ed1987434b63d9d85a7d32b4e7ded16d03d880e0ef46b87
+  metadata.gz: 0605dd69a69945ad4065c6164ff8fe5b05c33f6e9b9a3d7b75feeef331691419
+  data.tar.gz: c1291030bdfbc4c29cd43f84befbb3a886bbdfe224ae24d8bd995f0190e4a79f
 SHA512:
-  metadata.gz: b6064513f5c53b327985ac76fa23fc764fe2fdde289c6cc4cfd8355947d48085d1c6a029ec800b164581c4f022e9e0daf6985da31846c0c28006c114ebdec0ad
-  data.tar.gz: 28fec9b468aeb51ac9ab52ee237f2e25e63a9c9f70dd1ef5ca77f15a4adf118c773a8d0e3115db905d175b1ff386f8527dc654146229ec046674b40877feb13a
+  metadata.gz: 82a79260f974fba17dd2db7d972c5d9acb48614873226beb8a8479e058238eb7325982719c6739ebc221aefc38251dde0e3936ec0ba3fd997c1ae78c84e3de47
+  data.tar.gz: 4176792027d34272b2c365c797d112ddeb0b9c6438b3bcbdf3524ccbae6416bfbd03e7e279088173b8c2d425ef6b91c7a219696a029419b506a79f43c27fe1ab

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [2.4.0] - 2022-09-07
+### Added
+- allow the administrator to manually empty the root directory [#33](https://github.com/easyredmine/redmine-installer/pull/33)
+
 ## [2.3.0.beta] - 2019-06-10
 
 ### Added

data/lib/redmine-installer/cli.rb

@@ -48,7 +48,7 @@ module RedmineInstaller
         c.action do |args, options|
           options.default(enable_user_root: false)
 
-          RedmineInstaller::Install.new(args[0], args[1], options.__hash__).run
+          RedmineInstaller::Install.new(args[0], args[1], **options.__hash__).run
         end
       end
       alias_command :i, :install
@@ -77,7 +77,7 @@ module RedmineInstaller
         c.action do |args, options|
           options.default(enable_user_root: false, copy_files_with_symlink: false)
 
-          RedmineInstaller::Upgrade.new(args[0], args[1], options.__hash__).run
+          RedmineInstaller::Upgrade.new(args[0], args[1], **options.__hash__).run
         end
       end
       alias_command :u, :upgrade

data/lib/redmine-installer/redmine.rb

@@ -1,4 +1,5 @@
 require 'find'
+require 'io/console'
 
 module RedmineInstaller
   class Redmine < TaskModule
@@ -279,7 +280,17 @@ module RedmineInstaller
           next if entry == '.' || entry == '..'
           next if entry == FILES_DIR && task.options.copy_files_with_symlink
 
-          FileUtils.remove_entry_secure(entry)
+          begin
+            FileUtils.remove_entry_secure(entry)
+          rescue
+            if task.options.copy_files_with_symlink
+              print_title('Cannot automatically empty ' + root + '. Please manually empty this directory (except for ' + root + '/' + FILES_DIR + ') and then hit any key to continue...')
+            else
+              print_title('Cannot automatically empty ' + root + '. Please manually empty this directory and then hit any key to continue...')
+            end
+            STDIN.getch
+            break
+          end
         end
       end
 

data/lib/redmine-installer/version.rb

@@ -1,3 +1,5 @@
 module RedmineInstaller
-  VERSION = '2.3.2'
+
+  VERSION = '2.4.0'
+
 end

data/lib/redmine-installer.rb

@@ -32,7 +32,7 @@ module RedmineInstaller
   autoload :Easycheck,     'redmine-installer/easycheck'
 
   # Settings
-  MIN_SUPPORTED_RUBY = '2.3.0'
+  MIN_SUPPORTED_RUBY = '3.1.2'
 
   def self.logger
     @logger ||= RedmineInstaller::Logger.new

data/redmine-installer.gemspec

@@ -16,22 +16,24 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   files = `git ls-files -z`.split("\x0")
-  files.delete_if {|f| f.start_with?('spec/packages/') }
+  files.delete_if { |f| f.start_with?('spec/packages/') }
 
   spec.files         = files
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.3.0'
+  spec.required_ruby_version = '3.1.2'
 
+  spec.add_runtime_dependency 'bundler', '>= 1.16'
   spec.add_runtime_dependency 'commander'
+  spec.add_runtime_dependency 'pastel', '~> 0.8.0'
   spec.add_runtime_dependency 'rubyzip'
-  spec.add_runtime_dependency 'bundler', '>= 1.16'
-  spec.add_runtime_dependency 'pastel', '~> 0.7.2'
-  spec.add_runtime_dependency 'tty-prompt', '~> 0.16.1'
+  spec.add_runtime_dependency 'tty-progressbar', '~> 0.18.2'
+  spec.add_runtime_dependency 'tty-prompt', '~> 0.23.1'
   spec.add_runtime_dependency 'tty-spinner', '~> 0.8.0'
-  spec.add_runtime_dependency 'tty-progressbar', '~> 0.15.0'
 
+  spec.add_development_dependency 'childprocess', '~> 4.1.0'
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec', '~> 3.11.0'
 end

data/spec/installer_process.rb

@@ -39,7 +39,7 @@ class InstallerProcess
   end
 
   def run
-    Bundler.with_clean_env {
+    Bundler.with_unbundled_env {
       start
       yield
     }
@@ -67,28 +67,28 @@ class InstallerProcess
     # @process.io.stdin.write_nonblock(text + "\n")
   end
 
-  def get(*args)
-    @last_get_return = _get(*args)
+  def get(text, **args)
+    @last_get_return = _get(text, **args)
   end
 
   private
 
-    # max_wait in s
-    def _get(text, max_wait: 10)
-      wait_to = Time.now + max_wait
-      while Time.now < wait_to
-        @buffer << @stdout.read
-        index = @buffer.rindex(text)
-
-        if index
-          break
-          # return @buffer.slice!(0, index+text.size)
-        else
-          sleep 0.5
-        end
+  # max_wait in s
+  def _get(text, max_wait: 10)
+    wait_to = Time.now + max_wait
+    while Time.now < wait_to
+      @buffer << @stdout.read
+      index = @buffer.rindex(text)
+
+      if index
+        break
+        # return @buffer.slice!(0, index+text.size)
+      else
+        sleep 0.5
       end
-
-      @buffer
     end
 
+    @buffer
+  end
+
 end

data/spec/lib/backup_restore_spec.rb

@@ -57,7 +57,7 @@ RSpec.describe 'RedmineInstaller backup / restore', order: :defined do
     FileUtils.cp(dump, DATABASE_DUMP)
   end
 
-  it 'restore', command: 'install', args: [package_v345, '--database-dump', DATABASE_DUMP] do
+  it 'restore', command: 'install', args: [package_v503, '--database-dump', DATABASE_DUMP] do
     expected_output('Path to redmine root:')
     write(@redmine_root)
 

data/spec/lib/install_spec.rb

@@ -55,28 +55,28 @@ RSpec.describe RedmineInstaller::Install, command: 'install' do
     write(@redmine_root)
 
     expected_output('Path to package:')
-    write(package_v345)
+    write(package_v503)
 
     expected_output('Extracting redmine package')
 
     expected_successful_configuration(email: true)
     expected_successful_installation
 
-    expected_redmine_version('3.4.5')
+    expected_redmine_version('5.0.3')
     expected_email_configuration
   end
 
-  it 'download redmine', args: ['v3.4.5'] do
+  it 'download redmine', args: ['v5.0.3'] do
     expected_output('Path to redmine root:')
     write(@redmine_root)
 
-    expected_output_in('Downloading http://www.redmine.org/releases/redmine-3.4.5.zip', 30)
+    expected_output_in('Downloading https://www.redmine.org/releases/redmine-5.0.3.zip', 30)
     expected_output('Extracting redmine package')
 
     expected_successful_configuration
     expected_successful_installation
 
-    expected_redmine_version('3.4.5')
+    expected_redmine_version('5.0.3')
   end
 
   it 'installing something else', args: [package_someting_else] do
@@ -85,7 +85,7 @@ RSpec.describe RedmineInstaller::Install, command: 'install' do
     expected_output('is not valid')
   end
 
-  it 'bad database settings', args: [package_v345] do
+  it 'bad database settings', args: [package_v503] do
     write(@redmine_root)
 
     expected_output('Creating database configuration')
@@ -129,7 +129,7 @@ RSpec.describe RedmineInstaller::Install, command: 'install' do
     expected_output('--> Database migrating')
     expected_output_in('Redmine was installed', 60)
 
-    expected_redmine_version('3.4.5')
+    expected_redmine_version('5.0.3')
   end
 
   it 'high installer version', args: [package_high_installer_version] do

data/spec/lib/upgrade_spec.rb

@@ -26,7 +26,7 @@ RSpec.describe RedmineInstaller::Upgrade, :install_first, command: 'upgrade' do
     write(@redmine_root)
 
     expected_output('Path to package:')
-    write(package_v345)
+    write(package_v503)
 
     expected_output('Extracting redmine package')
     expected_output('Data backup')
@@ -44,7 +44,7 @@ RSpec.describe RedmineInstaller::Upgrade, :install_first, command: 'upgrade' do
 
     expected_successful_upgrade
 
-    expected_redmine_version('3.4.5')
+    expected_redmine_version('5.0.3')
 
     expect(File.exist?(test_test_file)).to be_falsey
 
@@ -66,7 +66,7 @@ RSpec.describe RedmineInstaller::Upgrade, :install_first, command: 'upgrade' do
     write(@redmine_root)
 
     wait_for_stdin_buffer
-    write(package_v345)
+    write(package_v503)
 
     wait_for_stdin_buffer
 
@@ -80,7 +80,7 @@ RSpec.describe RedmineInstaller::Upgrade, :install_first, command: 'upgrade' do
 
     expected_successful_upgrade
 
-    expected_redmine_version('3.4.5')
+    expected_redmine_version('5.0.3')
 
     expect(File.exist?(test_test_file)).to be_truthy
   end
@@ -94,7 +94,7 @@ RSpec.describe RedmineInstaller::Upgrade, :install_first, command: 'upgrade' do
     write(@redmine_root)
 
     wait_for_stdin_buffer
-    write(package_v345)
+    write(package_v503)
 
     wait_for_stdin_buffer
 
@@ -108,13 +108,14 @@ RSpec.describe RedmineInstaller::Upgrade, :install_first, command: 'upgrade' do
 
     expected_successful_upgrade
 
-    expected_redmine_version('3.4.5')
+    expected_redmine_version('5.0.3')
 
     # Not bullet-prof but at least check if files are still there
     expect(Dir.glob(File.join(files_dir, '*.txt')).sort).to eq(files.sort)
   end
 
   it 'upgrade rys and modify bundle/index' do
+    skip 'old version not supporting Ruby >3'
     wait_for_stdin_buffer
     write(@redmine_root)
 
@@ -171,7 +172,7 @@ RSpec.describe RedmineInstaller::Upgrade, :install_first, command: 'upgrade' do
       write(@redmine_root)
 
       wait_for_stdin_buffer
-      write(package_v345)
+      write(package_v503)
 
       go_down
       go_down
@@ -183,7 +184,7 @@ RSpec.describe RedmineInstaller::Upgrade, :install_first, command: 'upgrade' do
 
       write(answer)
       expected_successful_upgrade
-      expected_redmine_version('3.4.5')
+      expected_redmine_version('5.0.3')
 
       expect(Dir.exist?(plugin_dir)).to be(result)
     end

data/spec/packages_helper.rb

@@ -12,6 +12,10 @@ module PackagesHelper
     File.join(packages_dir, 'redmine-3.4.5-rys.zip')
   end
 
+  def package_v503
+    File.join(packages_dir, 'redmine-5.0.3.zip')
+  end
+
   def package_someting_else
     File.join(packages_dir, 'something-else.zip')
   end

data/spec/spec_helper.rb

@@ -30,12 +30,12 @@ RSpec.configure do |config|
 
   config.before(:all, :install_first) do
     @redmine_root = @origin_redmine = Dir.mktmpdir('redmine_root')
-    @process = InstallerProcess.new('install', package_v345, @origin_redmine)
+    @process = InstallerProcess.new('install', package_v503, @origin_redmine)
     @process.run do
       expected_successful_configuration
       expected_successful_installation
 
-      expected_redmine_version('3.4.5')
+      expected_redmine_version('5.0.3')
     end
     @backup_dir = Dir.mktmpdir('backup_dir')
   end

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: redmine-installer
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.4.0
 platform: ruby
 authors:
 - Ondřej Moravčík
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-24 00:00:00.000000000 Z
+date: 2022-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: commander
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: rubyzip
+  name: commander
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,47 +39,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: pastel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pastel
+  name: tty-progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.18.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.18.2
 - !ruby/object:Gem::Dependency
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.23.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.23.1
 - !ruby/object:Gem::Dependency
   name: tty-spinner
   requirement: !ruby/object:Gem::Requirement
@@ -95,19 +109,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.8.0
 - !ruby/object:Gem::Dependency
-  name: tty-progressbar
+  name: childprocess
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
-  type: :runtime
+        version: 4.1.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.11.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.11.0
 description: ''
 email:
 - moravcik.ondrej@gmail.com
@@ -176,23 +204,23 @@ homepage: https://github.com/easyredmine/redmine-installer
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '='
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 3.1.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.22
+signing_key:
 specification_version: 4
 summary: Easy way how install/upgrade Redmine, EasyRedmine or EasyProject.
 test_files: