redmine-installer 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6eaa904e13251ea33c73736a30c92a5d4ddeef38
-  data.tar.gz: 43e41ce807838f5f99b45058c3aabb1b821b5cff
+  metadata.gz: c6b1dc78262bd3d0e88d765b62bac3ff5c6cd31b
+  data.tar.gz: 4281ff021662f3f92e320dbcc150132161592a8d
 SHA512:
-  metadata.gz: 6066b5488f0860416ad1f8e16e3e9395338a0e04ab27c992098c87dd174283f50794ee20c823b4087178c9ac775169e314db7ce8339272ddca619e703b92dead
-  data.tar.gz: 98790f5d9cf1a4e662dc09d8ede703742817f87e3f3c7d66772560435c6bb19ec60d72bd3df5dff15cfe6ea97e216522aeb4aaf008c87344f8f8aeb309a41594
+  metadata.gz: 9120fb096383789fdced6385f500308b3f773a33c2a35eb5e1361391085317321cec5405f7a094cb29f9c51a3c8366f0ebda282c830e69a177c9514630581bce
+  data.tar.gz: a75f19c13818acc90aaaea573f622c8e79ad08a21e70b809c34058972fb66fffce3070a7354cd864a53ff6b3b3fda1582e45f1bfbec49061bfdb5faa400d4bcf

data/Gemfile

@@ -3,11 +3,12 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in redmine-installer.gemspec
 gemspec
 
+gem 'ansi'
 gem 'gli'
 gem 'i18n'
-gem 'ansi'
 gem 'notifier'
 gem 'ruby-progressbar'
+gem 'rubyzip'
 
 group :development do
   gem 'pry'

data/lib/redmine-installer/command.rb

@@ -48,6 +48,8 @@ module Redmine::Installer
         unless success
           if confirm(:do_you_want_repeat_command, false)
             return run(*_args)
+          else
+            raise Redmine::Installer::Error, I18n.translate(:command_exit_with_error, command: command)
           end
         end
 

data/lib/redmine-installer/config_param.rb

@@ -60,6 +60,7 @@ module Redmine::Installer
     attribute :default
     attribute :value
     attribute :ask, true
+    attribute :hide, false
 
     def initialize(name)
       # Default
@@ -77,6 +78,7 @@ module Redmine::Installer
 
     def set(key, value)
       self.send("#{key}=", value)
+      self
     end
 
     def default(value=nil)
@@ -84,6 +86,14 @@ module Redmine::Installer
 
       self.default = value
       self.value = value if self.value.nil?
+      self
+    end
+
+    def hide(value=nil)
+      return @hide if value.nil?
+
+      self.hide = value
+      self
     end
 
   end

data/lib/redmine-installer/helpers/generate_config.rb

@@ -18,7 +18,7 @@ module Redmine::Installer::Helper
 
       say("(#{instance.class.title})", 2)
       instance.params.for_asking.each do |p|
-        p.value = ask(p.title, default: p.default)
+        p.value = ask(p.title, default: p.default, hide: p.hide)
       end
 
       instance.make_config(base.tmp_redmine_root)

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

@@ -9,6 +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'
   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?'

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

@@ -10,6 +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'
   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?'

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

@@ -45,7 +45,7 @@ module Redmine::Installer::Plugin
       @params.add('database')
       @params.add('host').default('localhost')
       @params.add('username')
-      @params.add('password')
+      @params.add('password').hide(true)
       @params.add('encoding').default('utf8')
     end
 
@@ -143,7 +143,7 @@ module Redmine::Installer::Plugin
 
     class PostgreSQL < Database
       def self.adapter_name
-        'pg'
+        'postgresql'
       end
 
       def initialize
@@ -152,7 +152,7 @@ module Redmine::Installer::Plugin
       end
 
       def command(comm, file)
-        %{PGPASSWORD="#{get('password')}" #{comm} -i -h #{get('host')} -p #{get('port')} -U #{get('username')} -Fc -f #{file}}
+        %{PGPASSWORD="#{get('password')}" #{comm} -i -h #{get('host')} -p #{get('port')} -U #{get('username')} -Fc -f #{file} #{get('database')}}
       end
 
       def command_for_backup(file)

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

@@ -11,20 +11,34 @@ module Redmine::Installer::Plugin
       records.include?(self.class_name.downcase)
     end
 
-    class EasyProject < RedminePlugin
+  end
+end
 
-      RAKE_EASYPROJECT_INSTALL = 'bundle exec rake easyproject:install RAILS_ENV=production'
+##
+# EasyProject
+#
+# http://www.easyredmine.com
+#
+# Easy Redmine is complex project management web application best suited to project teams between
+# 10 - 100 users. Whether you manage just yourself or a huge team of software developers,
+# Easy Redmine will provide all necessary project management features to complete your projects
+# on time, scope and budget.
+#
+class EasyProject < Redmine::Installer::Plugin::RedminePlugin
 
-      def self.install
-        if am_i_there?
-          run_command(RAKE_EASYPROJECT_INSTALL, t('plugin.redmine_plugin.easyproject.install'))
-        end
-      end
-
-      def self.upgrade
-        install
-      end
+  class Redmine::Installer::Command
+    def rake_easyproject_install(env)
+      run(RAKE, 'easyproject:install', get_rails_env(env), :'plugin.redmine_plugin.easyproject.install')
     end
+  end
+
+  RAKE_EASYPROJECT_INSTALL = 'bundle exec rake  RAILS_ENV=production'
+
+  def self.install(base)
+    command.rake_easyproject_install(base.env) if am_i_there?
+  end
 
+  def self.upgrade(base)
+    install(base)
   end
 end

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

@@ -13,7 +13,9 @@ module Redmine::Installer::Step
         command.rake_generate_secret_token(base.env)
 
         # Other plugins can have post-install procedure
-        plugin::RedminePlugin.all.each(&:install)
+        plugin::RedminePlugin.all.each do |plugin|
+          plugin.install(base)
+        end
       end
     end
 

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

@@ -30,7 +30,9 @@ module Redmine::Installer::Step
         command.rake_generate_secret_token(base.env)
 
         # Other plugins can have post-install procedure
-        plugin::RedminePlugin.all.each(&:upgrade)
+        plugin::RedminePlugin.all.each do |plugin|
+          plugin.upgrade(base)
+        end
       end
 
       # Delete content of redmine_root

data/lib/redmine-installer/utils.rb

@@ -1,6 +1,7 @@
 require 'fileutils'
 require 'notifier'
 require 'ansi'
+require 'io/console'
 
 module Redmine::Installer
   module Utils
@@ -113,8 +114,14 @@ module Redmine::Installer
       end
 
       # Instead of `super` take only what I need
-      def gets
-        $stdin.gets.to_s.chomp
+      def gets(hide=false)
+        if hide
+          input = $stdin.noecho{|io| io.gets}.to_s.chomp
+          $stdout.puts # noecho is also for enter
+          input
+        else
+          $stdin.gets.to_s.chomp
+        end
       end
 
       # Asking on 1 line
@@ -134,7 +141,7 @@ module Redmine::Installer
         end
 
         say(message)
-        input = gets
+        input = gets(options[:hide])
 
         # Ctrl-D or enter was pressed
         return default if input.empty?

data/lib/redmine-installer/version.rb

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

data/lib/redmine-installer.rb

@@ -57,7 +57,6 @@ module Redmine
 end
 
 # Requirements
-require 'pry'
 require 'i18n'
 require 'redmine-installer/version'
 require 'redmine-installer/error'

data/redmine-installer.gemspec

@@ -20,9 +20,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "gli"
   spec.add_runtime_dependency "ansi"
+  spec.add_runtime_dependency "gli"
+  spec.add_runtime_dependency "i18n"
   spec.add_runtime_dependency "notifier"
+  spec.add_runtime_dependency "ruby-progressbar"
+  spec.add_runtime_dependency "rubyzip"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: redmine-installer
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ondřej Moravčík
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-14 00:00:00.000000000 Z
+date: 2014-11-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ansi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -25,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ansi
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -52,6 +66,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement