qdumpfs 1.9.1 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc77dcb0cc06a9f0bd3c05042fa61088e5babf3d5a70fdfa4b1788a6ae4e076e
-  data.tar.gz: e4923e91396f39f7311d8ceb3c1f1128bbbc606a76c55fd84a0753f10341505e
+  metadata.gz: 4ace57748311474078255f93323c921f04c1d63ce40f04bb12ec15d0e48a38e8
+  data.tar.gz: 7c214b8b293a6f5feee3573d3d87d09be7fb18f43d1db6376b2c521081025bd5
 SHA512:
-  metadata.gz: 311b46a74804b78ba6627130a7e2e400dfc0a3e16bfdcd197f6b9406d3f90802117999a5d6d851881b4664e78e213d117ef07a0842757d629b349ad55f271883
-  data.tar.gz: 05c44d7d33a0649cf63a751ec5e12fe0e64030678e52a2774b6d6e4802ce6e8bee12f9742c03d3c16fd6ec26a9fad34ce420ec1a55103fe930b9d0e8e8038ea9
+  metadata.gz: 10107064217f62fb81170d3d6a01d8de7e18ec2953aed30c3d6fe0d68d0f0a8b157745b7277b9b92e8a61aa6bf49d7c8f9b42144cc3724f6279d7719caf316ee
+  data.tar.gz: d82bc50988880296280b4cf7c6fd47669288ffefa72049829ea9e3219ea2ab2769e33b6dda41f8f847c620f5d1b6e053f9aeb47bb2bbe07b105d21f12945d3a0

data/.idea/qdumpfs.iml

@@ -10,50 +10,82 @@
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/.idea/copilot/chatSessions" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="rbenv: 3.1.6" jdkType="RUBY_SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module-library">
-      <library name="minitest (v5.22.3) [path][gem]" type="rubylib">
+      <library name="minitest (v5.25.1) [path][gem]" type="rubylib">
         <properties>
-          <option name="version" value="4" />
+          <option name="additionalInfo">
+            <AdditionalInfo>
+              <option name="authors" value="該当なし" />
+              <option name="email" value="該当なし" />
+              <option name="homepage" value="該当なし" />
+              <option name="summary" value="該当なし" />
+            </AdditionalInfo>
+          </option>
+          <option name="fromPath" value="true" />
+          <option name="name" value="minitest" />
+          <option name="requirePaths">
+            <list>
+              <option value="lib" />
+            </list>
+          </option>
+          <option name="url" value="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/minitest-5.25.1" />
+          <option name="version" value="5.25.1" />
         </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" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/minitest-5.25.1/lib" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/minitest-5.25.1/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" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/minitest-5.25.1/lib" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/minitest-5.25.1/test" />
         </SOURCES>
         <excluded>
-          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/minitest-5.22.3/test" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/minitest-5.25.1/test" />
         </excluded>
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="rake (v13.2.0) [path][gem]" type="rubylib">
+      <library name="rake (v13.2.1) [path][gem]" type="rubylib">
         <properties>
-          <option name="version" value="4" />
+          <option name="additionalInfo">
+            <AdditionalInfo>
+              <option name="authors" value="該当なし" />
+              <option name="email" value="該当なし" />
+              <option name="homepage" value="該当なし" />
+              <option name="summary" value="該当なし" />
+            </AdditionalInfo>
+          </option>
+          <option name="fromPath" value="true" />
+          <option name="name" value="rake" />
+          <option name="requirePaths">
+            <list>
+              <option value="lib" />
+            </list>
+          </option>
+          <option name="url" value="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/rake-13.2.1" />
+          <option name="version" value="13.2.1" />
         </properties>
         <CLASSES>
-          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/rake-13.2.0/doc" />
-          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/rake-13.2.0/exe" />
-          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/rake-13.2.0/lib" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/rake-13.2.1/doc" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/rake-13.2.1/exe" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/rake-13.2.1/lib" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/rake-13.2.0/doc" />
-          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/rake-13.2.0/exe" />
-          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/rake-13.2.0/lib" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/rake-13.2.1/doc" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/rake-13.2.1/exe" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/rake-13.2.1/lib" />
         </SOURCES>
         <excluded>
