qdumpfs 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc8d8dec60fe04598e9dd5bea8528f5299a7cbb7ee0f0432c3b6d46488917edf
-  data.tar.gz: '029dffccca2865524f208d28f2ebe2f63b2de465e0a5f08de93c597156fd48a9'
+  metadata.gz: 5a538d62022eefe0216aeebb5a145a9e58da17fec71b6e5568a05e6e3f0e5234
+  data.tar.gz: c4998bacaa329ddbccf59e97ffacc1f70f6c9e0e771a5684bce9b1231dbf1539
 SHA512:
-  metadata.gz: 9c393b76dddd9978adf5dfc77cfb25f3c14bfb9b1aca0767228b8b4c70fdf11206f4a35c9e0f5098b1c7ba1e3b113dc8f51de3ad14b48d39fe1dff8dd21309f1
-  data.tar.gz: 054605d2b4f91e2c0fdbd0518614b81a9f04f0ba378f0d92c5aba28c59456ae88c40dfb156579295c10130c248fc314197bd03398f18435cd1e0596696f444f2
+  metadata.gz: aa1a042fa12c461a65f66757ecc1966976672947d88de8e885141e128eea04c2d8cbdea9f833e3da5c52b28a28d24047e17142f12af47e204f9317ae04bd571b
+  data.tar.gz: 82467662b3415937881e00f85396783e096d6c3643a6bf5a469e9cae931887087edc6ba54795c1296097342f03c896a69e6223fe0697f6e9a3760109033c90e9

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    qdumpfs (0.8.0)
+    qdumpfs (0.9.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    minitest (5.14.2)
-    rake (13.0.1)
+    minitest (5.14.3)
+    rake (13.0.3)
 
 PLATFORMS
   ruby

data/lib/qdumpfs.rb

@@ -51,6 +51,7 @@ module Qdumpfs
       opt.on('--backup-at=YYYYMMDD', 'backup at YYYY/MM/DD') {|v|
         opts[:backup_at] = Date.parse(v)
       }
+      opt.on('-d', '--debug', 'debug mode') {|v| opts[:d] = v }
       opt.parse!(argv)
       option = Option.new(opts, argv)
       if opts[:v]
@@ -64,8 +65,10 @@ module Qdumpfs
         command = Command.new(option)
         command.run
       rescue => e
-#        p e.message
-#        p e.backtrace
+        if option.debug
+          p e.message
+          p e.backtrace
+        end
         puts opt.help
         exit        
       end
@@ -170,7 +173,7 @@ module Qdumpfs
           # ファイルのアップデート
           update_file(s, l, t)
           dirs[t] = File.stat(s) if File.ftype(s) == "directory"
-        rescue Errno::ENOENT, Errno::EACCES => e
+        rescue => e
           wprintf("%s: %s", src, e.message)
           next
         end
@@ -205,7 +208,7 @@ module Qdumpfs
         end
           chown_if_root(type, s, t)
           dirs[t] = File.stat(s) if File.ftype(s) == "directory"
-        rescue Errno::ENOENT, Errno::EACCES => e
+        rescue => e
           wprintf("%s: %s", s, e.message)
           next
         end

data/lib/qdumpfs/option.rb

@@ -141,15 +141,17 @@ module Qdumpfs
       @keep_day = $1.to_i if keep =~ /(\d+)D/
       @delete_from = @opts[:delete_from]
       @delete_to = @opts[:delete_to]
-      @delete_dirs = @opts[:delete_dirs]
+      @delete_dirs = @opts[:delete_dirs] || []
       @backup_at = @opts[:backup_at]
       @today = Date.today
+      @debug = @opts[:d]
     end
     attr_reader :dirs, :src, :dst, :cmd
     attr_reader :keep_year, :keep_month, :keep_week, :keep_day
     attr_reader :logdir, :logpath, :verifypath
     attr_reader :logger, :matcher, :reporter, :interval_proc
     attr_reader :delete_from, :delete_to, :delete_dirs, :backup_at
+    attr_reader :debug
     
     def report(type, filename)
       if @opts[:v]

data/lib/qdumpfs/util.rb

@@ -73,14 +73,14 @@ module QdumpfsFind
         yield file.dup.taint
         begin
           s = File.lstat(file)
-        rescue Errno::ENOENT, Errno::EACCES, Errno::ENOTDIR, Errno::ELOOP, Errno::ENAMETOOLONG => e
+        rescue => e
           logger.print("File.lstat path=#{file} error=#{e.message}")
           next
         end
         if s.directory? then
           begin
             fs = Dir.entries(file, :encoding=>'UTF-8')
-          rescue Errno::ENOENT, Errno::EACCES, Errno::ENOTDIR, Errno::ELOOP, Errno::ENAMETOOLONG => e
+          rescue => e
             logger.print("Dir.entries path=#{file} error=#{e.message}")
             next
           end
@@ -107,23 +107,22 @@ module QdumpfsUtils
 
   # We don't use File.copy for calling @interval_proc.
   def copy_file(src, dest)
-    File.open(src, 'rb') {|r|
-      File.open(dest, 'wb') {|w|
-        block_size = (r.stat.blksize or 8192)
-        begin
+    begin    
+      File.open(src, 'rb') {|r|
+        File.open(dest, 'wb') {|w|
+          block_size = (r.stat.blksize or 8192)
           i = 0
           while true
             block = r.sysread(block_size)
             w.syswrite(block)
             i += 1
             @written_bytes += block.size
-#            @interval_proc.call if i % 10 == 0
           end
-        rescue EOFError => e
-          #            puts e.message, e.backtrace
-        end
+        }
       }
-    }
+    rescue EOFError => e
+      # puts e.message, e.backtrace
+    end    
     unless FileTest.file?(dest)
       raise "copy_file fails #{dest}"
     end

data/lib/qdumpfs/version.rb

@@ -1,4 +1,4 @@
 module Qdumpfs
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end  
-  
+  

data/run_qdumpfs.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 
 curdir=$(dirname $0)
-bundle exec ruby $curdir/exe/qdumpfs $*
+bundle exec ruby $curdir/exe/qdumpfs "$@"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qdumpfs
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - src
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-22 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler