redmine-installer 2.2.7 → 2.3.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 442c2401c5d539b505972aea53825e4c4fb1cabc164a5872d339d424626cc5a3
-  data.tar.gz: abe111e9299aee2213a67be19bd71b05b5089b6e06d6e7168f008ab607e57190
+  metadata.gz: d94674fa60f2209607eb93d0d61fa089720de8bef92776d795d27692d4b54a2f
+  data.tar.gz: f8ab75a7abee89a142261a5d2ffe32b3ff28df1bf620012062a8da5cede7f033
 SHA512:
-  metadata.gz: 8d5131a3289953a8f7dee7b65ddb8ea2eb83f846b69f6bdef3c6d84f52587891cc2370e50cf7a3d7f68f2a9b35b1cac847f743816558a80bc557b1e5dd80e7d8
-  data.tar.gz: 8efdddf3a50d8ea3179a75f11166cea67b5e76ea471717290501bd73cc370775fa909c412fd0095db99166249f33be94e86cd9abaa8684c4f45c5205b587ede4
+  metadata.gz: 1413b109d141ec1a6be72921c2b0172a42685a7b82a33b75b85be6c2409a3a515c48940cc74ba697005d44cfa426a8588f2b1a23c00ed2a4585bead56b4995dc
+  data.tar.gz: 379b682c95ae9f978a34d7ea516e2f97cb356d6b6c28a2e6a5b4c521ba2b26f61e71d1fcc5a62a2765cb36530804d9639ccc9d4dc636598e0f7978710188062e

data/.gitignore

@@ -27,3 +27,4 @@ test/*
 /redmine-installer-err
 /redmine-installer-out
 /redmine
+/gems.locked

data/CHANGELOG.md

@@ -0,0 +1,23 @@
+# Changelog
+
+## [2.3.0.beta] - 2019-06-10
+
+### Added
+- Gems are required via Bundler
+- Easycheck for server requirenments
+- Validation for the package for upgrading
+
+### Changed
+- Gemfile was renamed to gems.rb
+- Installer is now asking if user wants to copy missing plugins
+- Tests aren't using system redmine-installer
+
+### Deprecated
+- Ruby <= 2.3
+
+### Removed
+
+### Fixed
+
+### Security
+

data/bin/redmine

@@ -1,5 +1,10 @@
 #!/usr/bin/env ruby
 
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../gems.rb', __dir__)
+
+require 'bundler'
+Bundler.require(:default)
+
 lib = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(lib) if !$LOAD_PATH.include?(lib)
 

data/{Gemfile → gems.rb}

@@ -3,6 +3,8 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in redmine-installer.gemspec
 gemspec
 
-gem 'pry'
-gem 'rspec'
-gem 'childprocess'
+group :development, :test do
+  gem 'pry'
+  gem 'rspec'
+  gem 'childprocess'
+end

data/lib/redmine-installer/cli.rb

@@ -20,7 +20,10 @@ module RedmineInstaller
       global_option('-d', '--debug', 'Logging message to stdout'){ $DEBUG = true }
       global_option('-s', '--silent', 'Be less version in output') { $SILENT_MODE = true }
       global_option('-e', '--env', 'For backward compatibility. Production is now always use.')
-      global_option('--skip-old-modifications', 'For backward compatibility. Missing modifications are now always copied.')
+      global_option('--run-easycheck', 'Run easycheck.sh from https://github.com/easyredmine/easy_server_requirements_check') do
+        RedmineInstaller::Easycheck.run
+      end
+
       default_command :help
 
 

data/lib/redmine-installer/command.rb

@@ -13,6 +13,12 @@ module RedmineInstaller
     end
 
     def run
+      Bundler.with_clean_env do
+        run!
+      end
+    end
+
+    def run!
       success = false
 
       logger.std("--> #{cmd}")

data/lib/redmine-installer/easycheck.rb

@@ -0,0 +1,27 @@
+require 'open3'
+
+module RedmineInstaller
+  class Easycheck
+    extend Utils
+
+    EASYCHECK_SH = 'https://raw.githubusercontent.com/easyredmine/easy_server_requirements_check/master/easycheck.sh'
+
+    def self.run
+      if Kernel.system('which', 'wget')
+        Open3.pipeline(['wget', EASYCHECK_SH, '-O', '-', '--quiet'], 'bash')
+
+      elsif Kernel.system('which', 'curl')
+        Open3.pipeline(['curl', EASYCHECK_SH, '--output', '-', '--silent'], 'bash')
+
+      else
+        error 'Neither wget nor curl was found'
+      end
+
+      puts
+      if !prompt.yes?('Continue?')
+        error 'Canceled'
+      end
+    end
+
+  end
+end

data/lib/redmine-installer/install.rb

@@ -17,11 +17,13 @@ module RedmineInstaller
       @temp_redmine.valid_options
       @environment.check
       @target_redmine.ensure_and_valid_root
+
       @package.ensure_and_valid_package
       @package.extract
 
       @temp_redmine.root = @package.redmine_root
       @package_config.check_version
+      @temp_redmine.validate
 
       @temp_redmine.create_database_yml
       @temp_redmine.create_configuration_yml

data/lib/redmine-installer/redmine.rb

@@ -395,11 +395,12 @@ module RedmineInstaller
       logger.info('Important files was copyied')
     end
 
-    # New package may not have all plugins
-    #
-    def copy_missing_plugins_from(other_redmine)
-      # Copy missing redmine plugins
-      Dir.chdir(other_redmine.plugins_path) do
+    def yield_missing_plugins(source_directory, target_directory)
+      if !Dir.exist?(source_directory)
+        return
+      end
+
+      Dir.chdir(source_directory) do
         Dir.entries('.').each do |plugin|
           next if plugin == '.' || plugin == '..'
 
@@ -408,28 +409,44 @@ module RedmineInstaller
             next
           end
 
-          to = File.join(plugins_path, plugin)
+          to = File.join(target_directory, plugin)
 
           # Plugins does not exist
           unless Dir.exist?(to)
-            FileUtils.cp_r(plugin, to)
+            yield File.expand_path(plugin), File.expand_path(to)
           end
         end
       end
+    end
 
-      # Copy missing client modification plugin
-      if easyproject?
-        old_modifications = Dir.glob(File.join(other_redmine.easy_plugins_path, 'modification_*'))
-        old_modifications.each do |old_modification_path|
-          next if !File.directory?(old_modification_path)
+    # New package may not have all plugins
+    #
+    def copy_missing_plugins_from(other_redmine)
+      missing = []
 
-          basename = File.basename(old_modification_path)
+      yield_missing_plugins(other_redmine.plugins_path, plugins_path) do |from, to|
+        missing << [from, to]
+      end
+
+      yield_missing_plugins(other_redmine.easy_plugins_path, easy_plugins_path) do |from, to|
+        missing << [from, to]
+      end
 
-          new_modification_path = File.join(easy_plugins_path, basename)
-          next if File.exist?(new_modification_path)
+      missing_plugin_names = missing.map{|(from, to)| File.basename(from) }
+      logger.info("Missing plugins: #{missing_plugin_names.join(', ')}")
 
-          FileUtils.cp_r(old_modification_path, new_modification_path)
-        end
+      if missing.empty?
+        return
+      end
+
+      puts
+      if !prompt.yes?("Your application contains plugins that are not present in the package (#{missing_plugin_names.join(', ')}). Would you like to copy them?")
+        return
+      end
+
+      missing.each do |(from, to)|
+        FileUtils.cp_r(from, to)
+        logger.info("Copied #{from} to #{to}")
       end
     end
 
@@ -438,7 +455,7 @@ module RedmineInstaller
       Dir.chdir(root) do
         REQUIRED_FILES.each do |path|
           unless File.exist?(path)
-            error "Redmine #{root} is not valid. Missing #{path}."
+            error "Redmine #{root} is not valid. Directory '#{path}' is missing."
           end
         end
       end

data/lib/redmine-installer/upgrade.rb

@@ -20,6 +20,7 @@ module RedmineInstaller
 
       @temp_redmine.root = @package.redmine_root
       @package_config.check_version
+      @temp_redmine.validate
 
       @target_redmine.make_backup
 

data/lib/redmine-installer/version.rb

@@ -1,3 +1,3 @@
 module RedmineInstaller
-  VERSION = '2.2.7'
+  VERSION = '2.3.0.beta'
 end

data/lib/redmine-installer.rb

@@ -29,6 +29,7 @@ module RedmineInstaller
   autoload :Backup,        'redmine-installer/backup'
   autoload :RestoreDB,     'redmine-installer/restore_db'
   autoload :PackageConfig, 'redmine-installer/package_config'
+  autoload :Easycheck,     'redmine-installer/easycheck'
 
   # Settings
   MIN_SUPPORTED_RUBY = '2.3.0'
@@ -53,7 +54,7 @@ module RedmineInstaller
   /_/  \\__/\\_,_/_/_/_/_/_//_/\\__/
 
 
-  Powered by EasyRedmine
+  Powered by EasySoftware
 
     PRINT
   end

data/redmine-installer.gemspec

@@ -16,14 +16,14 @@ 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.1.0'
+  spec.required_ruby_version = '>= 2.3.0'
 
   spec.add_runtime_dependency 'commander'
   spec.add_runtime_dependency 'rubyzip'

data/spec/installer_process.rb

@@ -17,8 +17,11 @@ class InstallerProcess
       args << '--bundle-options' << '--without rmagick'
     end
 
+    redmine_bin_file = File.expand_path('../bin/redmine', __dir__)
+
+    @process = ChildProcess.build(redmine_bin_file, command, *args)
     # @process = ChildProcess.build('bin/redmine', command, *args)
-    @process = ChildProcess.build('redmine', command, *args)
+    # @process = ChildProcess.build('redmine', command, *args)
     @process.io.stdout = tempfile_out
     @process.io.stderr = tempfile_err
     @process.environment['REDMINE_INSTALLER_SPEC'] = '1'

data/spec/lib/install_spec.rb

@@ -82,20 +82,7 @@ RSpec.describe RedmineInstaller::Install, command: 'install' do
   it 'installing something else', args: [package_someting_else] do
     write(@redmine_root)
 
-    expected_successful_configuration
-
-    expected_output('Redmine installing')
-    expected_output_in('--> Bundle install', 50)
-
-    expected_output("Gemfile.lock wasn't created")
-    expected_output('‣ Try again')
-
-    go_down
-    go_down
-    expected_output('‣ Cancel')
-    write('')
-
-    expected_output('Operation canceled by user')
+    expected_output('is not valid')
   end
 
   it 'bad database settings', args: [package_v345] do
@@ -158,6 +145,7 @@ RSpec.describe RedmineInstaller::Install, command: 'install' do
     expected_successful_installation(
       after_create: proc {
         expected_output('Would you like to load default data')
+
         write('y')
         expected_output('Database cleaning')
         expected_output('Database restoring')

data/spec/lib/upgrade_spec.rb

@@ -147,4 +147,55 @@ RSpec.describe RedmineInstaller::Upgrade, :install_first, command: 'upgrade' do
     expect(plugin_paths).to start_with(@redmine_root)
   end
 
+  it 'upgrading something else' do
+    wait_for_stdin_buffer
+    write(@redmine_root)
+
+    wait_for_stdin_buffer
+    write(package_someting_else)
+
+    wait_for_stdin_buffer
+    expected_output('is not valid')
+  end
+
+  context 'missing plugins' do
+
+    def upgrade_it(answer, result)
+      # Create some plugins
+      plugin_name = 'new_plugin'
+      plugin_dir = File.join(@redmine_root, 'plugins', plugin_name)
+      FileUtils.mkdir_p(plugin_dir)
+      FileUtils.touch(File.join(plugin_dir, 'init.rb'))
+
+      wait_for_stdin_buffer
+      write(@redmine_root)
+
+      wait_for_stdin_buffer
+      write(package_v345)
+
+      go_down
+      go_down
+      expected_output('‣ Nothing')
+      select_choice
+      write('y')
+
+      expected_output("Your application contains plugins that are not present in the package (#{plugin_name}). Would you like to copy them?")
+
+      write(answer)
+      expected_successful_upgrade
+      expected_redmine_version('3.4.5')
+
+      expect(Dir.exist?(plugin_dir)).to be(result)
+    end
+
+    it 'yes' do
+      upgrade_it('y', true)
+    end
+
+    it 'no' do
+      upgrade_it('n', false)
+    end
+
+  end
+
 end

data/spec/spec_helper.rb

@@ -1,3 +1,8 @@
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../gems.rb', __dir__)
+
+require 'bundler'
+Bundler.require(:default, :test)
+
 lib = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(lib) if !$LOAD_PATH.include?(lib)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine-installer
 version: !ruby/object:Gem::Version
-  version: 2.2.7
+  version: 2.3.0.beta
 platform: ruby
 authors:
 - Ondřej Moravčík
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-08 00:00:00.000000000 Z
+date: 2019-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -132,17 +132,19 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
-- Gemfile
+- CHANGELOG.md
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/redmine
+- gems.rb
 - lib/redmine-installer.rb
 - lib/redmine-installer/backup.rb
 - lib/redmine-installer/cli.rb
 - lib/redmine-installer/command.rb
 - lib/redmine-installer/configuration.rb
 - lib/redmine-installer/database.rb
+- lib/redmine-installer/easycheck.rb
 - lib/redmine-installer/environment.rb
 - lib/redmine-installer/errors.rb
 - lib/redmine-installer/install.rb
@@ -182,12 +184,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6