-          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/rake-13.2.0/doc" />
-          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/rake-13.2.0/exe" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/rake-13.2.1/doc" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/rake-13.2.1/exe" />
         </excluded>
       </library>
     </orderEntry>
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v2.4.20, rbenv: 3.1.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v2.3.27, rbenv: 3.1.6) [gem]" level="application" />
   </component>
   <component name="RakeTasksCache-v2">
     <option name="myRootTask">

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    qdumpfs (1.9.1)
+    qdumpfs (1.10.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    minitest (5.25.1)
+    minitest (5.25.2)
     rake (13.2.1)
 
 PLATFORMS

data/lib/qdumpfs/option.rb

@@ -59,11 +59,7 @@ module Qdumpfs
       @file.puts msg
     end
   end
-  
-  
-  class Error < StandardError
-  end
-  
+
   
   class NullMatcher
     def initialize(options = {})

data/lib/qdumpfs/version.rb

@@ -1,4 +1,4 @@
 module Qdumpfs
-  VERSION = "1.9.1"
+  VERSION = "1.10.0"
 end  
   

data/lib/qdumpfs.rb

@@ -198,6 +198,8 @@ module Qdumpfs
           # ファイルのアップデート
           update_file(s, l, t)
           dirs[t] = File.stat(s) if File.ftype(s) == "directory"
+        rescue Errno::ENOSPC
+          raise
         rescue => e
           report_error(s, e)
           @error_files << [s, e.message]          
@@ -235,6 +237,8 @@ module Qdumpfs
           end
           chown_if_root(type, s, t)
           dirs[t] = File.stat(s) if File.ftype(s) == "directory"
+        rescue Errno::ENOSPC
+          raise
         rescue => e
           report_error(s, e)
           @error_files << [s, e.message]
@@ -309,7 +313,29 @@ module Qdumpfs
       }
       return nil
     end
-    
+
+    def incomplete_backup(today)
+      #      puts "incomplete_backup #{today}"
+      # バックアップが途中で終了した場合、そのディレクトリをリネームする
+      dirname = File.dirname(today)
+      prefix = "_"
+      incomplete = dirname.sub(/(\d+)$/, prefix + '\1')
+      return unless FileTest.directory?(dirname) # バックアップが途中で途中で終了。ただしまだ日付ディレクトリが存在しない場合はなにもしない。
+
+      # すでにincompleteが存在する場合はユニークな名前を探す
+      0.upto(10) do |i|
+        break unless FileTest.exist?(incomplete)
+        prefix += "_"
+        incomplete = dirname.sub(/(\d+)$/, prefix + '\1')
+      end
+      if FileTest.directory?(incomplete)
+        log("cannot rename incomplete backup: #{incomplete}")
+      else
+        FileUtils.mv(dirname, incomplete)
+        log("rename incomplete backup: #{dirname} -> #{incomplete}")
+      end
+    end
+
     def backup
       #####  オリジナルのバックアップルーチン
       @opt.validate_directories(2)
@@ -336,31 +362,37 @@ module Qdumpfs
       base = File.basename(src)
       dirname = File.dirname(src)
       raise RuntimeError unless FileTest.exist?(dirname + '/' + base)
-      
-      # 存在するバックアップの最新を取得
-      latest = latest_snapshot(start_time, src, dst, base)
-      # 現在の日付フォルダを取得j:/to/backup1/2019/05/10/home
-      today  = File.join(dst, datedir(start_time), base)
-      File.umask(0077)
-      FileUtils.mkpath(today) unless @opt.dry_run
-      if windows?
-        src = src.sub( /^[A-Za-z]:$/, src + "/" )
-      end
-      if latest
-        # バックアップがすでに存在する場合差分コピー
-        log("## update_snapshot #{src} #{latest}=>#{today} ##")
-        update_snapshot(src, latest, today)
-      else
-        # 初回は単純に再帰コピー
-        log("## recursive_copy #{src}=>#{today} ##")
-        recursive_copy(src, today)
-      end
-      unless @opt.dry_run
-        create_latest_symlink(dst, today)
-        elapsed = Time.now - start_time
-        log_result(src, today, elapsed)
+
+      begin
+        # 存在するバックアップの最新を取得
+        latest = latest_snapshot(start_time, src, dst, base)
+        # 現在の日付フォルダを取得j:/to/backup1/2019/05/10/home
+        today  = File.join(dst, datedir(start_time), base)
+        File.umask(0077)
+        FileUtils.mkpath(today) unless @opt.dry_run
+        if windows?
+          src = src.sub( /^[A-Za-z]:$/, src + "/" )
+        end
+        if latest
+          # バックアップがすでに存在する場合差分コピー
+          log("## update_snapshot #{src} #{latest}=>#{today} ##")
+          update_snapshot(src, latest, today)
+        else
+          # 初回は単純に再帰コピー
+          log("## recursive_copy #{src}=>#{today} ##")
+          recursive_copy(src, today)
+        end
+        unless @opt.dry_run
+          create_latest_symlink(dst, today)
+          elapsed = Time.now - start_time
+          log_result(src, today, elapsed)
+        end
+        log("##### backup end #####")
+      rescue Errno::ENOSPC
+        # 直前のmkpathでエラーが発生した場合 Errno::ENOSPCが発生する。内部ではIncompleteErrorに変換している
+        incomplete_backup(today)
+        log("##### backup incomplete(No space left on device) #####")
       end
