redmine-installer 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6b1dc78262bd3d0e88d765b62bac3ff5c6cd31b
-  data.tar.gz: 4281ff021662f3f92e320dbcc150132161592a8d
+  metadata.gz: 1cbbf5830bfd93d5c77dc0a7800c86a1b5a18d02
+  data.tar.gz: b1eae7e8eba3dbd5b4087a31a4401c295532f886
 SHA512:
-  metadata.gz: 9120fb096383789fdced6385f500308b3f773a33c2a35eb5e1361391085317321cec5405f7a094cb29f9c51a3c8366f0ebda282c830e69a177c9514630581bce
-  data.tar.gz: a75f19c13818acc90aaaea573f622c8e79ad08a21e70b809c34058972fb66fffce3070a7354cd864a53ff6b3b3fda1582e45f1bfbec49061bfdb5faa400d4bcf
+  metadata.gz: a95f8f3bee4ebe2382286580db9dab236c2b41fe6f923989984db5e9f79dab8ea6525d00f389aa48e5cbb32853e200bc770176bce0550346269352acf004f958
+  data.tar.gz: 67e5b24065eb29494644ca2c0d4a070933c4ad2def7c2a50993524fa17ae3d13566a1daa2e11909c7be615ef7b06c5a85c17608f65e67665bb326cbbc85262e7

data/README.md

@@ -1,5 +1,7 @@
 # Redmine::Installer
 
+Easy way how to install/upgrade Redmine or plugin
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -20,13 +22,51 @@ Or install it yourself as:
 $ gem install redmine-installer
 ```
 
+## Examples
+
+Simple install and ugrade
+
+```
+$ wget http://www.redmine.org/releases/redmine-2.3.0.zip
+$ wget http://www.redmine.org/releases/redmine-2.5.0.zip
+
+$ redmine install redmine-2.3.0.zip
+$ redmine upgrade redmine-2.5.0.zip
+```
+
+Set languages
+
+```
+$ redmine --locale cs install redmine-2.3.0.zip
+```
+
+Install from git
+
+```
+$ redmine install git@github.com:redmine/redmine.git --source git
+$ redmine upgrade --source git
+```
+
+Install from git with specific branch
+
+```
+$ redmine install git@github.com:redmine/redmine.git --source git --branch 2.3-stable
+$ redmine upgrade --source git
+```
+
 ## Usage
 
 ```
-redmine GLOBAL_ARGUMENTS ACTION ARGUMENTS
+redmine GLOBAL_FLAGS ACTION ARGUMENTS FLAGS
 ```
 
-#### Global arguments
+See help for more details
+
+```
+redmine help
+```
+
+#### Global flags
 
 <table>
   <thead>
@@ -45,7 +85,7 @@ redmine GLOBAL_ARGUMENTS ACTION ARGUMENTS
     <tr>
       <td>--locale / -l</td>
       <td>en</td>
-      <td>languages for application</td>
+      <td>language for application</td>
     </tr>
   </tbody>
 </table>
@@ -57,9 +97,7 @@ Some commands have defined shortcut for quicker access. Fox example:
 
 ```
 redmine install package
-
 # is equal as
-
 redmine i package
 ```
 
@@ -71,7 +109,7 @@ u -> upgrade
 b -> backup
 ```
 
-#### Common arguments
+#### Common flags for all command
 
 <table>
   <thead>
@@ -86,46 +124,50 @@ b -> backup
       <td>--environment / --env / -e</td>
       <td>production</td>
       <td>
-        environment for redmine
+        environment for redmine<br>
+        you can set more environment like: <br>
+        &nbsp;&nbsp;&nbsp;<i>--env env1,env2,env3</i>
       </td>
     </tr>
   </tbody>
 </table>
 
-### Instalation
+## Install
 
-You can instal redmine package from archive or git.
+Install new redmine instance from archive or git.
 
 #### Steps:
 
-- *1. Redmine root* - where should be new redmine located
-- *2. Load package* - extract package
-- *3. Database configuration* - you can choose type of DB which you want to use
-- *4. Email sending configuration* - email sending configuration
-- *5. Install* - install commands are executed
-- *6. Moving redmine* - redmine is moved from temporarily folder to given redmine_root
-- *7. Webserve configuration* - generating webserver configuration
+- **1. Redmine root** - insert _path_ where redmine will be installed
+	- _path_ must point to the folder
+	- target folder must be writable
+- **2. Load package** - loading package to temporary folder
+- **3. Database configuration** - you can choose type of DB which you want to use
+	- currently: MySQL or PostgreSQL
+	- you can also skip this step and run migration manually
+- **4. Email sending configuration** - you can set email configuration
+- **5. Install** - install commands are executed
+- **6. Moving redmine** - redmine is moved from temporarily folder to given _redmine\_root_
+- **7. Webserve configuration** - you can generate setting from selected webserver
 
 #### From archive
 
 Supported archives are **.zip** and **.tar.gz**.
 
 ```
-# minimal
 redmine install PATH_TO_PACKAGE
 
-# full
-redmine install PATH_TO_PACKAGE --env ENV1,ENV2,ENV3
+# with environment
+redmine install PATH_TO_PACKAGE --env environment
 ```
 
 #### From git
 
 ```
-# minimal
 redmine install GIT_REPO --source git
 
-# full
-redmine install GIT_REPO --source git --branch GIT_BRANCH --env ENV1,ENV2,ENV3
+# with specific branch
+redmine install GIT_REPO --source git --branch GIT_BRANCH --env environment
 ```
 
 ##### Arguments
@@ -133,7 +175,7 @@ redmine install GIT_REPO --source git --branch GIT_BRANCH --env ENV1,ENV2,ENV3
 <table>
   <thead>
     <tr>
-      <th>argumnest</th>
+      <th>argument</th>
       <th>default</th>
       <th>description</th>
     </tr>
@@ -143,18 +185,18 @@ redmine install GIT_REPO --source git --branch GIT_BRANCH --env ENV1,ENV2,ENV3
       <td>--branch / -b</td>
       <td>master</td>
       <td>
-        branch of git defined by GIT_REPO
+        git branch
       </td>
     </tr>
   </tbody>
 </table>
 
 
-### Upgrade
+## Upgrade
 
-You can upgrade current redmine by archive or currently defined git repository. If your redmine contain plugins which are not part of new package - all these plugins will be kept otherwise are replaced with those from package.
+Upgrading existing instance of redmine with archive or defined git repository. If your redmine contain plugins which are not part of new package - all these plugins will be kept otherwise are replaced with those from package.
 
-Final step will ask you if you want save steps configuration. If you say YES, configuration will be stored as profile so next time you can upgrade redmine faster.
+Final step will ask you if you want save steps configuration. If you say _YES_, configuration will be stored as profile so next time you can upgrade redmine faster.
 
 ```
 redmine upgrade PACKAGE --profile PROFILE_ID
@@ -164,37 +206,38 @@ Profiles are stored on *HOME_FOLDER/.redmine-installer-profiles.yml*.
 
 #### Steps:
 
-- *1. Redmine root* - where should be new redmine located
-- *2. Load package* - extract package
-- *3. Validation* - current redmine should be valid
-- *4. Backup* - backup current redmine (see backup section)
-- *5. Upgrading* - install commands are executed
-- *6. Moving redmine* - redmine is moved from temporarily folder to given redmine_root
-- *7. Profile saving* - generating profile (see profile section)
+- **1. Redmine root** - where is redmine located
+- **2. Load package** -  loading package to temporary folder
+- **3. Validation** - validation of current redmine
+- **4. Backup** - backup current instance
+	- **full backup**: complete _redmine\_root_ with database
+	- **backup** (default): only configuration file with database
+	- **database**: only database
+- **5. Upgrading** - upgrade commands are executed
+- **6. Moving redmine** - current redmine is upgraded by new files
+- **7. Profile saving** - generating profile (see profile section)
 
 
 #### From archive
 
 ```
-# minimal
 redmine upgrade PATH_TO_PACKAGE
 
-# full
-redmine upgrade PATH_TO_PACKAGE --env ENV1,ENV2,ENV3
+# with environment
+redmine upgrade PATH_TO_PACKAGE --env environment
 ```
 
 #### From git
 
 ```
-# minimal
 redmine upgrade --source git
 
-# full
-redmine upgrade --source git --env ENV1,ENV2,ENV3
+# with environment
+redmine upgrade --source git --env environment
 ```
 
 
-### Backup
+## Backup
 
 ```
 redmine backup
@@ -202,10 +245,13 @@ redmine backup
 
 #### Steps:
 
-- *1. Redmine root* - where should be new redmine located
-- *2. Validation* - current redmine should be valid
-- *3. Backup* - backup current redmine (see backup section)
-- *4. Profile saving* - generating profile (see profile section)
+- **1. Redmine root** - where is redmine located
+- **2. Validation** - validation of current redmine
+- **3. Backup** - backup current instance
+	- **full backup**: complete _redmine\_root_ with database
+	- **backup** (default): only configuration file with database
+	- **database**: only database
+- **4. Profile saving** - generating profile (see profile section)
 
 You can choose one of 3 types.
 
@@ -239,35 +285,5 @@ You can choose one of 3 types.
   </tbody>
 </table>
 
-## Examples
-
-Simple install and ugrade
-
-```
-$ wget http://www.redmine.org/releases/redmine-2.3.0.zip
-$ wget http://www.redmine.org/releases/redmine-2.5.0.zip
-
-$ redmine install redmine-2.3.0.zip
-$ redmine upgrade redmine-2.5.0.zip
-```
-
-Set languages
-
-```
-$ redmine --locale cs install redmine-2.3.0.zip
-```
 
-Install from git
-
-```
-$ redmine install git@github.com:redmine/redmine.git --source git
-$ redmine upgrade --source git
-```
-
-Install from git with specific branch
-
-```
-$ redmine install git@github.com:redmine/redmine.git --source git --branch 2.3-stable
-$ redmine upgrade --source git
-```
- 
+ 

data/bin/redmine

@@ -5,4 +5,5 @@ $LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
 
 require 'redmine-installer'
 
+Redmine::Installer.print_logo
 Redmine::Installer::CLI.start(ARGV)

data/lib/redmine-installer.rb

@@ -68,4 +68,3 @@ require 'redmine-installer/backup'
 
 # Default configurations
 Redmine::Installer.set_i18n
-Redmine::Installer.print_logo

data/lib/redmine-installer/command.rb

@@ -49,7 +49,7 @@ module Redmine::Installer
           if confirm(:do_you_want_repeat_command, false)
             return run(*_args)
           else
-            raise Redmine::Installer::Error, I18n.translate(:command_exit_with_error, command: command)
+            error(:command_exit_with_error, command: command)
           end
         end
 

data/lib/redmine-installer/locales/cs.yml

@@ -9,7 +9,7 @@ cs:
   cli_flag_source: 'Jaký typ je balíček'
   cli_flag_branch: 'Jiná větev gitu'
   cli_flag_environment: 'Prostředí redminu'
-  command_exit_with_error: 'Příkaz: <bright>%{command}</bright> skončil s chybou'
+  command_exit_with_error: 'Příkaz skončil s chybou: <bright>%{command}</bright>'
   dir_not_exist_and_cannot_be_created: 'Složka %{dir} neexistuje a nemůže být vytvořena'
   dir_is_not_writeable: 'Složka <bright>%{dir}</bright> není zapisovatelná'
   do_you_want_repeat_command: 'Chcete opakovat příkaz?'
@@ -31,6 +31,7 @@ cs:
   only_database: 'Pouze databáze'
   path_for_redmine_root: 'Cesta pro redmine_root'
   powered_by: 'Powered by EasyRedmine'
+  restoring_database: '... Obnova database'
   skip: 'Přeskočit'
   try_again: 'zkusit znova'
   what_dir_for_backups: 'Jaká složka pro zálohu?'

data/lib/redmine-installer/locales/en.yml

@@ -10,7 +10,7 @@ en:
   cli_flag_source: 'What type is package argument'
   cli_flag_branch: 'Different branch for git'
   cli_flag_environment: 'Environment for redmine'
-  command_exit_with_error: 'Command: <bright>%{command}</bright> exit with an error'
+  command_exit_with_error: 'Command exit with an error: <bright>%{command}</bright>'
   dir_not_exist_and_cannot_be_created: 'Dir %{dir} does not exist and can not be created'
   dir_is_not_writeable: 'Dir <bright>%{dir}</bright> is not writeable'
   do_you_want_repeat_command: 'Do you want repeat this command?'
@@ -32,6 +32,7 @@ en:
   only_database: 'Only database'
   path_for_redmine_root: 'Path for redmine_root'
   powered_by: 'Powered by EasyRedmine'
+  restoring_database: '... Restoring database'
   skip: 'Skip'
   try_again: 'try again'
   what_dir_for_backups: 'What dir for backups?'

data/lib/redmine-installer/plugins/database.rb

@@ -35,7 +35,9 @@ module Redmine::Installer::Plugin
     end
 
     def self.restore_all(redmine_root, backup_dir)
-      load_all(redmine_root).each do |klass|
+      databases = load_all(redmine_root)
+      databases.uniq! {|d| d.params['database'].value}
+      databases.each do |klass|
         klass.restore(backup_dir)
       end
     end
@@ -102,6 +104,7 @@ module Redmine::Installer::Plugin
       # More enviroments can use the same database
       return unless File.exist?(file)
 
+      Kernel.system(command_for_empty)
       Kernel.system(command_for_restore(file))
     end
 
@@ -128,6 +131,10 @@ module Redmine::Installer::Plugin
         "-h #{params['host'].value} -P #{get('port')} -u #{get('username')} -p#{get('password')} #{get('database')}"
       end
 
+      def command_for_empty
+        "mysql #{command_args} -e 'drop database #{get('database')}; create database #{get('database')};'"
+      end
+
       def command_for_backup(file)
         "mysqldump --add-drop-database #{command_args} > #{file}"
       end
@@ -155,6 +162,11 @@ module Redmine::Installer::Plugin
         %{PGPASSWORD="#{get('password')}" #{comm} -i -h #{get('host')} -p #{get('port')} -U #{get('username')} -Fc -f #{file} #{get('database')}}
       end
 
+      def command_for_empty
+        # %{PGPASSWORD="#{get('password')}" psql -i -h #{get('host')} -p #{get('port')} -U #{get('username')} -c 'drop database #{get('database')}; create database #{get('database')};'}
+        ''
+      end
+
       def command_for_backup(file)
         command('pg_dump', file)
       end

data/lib/redmine-installer/plugins/email_sending.rb

@@ -8,7 +8,7 @@ module Redmine::Installer::Plugin
     def initialize
       @params = Redmine::Installer::ConfigParams.new
       @params.add('user_name')
-      @params.add('password')
+      @params.add('password').hide(true)
     end
 
     def build

data/lib/redmine-installer/steps/backup.rb

@@ -26,7 +26,10 @@ module Redmine::Installer::Step
     end
 
     def down
-      database_restore if @database_backed_up
+      if @database_backed_up
+        say(:restoring_database)
+        database_restore
+      end
     end
 
     def final_step

data/lib/redmine-installer/version.rb

@@ -1,5 +1,5 @@
 module Redmine
   module Installer
-    VERSION = '1.0.2'
+    VERSION = '1.0.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine-installer
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Ondřej Moravčík
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2014-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi