redmine-installer 2.0.0.rc3 → 2.0.1.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4addf7ace678fae31a3b00bc0a96a26d313e3d1
-  data.tar.gz: a54231fd4c6b6d42ab9442dbc4dfa719c884269c
+  metadata.gz: ed131f6901b7e57bf6f2e01673c82fe2f97ad8e5
+  data.tar.gz: e1aa7e6f59b41c27661e0a11601960139d352c6e
 SHA512:
-  metadata.gz: 5ed2dd41d4fd2b14c1baf73cb46d136f27d05c08acbf699956983b9e35e7f04aceaa75ebe88edebad07398509c3693ae7dc30420e4ca9ea07505533eed95c0da
-  data.tar.gz: 5f882361eff038c3e6f5f2cc9b9f0e1b286d6d55c1482f6eb112397a94f6fc0d63b2ef1c2ed58eb7f57c7a538c034c15d787a15a6113642b4e1c9dfb7cb0bcc2
+  metadata.gz: 196ba4d02f4600dc06a595ee10371b81f01154c383d25c0d226b816a067987c94df339a60aff60e4959243d2bc573781fb88690f07b017dccaefe73020bc8a50
+  data.tar.gz: 5a4366998263ee3baa0505cc4e02173ef3e7f1c5a6a2badf443594ae68e1b00ac945c58d2d65d12616d67091ff4f9cf4db673a65cad1549c226493d443a5297b

data/README.md

@@ -59,7 +59,7 @@ Examples:
 Install Redmine. Installer will ask for every required parameters.
 - `redmine install`
 
-Install Redmine from internet 
+Install Redmine from internet
 - `redmine install https://server.tld/REDMINE_PACKAGE.zip /srv/redmine`
 
 Install Redmine from redmine.zip package into /srv/redmine folder.
@@ -95,7 +95,7 @@ Examples:
 Upgrade Redmine located on /srv/redmine with package redmine2.zip
 - `redmine upgrade redmine2.zip /srv/redmine`
 
-Upgrade Redmine from internet 
+Upgrade Redmine from internet
 - `redmine upgrade https://server.tld/REDMINE_PACKAGE.zip /srv/redmine`
 
 Upgrade Redmine and keep directory.
@@ -115,6 +115,19 @@ redmine backup [REDMINE_ROOT]
 
 Examples:
 
-Backup project located on /srv/redmine
+Backup project located in /srv/redmine
 - `redmine upgrade /srv/redmine`
 
+### Restoring database
+
+Restore database dump to redmine.
+
+```
+redmine help restore-db
+redmine restore-db DATABASE_DUMP [REDMINE_ROOT] [options]
+```
+
+Examples:
+
+Restore database db.dump for redmine in /srv/redmine
+- `redmine restore-db db.dump /srv/redmine`

data/lib/redmine-installer.rb

@@ -27,6 +27,7 @@ module RedmineInstaller
   autoload :Command,       'redmine-installer/command'
   autoload :Profile,       'redmine-installer/profile'
   autoload :Backup,        'redmine-installer/backup'
+  autoload :RestoreDB,     'redmine-installer/restore_db'
 
   # Settings
   MIN_SUPPORTED_RUBY = '2.1.0'

data/lib/redmine-installer/cli.rb

@@ -66,12 +66,13 @@ module RedmineInstaller
                   'redmine upgrade --keep git_repositories'
 
         c.option '--enable-user-root', 'Skip root as root validation'
-        c.option '--bundle-options', String, 'Add options to bundle command'
+        c.option '--bundle-options OPTIONS', String, 'Add options to bundle command'
         c.option '-p', '--profile PROFILE_ID', Integer, 'Use saved profile'
         c.option '--keep PATH(s)', Array, 'Keep paths, use multiple options or separate values by comma (paths must be relative)', &method(:parse_keep_options)
+        c.option '--copy-files-with-symlink', 'Files will be referenced by symlinks instead of copying files. Only for advance users.'
 
         c.action do |args, options|
-          options.default(enable_user_root: false)
+          options.default(enable_user_root: false, copy_files_with_symlink: false)
 
           RedmineInstaller::Upgrade.new(args[0], args[1], options.__hash__).run
         end
@@ -94,7 +95,7 @@ module RedmineInstaller
 
 
       # --- Backup ------------------------------------------------------------
-      command :'backup' do |c|
+      command :backup do |c|
         c.syntax = 'backup [REDMINE_ROOT]'
         c.description = 'Backup redmine'
 
@@ -108,6 +109,24 @@ module RedmineInstaller
       alias_command :b, :backup
 
 
+      # --- Restore db --------------------------------------------------------
+      command :'restore-db' do |c|
+        c.syntax = 'restore-db DATABASE_DUMP [REDMINE_ROOT] [options]'
+        c.description = 'Restore database and delete old data'
+
+        c.example 'Restore DB',
+                  'redmine restore-db /srv/redmine.sql'
+
+        c.option '--enable-user-root', 'Skip root as root validation'
+
+        c.action do |args, options|
+          options.default(enable_user_root: false)
+
+          RedmineInstaller::RestoreDB.new(args[0], args[1]).run
+        end
+      end
+
+
       run!
     end
 

data/lib/redmine-installer/redmine.rb

@@ -24,6 +24,8 @@ module RedmineInstaller
 
     CHECK_N_INACCESSIBLE_FILES = 10
 
+    FILES_DIR = 'files'
+
     def initialize(task, root=nil)
       super(task)
       @root = root.to_s
@@ -42,7 +44,7 @@ module RedmineInstaller
     end
 
     def files_path
-      File.join(root, 'files')
+      File.join(root, FILES_DIR)
     end
 
     def plugins_path
@@ -57,6 +59,10 @@ module RedmineInstaller
       File.join(root, 'log')
     end
 
+    def bundle_path
+      File.join(root, '.bundle')
+    end
+
     def pids_files
       Dir.glob(File.join(root, 'tmp', 'pids', '*'))
     end
@@ -210,6 +216,26 @@ module RedmineInstaller
       end
     end
 
+    def restore_db
+      print_title('Database restoring')
+
+      @database = Database.init(self)
+
+      Dir.chdir(root) do
+        # Load database dump (if was set via CLI)
+        load_database_dump
+
+        # Migrating
+        rake_db_migrate
+
+        # Plugin migrating
+        rake_redmine_plugin_migrate
+
+        # Install easyproject
+        rake_easyproject_install if easyproject?
+      end
+    end
+
     # # => ['.', '..']
     # def empty_root?
     #   Dir.entries(root).size <= 2
@@ -219,6 +245,8 @@ module RedmineInstaller
       Dir.chdir(root) do
         Dir.entries('.').each do |entry|
           next if entry == '.' || entry == '..'
+          next if entry == FILES_DIR && task.options.copy_files_with_symlink
+
           FileUtils.remove_entry_secure(entry)
         end
       end
@@ -230,7 +258,12 @@ module RedmineInstaller
       Dir.chdir(other_redmine.root) do
         Dir.entries('.').each do |entry|
           next if entry == '.' || entry == '..'
-          FileUtils.mv(entry, root)
+
+          if entry == FILES_DIR && task.options.copy_files_with_symlink
+            FileUtils.rm(entry)
+          else
+            FileUtils.mv(entry, root)
+          end
         end
       end
 
@@ -250,13 +283,24 @@ module RedmineInstaller
         end
 
         # Copy files
-        FileUtils.cp_r(other_redmine.files_path, root)
+        if task.options.copy_files_with_symlink
+          FileUtils.rm_rf(files_path)
+          FileUtils.ln_s(other_redmine.files_path, root)
+        else
+          FileUtils.cp_r(other_redmine.files_path, root)
+        end
 
         # Copy old logs
         FileUtils.mkdir_p(log_path)
         Dir.glob(File.join(other_redmine.log_path, 'redmine_installer_*')).each do |log|
           FileUtils.cp(log, log_path)
         end
+
+        # Copy bundle config
+        if Dir.exist?(other_redmine.bundle_path)
+          FileUtils.mkdir_p(bundle_path)
+          FileUtils.cp_r(other_redmine.bundle_path, root)
+        end
       end
 
       # Copy 'keep' files (base on options)
@@ -403,7 +447,7 @@ module RedmineInstaller
     end
 
     def valid_options
-      if @database_dump_to_load && !File.exist?(@database_dump_to_load)
+      if @database_dump_to_load && !(File.exist?(@database_dump_to_load) && File.file?(@database_dump_to_load))
         error "Database dump #{@database_dump_to_load} does not exist (path is expanded)."
       end
     end

data/lib/redmine-installer/restore_db.rb

@@ -0,0 +1,26 @@
+module RedmineInstaller
+  class RestoreDB < Task
+
+    def initialize(database_dump, redmine_root)
+      super(database_dump: database_dump.to_s)
+
+      @environment = Environment.new(self)
+      @redmine = Redmine.new(self, redmine_root)
+    end
+
+    def up
+      @environment.check
+
+      @redmine.valid_options
+      @redmine.ensure_and_valid_root
+      @redmine.validate
+      @redmine.check_running_state
+      @redmine.restore_db
+
+      puts
+      puts pastel.bold('Database was restored')
+      logger.info('Database was restored')
+    end
+
+  end
+end

data/lib/redmine-installer/version.rb

@@ -1,3 +1,3 @@
 module RedmineInstaller
-  VERSION = '2.0.0.rc3'
+  VERSION = '2.0.1.rc1'
 end

data/redmine-installer.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'tty-progressbar', '~> 0.10.1'
   spec.add_runtime_dependency 'rubyzip'
   spec.add_runtime_dependency 'pastel'
+  spec.add_runtime_dependency 'bundler', '~> 1.11'
 
-  spec.add_development_dependency 'bundler', '~> 1.11'
   spec.add_development_dependency 'rake'
 end

data/spec/installer_process.rb

@@ -11,7 +11,13 @@ class InstallerProcess
     tempfile_out.sync = true
     tempfile_err.sync = true
 
-    @process = ChildProcess.build('bin/redmine', command, *args.flatten.compact)
+    args = args.flatten.compact
+
+    if ['install', 'upgrade'].include?(command)
+      args << '--bundle-options' << '--without rmagick'
+    end
+
+    @process = ChildProcess.build('bin/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

@@ -73,7 +73,7 @@ RSpec.describe RedmineInstaller::Install, command: 'install' do
     expected_output('Redmine installing')
     expected_output_in('--> Bundle install', 50)
 
-    expected_output('Gemfile not found')
+    expected_output("Gemfile.lock wasn't created")
     expected_output('‣ Try again')
 
     go_down

data/spec/lib/upgrade_spec.rb

@@ -80,4 +80,33 @@ RSpec.describe RedmineInstaller::Upgrade, :install_first, command: 'upgrade' do
     expect(File.exist?(test_test_file)).to be_truthy
   end
 
+  it 'copy files with symlink ', args: ['--copy-files-with-symlink'] do
+    files_dir = File.join(@redmine_root, 'files')
+    files = (0..10).map {|i| File.join(files_dir, "file_#{i}.txt") }
+    FileUtils.touch(files)
+
+    wait_for_stdin_buffer
+    write(@redmine_root)
+
+    wait_for_stdin_buffer
+    write(package_v320)
+
+    wait_for_stdin_buffer
+
+    go_down
+    go_down
+    expected_output('‣ Nothing')
+    select_choice
+
+    expected_output('Are you sure you dont want backup?')
+    write('y')
+
+    expected_successful_upgrade
+
+    expected_redmine_version('3.2.0')
+
+    # 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
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine-installer
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc3
+  version: 2.0.1.rc1
 platform: ruby
 authors:
 - Ondřej Moravčík
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-22 00:00:00.000000000 Z
+date: 2017-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -101,7 +101,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -152,6 +152,7 @@ files:
 - lib/redmine-installer/patches/tty.rb
 - lib/redmine-installer/profile.rb
 - lib/redmine-installer/redmine.rb
+- lib/redmine-installer/restore_db.rb
 - lib/redmine-installer/spec/spec.rb
 - lib/redmine-installer/task.rb
 - lib/redmine-installer/task_module.rb