qdumpfs 1.0.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7e95debed71b63b553da2ee5d9f4bb7828a855c1ed76a20188821fc507222f0
-  data.tar.gz: 31272461b61233cc082f9b44370eb3304415ac8025b67d8a13900795ead68570
+  metadata.gz: 924f153cf5eae013f68a399286176976d01f1c78efd78804c72bdc89b5642248
+  data.tar.gz: a60cf9bf9d1d2a8ab43ae24f09f7675a61eae527017effac8af9544b493a953a
 SHA512:
-  metadata.gz: 7419e48fea0c72b06d7c810ae22cf6c12f78aa4e9bcce21ffeeba176eafd039836169b178c0a13f892ca3834f687ea0a271b811311e6bf4904917a15a315ebf9
-  data.tar.gz: 1e596cb96545f92477e8695fd77394aba619afc928176a2d0f505914c25d1215e1eeda648a7673d10794460ea4521cb93933fe1303313b08aa7660d25d8ccb2f
+  metadata.gz: 1ea65b4989549346110f8a6ce1b63b9dac4418cff1e0dabd8bb99fd2e6d16b1c57f2192ac917c7c6164083e6dfc87f2a7134aeba3d014f5727388be27fd7702d
+  data.tar.gz: c2ac5821044dc5ad45cacfca0fb63224bfd60a22bb1fd10a94586137ae798c853253079af69cd66df7ef4328ebfb381b35ddfe029c7271010caf7d4f4606ff4f

data/.gitignore

@@ -16,3 +16,4 @@ test*.cmd
 /data/to2
 
 
+/sync_d.cmd

data/Gemfile.lock

@@ -1,23 +1,22 @@
 PATH
   remote: .
   specs:
-    qdumpfs (1.0.1)
+    qdumpfs (1.2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    minitest (5.14.4)
-    rake (13.0.3)
+    minitest (5.15.0)
+    rake (13.0.6)
 
 PLATFORMS
-  ruby
-  x64-mingw32
+  x86_64-darwin-21
 
 DEPENDENCIES
-  bundler (~> 1.17)
+  bundler (~> 2.0)
   minitest (~> 5.0)
   qdumpfs!
   rake (>= 12.3.3)
 
 BUNDLED WITH
-   1.17.2
+   2.3.8

data/lib/qdumpfs/option.rb

@@ -152,6 +152,10 @@ module Qdumpfs
     attr_reader :logger, :matcher, :reporter, :interval_proc
     attr_reader :delete_from, :delete_to, :delete_dirs, :backup_at
     attr_reader :debug
+
+    def close
+      @logger.close
+    end
     
     def report(type, filename)
       if @opts[:v]
@@ -176,6 +180,11 @@ module Qdumpfs
       end
       log(msg)
     end
+
+    def report_error(filename, reason)
+      msg = sprintf("err_file\t%s\t%s\n", filename, reason)
+      log(msg)
+    end
     
     def log(msg, console = true)
       return if (msg.nil? || msg == '')
@@ -186,6 +195,10 @@ module Qdumpfs
     def dry_run
       @opts[:n]
     end
+
+    def verbose
+      @opts[:v]
+    end
     
     def limit_sec
       @limit.to_i * 3600

data/lib/qdumpfs/version.rb

@@ -1,4 +1,4 @@
 module Qdumpfs
-  VERSION = "1.0.1"
+  VERSION = "1.2.1"
 end  
   

data/lib/qdumpfs.rb

@@ -15,6 +15,7 @@ module Qdumpfs
     include QdumpfsUtils
     
     def self.run(argv)
+      args = argv.clone
       STDOUT.sync = true
       opts = {}
       opt = OptionParser.new(argv)
@@ -33,7 +34,7 @@ module Qdumpfs
         opts[:ep] << Regexp.new(v)
       }
       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 }
+      opt.on('-w GLOB', '--exclude-by-glob=GLOB', 'exclude files matching GLOB') {|v| opts[:eg] = v }
       commands = ['backup', 'sync', 'list', 'expire', 'verify', 'delete']
       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}
@@ -56,6 +57,8 @@ module Qdumpfs
       option = Option.new(opts, argv)
       if opts[:v]
         puts "<<<<< qdumpfs options >>>>> "
+        args = args.join(' ')
+        puts "args: #{args}"
         puts "logdir: #{option.logdir}"
         puts "logpath: #{option.logpath}"
         puts "verifypath: #{option.verifypath}"
@@ -70,7 +73,9 @@ module Qdumpfs
           p e.backtrace
         end
         puts opt.help
-        exit        
+        exit
+      ensure
+        option.close
       end
     end
     
@@ -100,9 +105,15 @@ module Qdumpfs
     def log_result(src, today, elapsed)
       time  = Time.now.strftime("%Y-%m-%dT%H:%M:%S")
       bytes = convert_bytes(@written_bytes)
-      msg = sprintf("%s: %s -> %s (in %.2f sec, %s written)\n",
-      time, src, today, elapsed, bytes)
+      msg = sprintf("%s: %s -> %s (in %.2f sec, %s written)\n", time, src, today, elapsed, bytes)
       log(msg)
+      log("error files:\n")
+      i = 1
+      @error_files.each do |filename, reason|
+        msg = "#{i}. #{filename}\t#{reason}\n"
+        log(msg)
+        i += 1
+      end
     end
 
     def log(msg, console = true)
@@ -113,6 +124,10 @@ module Qdumpfs
       @opt.report(type, file_name)
     end
 
+    def report_error(file_name, reason)
+      @opt.report_error(file_name, reason)
+    end
+
     def update_file(src, latest, today)
       type = detect_type(src, latest)
       report(type, src)
@@ -180,7 +195,8 @@ module Qdumpfs
           update_file(s, l, t)
           dirs[t] = File.stat(s) if File.ftype(s) == "directory"
         rescue => e
-          log("#{src}: #{e.message}")
+          report_error(s, e.message)
+          @error_files << [s, e.message]          
           next
         end
       end
@@ -215,7 +231,8 @@ module Qdumpfs
           chown_if_root(type, s, t)
           dirs[t] = File.stat(s) if File.ftype(s) == "directory"
         rescue => e
-          log("#{src}: #{e.message}")
+          report_error(s, e.message)
+          @error_files << [s, e.message]
           next
         end
       end
@@ -295,6 +312,7 @@ module Qdumpfs
       log("##### backup start #####")
       
       @written_bytes = 0
+      @error_files = []
       start_time = Time.now
       if @opt.backup_at
         start_time = to_time(@opt.backup_at)
@@ -351,6 +369,7 @@ module Qdumpfs
       
       start_time = Time.now
       @written_bytes = 0
+      @error_files = []
       src = @opt.src
       dst = @opt.dst
       
@@ -397,6 +416,10 @@ module Qdumpfs
       
       end_time = Time.now
       diff = time_diff(start_time, end_time)
+
+      elapsed = Time.now - start_time
+      log_result(src, dst, elapsed)
+        
       log("##### sync end #{fmt(end_time)} diff=#{diff} last_sync_complete=#{last_sync_complete} #####")
     end
       

data/qdumpfs.gemspec

@@ -36,8 +36,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.17"
-#  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.0"  
   spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "minitest", "~> 5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qdumpfs
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.2.1
 platform: ruby
 authors:
 - src
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-10 00:00:00.000000000 Z
+date: 2022-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -105,7 +105,7 @@ metadata:
   homepage_uri: https://github.com/src256/qdumpfs
   source_code_uri: https://github.com/src256/qdumpfs
   changelog_uri: https://github.com/src256/qdumpfs
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -120,8 +120,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: qdumpfs
 test_files: []