techinform 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c63c8438bf1e6d54431111e44d43d1dd966629d1094e99de30b6248c68874bd
-  data.tar.gz: 14ed136ea188bcde20277c34d1d50a2cbdf7607fd0e3513cbf57936c46efc46d
+  metadata.gz: 982f80834a27d59d06f53151288b90e17fc874994520dad6b970e2916fa747d8
+  data.tar.gz: d809f949a48c583710416d686e980348433be89585241ace121c4342b15b4165
 SHA512:
-  metadata.gz: 6d3982448c3e16211eb75060719df076834482eda712ac6214d2be6707a8a0b5c7014ecb15a9b8e9015244efe519d0fbf1bd3a308250a5b5a9d1a9317bffac9a
-  data.tar.gz: 508abdfe5a74a2004f7edc416eb68f0f76febad6198423737ad0eec215f81af1a52f3082748ccdff06978b1de1b9db76dc22a46167d85a59bca4ebfa381bfe14
+  metadata.gz: 8dec9afb688a0c671b1f77886eeb33f33fb04ce94ce313f91fd3a5156eaa7f57727c49dc1d4be4c70083da7dec27518b02b6714a38d31415e2d3d6c9b8593d35
+  data.tar.gz: a4f43b84f25fabe4e21de5ecc2ef43e139003ed17d24a13b4f19546ff0a58b40a8f3a454f00f4bef8f5091c788e97928c74e465a4df9f9e9b8349fa8fbd5543d

data/.ruby-version

@@ -1 +1 @@
-2.5.1
+2.5.5

data/lib/backup/backup.rb

@@ -28,8 +28,12 @@ class Backup
     self.class.to_s.gsub('Backup', '').downcase
   end
 
+  def backup_type_filename
+    backup_type
+  end
+
   def filename
-    "#{backup_type}-#{DateTime.now.strftime(DATE_FORMAT)}.#{filename_extension}"
+    "#{backup_type_filename}-#{DateTime.now.strftime(DATE_FORMAT)}.#{filename_extension}"
   end
 
   def filename_extension(base = 'tar')

data/lib/backup/db_backup.rb

@@ -22,40 +22,4 @@ class DbBackup < Backup
   def restore_path
     "#{Techinform::BACKUPS_ALL_PREFIX}/backups/#{backup_type}/#{database}"
   end
-
-  def filepath
-    "#{path}/#{filename}"
-  end
-
-  def ensure_path
-    `mkdir -p #{path}`
-  end
-
-  def clean_files
-    result = {} # true - delete file, false - do not delete
-    months_taken = []
-    days_taken = []
-    files = Dir.entries(path) - ['.', '..']
-    files.each do |file|
-      datetime = get_datetime_from_filename(file)
-      day_id = datetime.strftime('%Y-%m-%d')
-      month_id = datetime.strftime('%Y-%m')
-      if datetime < (DateTime.now << 2)     # 1 month ago
-        if datetime.day == 1 && !(months_taken.include? month_id)
-          result[file] = false
-          months_taken << month_id
-        else
-          result[file] = true
-        end
-      elsif datetime < DateTime.now - 14 # 2 weeks ago
-        if [1, 7, 14, 21].include?(datetime.day) && !(days_taken.include?(day_id))
-          result[file] = false
-          days_taken << day_id
-        else
-          result[file] = true
-        end
-      elsif days_taken.includ
-      end
-    end
-  end
 end

data/lib/backup/files_backup.rb

@@ -0,0 +1,25 @@
+require_relative 'backup'
+
+class FilesBackup < Backup
+  attr_reader :files_backup
+
+  def initialize files_backup = '/etc'
+    @files_backup = files_backup
+  end
+
+  def print_info
+    puts "Run #{files_backup} backup to #{filepath}..."
+  end
+
+  def backup_type_filename
+    files_backup.sub(/^\//, '').gsub('/', '_')
+  end
+
+  def path
+    "#{Techinform::BACKUPS_LOCAL_PREFIX}/#{backup_type}/#{backup_type_filename}"
+  end
+
+  def backup_command
+    "tar -c #{files_backup}"
+  end
+end

data/lib/techinform/backup.rb

@@ -34,10 +34,16 @@ module Techinform
       dbs
     end
 
+    desc 'files', 'Files backup'
+    def files(files_backup='/etc')
+      require_relative '../../lib/backup/files_backup'
+      FilesBackup.new(files_backup).run
+    end
+
     desc 'etc', 'Backup of /etc folder'
     def etc
-      require_relative '../../lib/backup/etc_backup'
-      EtcBackup.new.run
+      require_relative '../../lib/backup/files_backup'
+      FilesBackup.new('/etc').run
     end
 
     desc 'sync [server] [type] [ipaddr | dnsname]', 'Sync backups from remote server'

data/lib/techinform/version.rb

@@ -1,3 +1,3 @@
 module Techinform
-  VERSION = "1.2.2"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: techinform
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Alexey Chernikov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-30 00:00:00.000000000 Z
+date: 2019-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -101,7 +101,7 @@ files:
 - exe/ti
 - lib/backup/backup.rb
 - lib/backup/db_backup.rb
-- lib/backup/etc_backup.rb
+- lib/backup/files_backup.rb
 - lib/backup/mysql_backup.rb
 - lib/backup/postgre_backup.rb
 - lib/techinform.rb

data/lib/backup/etc_backup.rb

@@ -1,11 +0,0 @@
-require_relative 'backup'
-
-class EtcBackup < Backup
-  def print_info
-    puts "Run etc backup to #{filepath}..."
-  end
-
-  def backup_command
-    'tar -c /etc'
-  end
-end