redmine-installer 2.1.4 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2fca52362c2073113f2fae44d25c875ad0d3a8107a419306ef52c1f201ed1e6
-  data.tar.gz: 4f7263a4b318f5e240b8523120c064c79fa1585d5e9e4c4656c64a062227bcec
+  metadata.gz: 5bb267b21e7a017379570dc6403992a1c1f24ee5cd99d46e0f804507822eb4ef
+  data.tar.gz: cc4861e5978b24200309f5752872e6326f98c7e2b9572831ce23dc693239e76c
 SHA512:
-  metadata.gz: 0c1888894ac0799c639910e8ff3d39c39c8f3c1245994a87528fd6cc28e30111d215bbe01631a5226a3a5bd55c5737be24bd6f7dbe0b27eb6ca542edeaeeac49
-  data.tar.gz: '0827654c93010b7ae6753508487dd07b88fc85f9f57a525e92603e66c45b81feabfdb929d3ca126801d67df61c3390f0f15c2a0e9d5a191330e2a7aca2b7ea7d'
+  metadata.gz: 93a5dd5b2c0b11575542071b65cef96ffc5328c239230f506852d163e0708d0b8befcb17ddeb03405975c7f6bb27095cf742991dda7c029fab78c78b5089cdfc
+  data.tar.gz: 6baab12f21600f53306a3561400893a111bf82863930d7d5109302c99cf14b0c6edcd26c3a4ab198b8022f1cade4fc6d5f926091ee8efb97ba53eb7cc526450e

data/lib/redmine-installer.rb

@@ -28,9 +28,10 @@ module RedmineInstaller
   autoload :Profile,       'redmine-installer/profile'
   autoload :Backup,        'redmine-installer/backup'
   autoload :RestoreDB,     'redmine-installer/restore_db'
+  autoload :PackageConfig, 'redmine-installer/package_config'
 
   # Settings
-  MIN_SUPPORTED_RUBY = '2.1.0'
+  MIN_SUPPORTED_RUBY = '2.2.0'
 
   def self.logger
     @logger ||= RedmineInstaller::Logger.new

data/lib/redmine-installer/install.rb

@@ -1,6 +1,8 @@
 module RedmineInstaller
   class Install < Task
 
+    attr_reader :package_config
+
     def initialize(package, redmine_root, **options)
       super(**options)
 
@@ -8,6 +10,7 @@ module RedmineInstaller
       @package = Package.new(self, package)
       @target_redmine = Redmine.new(self, redmine_root)
       @temp_redmine = Redmine.new(self)
+      @package_config = PackageConfig.new(@temp_redmine)
     end
 
     def up
@@ -18,6 +21,7 @@ module RedmineInstaller
       @package.extract
 
       @temp_redmine.root = @package.redmine_root
+      @package_config.check_version
 
       @temp_redmine.create_database_yml
       @temp_redmine.create_configuration_yml

data/lib/redmine-installer/package.rb

@@ -9,7 +9,7 @@ module RedmineInstaller
     SUPPORTED_ARCHIVE_FORMATS = ['.zip', '.gz', '.tgz']
     TAR_LONGLINK = '././@LongLink'
 
-    attr_reader :package
+    attr_reader :package, :temp_dir
 
     def initialize(task, package)
       super(task)

data/lib/redmine-installer/package_config.rb

@@ -0,0 +1,76 @@
+module RedmineInstaller
+  class PackageConfig
+    include Utils
+
+    CONFIG_DIR = '_package'
+
+    def initialize(redmine)
+      @redmine = redmine
+    end
+
+    def min_version
+      options['min_version']
+    end
+
+    def dump_type
+      options['dump_type']
+    end
+
+    def dump_file
+      File.join(@redmine.root, CONFIG_DIR, options['dump_file'].to_s)
+    end
+
+    def dump_attached?
+      File.exist?(dump_file)
+    end
+
+    def sql_dump_file
+      if defined?(@sql_dump_file)
+        return @sql_dump_file
+      end
+
+      if !dump_attached?
+        @sql_dump_file = nil
+      end
+
+      if dump_file.end_with?('.gz')
+        @sql_dump_file = File.join(@redmine.root, CONFIG_DIR, 'dump.sql')
+
+        Zlib::GzipReader.open(dump_file) { |gz|
+          File.binwrite(@sql_dump_file, gz.read)
+        }
+      else
+        @sql_dump_file = dump_file
+      end
+
+      @sql_dump_file
+    end
+
+    def dump_compatible?(database)
+      database.adapter_name.start_with?(dump_type.to_s)
+    end
+
+    def options
+      @options ||= _options
+    end
+
+    def check_version
+      if min_version && Gem::Version.new(min_version) > Gem::Version.new(RedmineInstaller::VERSION)
+        error "You are using an old version of installer. Min version is #{min_version} (current: #{RedmineInstaller::VERSION}). Please run `gem install redmine-installer`."
+      end
+    end
+
+    private
+
+      def _options
+        config_file = File.join(@redmine.root, CONFIG_DIR, 'redmine-installer.yaml')
+
+        if File.exist?(config_file)
+          YAML.load_file(config_file)
+        else
+          {}
+        end
+      end
+
+  end
+end

data/lib/redmine-installer/redmine.rb

@@ -204,7 +204,7 @@ module RedmineInstaller
         # Ensuring database
         rake_db_create
 
-        # Load database dump (if was set via CLI)
+        # Load database dump (if was set via CLI or attach on package)
         load_database_dump
 
         # Migrating
@@ -651,9 +651,7 @@ module RedmineInstaller
         Dir.entries(plugins_path).include?('easyproject')
       end
 
-      def load_database_dump
-        return if @database_dump_to_load.nil?
-
+      def load_database_dump_from_file
         selected = prompt.select('Database dump will be loaded. Before that all data must be destroy.',
           'Skip dump loading' => :cancel,
           'I am aware of this. Want to continue' => :continue)
@@ -666,6 +664,23 @@ module RedmineInstaller
         end
       end
 
+      def load_database_dump_from_package
+        if !prompt.no?('Would you like to load default data? Warning: By choosing "yes", you are confirming that all your existing redmine data will be removed.')
+
+          @database.do_restore(task.package_config.sql_dump_file)
+
+          logger.info('Default database dump was loaded.')
+        end
+      end
+
+      def load_database_dump
+        if @database_dump_to_load
+          load_database_dump_from_file
+        elsif task.package_config.dump_attached? && task.package_config.dump_compatible?(@database)
+          load_database_dump_from_package
+        end
+      end
+
       def without_env(*names)
         backup = ENV.clone.to_hash
         ENV.delete_if {|key, _| names.include?(key) }

data/lib/redmine-installer/upgrade.rb

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

data/lib/redmine-installer/version.rb

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

data/spec/installer_helper.rb

@@ -66,9 +66,10 @@ module InstallerHelper
     select_choice
   end
 
-  def expected_successful_installation_or_upgrade(db_creating: false)
+  def expected_successful_installation_or_upgrade(db_creating: false, after_create: nil)
     expected_output_in('--> Bundle install', 50)
     expected_output_in('--> Database creating', 50) if db_creating
+    after_create && after_create.call
     expected_output_in('--> Database migrating', 50)
     expected_output_in('--> Plugins migration', 50)
     expected_output_in('--> Generating secret token', 50)
@@ -79,9 +80,9 @@ module InstallerHelper
     expected_output('Moving installer log ... OK')
   end
 
-  def expected_successful_installation
+  def expected_successful_installation(**options)
     expected_output('Redmine installing')
-    expected_successful_installation_or_upgrade(db_creating: true)
+    expected_successful_installation_or_upgrade(db_creating: true, **options)
     expected_output('Redmine was installed')
   end
 

data/spec/lib/install_spec.rb

@@ -144,4 +144,32 @@ RSpec.describe RedmineInstaller::Install, command: 'install' do
     expected_redmine_version('3.4.5')
   end
 
+  it 'high installer version', args: [package_high_installer_version] do
+    write(@redmine_root)
+    expected_output('You are using an old version of installer')
+  end
+
+  it 'download redmine', args: [package_default_db] do
+    expected_output('Path to redmine root:')
+    write(@redmine_root)
+
+    expected_successful_configuration
+    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')
+      }
+    )
+
+    expected_redmine_version('3.4.5')
+
+    Dir.chdir(@redmine_root) do
+      out = `rails runner "puts Issue.count"`.strip
+      expect($?.success?).to be_truthy
+      expect(out).to eq('3')
+    end
+  end
+
 end

data/spec/packages_helper.rb

@@ -16,4 +16,12 @@ module PackagesHelper
     File.join(packages_dir, 'something-else.zip')
   end
 
+  def package_high_installer_version
+    File.join(packages_dir, 'high-installer-version.zip')
+  end
+
+  def package_default_db
+    File.join(packages_dir, 'redmine-3.4.5-default-db.zip')
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine-installer
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.2.0
 platform: ruby
 authors:
 - Ondřej Moravčík
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-05 00:00:00.000000000 Z
+date: 2018-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -148,6 +148,7 @@ files:
 - lib/redmine-installer/install.rb
 - lib/redmine-installer/logger.rb
 - lib/redmine-installer/package.rb
+- lib/redmine-installer/package_config.rb
 - lib/redmine-installer/patches/ruby.rb
 - lib/redmine-installer/patches/tty.rb
 - lib/redmine-installer/profile.rb