qdumpfs 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ceaa58593a1a92b6d0c9f2d76bd7ed5a75822c0452a2551781946ec73d8a6ad5
-  data.tar.gz: caf81857a389d2a81094f167e8160195ab8c5fd107fbbef4387d7303a4e12a3b
+  metadata.gz: 3fe2d92b26abfc9df013c1affc9b3576ef4fe006d872909c8d7b637a6f9ca38a
+  data.tar.gz: 919639dab6b87bea4ffc1ea0da988e00e442abc49641f698001e2353a3bf0857
 SHA512:
-  metadata.gz: 17439939c7fd6e82f8ad6a560d9faaf5d268c275e121c1939ddc574f0c99e3aba807fe301b282b226b19f2b676b3802bd8016c130ed2d95765380406fca91f1f
-  data.tar.gz: 3f5f378da6ca8e0a4f3a9732227a099909bb15748066d64da7b10c642b66bb1a877d4262b29aa98cf5b44ae9b78bc6b5d0d806fe19fe99e9cb670b490509f7f0
+  metadata.gz: 44ccd6920a656c9f796a90832fe04fe1661da1ad492a22fe5661b8b2de7cd3d6b5294ba166f672fd02fcd6b49bc638c26e57db9689c3d5e403dd91425de85b0a
+  data.tar.gz: f9f037f8b506efb3b8b47b35bae102ca086c77c00feb360aec20bcea9adfc6de4555331aaf6dbaf24b98417530fd35aef2270f51646402df6e9fcabdbfb57afd

data/.gitignore

@@ -11,4 +11,5 @@ list*
 log.txt
 *test.cmd
 test*.cmd
+*.log
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    qdumpfs (0.4.0)
+    qdumpfs (0.5.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -6,21 +6,56 @@ qdumpfs is a modified version of pdumpfs.
 
 gem install qdumpfs
 
-```ruby
-gem 'qdumpfs'
+## Usage
+
+
+```
+Usage: qdumpfs [options] <source> <dest>
+    -h, --help                       show this message
+Options
+    -v, --verbose                    verbose message
+    -r, --report                     report message
+    -n, --dry-run                    don't actually run any commands
+    -e, --exclude=PATTERN            exclude files/directories matching PATTERN
+    -s, --exclude-by-size=SIZE       exclude files larger than SIZE
+    -w, --exclude-by-glob=GLOB       exclude files matching GLOB
+    -c, --command=COMMAND            backup|sync|list|expire|verify|test
+    -l, --limit=HOURS                limit hours
+    -k, --keep=KEEPARG               ex: --keep 100Y12M12W30D (100years, 12months, 12weeks, 30days, default)
 ```
 
-And then execute:
+## Example
 
-    $ bundle
+Backup your home directory, run the following command.
+```
+qdumpfs /home/foo /backup
+```
 
-Or install it yourself as:
+You can specify command option(default is "backup").
+```
+qdumpfs --command=backup /home/foo /backup
+```
 
-    $ gem install qdumpfs
+Sync two backup directories.
+```
+qdumpfs --command=sync /backup1 /backup2
+```
 
-## Usage
+Sync two backup directories(limit 1 hours, keep 100Y12M12W30D).
+```
+qdumpfs --command=sync --limit=1 /backup1 /backup2
+```
+
+Sync two backup directories(limit 1 hours, keep specified backups only).
+```
+qdumpfs --command=sync --limit=1 --keep=5Y6M7W10D --keep/backup1 /backup2
+```
+
+Expire backup directory.
+```
+qdumpfs --command=expire --limit=1 --keep=5Y6M7W10D --keep/backup1 /backup2
+```
 
-qdumpfs srcdir dstdir
 
 ## License
 

data/lib/qdumpfs.rb

@@ -19,8 +19,8 @@ module Qdumpfs
       opts = {}
       opt = OptionParser.new(argv)
       opt.version = VERSION
-      opt.banner = "Usage: #{opt.program_name} [-h|--help]"
-      opt.separator('')
+      opt.banner = "Usage: #{opt.program_name} [options] <source> <dest>"
+      opt.separator('Options')
       opt.on_head('-h', '--help', 'show this message') do |v|
         puts opt.help
         exit
@@ -34,24 +34,26 @@ module Qdumpfs
       }
       opt.on('-s SIZE', '--exclude-by-size=SIZE', 'exclude files larger than SIZE') {|v| opts[:es] = v }
       opt.on('-w GLOB', '--exclude-by-glob=GLOB', 'exclude files matching GLOB') {|v| opts[:ep] = v }
-      commands = ['backup', 'sync', 'list', 'expire', 'verify', 'test']
+      commands = ['backup', 'sync', 'list', 'expire', 'verify']
       opt.on('-c COMMAND', '--command=COMMAND', commands, commands.join('|')) {|v| opts[:c] = v}
       opt.on('-l HOURS', '--limit=HOURS', 'limit hours') {|v| opts[:limit] = v}
       opt.on('-k KEEPARG', '--keep=KEEPARG', 'ex: --keep 100Y12M12W30D (100years, 12months, 12weeks, 30days, default)') {|v| opts[:keep] = v}
-
-
+      opt.on('--logdir LOGDIR', 'logdir') {|v| opts[:logdir] = v}
       opt.parse!(argv)
       option = Option.new(opts, ARGV)
-      
+      if opts[:v]
+        puts "<<<<< qdumpfs options >>>>> "
+        puts "logdir: #{option.logdir}"
+        puts "logpath: #{option.logpath}"
+        puts "verifypath: #{option.verifypath}"
+        puts 
+      end
       begin
         command = Command.new(option)
         command.run
-      rescue ArgumentError => e
-        puts e.message, e.backtrace
-        puts opt.help
-        exit
       rescue => e
-        puts e.message, e.backtrace
+        puts opt.help
+        exit        
       end
     end
     
@@ -70,9 +72,9 @@ module Qdumpfs
         expire
       elsif @opt.cmd == 'verify'
         verify
-      elsif @opt.cmd == 'test'
-        test
-      else
+#      elsif @opt.cmd == 'test'
+#        test
+#      else
         raise RuntimeError, "unknown command: #{cmd}"
       end
     end
@@ -394,15 +396,7 @@ module Qdumpfs
       diff = time_diff(start_time, end_time)
       log("##### sync end #{fmt(end_time)} diff=#{diff} last_sync_complete=#{last_sync_complete} #####")
     end
-    
-    def open_verify_file
-      filename = File.join(@log_dir, 'verify.txt')
-      if FileTest.file?(filename)
-        File.unlink(filename)
-      end
-      File.open(filename, 'a')
-    end
-    
+      
     def verify
       file = @opt.open_verifyfile
     

data/lib/qdumpfs/option.rb

@@ -109,9 +109,9 @@ module Qdumpfs
       @cmd = @opts[:c] || 'backup'
       
       #      @logger = NullLogger.new
-      logfile = @opts[:logfile] || 'log.txt'
+      logfile = 'qdumpfs.log'
       #ログディレクトリの作成      
-      @logdir = File.expand_path('.')
+      @logdir = @opts[:logdir] || Dir.pwd
       Dir.mkdir(@logdir) unless FileTest.directory?(@logdir)
       @logpath = File.join(@logdir, logfile)
       @logger = SimpleLogger.new(@logpath)
@@ -143,7 +143,7 @@ module Qdumpfs
     end
     attr_reader :dirs, :src, :dst, :cmd
     attr_reader :keep_year, :keep_month, :keep_week, :keep_day
-    attr_reader :logdir, :logfile, :verifyfile
+    attr_reader :logdir, :logpath, :verifypath
     attr_reader :logger, :matcher, :reporter, :interval_proc
     
     def report(type, filename)

data/lib/qdumpfs/version.rb

@@ -1,3 +1,3 @@
 module Qdumpfs
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/test_qdumpfs.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+curdir=$(dirname $0)
+bundle exec ruby $curdir/exe/qdumpfs $* ~/_qdumpfs/src ~/_qdumpfs/dst
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qdumpfs
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - src
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-16 00:00:00.000000000 Z
+date: 2020-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,6 +91,7 @@ files:
 - test_pdumpfs/data/foo
 - test_pdumpfs/data/secret/secret
 - test_pdumpfs/pdumpfs-test
+- test_qdumpfs.sh
 homepage: https://github.com/src256/qdumpfs
 licenses:
 - MIT