-      log("##### backup end #####")
     end
     
     def sync
@@ -379,49 +411,55 @@ module Qdumpfs
       log("##### sync start #{fmt(start_time)} => limit_time=#{fmt(limit_time)} #####")
       count = 0
       last_sync_complete = false
-      while true
-        count += 1
-        log("## sync_latest count=#{count} ##")
-        latest_start = Time.now
-        sync_result, from, to = sync_latest(src, dst)
-        latest_end = Time.now
-        
-        log("## sync_latest result=#{sync_result} from=#{from} to=#{to} ##")
-        unless sync_result
-          # 同期結果がtrueでない場合ここで終了。ただしsync_result=falseになるのはコピー元フォルダが存在しない場合なので、
-          # 中途半端な結果にはならない
-          last_sync_complete = true
-          break
-        end
-        
-        from_count, to_count = do_verify(from, to)
-        log("## from_count=#{from_count} to_count=#{to_count} equals=#{from_count == to_count} ##") 
-        unless from_count == to_count
-          # ファイル数が同じでない場合ここで終了
-          last_sync_complete = false
-          break        
-        end
-        
-        # 次回同期にかかる時間を最終同期時間の半分と予想
-        next_sync = (latest_end - latest_start) / 2
-        
-        cur_time = Time.now
-        in_limit = (cur_time + next_sync) < limit_time
-        log("## cur_time=#{fmt(cur_time)} + next_sync=#{next_sync} <  limit_time=#{fmt(limit_time)} in_limit=#{in_limit} ## ")
-        unless in_limit
-          # 指定時間内ではない場合ここで終了(ただし最終同期は成功)
-          last_sync_complete = true
-          break                
+
+      begin
+        while true
+          count += 1
+          log("## sync_latest count=#{count} ##")
+          latest_start = Time.now
+          sync_result, from, to = sync_latest(src, dst)
+          latest_end = Time.now
+
+          log("## sync_latest result=#{sync_result} from=#{from} to=#{to} ##")
+          unless sync_result
+            # 同期結果がtrueでない場合ここで終了。ただしsync_result=falseになるのはコピー元フォルダが存在しない場合なので、
+            # 中途半端な結果にはならない
+            last_sync_complete = true
+            break
+          end
+
+          from_count, to_count = do_verify(from, to)
+          log("## from_count=#{from_count} to_count=#{to_count} equals=#{from_count == to_count} ##")
+          unless from_count == to_count
+            # ファイル数が同じでない場合ここで終了
+            last_sync_complete = false
+            break
+          end
+
+          # 次回同期にかかる時間を最終同期時間の半分と予想
+          next_sync = (latest_end - latest_start) / 2
+
+          cur_time = Time.now
+          in_limit = (cur_time + next_sync) < limit_time
+          log("## cur_time=#{fmt(cur_time)} + next_sync=#{next_sync} <  limit_time=#{fmt(limit_time)} in_limit=#{in_limit} ## ")
+          unless in_limit
+            # 指定時間内ではない場合ここで終了(ただし最終同期は成功)
+            last_sync_complete = true
+            break
+          end
         end
-      end
-      
-      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_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} #####")
+      rescue Errno::ENOSPC
+        incomplete_backup(today)
+        log("##### backup incomplete(No space left on device) #####")
+      end
     end
       
     def verify

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qdumpfs
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.10.0
 platform: ruby
 authors:
 - src
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-12 00:00:00.000000000 Z
+date: 2024-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler