techinform 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9174fa203b317bd3390af41c7f3de5469e17befaf4c7ae5d9c16961042929ab0
-  data.tar.gz: 5f1f5b33897089fe4265f1b9ffc2e3f9cb2bb933c634f49654c3f28abc655223
+  metadata.gz: 377409d470d19efcfd9028db6bdefa2071403ac78f60e2b56f67550520eb305c
+  data.tar.gz: 30a08875950a5c865e51bc72d9c6decc346374caf6f94253147ec50e9d640e66
 SHA512:
-  metadata.gz: 778e984a1f3d2fc5dc170e4f90673edf160367a71df26b5aa756b8aa72f7aee85a8646cba2bf10021676d8b6ecf2b9e5b08301ebd488b8ca7603288ba238a1f8
-  data.tar.gz: 6d9ad5c8d8c8fa02a90f7907c3c14557201b7b88e48b3347ca1c81adc29aee36a74a4f9401f7388f1b3fb848d89ddb306002350a236b1467a3fcafdf70a788bf
+  metadata.gz: 73a5ca1881758fee223838342fc950b73a4c328b81ff504d273f4d240ec823cb071f5d412589c0542f99b2241704745a0c3ef9c9cca9d4420073a388153d5254
+  data.tar.gz: 4f0253a7eaf1d62c88d3bbee508eb3a98f226931545fed400026b0be7968574db8d470b709117eb8525866f89f26955482707cb574f2a9cc508929df8cdb2e23

data/CHANGELOG.md

@@ -1,4 +1,9 @@
 
+### 1.5.1
+
+- Use parallel version of bzip2 - lbzip2 - if installed
+- Use DBUSER environment variable as database user insted of USER
+
 ### 1.5.0
 
 Change progress display - now correctly shows percents

data/README.md

@@ -17,7 +17,7 @@ Install gem yourself as:
     
 * mysqldump - for mysql database dumps
 * gpg2 - backup encryption support
-* bzip2 - backup compression support
+* bzip2 - backup compression support (prefer lbzip2 if installed)
 * rsync - syncing backups
     
 ## Configuration

data/lib/backup/backup.rb

@@ -1,6 +1,7 @@
 require 'date'
 require_relative '../techinform/defaults'
 require 'highline'
+require 'bzip2_selector'
 
 class Backup
   attr_reader :dry_run, :quiet
@@ -60,7 +61,7 @@ class Backup
     if encrypt?
       "| gpg2 --encrypt #{"--compress-algo=bzip2" if compress?} --recipient=#{ENV['GPGKEY']}"
     else
-      "| bzip2" if compress?
+      "| #{bzip2}" if compress?
     end
   end
 

data/lib/backup/db_backup.rb

@@ -5,7 +5,7 @@ class DbBackup < Backup
 
   def initialize user: nil, database: nil, password: nil, compress: true, host: nil, encrypt: nil
     super compress: compress, encrypt: encrypt
-    user = ENV['USER'] if user.nil?
+    user = ENV['DBUSER'] if user.nil?
     password = ENV['PASSWORD'] if password.nil?
     @password, @user, @database, @host = password, user, database, host
     ensure_path unless database.nil?

data/lib/bzip2_selector.rb

@@ -0,0 +1,7 @@
+def bzip2
+  @bzip2 ||= (system('which lbzip2 > /dev/null') ? 'lbzip2' : 'bzip2')
+end
+
+def bunzip2
+  @bunzip2 ||= (system('which lbunzip2 > /dev/null') ? 'lbunzip2' : 'bunzip2')
+end

data/lib/techinform.rb

@@ -2,12 +2,15 @@ require 'techinform/version'
 require 'techinform/projects'
 require_relative 'techinform/backup'
 require 'thor'
+require 'bzip2_selector'
+
 
 module Techinform
   class CLI < Thor
     desc 'restore [type] [absolute_filename or database to select file] [dbname]', 'Restore database from backup; if no absolute filename given, will present select menu to choose file'
-    def restore(type, filename, dbname, just_decrypt = false)
+    def restore(type, filename, dbname = nil, just_decrypt = false)
       require 'highline'
+      dbname = filename if dbname.nil?
       if !File.exist?(filename)
         cli = HighLine.new
         path = type == 'pg' ? PostgreBackup.new(database: filename).restore_path : MysqlBackup.new(database: filename).restore_path
@@ -15,28 +18,31 @@ module Techinform
       end
       encrypted = filename.split('.').last == 'gpg'
       if type == 'pg'
-        puts "Restoring postgres backup to database #{dbname}..."
         if encrypted && just_decrypt
-          `pv --wait #{filename} | gpg2 --decrypt  | bzip2 > #{File.basename(filename, '.*')}`
+          puts "Decrypting postgres backup of #{filename}..."
+          `pv --wait #{filename} | gpg2 --decrypt  | #{bzip2} > #{File.basename(filename, '.*') + '.bz2'}`
         elsif encrypted
+          puts "Restoring postgres backup to database #{dbname}..."
           `pv --wait #{filename} | gpg2 --decrypt | psql #{dbname} > /dev/null`
         else
-          `pv --wait #{filename} | bunzip2 | psql #{dbname} > /dev/null`
+          `pv --wait #{filename} | #{bunzip2} | psql #{dbname} > /dev/null`
         end
       else
-        puts "Restoring mysql backup to database #{dbname}..."
         if encrypted && just_decrypt
-          `pv --wait #{filename} | gpg2 --decrypt | bzip2 > #{File.basename(filename, '.*')}`
+          puts "Decrypting mysql backup of #{filename}..."
+          `pv --wait #{filename} | gpg2 --decrypt | #{bzip2} > #{File.basename(filename, '.*') + '.bz2'}`
         elsif encrypted
-          `pv --wait #{filename} | gpg2 --decrypt | mysql #{"-u#{ENV['USER']}" if !ENV['USER'].nil?} #{"-p#{ENV['PASSWORD']}" if !ENV['PASSWORD'].nil?} #{dbname}`
+          puts "Restoring mysql backup to database #{dbname}..."
+          `pv --wait #{filename} | gpg2 --decrypt | mysql#{" -u#{ENV['DBUSER']}" if !ENV['DBUSER'].nil?}#{" -p#{ENV['PASSWORD']}" if !ENV['PASSWORD'].nil?} #{dbname}`
         else
-          `pv --wait #{filename} | bunzip2 | mysql #{"-u#{ENV['USER']}" if !ENV['USER'].nil?} #{"-p#{ENV['PASSWORD']}" if !ENV['PASSWORD'].nil?} #{dbname}`
+          `pv --wait #{filename} | #{bunzip2} | mysql#{" -u#{ENV['DBUSER']}" if !ENV['DBUSER'].nil?}#{" -p#{ENV['PASSWORD']}" if !ENV['PASSWORD'].nil?} #{dbname}`
         end
       end
     end
 
     desc 'decrypt [type] [absolute_filename or database to select file]', 'Decrypt file from backup; if no absolute filename given, will present select menu to choose file'
     def decrypt(type, filename)
+      puts "lbzip2 is not found. Single-threaded bzip2 will be used. Consider installing lbzip2" if bzip2 == 'bzip2'
       restore(type, filename, nil, true)
     end
 

data/lib/techinform/version.rb

@@ -1,3 +1,3 @@
 module Techinform
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

data/techinform.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
     spec.metadata["allowed_push_host"] = "https://rubygems.org"
 
     spec.metadata["homepage_uri"] = spec.homepage
-    spec.metadata["source_code_uri"] = "https://github.com/techinform-dev/techinform"
-    spec.metadata["changelog_uri"] = "https://github.com/techinform-dev/techinform/CHANGELOG.md"
+    spec.metadata["source_code_uri"] = "https://github.com/alexey-chernikov/techinform"
+    spec.metadata["changelog_uri"] = "https://github.com/alexey-chernikov/techinform/CHANGELOG.md"
   else
     raise "RubyGems 2.0 or newer is required to protect against " \
       "public gem pushes."
@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'thor', '~> 0.20'
   spec.add_dependency 'highline', '~> 2.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.15'
+  spec.add_development_dependency 'bundler', '~> 2.1'
   spec.add_development_dependency 'rake', '~> 13.0.1'
   spec.add_development_dependency 'minitest', '~> 5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: techinform
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Alexey Chernikov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-08 00:00:00.000000000 Z
+date: 2020-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -109,6 +109,7 @@ files:
 - lib/backup/files_backup.rb
 - lib/backup/mysql_backup.rb
 - lib/backup/postgre_backup.rb
+- lib/bzip2_selector.rb
 - lib/techinform.rb
 - lib/techinform/backup.rb
 - lib/techinform/defaults.rb
@@ -122,8 +123,8 @@ licenses:
 metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://techinform.dev
-  source_code_uri: https://github.com/techinform-dev/techinform
-  changelog_uri: https://github.com/techinform-dev/techinform/CHANGELOG.md
+  source_code_uri: https://github.com/alexey-chernikov/techinform
+  changelog_uri: https://github.com/alexey-chernikov/techinform/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths: