techinform 1.4.5 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6eed700c5d31d287760c0358c2fcdfdc92d80e7f5dad1ca5728834a3ec4dbd0
-  data.tar.gz: 03be94dcec928086b0f34a1526966d3298f773bd537f035051c1d1302bedc541
+  metadata.gz: 377409d470d19efcfd9028db6bdefa2071403ac78f60e2b56f67550520eb305c
+  data.tar.gz: 30a08875950a5c865e51bc72d9c6decc346374caf6f94253147ec50e9d640e66
 SHA512:
-  metadata.gz: d03b823421b4538dd8708a09dd164b4a1bb70b52ee88889982215ee6e50c9553c01b11baf55a11bd90c7aa984eb92d70c2df44d01b4062a3b251d3faf79f37ae
-  data.tar.gz: ddfc1b8a43ac36068227966da42be4ca44d4439aa0bf51d50d701730a9263a2fc7741db898b65911d2d844706a6b29154182157ffb2ddb0db9e7d52740af10b7
+  metadata.gz: 73a5ca1881758fee223838342fc950b73a4c328b81ff504d273f4d240ec823cb071f5d412589c0542f99b2241704745a0c3ef9c9cca9d4420073a388153d5254
+  data.tar.gz: 4f0253a7eaf1d62c88d3bbee508eb3a98f226931545fed400026b0be7968574db8d470b709117eb8525866f89f26955482707cb574f2a9cc508929df8cdb2e23

data/.github/workflows/gempush.yml

@@ -0,0 +1,30 @@
+name: Ruby Gem
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    name: Build + Publish
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby 2.7
+      uses: actions/setup-ruby@v1
+      with:
+        version: 2.7.x
+
+    - name: Publish to RubyGems
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push *.gem
+      env:
+        GEM_HOST_API_KEY: ${{secrets.RUBYGEMS_AUTH_TOKEN}}

data/.ruby-version

@@ -1 +1 @@
-2.5.5
+2.7.1

data/CHANGELOG.md

@@ -0,0 +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

@@ -1,6 +1,6 @@
 # Techinform
 
-Collection of console tools, useful for everyday tasks in Techinform company.
+Collection of console tools, useful for everyday tasks in Techinform Soft company (https://techinform.dev).
 
 * All backups stored at /backups/local directory.
 * All backup sync goes to /backups/< server name > directory.
@@ -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)
+    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,22 +18,34 @@ module Techinform
       end
       encrypted = filename.split('.').last == 'gpg'
       if type == 'pg'
-        puts "Restoring postgres backup to database #{dbname}..."
-        if encrypted
-          `gpg2 --decrypt #{filename} | pv --wait | psql #{dbname} > /dev/null`
+        if encrypted && just_decrypt
+          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
-          `tar -xOf #{filename} | bunzip2 | pv | psql #{dbname} > /dev/null`
+          `pv --wait #{filename} | #{bunzip2} | psql #{dbname} > /dev/null`
         end
       else
-        puts "Restoring mysql backup to database #{dbname}..."
-        if encrypted
-          `gpg2 --decrypt #{filename} | pv --wait | mysql #{"-u#{ENV['USER']}" if !ENV['USER'].nil?} #{"-p#{ENV['PASSWORD']}" if !ENV['PASSWORD'].nil?} #{dbname}`
+        if encrypted && just_decrypt
+          puts "Decrypting mysql backup of #{filename}..."
+          `pv --wait #{filename} | gpg2 --decrypt | #{bzip2} > #{File.basename(filename, '.*') + '.bz2'}`
+        elsif encrypted
+          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
-          `tar -xOf #{filename} | bunzip2 | pv | 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
+
     desc 'deploy [project]', 'Deploy specific project'
     def deploy(project)
       `cd ~/projects/#{project} && git pull origin master && bundle install && cap production deploy`

data/lib/techinform/version.rb

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

data/techinform.gemspec

@@ -7,11 +7,24 @@ Gem::Specification.new do |spec|
   spec.name          = 'techinform'
   spec.version       = Techinform::VERSION
   spec.authors       = ['Alexey Chernikov']
-  spec.email         = ['alexey.chernikov@gmail.com']
+  spec.email         = ['alexey@chernikov.online']
 
   spec.summary       = %q{Console tools, useful at Techinform}
-  spec.description   = %q{Collection of console tools, which is useful for everyday work at Techinform.}
-  spec.homepage      = 'https://techinform.pro'
+  spec.description   = %q{Collection of console tools, which is useful for everyday work at Techinform Soft ( https://techinform.dev )}
+  spec.homepage      = 'https://techinform.dev'
+
+  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
+  # to allow pushing to a single host or delete this section to allow pushing to any host.
+  if spec.respond_to?(:metadata)
+    spec.metadata["allowed_push_host"] = "https://rubygems.org"
+
+    spec.metadata["homepage_uri"] = spec.homepage
+    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."
+  end
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -25,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 'rake', '~> 10.0'
+  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.4.5
+  version: 1.5.1
 platform: ruby
 authors:
 - Alexey Chernikov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-23 00:00:00.000000000 Z
+date: 2020-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -44,28 +44,28 @@ 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
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -80,17 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-description: Collection of console tools, which is useful for everyday work at Techinform.
+description: Collection of console tools, which is useful for everyday work at Techinform
+  Soft ( https://techinform.dev )
 email:
-- alexey.chernikov@gmail.com
+- alexey@chernikov.online
 executables:
 - techinform
 - ti
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/gempush.yml"
 - ".gitignore"
 - ".ruby-version"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - README.md
@@ -106,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
@@ -113,10 +117,14 @@ files:
 - lib/techinform/sync/rails_exclude_files
 - lib/techinform/version.rb
 - techinform.gemspec
-homepage: https://techinform.pro
+homepage: https://techinform.dev
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
+  homepage_uri: https://techinform.dev
+  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:
@@ -132,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Console tools, useful at Techinform