qdumpfs 1.5.3 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e087de6a6bbd303a4aa627978ac3cb6c17cfb082b3bf4c74aab91294f1cdc12b
-  data.tar.gz: '082d2c1e1db12c650c5b8212f4a2cdf33fe723c2f2bd3684acbcd3e80ca593b3'
+  metadata.gz: d2912844a928c79223f682ec29561480c360c45bdc18ee9590b6623bbe04d95d
+  data.tar.gz: 9dac9f189d8948cbebf0a929a01763557300ac676679667bea3d6f2e0a652969
 SHA512:
-  metadata.gz: ad74b997b6dad5e6a1bc3b3406a95831dbf2ced159ea64bb1acb47e9cec4efcc16916cd1ae3bd78283a1a600117d92a8f41628bc2fb28eb23d2275e429ba8fdb
-  data.tar.gz: d025337b18fb68fbdb73f5bc2c9e1ec347659f3b35063fa92c2c9f0329d8bd1aa9bacc3f75d7347072e3af59dcf138ebbdcae4df7efe9a60f8610d0935bc9ba3
+  metadata.gz: 6769d780454a153e62e455ded96760971d62b82533773b72b872165e6cd7ec8bb96f661f7e87652f543c6f5e3af5631597231f937a8a2b4f44d1011a58b2b6d9
+  data.tar.gz: 882a8b0d152355f900c8d48e02458a53c9c898dbd6ee1516b33383a54ba6e023b807e197b0a2b87578279e71a70255b31f4498bc5170e4edca5c7ec2eb5289cf

data/.gitignore

@@ -11,10 +11,13 @@ list*
 log.txt
 *test.cmd
 test*.cmd
+test*.sh
 *.log
 /data/to
 /data/to2
-
-
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/dataSources.xml
+.idea/dataSources.local.xml
 /sync_d.cmd
-/test.
+/test

data/.idea/.gitignore

@@ -0,0 +1,10 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# GitHub Copilot persisted chat sessions
+/copilot/chatSessions

data/.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,16 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="RubyArgCount" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="RubyCaseWithoutElseBlockInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RubyTooManyInstanceVariablesInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RubyTooManyMethodsInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RubyUnnecessaryReturnStatement" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RubyUnusedLocalVariable" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
+      <option name="processCode" value="true" />
+      <option name="processLiterals" value="true" />
+      <option name="processComments" value="true" />
+    </inspection_tool>
+  </profile>
+</component>

data/.idea/misc.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="rbenv: 3.1.3" project-jdk-type="RUBY_SDK" />
+</project>

data/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/qdumpfs.iml" filepath="$PROJECT_DIR$/.idea/qdumpfs.iml" />
+    </modules>
+  </component>
+</project>

data/.idea/qdumpfs.iml

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="RUBY_MODULE" version="4">
+  <component name="ModuleRunConfigurationManager">
+    <shared />
+  </component>
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/features" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/.idea/copilot/chatSessions" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library">
+      <library name="minitest (v5.22.3) [path][gem]" type="rubylib">
+        <properties>
+          <option name="version" value="4" />
+        </properties>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/minitest-5.22.3/lib" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/minitest-5.22.3/test" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/minitest-5.22.3/lib" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/minitest-5.22.3/test" />
+        </SOURCES>
+        <excluded>
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/minitest-5.22.3/test" />
+        </excluded>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="rake (v13.1.0) [path][gem]" type="rubylib">
+        <properties>
+          <option name="version" value="4" />
+        </properties>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/rake-13.1.0/doc" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/rake-13.1.0/exe" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/rake-13.1.0/lib" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/rake-13.1.0/doc" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/rake-13.1.0/exe" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/rake-13.1.0/lib" />
+        </SOURCES>
+        <excluded>
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/rake-13.1.0/doc" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/rake-13.1.0/exe" />
+        </excluded>
+      </library>
+    </orderEntry>
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v2.4.20, rbenv: 3.1.3) [gem]" level="application" />
+  </component>
+  <component name="RakeTasksCache-v2">
+    <option name="myRootTask">
+      <RakeTaskImpl id="rake">
+        <subtasks>
+          <RakeTaskImpl description="Build qdumpfs-1.6.1.gem into the pkg directory" fullCommand="build" id="build" />
+          <RakeTaskImpl id="build">
+            <subtasks>
+              <RakeTaskImpl description="Generate SHA512 checksum if qdumpfs-1.6.1.gem into the checksums directory" fullCommand="build:checksum" id="checksum" />
+            </subtasks>
+          </RakeTaskImpl>
+          <RakeTaskImpl description="Remove any temporary products" fullCommand="clean" id="clean" />
+          <RakeTaskImpl description="Remove any generated files" fullCommand="clobber" id="clobber" />
+          <RakeTaskImpl description="Build and install qdumpfs-1.6.1.gem into system gems" fullCommand="install" id="install" />
+          <RakeTaskImpl id="install">
+            <subtasks>
+              <RakeTaskImpl description="Build and install qdumpfs-1.6.1.gem into system gems without network access" fullCommand="install:local" id="local" />
+            </subtasks>
+          </RakeTaskImpl>
+          <RakeTaskImpl description="Create tag v1.6.1 and build and push qdumpfs-1.6.1.gem to rubygems.org" fullCommand="release[remote]" id="release[remote]" />
+          <RakeTaskImpl description="Run tests" fullCommand="test" id="test" />
+          <RakeTaskImpl description="" fullCommand="default" id="default" />
+          <RakeTaskImpl description="" fullCommand="release" id="release" />
+          <RakeTaskImpl id="release">
+            <subtasks>
+              <RakeTaskImpl description="" fullCommand="release:guard_clean" id="guard_clean" />
+              <RakeTaskImpl description="" fullCommand="release:rubygem_push" id="rubygem_push" />
+              <RakeTaskImpl description="" fullCommand="release:source_control_push" id="source_control_push" />
+            </subtasks>
+          </RakeTaskImpl>
+        </subtasks>
+      </RakeTaskImpl>
+    </option>
+  </component>
+</module>

data/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    qdumpfs (1.5.3)
+    qdumpfs (1.6.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    minitest (5.19.0)
-    rake (13.0.6)
+    minitest (5.22.3)
+    rake (13.1.0)
 
 PLATFORMS
   x64-mingw32
@@ -20,4 +20,4 @@ DEPENDENCIES
   rake (>= 12.3.3)
 
 BUNDLED WITH
-   2.2.33
+   2.4.20

data/lib/qdumpfs/option.rb

@@ -68,6 +68,7 @@ module Qdumpfs
   class NullMatcher
     def initialize(options = {})
     end
+    # @param [Object] path
     def exclude?(path)
       false
     end

data/lib/qdumpfs/util.rb

@@ -35,7 +35,8 @@ class File
     begin
       File.unlink(dest) if File.anything_exist?(dest)
       File.symlink(src, dest)
-    rescue 
+    rescue
+      puts "force_symlink fails #{src} #{dest}"
     end
   end
 
@@ -65,10 +66,10 @@ module QdumpfsFind
   def find(logger, *paths)
     block_given? or return enum_for(__method__, *paths)
     paths.collect!{|d|
-      raise Errno::ENOENT unless File.exist?(d);
+      raise Errno::ENOENT unless File.exist?(d)
       d.dup
     }
-    while file = paths.shift
+    while (file = paths.shift)
       catch(:prune) do
         yield file.dup.taint
         begin
@@ -77,7 +78,7 @@ module QdumpfsFind
           logger.print("File.lstat path=#{file} error=#{e.message}")
           next
         end
-        if s.directory? then
+        if s.directory?
           begin
             fs = Dir.entries(file, :encoding=>'UTF-8')
           rescue => e
@@ -116,12 +117,14 @@ module QdumpfsUtils
             block = r.sysread(block_size)
             w.syswrite(block)
             i += 1
-            @written_bytes += block.size
+            @write_bytes += block.size
           end
         }
       }
-    rescue EOFError => e
-      # puts e.message, e.backtrace
+    rescue EOFError
+      # この実装だとファイルサイズがblock_sizeより小さい場合にEOFErrorが発生する
+      # それはしかたがないので無視する
+      #       puts e.message
     end    
     unless FileTest.file?(dest)
       raise "copy_file fails #{dest}"
@@ -136,7 +139,12 @@ module QdumpfsUtils
     File.utime(stat.atime, stat.mtime, dest)
     File.chmod(stat.mode, dest) # not necessary. just to make sure
   end
-  
+
+  def link(src, dest)
+    @link_bytes += File.size(src)
+    File.force_link(src, dest)
+  end
+    
   def convert_bytes(bytes)
     if bytes < 1024
       sprintf("%dB", bytes)
@@ -189,7 +197,7 @@ module QdumpfsUtils
           type = "new_file"
         when "link"
           type = "symlink"
-          end
+        end
       end
     end
     return type

data/lib/qdumpfs/version.rb

@@ -1,4 +1,4 @@
 module Qdumpfs
-  VERSION = "1.5.3"
+  VERSION = "1.6.1"
 end  
   

data/lib/qdumpfs.rb

@@ -68,8 +68,8 @@ module Qdumpfs
         command = Command.new(option)
         command.run
       rescue => e
+        puts e.message + "\n"
         if option.debug
-          p e.message
           p e.backtrace
         end
         puts opt.help
@@ -104,8 +104,9 @@ module Qdumpfs
     private
     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)
+      write_bytes = convert_bytes(@write_bytes)
+      link_bytes = convert_bytes(@link_bytes)
+      msg = sprintf("%s: %s -> %s (in %.2f sec, %s write, %s link)\n", time, src, today, elapsed, write_bytes, link_bytes)
       log(msg)
       log("error files:\n")
       i = 1
@@ -136,7 +137,7 @@ module Qdumpfs
       when "directory"
         FileUtils.mkpath(today)
       when "unchanged"
-        File.force_link(latest, today)
+        link(latest, today)
       when "updated"
         copy(src, today)
       when "new_file"
@@ -181,16 +182,17 @@ module Qdumpfs
       # today: 差分バックアップ先ディレクトリ ex)j:/to/backup1/2019/05/10/home
       dirs = {};
       QdumpfsFind.find(@opt.logger, src) do |s|      # path of the source file
-        if @opt.matcher.exclude?(s)
-          if File.lstat(s).directory? then Find.prune() else next end
-        end
-        # バックアップ元ファイルのパスからディレクトリ部分を削除
-        r = make_relative_path(s, src)
-        # 既存バックアップファイルのパス
-        l = File.join(latest, r)  # path of the latest  snapshot
-        # 新規バックアップファイルのパス
-        t = File.join(today, r)   # path of the today's snapshot
         begin
+          if @opt.matcher.exclude?(s)
+            if File.lstat(s).directory? then Find.prune else next end
+          end
+          # バックアップ元ファイルのパスからディレクトリ部分を削除
+          r = make_relative_path(s, src)
+          # 既存バックアップファイルのパス
+          l = File.join(latest, r)  # path of the latest  snapshot
+          # 新規バックアップファイルのパス
+          t = File.join(today, r)   # path of the today's snapshot
+
           # ファイルのアップデート
           update_file(s, l, t)
           dirs[t] = File.stat(s) if File.ftype(s) == "directory"
@@ -207,12 +209,13 @@ module Qdumpfs
     def recursive_copy(src, dst)
       dirs = {}
       QdumpfsFind.find(@opt.logger, src) do |s|
-        if @opt.matcher.exclude?(s)
-          if File.lstat(s).directory? then Find.prune() else next end
-        end
-        r = make_relative_path(s, src)
-        t = File.join(dst, r)
         begin
+          if @opt.matcher.exclude?(s)
+            if File.lstat(s).directory? then Find.prune else next end
+          end
+          r = make_relative_path(s, src)
+          t = File.join(dst, r)
+
           type = detect_type(s)
           report(type, s)
           next if @opt.dry_run
@@ -227,7 +230,7 @@ module Qdumpfs
             # just ignore it
           else
             raise "#{type}: shouldn't be reached here"
-        end
+          end
           chown_if_root(type, s, t)
           dirs[t] = File.stat(s) if File.ftype(s) == "directory"
         rescue => e
@@ -311,7 +314,8 @@ module Qdumpfs
       
       log("##### backup start #####")
       
-      @written_bytes = 0
+      @write_bytes = 0
+      @link_bytes = 0
       @error_files = []
       start_time = Time.now
       if @opt.backup_at
@@ -362,7 +366,8 @@ module Qdumpfs
       @opt.validate_directories(2)
       
       start_time = Time.now
-      @written_bytes = 0
+      @write_bytes = 0
+      @link_bytes = 0
       @error_files = []
       src = @opt.src
       dst = @opt.dst
@@ -421,7 +426,7 @@ module Qdumpfs
       file = @opt.open_verifyfile
     
       start_time = Time.now
-      add_log("##### verify start #{fmt(start_time)} #####")
+      log("##### verify start #{fmt(start_time)} #####")
     
       src_count, dst_count = do_verify(src, dst)
     
@@ -432,7 +437,7 @@ module Qdumpfs
       
       end_time = Time.now
       diff = time_diff(start_time, end_time)
-      add_log("##### list end #{fmt(end_time)} diff=#{diff} #####")
+      log("##### list end #{fmt(end_time)} diff=#{diff} #####")
       
       file.close 
     end

data/test_qdumpfs.sh

@@ -1,6 +1,5 @@
 #!/bin/sh
 
 curdir=$(dirname $0)
-bundle exec ruby $curdir/exe/qdumpfs $* ~/_qdumpfs/src ~/_qdumpfs/dst
-
-
+#bundle exec ruby $curdir/exe/qdumpfs $* ~/_qdumpfs/src ~/_qdumpfs/dst
+bundle exec ruby $curdir/exe/qdumpfs $* --exclude="/Users/sora/Documents/Virtual Machines.localized"  /Users/sora /Volumes/qdumpfs/home

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qdumpfs
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.6.1
 platform: ruby
 authors:
 - src
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-07 00:00:00.000000000 Z
+date: 2024-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -62,6 +62,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".idea/.gitignore"
+- ".idea/inspectionProfiles/Project_Default.xml"
+- ".idea/misc.xml"
+- ".idea/modules.xml"
+- ".idea/qdumpfs.iml"
+- ".idea/vcs.xml"
 - ".travis.yml"
 - ".vscode/settings.json"
 - CODE_OF_CONDUCT.md
@@ -121,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: qdumpfs