redmine-installer 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 525718299dda12ef91b9d72e068c57dbb76cdd6bd64c912655ebfa6b7bfc2a6b
-  data.tar.gz: daa66c51c307b3a64c8dd98f39bae50b5040620299a1a4be54b6b52d948bbd86
+  metadata.gz: ec96d4984b4c45e21344787cd394b022d02bd4d856e5b8a4b2bd2460d4cb24a2
+  data.tar.gz: 58b94762b3e044099d45336fafbe878f16eac2fe6d0b964f96ead4c30cbdfdb9
 SHA512:
-  metadata.gz: a3806697afbfb76fcfc8ff203cd41f1eb0d7f22429fe7fc2695b99c2d2a56a9d2734f8df3fc19bc96e162c359a35d1509e79561dfba99637ba654629918c4344
-  data.tar.gz: b86c957b30ace57e6d3f787ce789a84c088cb366c454fefb380e45c27768c8a1f70062fd2c03f1fb598ac582b4de35a7679fb321242448c7629b9e1759a5b178
+  metadata.gz: f119d9a2243485cb25c3c42272be9a83470faa73ebde07f59a17eafe7bdb239e9f4a20b12e784b47130d322508a9fd72de956c26dd85ff9b61cdd9ecdd335fb3
+  data.tar.gz: 2d636c5c2ae93e696437e50f875fc739d3e5f45377f88c28378ebda481d29b18717c477e0f416a1eac732d1f617852f2d8a176c3265cb8219f56b7501580cf29

data/lib/redmine-installer/configuration.rb

@@ -33,7 +33,7 @@ module RedmineInstaller
       end
 
       def get_parameters
-        @username = prompt.ask('Username:', required: true)
+        @user_name = prompt.ask('Username:', required: true)
         @password = prompt.mask('Password:', required: true)
       end
 
@@ -66,10 +66,11 @@ module RedmineInstaller
         settings['port']    = @port
 
         # Optional
-        settings['authentication']       = @authentication  unless @authentication.to_s.empty?
+        settings['authentication']       = @authentication.to_sym  unless @authentication.to_s.empty?
         settings['domain']               = @domain          unless @domain.to_s.empty?
         settings['user_name']            = @user_name       unless @user_name.to_s.empty?
         settings['password']             = @password        unless @password.to_s.empty?
+        settings['tls']                  = @enable_tls      unless @enable_tls.to_s.empty?
         settings['enable_starttls_auto'] = @enable_starttls unless @enable_starttls.to_s.empty?
         settings['openssl_verify_mode']  = @openssl_verify  unless @openssl_verify.to_s.empty?
 
@@ -77,7 +78,7 @@ module RedmineInstaller
       end
 
       def to_s
-        "<#{class_name} #{@username}@#{@address}:#{@port}>"
+        "<#{class_name} #{@user_name}@#{@address}:#{@port}>"
       end
 
     end
@@ -115,6 +116,7 @@ module RedmineInstaller
         @domain = prompt.ask('Domain:')
         @authentication = prompt.ask('Authentication:')
         @openssl_verify = prompt.ask('Openssl verify mode:')
+        @enable_tls = prompt.yes?('Enable tls?:', default: false)
         @enable_starttls = prompt.yes?('Enable starttls?:', default: true)
       end
 

data/lib/redmine-installer/version.rb

@@ -1,3 +1,3 @@
 module RedmineInstaller
-  VERSION = '2.2.3'
+  VERSION = '2.2.4'
 end

data/spec/installer_helper.rb

@@ -27,13 +27,53 @@ module InstallerHelper
     # @process.write("\r\n")
   end
 
+  def go_up
+    @process.write("\e[A")
+  end
+
   def go_down
     # write(TTY::Reader::Keys.keys[:down])
     # write("\e[B")
     @process.write("\e[B")
   end
 
-  def expected_successful_configuration
+  def email_username
+    'username'
+  end
+
+  def email_password
+    'password'
+  end
+
+  def email_address
+    'address'
+  end
+
+  def email_port
+    '123'
+  end
+
+  def email_domain
+    'domain'
+  end
+
+  def email_authentication
+    'plain'
+  end
+
+  def email_openssl_verify_mode
+    'none'
+  end
+
+  def email_enable_tls
+    false
+  end
+
+  def email_enable_starttls
+    true
+  end
+
+  def expected_successful_configuration(email: false)
     expected_output('Creating database configuration')
     expected_output('What database do you want use?')
     expected_output('‣ MySQL')
@@ -62,8 +102,44 @@ module InstallerHelper
 
     expected_output('Creating email configuration')
     expected_output('Which service to use for email sending?')
-    expected_output('‣ Nothing')
-    select_choice
+
+    if email
+      go_up
+      go_up
+      go_up
+      expected_output('‣ Custom configuration (SMTP)')
+      select_choice
+
+      expected_output('Username:')
+      write(email_username)
+
+      expected_output('Password:')
+      write(email_password)
+
+      expected_output('Address:')
+      write(email_address)
+
+      expected_output('Port:')
+      write(email_port)
+
+      expected_output('Domain:')
+      write(email_domain)
+
+      expected_output('Authentication:')
+      write(email_authentication)
+
+      expected_output('Openssl verify mode:')
+      write(email_openssl_verify_mode)
+
+      expected_output('Enable tls?: (y/N)')
+      write(email_enable_tls ? 'y' : 'n')
+
+      expected_output('Enable starttls?: (Y/n)')
+      write(email_enable_starttls ? 'y' : 'n')
+    else
+      expected_output('‣ Nothing')
+      select_choice
+    end
   end
 
   def expected_successful_installation_or_upgrade(db_creating: false, after_create: nil)
@@ -103,6 +179,24 @@ module InstallerHelper
     end
   end
 
+  def expected_email_configuration
+    Dir.chdir(@redmine_root) do
+      configuration = YAML.load_file('config/configuration.yml')['default']['email_delivery']
+      smtp_settings = configuration['smtp_settings']
+
+      expect(configuration['delivery_method']).to eq(:smtp)
+      expect(smtp_settings['address']).to eq(email_address)
+      expect(smtp_settings['port']).to eq(email_port.to_i)
+      expect(smtp_settings['authentication']).to eq(email_authentication.to_sym)
+      expect(smtp_settings['domain']).to eq(email_domain)
+      expect(smtp_settings['user_name']).to eq(email_username)
+      expect(smtp_settings['password']).to eq(email_password)
+      expect(smtp_settings['tls']).to eq(email_enable_tls)
+      expect(smtp_settings['enable_starttls_auto']).to eq(email_enable_starttls)
+      expect(smtp_settings['openssl_verify_mode']).to eq(email_openssl_verify_mode)
+    end
+  end
+
   def wait_for_stdin_buffer
     sleep 0.5
   end

data/spec/lib/install_spec.rb

@@ -59,10 +59,11 @@ RSpec.describe RedmineInstaller::Install, command: 'install' do
 
     expected_output('Extracting redmine package')
 
-    expected_successful_configuration
+    expected_successful_configuration(email: true)
     expected_successful_installation
 
     expected_redmine_version('3.4.5')
+    expected_email_configuration
   end
 
   it 'download redmine', args: ['v3.4.5'] do

metadata

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