redmine-installer 2.0.0.rc1 → 2.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22ee60b5ea969b4287d629fd536e57d59ef15674
-  data.tar.gz: aa29dc2561c8f9feaecd3ca005c443dbe4f32b10
+  metadata.gz: 26158b437ec271b8119c49fefe9d6667f0606b51
+  data.tar.gz: 39ee0b39018f4ef9d87a136c830db545ce1529a9
 SHA512:
-  metadata.gz: 833e0b691d62ac3c0016d41958247ee1a58995fc8ee720cf8d1cfa31d6bfba3a6f6b75032bb51cb8bb5df1a6e73117f94e837a11bd8e8067401a36fd048d6464
-  data.tar.gz: 5e10b97774c463b927f87230fedfaa10070392cfccc8661f520563e3ba8af364d81f911258a9add411354046abc16b4c3b1d748762b2ef439a16538cab5653ad
+  metadata.gz: bbee7a53bc34292d1760923e3388eaf3a892333ca3a3bae882411be2acebb1bb222b8db56b8239193c65658447e9d920e9c4445c8d0394e49eb4647db431b0b4
+  data.tar.gz: 4465562fb27dff866de2695f23dc612900f1c6a99edf107f449b4691f03ac3875051ec28b2209b199d4569df1655e44adef81a1b7266e19a04004a6ceb7fcb47

data/README.md

@@ -46,7 +46,7 @@ Create new project on empty directory. All argument are optional. Directory shou
 
 ```
 redmine help install
-redmine install [PACKAGE] [REDMINE_ROOT] [options]
+redmine install [PACKAGE PATH or URL] [REDMINE_ROOT] [options]
 ```
 
 ```
@@ -59,6 +59,9 @@ Examples:
 Install Redmine. Installer will ask for every required parameters.
 - `redmine install`
 
+Install Redmine from internet 
+- `redmine install https://server.tld/REDMINE_PACKAGE.zip /srv/redmine`
+
 Install Redmine from redmine.zip package into /srv/redmine folder.
 - `redmine install redmine.zip /srv/redmine`
 
@@ -77,7 +80,7 @@ Since current root is deleted you should use option `--keep` if you want preserv
 
 ```
 redmine help upgrade
-redmine upgrade [PACKAGE] [REDMINE_ROOT] [options]
+redmine upgrade [PACKAGE PATH or URL] [REDMINE_ROOT] [options]
 ```
 
 ```
@@ -92,6 +95,9 @@ Examples:
 Upgrade Redmine located on /srv/redmine with package redmine2.zip
 - `redmine upgrade redmine2.zip /srv/redmine`
 
+Upgrade Redmine from internet 
+- `redmine upgrade https://server.tld/REDMINE_PACKAGE.zip /srv/redmine`
+
 Upgrade Redmine and keep directory.
 - `redmine upgrade redmine2.zip /srv/redmine --keep directory_i_want_keep`
 
@@ -111,3 +117,4 @@ Examples:
 
 Backup project located on /srv/redmine
 - `redmine upgrade /srv/redmine`
+

data/lib/redmine-installer/cli.rb

@@ -31,6 +31,8 @@ module RedmineInstaller
 
         c.example 'Install from archive',
                   'redmine install ~/REDMINE_PACKAGE.zip'
+        c.example 'Install package from internet',
+                  'redmine install https://server.tld/REDMINE_PACKAGE.zip'
         c.example 'Install specific version from internet',
                   'redmine install v3.1.0'
         c.example 'Install package to new dir',
@@ -56,8 +58,10 @@ module RedmineInstaller
 
         c.example 'Upgrade with new package',
                   'redmine upgrade ~/REDMINE_PACKAGE.zip'
-        c.example 'Upgrade',
+        c.example 'Upgrade with package from internet',
                   'redmine upgrade ~/REDMINE_PACKAGE.zip redmine_root'
+        c.example 'Upgrade',
+                  'redmine upgrade https://server.tld/REDMINE_PACKAGE.zip redmine_root'
         c.example 'Upgrade and keep directory',
                   'redmine upgrade --keep git_repositories'
 

data/lib/redmine-installer/package.rb

@@ -23,7 +23,9 @@ module RedmineInstaller
 
       if !File.exist?(@package)
         if @package =~ /\Av?(\d\.\d\.\d)\Z/
-          @package = download_redmine($1)
+          @package = download_redmine_version($1)
+        elsif valid_url?(@package)
+          @package = download_from_url(@package)
         else
           error "File doesn't exist #{@package}"
         end
@@ -82,20 +84,32 @@ module RedmineInstaller
 
     private
 
-      def download_redmine(version)
+      def valid_url?(string)
+        uri = URI.parse(string)
+        ['http', 'https'].include?(uri.scheme)
+      rescue URI::BadURIError, URI::InvalidURIError
+        false
+      end
+
+      def download_redmine_version(version)
+        url = "http://www.redmine.org/releases/redmine-#{version}.zip"
+        download_from_url(url)
+      end
+
+      def download_from_url(url)
+        uri = URI.parse(url)
+
         @temp_file = Tempfile.new(['redmine', '.zip'])
         @temp_file.binmode
 
-        uri = URI("http://www.redmine.org/releases/redmine-#{version}.zip")
-
         Net::HTTP.start(uri.host, uri.port) do |http|
           head = http.request_head(uri)
 
           unless head.is_a?(Net::HTTPSuccess)
-            error "Cannot download redmine #{version}"
+            error "Cannot download #{uri}"
           end
 
-          print_title("Downloading redmine #{version}")
+          print_title("Downloading #{uri}")
           progressbar = TTY::ProgressBar.new(PROGRESSBAR_FORMAT, total: head['content-length'].to_i, frequency: 2, clear: true)
 
           http.get(uri) do |data|
@@ -106,7 +120,7 @@ module RedmineInstaller
           progressbar.finish
         end
 
-        logger.info("Redmine #{version} downloaded")
+        logger.info("#{uri} downloaded")
 
         @temp_file.close
         @temp_file.path

data/lib/redmine-installer/spec/spec.rb

@@ -1,52 +1,3 @@
-# $stdin.sync = true
-# $stdout.sync = true
-
-# # require 'redmine-installer/spec/cursor'
-
-# class TestPrompt < TTY::Prompt
-
-#   def initialize(*args)
-#     # @input  = StringIO.new
-#     # @output = StringIO.new
-#     # super(input: @input, output: @output)
-#     super
-#     @pastel = Pastel.new(enabled: false)
-#   end
-
-# end
-
-# module RedmineInstaller
-
-#   # def self.prompt
-#   #   @prompt ||= TestPrompt.new
-#   # end
-
-#   def self.pastel
-#     @pastel ||= Pastel.new(enabled: false)
-#   end
-
-# end
-
-# module TTY
-#   module Cursor
-
-#     singleton_methods.each do |name|
-#       class_eval <<-METHODS
-
-#         def #{name}(*)
-#           ''
-#         end
-
-#         def self.#{name}(*)
-#           ''
-#         end
-
-#       METHODS
-#     end
-
-#   end
-# end
-
 $stdin.sync = true
 $stdout.sync = true
 
@@ -72,10 +23,22 @@ class TestPrompt < TTY::Prompt
 
   def initialize(*args)
     super
+    @enabled_color = false
     @pastel = Pastel.new(enabled: false)
   end
 
 end
 
+class TTY::Prompt::Reader::Console
+
+  def get_char(options)
+    return input.getc unless input.tty?
+    mode.raw(options[:raw]) do
+      mode.echo(options[:echo]) { input.getc }
+    end
+  end
+
+end
+
 RedmineInstaller.instance_variable_set(:@prompt, TestPrompt.new)
 RedmineInstaller.instance_variable_set(:@pastel, Pastel.new(enabled: false))

