techinform 1.4.8 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5b728058ba7c64a9ac091655bafc898325e5b06b633cf487c1b6208ba3097ad
-  data.tar.gz: f078deb4745f630e0626e52752a895964192190d2568f1f713adcfc972c93ba1
+  metadata.gz: 183e41f8f63575678f62a93a9272e12ffe466065f5fcac85f83294dff4af6aba
+  data.tar.gz: 4565a5f143d018ca3990e7718044d816ee292d98c2b3876a89edf7d63e3c8267
 SHA512:
-  metadata.gz: 84bafca7ae63e7f6e759392d6ca8cf813fc369e6f67e4a049970f288bb8fab6e429e0043011f37b6bca06dafa24dd5c6c6c9c1e9ae05d870f704958333d569ab
-  data.tar.gz: c9e0b94c31084b37d934ede00297fe642bf79171af0bb0b5e6202fd56a9dc7a3e8c5dbb4aed419494d54b6b9eaba094a1ba4d2d52549be87f16a2809bee7079c
+  metadata.gz: 969add1f0314c3e7b4f0e715efddab7cabcf481147d98839993fb38455742f775c0114aa2aea4c2eb1f1586e798faa78075f45813852b544b49bdce8339d8873
+  data.tar.gz: d9851e6fdac255d5c5e7b07b3b78525eecbd9350e201f6378bd9261ecaf893fad19cc02c189edffc2f394681365ae4318642ea64014150c41b80d8bf11e9cbc6

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,20 @@
+### 1.6.1
+
+- Do not sync releases folder in case of rails backup sync
+
+### 1.6.0 
+
+- Adds --delete option on backup sync (via rsync)
+
+### 1.5.2
+
+- Version bump with minor text changes
+
+### 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
@@ -28,7 +28,7 @@ Available variables:
 
     DEBUG=true                      # Print debug information on commands run
     GPGKEY=< email | key id >       # Enables encryption and encrypt with specific public key via gpg2. gpg2 should be installed
-    USER=root                       # User for database access
+    DBUSER=root                       # User for database access
     PASSWORD=password               # Password for database access
 
 ## Usage

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
-          `gpg2 --decrypt #{filename} | pv --wait | bzip2 > #{File.basename(filename, '.*')}`
+          puts "Decrypting postgres backup of #{filename}..."
+          `pv --wait #{filename} | gpg2 --decrypt  | #{bzip2} > #{File.basename(filename, '.*') + '.bz2'}`
         elsif encrypted
-          `gpg2 --decrypt #{filename} | pv --wait | psql #{dbname} > /dev/null`
+          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 && just_decrypt
-          `gpg2 --decrypt #{filename} | pv --wait | bzip2 > #{File.basename(filename, '.*')}`
+          puts "Decrypting mysql backup of #{filename}..."
+          `pv --wait #{filename} | gpg2 --decrypt | #{bzip2} > #{File.basename(filename, '.*') + '.bz2'}`
         elsif encrypted
-          `gpg2 --decrypt #{filename} | pv --wait | 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
-          `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
 

data/lib/techinform/backup.rb

@@ -47,10 +47,11 @@ module Techinform
     end
 
     desc 'sync [server] [type] [ipaddr | dnsname]', 'Sync backups from remote server'
+    option :delete, type: :boolean, default: false, desc: 'Mirror files (delete nonexistent) on sync'
     def sync(server, type, ipaddr)
       location = Techinform.backups_syncing_location(server, type)
       `mkdir -p #{location}`
-      system("rsync -avz #{"--exclude-from=#{"#{File.dirname(__FILE__)}/sync/rails_exclude_files"}" if type == 'rails'} backup@#{ipaddr}::#{type} #{location}")
+      system("rsync -avz #{'--delete' if options[:delete]} #{"--exclude-from=#{"#{File.dirname(__FILE__)}/sync/rails_exclude_files"}" if type == 'rails'} backup@#{ipaddr}::#{type} #{location}")
     end
   end
 end

data/lib/techinform/sync/rails_exclude_files

@@ -2,4 +2,5 @@ db/sphinx
 tmp/
 shared/bundle
 shared/log
-deploy/*/repo
+deploy/*/repo
+releases/

data/lib/techinform/version.rb

@@ -1,3 +1,3 @@
 module Techinform
-  VERSION = "1.4.8"
+  VERSION = "1.6.1"
 end

data/techinform.gemspec

@@ -16,11 +16,11 @@ Gem::Specification.new do |spec|
   # 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["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.4.8
+  version: 1.6.1
 platform: ruby
 authors:
 - Alexey Chernikov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-27 00:00:00.000000000 Z
+date: 2020-12-19 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
@@ -90,8 +90,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/gempush.yml"
 - ".gitignore"
 - ".ruby-version"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - README.md
@@ -107,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
@@ -118,10 +121,9 @@ homepage: https://techinform.dev
 licenses:
 - MIT
 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:
@@ -137,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Console tools, useful at Techinform