redmine-installer 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: df3d0422ae2a8334b0425d08435be1d8bbdd2bfc
-  data.tar.gz: 1e91b682ff8842a92c3962cc0d32452742834842
+SHA256:
+  metadata.gz: 6aaf1637a3a7281040d90412cfc4a3fd0e2a981276539209cabd3f7d52182abf
+  data.tar.gz: 772331932c5e7a7e06fc8cb1ba5c1ccb48fcf304f48b9d23af5becad6b8c6d81
 SHA512:
-  metadata.gz: b82ba9c160c1b5c703ab9b42c201d71748358c0cd3f9cf95b5ccf9f98425e037b0a96f0272188010ccb6744ff41bc506055c47508389996e741b20fffefdd952
-  data.tar.gz: 0dbe5c8c89bad0e82cb7bcd6a980837d15a4474d481cb678374194362004fc4ab618014143b31f14f1186cd494bd14f3d3427c3acc8bcce9d8f2c9730154e5ba
+  metadata.gz: 488064884bcd5635fabb3b0cd1dc14a58e32685d1f500c6acc703bfbdc7a89e751066410d8c4f32037c14f305377a24d6e0a871ed52caf22017f2245d76c157c
+  data.tar.gz: f87dc2402d20ce941b93190593b2403535de2d79f0360f45d2babbb4bcd8437eaf0b32b0556e7b9c121428c965521ed809158fc9c189306f3951cf77ed0d9fdf

data/lib/redmine-installer/redmine.rb

@@ -260,6 +260,43 @@ module RedmineInstaller
 
     def move_from(other_redmine)
       Dir.chdir(other_redmine.root) do
+
+        # Bundler save plugin with absolute paths
+        # which is not pointing to the temporary directory
+        bundle_index = File.join(Dir.pwd, '.bundle/plugin/index')
+
+        if File.exist?(bundle_index)
+          index = YAML.load_file(bundle_index)
+
+          # { load_paths: { PLUGIN_NAME: *PATHS } }
+          #
+          if index.has_key?('load_paths')
+            load_paths = index['load_paths']
+            if load_paths.is_a?(Hash)
+              load_paths.each do |_, paths|
+                paths.each do |path|
+                  path.sub!(other_redmine.root, root)
+                end
+              end
+            end
+          end
+
+          # { plugin_paths: { PLUGIN_NAME: PATH } }
+          #
+          if index.has_key?('plugin_paths')
+            plugin_paths = index['plugin_paths']
+            if plugin_paths.is_a?(Hash)
+              plugin_paths.each do |_, path|
+                path.sub!(other_redmine.root, root)
+              end
+            end
+          end
+
+          File.write(bundle_index, index.to_yaml)
+
+          logger.info("Bundler plugin index from #{other_redmine.root} into #{root}")
+        end
+
         Dir.entries('.').each do |entry|
           next if entry == '.' || entry == '..'
 

data/lib/redmine-installer/spec/spec.rb

@@ -29,13 +29,10 @@ class TestPrompt < TTY::Prompt
 
 end
 
-class TTY::Prompt::Reader::Console
+class TTY::Reader::Console
 
   def get_char(options)
-    return input.getc unless input.tty?
-    mode.raw(options[:raw]) do
-      mode.echo(options[:echo]) { input.getc }
-    end
+    input.getc
   end
 
 end

data/lib/redmine-installer/version.rb

@@ -1,3 +1,3 @@
 module RedmineInstaller
-  VERSION = '2.0.2'
+  VERSION = '2.1.0'
 end

data/redmine-installer.gemspec

@@ -25,12 +25,12 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.1.0'
 
   spec.add_runtime_dependency 'commander'
-  spec.add_runtime_dependency 'tty-prompt', '~> 0.11.0'
-  spec.add_runtime_dependency 'tty-spinner', '~> 0.4.1'
-  spec.add_runtime_dependency 'tty-progressbar', '~> 0.10.1'
+  spec.add_runtime_dependency 'tty-prompt'#, '~> 0.11.0'
+  spec.add_runtime_dependency 'tty-spinner'#, '~> 0.4.1'
+  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_runtime_dependency 'bundler', '~> 1.16'
 
   spec.add_development_dependency 'rake'
 end

data/spec/installer_helper.rb

@@ -22,13 +22,15 @@ module InstallerHelper
 
   # Be carefull - this could have later unpredictable consequences on stdin
   def select_choice
-    @process.write(' ')
-    # @process.write("\r")
+    # @process.write(' ')
+    @process.write("\r")
     # @process.write("\r\n")
   end
 
   def go_down
-    write(TTY::Prompt::Reader::Codes.keys[:down])
+    # write(TTY::Reader::Keys.keys[:down])
+    # write("\e[B")
+    @process.write("\e[B")
   end
 
   def expected_successful_configuration

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_v310, '--database-dump', DATABASE_DUMP] do
+  it 'restore', command: 'install', args: [package_v345, '--database-dump', DATABASE_DUMP] do
     expected_output('Path to redmine root:')
     write(@redmine_root)
 

data/spec/lib/install_spec.rb

@@ -36,7 +36,7 @@ RSpec.describe RedmineInstaller::Install, command: 'install' do
   end
 
   it 'install without arguments', args: [] do
-    regular_package = File.expand_path(File.join(File.dirname(__FILE__), '..', 'packages', 'redmine-3.1.0.zip'))
+    regular_package = File.expand_path(File.join(File.dirname(__FILE__), '..', 'packages', 'redmine-3.4.5.zip'))
 
     expected_output('Path to redmine root:')
     write(@redmine_root)
@@ -49,20 +49,20 @@ RSpec.describe RedmineInstaller::Install, command: 'install' do
     expected_successful_configuration
     expected_successful_installation
 
-    expected_redmine_version('3.1.0')
+    expected_redmine_version('3.4.5')
   end
 
-  it 'download redmine', args: ['v3.1.1'] do
+  it 'download redmine', args: ['v3.4.5'] do
     expected_output('Path to redmine root:')
     write(@redmine_root)
 
-    expected_output_in('Downloading http://www.redmine.org/releases/redmine-3.1.1.zip', 30)
+    expected_output_in('Downloading http://www.redmine.org/releases/redmine-3.4.5.zip', 30)
     expected_output('Extracting redmine package')
 
     expected_successful_configuration
     expected_successful_installation
 
-    expected_redmine_version('3.1.1')
+    expected_redmine_version('3.4.5')
   end
 
   it 'installing something else', args: [package_someting_else] do
@@ -79,18 +79,18 @@ RSpec.describe RedmineInstaller::Install, command: 'install' do
     go_down
     go_down
     expected_output('‣ Cancel')
-    write(' ')
+    write('')
 
     expected_output('Operation canceled by user')
   end
 
-  it 'bad database settings', args: [package_v310] do
+  it 'bad database settings', args: [package_v345] do
     write(@redmine_root)
 
     expected_output('Creating database configuration')
     go_down
     expected_output('‣ PostgreSQL')
-    write(' ')
+    write('')
 
     write('test')
     write('')
@@ -101,7 +101,7 @@ RSpec.describe RedmineInstaller::Install, command: 'install' do
     write('')
 
     expected_output('Creating email configuration')
-    write(' ')
+    write('')
 
     expected_output('Redmine installing')
     expected_output_in('--> Database migrating', 60)
@@ -111,11 +111,12 @@ RSpec.describe RedmineInstaller::Install, command: 'install' do
     go_down
     go_down
     expected_output('‣ Change database configuration')
-    write(' ')
+    write('')
+
 
     go_down
     expected_output('‣ PostgreSQL')
-    write(' ')
+    write('')
 
     write('test')
     write('')
@@ -128,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.1.0')
+    expected_redmine_version('3.4.5')
   end
 
 end

data/spec/lib/upgrade_spec.rb

@@ -21,7 +21,7 @@ RSpec.describe RedmineInstaller::Upgrade, :install_first, command: 'upgrade' do
     write(@redmine_root)
 
     expected_output('Path to package:')
-    write(package_v320)
+    write(package_v345)
 
     expected_output('Extracting redmine package')
     expected_output('Data backup')
@@ -39,7 +39,7 @@ RSpec.describe RedmineInstaller::Upgrade, :install_first, command: 'upgrade' do
 
     expected_successful_upgrade
 
-    expected_redmine_version('3.2.0')
+    expected_redmine_version('3.4.5')
 
     expect(File.exist?(test_test_file)).to be_falsey
 
@@ -61,7 +61,7 @@ RSpec.describe RedmineInstaller::Upgrade, :install_first, command: 'upgrade' do
     write(@redmine_root)
 
     wait_for_stdin_buffer
-    write(package_v320)
+    write(package_v345)
 
     wait_for_stdin_buffer
 
@@ -75,7 +75,7 @@ RSpec.describe RedmineInstaller::Upgrade, :install_first, command: 'upgrade' do
 
     expected_successful_upgrade
 
-    expected_redmine_version('3.2.0')
+    expected_redmine_version('3.4.5')
 
     expect(File.exist?(test_test_file)).to be_truthy
   end
@@ -89,7 +89,7 @@ RSpec.describe RedmineInstaller::Upgrade, :install_first, command: 'upgrade' do
     write(@redmine_root)
 
     wait_for_stdin_buffer
-    write(package_v320)
+    write(package_v345)
 
     wait_for_stdin_buffer
 
@@ -103,7 +103,7 @@ RSpec.describe RedmineInstaller::Upgrade, :install_first, command: 'upgrade' do
 
     expected_successful_upgrade
 
-    expected_redmine_version('3.2.0')
+    expected_redmine_version('3.4.5')
 
     # 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)

data/spec/packages_helper.rb

@@ -1,15 +1,19 @@
 module PackagesHelper
 
-  def package_v310
-    File.expand_path(File.join(File.dirname(__FILE__), 'packages', 'redmine-3.1.0.zip'))
-  end
+  # def package_v310
+  #   File.expand_path(File.join(File.dirname(__FILE__), 'packages', 'redmine-3.1.0.zip'))
+  # end
 
-  def package_v320
-    File.expand_path(File.join(File.dirname(__FILE__), 'packages', 'redmine-3.2.0.zip'))
-  end
+  # def package_v320
+  #   File.expand_path(File.join(File.dirname(__FILE__), 'packages', 'redmine-3.2.0.zip'))
+  # end
+
+  # def package_v330
+  #   File.expand_path(File.join(File.dirname(__FILE__), 'packages', 'redmine-3.3.0.zip'))
+  # end
 
-  def package_v330
-    File.expand_path(File.join(File.dirname(__FILE__), 'packages', 'redmine-3.3.0.zip'))
+  def package_v345
+    File.expand_path(File.join(File.dirname(__FILE__), 'packages', 'redmine-3.4.5.zip'))
   end
 
   def package_someting_else

data/spec/spec_helper.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine-installer
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Ondřej Moravčík
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-28 00:00:00.000000000 Z
+date: 2018-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -28,44 +28,44 @@ dependencies:
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tty-spinner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tty-progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Easy way how install/upgrade Redmine, EasyRedmine or EasyProject.