data/lib/redmine-installer/version.rb

@@ -1,3 +1,3 @@
 module RedmineInstaller
-  VERSION = '2.0.0.rc1'
+  VERSION = '2.0.0.rc2'
 end

data/redmine-installer.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.1.0'
 
   spec.add_runtime_dependency 'commander'
-  spec.add_runtime_dependency 'tty-prompt', '~> 0.10.0'
+  spec.add_runtime_dependency 'tty-prompt', '~> 0.11.0'
   spec.add_runtime_dependency 'tty-spinner', '~> 0.4.1'
   spec.add_runtime_dependency 'tty-progressbar', '~> 0.10.1'
   spec.add_runtime_dependency 'rubyzip'

data/spec/installer_helper.rb

@@ -28,7 +28,7 @@ module InstallerHelper
   end
 
   def go_down
-    write(TTY::Prompt::Reader::Codes::KEY_DOWN)
+    write(TTY::Prompt::Reader::Codes.keys[:down])
   end
 
   def expected_successful_configuration
@@ -36,7 +36,7 @@ module InstallerHelper
     expected_output('What database do you want use?')
     expected_output('‣ MySQL')
 
-    write(TTY::Prompt::Reader::Codes::KEY_DOWN)
+    go_down
     expected_output('‣ PostgreSQL')
     select_choice
 

data/spec/lib/install_spec.rb

@@ -56,7 +56,7 @@ RSpec.describe RedmineInstaller::Install, command: 'install' do
     expected_output('Path to redmine root:')
     write(@redmine_root)
 
-    expected_output_in('Downloading redmine 3.1.1', 20)
+    expected_output_in('Downloading http://www.redmine.org/releases/redmine-3.1.1.zip', 30)
     expected_output('Extracting redmine package')
 
     expected_successful_configuration
@@ -76,8 +76,8 @@ RSpec.describe RedmineInstaller::Install, command: 'install' do
     expected_output('Gemfile not found')
     expected_output('‣ Try again')
 
-    write(TTY::Prompt::Reader::Codes::KEY_DOWN)
-    write(TTY::Prompt::Reader::Codes::KEY_DOWN)
+    go_down
+    go_down
     expected_output('‣ Cancel')
     write(' ')
 
@@ -88,8 +88,7 @@ RSpec.describe RedmineInstaller::Install, command: 'install' do
     write(@redmine_root)
 
     expected_output('Creating database configuration')
-
-    write(TTY::Prompt::Reader::Codes::KEY_DOWN)
+    go_down
     expected_output('‣ PostgreSQL')
     write(' ')
 
@@ -109,12 +108,12 @@ RSpec.describe RedmineInstaller::Install, command: 'install' do
     expected_output('Migration end with error')
     expected_output('‣ Try again')
 
-    write(TTY::Prompt::Reader::Codes::KEY_DOWN)
-    write(TTY::Prompt::Reader::Codes::KEY_DOWN)
+    go_down
+    go_down
     expected_output('‣ Change database configuration')
     write(' ')
 
-    write(TTY::Prompt::Reader::Codes::KEY_DOWN)
+    go_down
     expected_output('‣ PostgreSQL')
     write(' ')
 

data/spec/lib/upgrade_spec.rb

@@ -65,8 +65,8 @@ RSpec.describe RedmineInstaller::Upgrade, :install_first, command: 'upgrade' do
 
     wait_for_stdin_buffer
 
-    write(TTY::Prompt::Reader::Codes::KEY_DOWN)
-    write(TTY::Prompt::Reader::Codes::KEY_DOWN)
+    go_down
+    go_down
     expected_output('‣ Nothing')
     select_choice
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine-installer
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0.rc2
 platform: ruby
 authors:
 - Ondřej Moravčík
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2017-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: tty-spinner
   requirement: !ruby/object:Gem::Requirement