redmine-installer 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7500e6a34d0f24f23278c108421b7528da2fa5e603622dd0eca7951edd64a44
-  data.tar.gz: '09f3708353e33358a19e9fc868c751d8b0affa0d29cf18edddcffd57a8a614db'
+  metadata.gz: e2fca52362c2073113f2fae44d25c875ad0d3a8107a419306ef52c1f201ed1e6
+  data.tar.gz: 4f7263a4b318f5e240b8523120c064c79fa1585d5e9e4c4656c64a062227bcec
 SHA512:
-  metadata.gz: b40c8c8e8bc3e5e15bef62f038851a248cb3ab8fa1128ccbedcc4866a976e3670c818304d1e653b4747477c2fc62bec0998a6ac49311a0c757db5ef11c2c1d44
-  data.tar.gz: 9907445abb7761c17cc41755b0f3a7a681cf73575686486b1836c81ef7487c8749dd1e7a270ba06d7e29c59ed70b5736997a214fdcaed494bad4fcd3705e6046
+  metadata.gz: 0c1888894ac0799c639910e8ff3d39c39c8f3c1245994a87528fd6cc28e30111d215bbe01631a5226a3a5bd55c5737be24bd6f7dbe0b27eb6ca542edeaeeac49
+  data.tar.gz: '0827654c93010b7ae6753508487dd07b88fc85f9f57a525e92603e66c45b81feabfdb929d3ca126801d67df61c3390f0f15c2a0e9d5a191330e2a7aca2b7ea7d'

data/lib/redmine-installer/redmine.rb

@@ -116,20 +116,45 @@ module RedmineInstaller
 
       logger.info("REDMINE_ROOT: #{@root}")
 
-      inaccessible_files = []
+      unreadable_files = []
+      all_directories = []
 
       Find.find(@root).each do |item|
-        if !File.writable?(item) || !File.readable?(item)
-          inaccessible_files << item
+        if unreadable_files.size > CHECK_N_INACCESSIBLE_FILES
+          break
         end
 
-        if inaccessible_files.size > CHECK_N_INACCESSIBLE_FILES
-          break
+        # Installer only need read permission for a few files
+        # but for sure it checks all of them
+        if !File.readable?(item)
+          unreadable_files << item
+          next
+        end
+
+        # Actualy this permission should not be needed
+        # becase deletable is checked by parent directory
+        # if !File.writable?(item)
+        #   unreadable_files << item
+        # end
+
+        all_directories << File.dirname(item)
+      end
+
+      if unreadable_files.any?
+        error "Application root contains unreadable files. Make sure that all files in #{@root} are readable for user #{env_user} (limit #{CHECK_N_INACCESSIBLE_FILES} files: #{unreadable_files.join(', ')})"
+      end
+
+      unwritable_directories = []
+
+      all_directories.uniq!
+      all_directories.each do |item|
+        if !File.writable?(item)
+          unwritable_directories << item
         end
       end
 
-      if inaccessible_files.any?
-        error "Redmine root contains inaccessible files. Make sure that all files in #{@root} are readable/writeable for user #{env_user} (limit #{CHECK_N_INACCESSIBLE_FILES} files: #{inaccessible_files.join(', ')})"
+      if unwritable_directories.any?
+        error "Application root contains unwritable directories. Make sure that all directories in #{@root} are writable for user #{env_user} (limit #{CHECK_N_INACCESSIBLE_FILES} files: #{unwritable_directories.join(', ')})"
       end
     end
 

data/lib/redmine-installer/version.rb

@@ -1,3 +1,3 @@
 module RedmineInstaller
-  VERSION = '2.1.3'
+  VERSION = '2.1.4'
 end

data/spec/installer_process.rb

@@ -17,7 +17,8 @@ class InstallerProcess
       args << '--bundle-options' << '--without rmagick'
     end
 
-    @process = ChildProcess.build('bin/redmine', command, *args)
+    # @process = ChildProcess.build('bin/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'
@@ -35,8 +36,10 @@ class InstallerProcess
   end
 
   def run
-    start
-    yield
+    Bundler.with_clean_env {
+      start
+      yield
+    }
   ensure
     stop
   end

data/spec/lib/install_spec.rb

@@ -2,17 +2,32 @@ require 'spec_helper'
 
 RSpec.describe RedmineInstaller::Install, command: 'install' do
 
-  it 'bad permission', args: [] do
+  it 'unreadable file', args: [] do
     FileUtils.chmod(0000, @redmine_root)
 
     expected_output('Path to redmine root:')
     write(@redmine_root)
 
-    expected_output('Redmine root contains inaccessible files')
+    expected_output('Application root contains unreadable files')
 
     FileUtils.chmod(0600, @redmine_root)
   end
 
+  it 'unwritable directory', args: [] do
+    directory = File.join(@redmine_root, 'directory')
+    subdirectory = File.join(directory, 'subdirectory')
+
+    FileUtils.mkdir_p(subdirectory)
+    FileUtils.chmod(0444, directory)
+
+    expected_output('Path to redmine root:')
+    write(@redmine_root)
+
+    expected_output('Application root contains unreadable files')
+
+    FileUtils.chmod(0700, directory)
+  end
+
   it 'non-existinig package', args: [] do
     this_file = File.expand_path(File.join(File.dirname(__FILE__)))
 
@@ -111,7 +126,6 @@ RSpec.describe RedmineInstaller::Install, command: 'install' do
     expected_output('‣ Change database configuration')
     write('')
 
-
     go_down
     expected_output('‣ PostgreSQL')
     write('')

data/spec/lib/upgrade_spec.rb

@@ -10,6 +10,11 @@ RSpec.describe RedmineInstaller::Upgrade, :install_first, command: 'upgrade' do
   end
 
   it 'upgrading with full backup' do
+    # This should not be a problem because file still could be deleted
+    unwritable_file = File.join(@redmine_root, 'unwritable_file')
+    FileUtils.touch(unwritable_file)
+    FileUtils.chmod(0400, unwritable_file)
+
     test_test_dir = File.join(@redmine_root, 'test_test')
     test_test_file = File.join(test_test_dir, 'test.txt')
     FileUtils.mkdir_p(test_test_dir)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine-installer
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Ondřej Moravčík
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-20 00:00:00.000000000 Z
+date: 2018-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander