qdumpfs 1.2.1 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 924f153cf5eae013f68a399286176976d01f1c78efd78804c72bdc89b5642248
-  data.tar.gz: a60cf9bf9d1d2a8ab43ae24f09f7675a61eae527017effac8af9544b493a953a
+  metadata.gz: b25a6c117f23df1dee400451de5cc4a74b1f701d3b1b8f10c3e7dbf2b9b1bc45
+  data.tar.gz: 82d1049e0c68f14ac62fb758f4924867cb04a0ca1c80a260e2d397fa5f45ebcf
 SHA512:
-  metadata.gz: 1ea65b4989549346110f8a6ce1b63b9dac4418cff1e0dabd8bb99fd2e6d16b1c57f2192ac917c7c6164083e6dfc87f2a7134aeba3d014f5727388be27fd7702d
-  data.tar.gz: c2ac5821044dc5ad45cacfca0fb63224bfd60a22bb1fd10a94586137ae798c853253079af69cd66df7ef4328ebfb381b35ddfe029c7271010caf7d4f4606ff4f
+  metadata.gz: ff36ff467335da6da4dff83413cd3756e50cde6b83cccbc438b04bd44f41ccf59b3f3daf90335bdfe9f7ccf62bcd473de72e643f7f05229844bf4e2e238888ec
+  data.tar.gz: ef34f14cbfd8f16cc5f7172b590714bfb3b996e198dac6e12af8b34a94bb290776e8a84ec337ca7493712c6ae8d78dbb9bfa3e2780dc89b221ae48d020639a2e

data/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "ruby.intellisense": "rubyLocate"
+}

data/Gemfile.lock

@@ -1,16 +1,17 @@
 PATH
   remote: .
   specs:
-    qdumpfs (1.2.1)
+    qdumpfs (1.5.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    minitest (5.15.0)
+    minitest (5.19.0)
     rake (13.0.6)
 
 PLATFORMS
-  x86_64-darwin-21
+  x64-mingw32
+  x86_64-darwin-22
 
 DEPENDENCIES
   bundler (~> 2.0)
@@ -19,4 +20,4 @@ DEPENDENCIES
   rake (>= 12.3.3)
 
 BUNDLED WITH
-   2.3.8
+   2.2.33

data/build.cmd

@@ -1,6 +1,6 @@
 @echo off
 
-call uru 265p114
+call uru 306p216
 
 set bundle_dir=./vendor/bundle
 

data/lib/qdumpfs/option.rb

@@ -13,17 +13,28 @@ module Qdumpfs
           backup_dirs << backup_dir
         end
       end
+      backup_dirs.sort_by!{|backup_dir| backup_dir.date}
       backup_dirs
     end
     
     def self.find(backup_dirs, from_date, to_date)
       backup_dirs.select{|backup_dir| backup_dir.date >= from_date && backup_dir.date <= to_date}
     end
+
+    def self.dump(dirs)
+      dirs.each do |dir|
+        puts dir
+      end
+    end
     
     def initialize
       @keep = false
     end
     attr_accessor :path, :date, :keep
+
+    def to_s
+      "path=#{@path} date=#{@date} keep=#{@keep}"
+    end
   end
   
   
@@ -214,13 +225,13 @@ module Qdumpfs
       @dirs.each do |dir|
         validate_directory(dir)
       end
-      if @dirs.size == 2 && windows?
-        # ディレクトリが2つだけ指定されている場合、コピー先はntfsである必要がある
-        unless ntfs?(dst)
-          fstype = get_filesystem_type(dst)
-          raise sprintf("only NTFS is supported but %s is %s.", dst, fstype)
-        end      
-      end
+      # if @dirs.size == 2 && windows?
+      #   # ディレクトリが2つだけ指定されている場合、コピー先はntfsである必要がある
+      #   unless ntfs?(dst)
+      #     fstype = get_filesystem_type(dst)
+      #     raise sprintf("only NTFS is supported but %s is %s.", dst, fstype)
+      #   end      
+      # end
       if @dirs.size < min_count
         raise "#{min_count} directories required."
       end
@@ -298,7 +309,7 @@ module Qdumpfs
     end
         
     def keep_dirs(backup_dirs, num)
-      num.downto(0) do |i|
+      (num - 1).downto(0) do |i|
         from_date, to_date = yield(i)
         dirs = BackupDir.find(backup_dirs, from_date, to_date)
         dirs[0].keep = true if dirs.size > 0

data/lib/qdumpfs/util.rb

@@ -171,7 +171,7 @@ module QdumpfsUtils
         case File.ftype(src)
         when "file"
           same_file = same_file?(src, latest)
-          #          p "same_file? #{src} #{latest} result=#{same_file}"
+#          puts "same_file? #{src} #{latest} result=#{same_file}"
           if same_file
             type = "unchanged"
           else
@@ -183,6 +183,7 @@ module QdumpfsUtils
           type = "symlink"
         end
       else
+ #       puts "latest=#{latest}"
         case File.ftype(src)
         when "file"
           type = "new_file"

data/lib/qdumpfs/version.rb

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

data/lib/qdumpfs/win32.rb

@@ -4,143 +4,3 @@ def windows?
   /mswin32|cygwin|mingw|bccwin/.match(RUBY_PLATFORM)
 end
 
-if windows?
-  # http://www.virtuouscode.com/2011/08/25/temporarily-disabling-warnings-in-ruby/
-  
-  # https://stackoverflow.com/questions/39051793/can-i-hide-the-warning-message-dl-is-deprecated-please-use-fiddle-in-ruby
-  original_verbose = $VERBOSE
-  $VERBOSE = nil
-  
-  require 'Win32API'
-  require "win32ole"
-  
-  $VERBOSE = original_verbose
-
-  if RUBY_VERSION < "1.8.0"
-    CreateHardLinkA = Win32API.new("kernel32", "CreateHardLinkA", "ppl", 'i')
-    def File.link(l, t)
-      result = CreateHardLinkA.call(t, l, 0)
-
-      raise Errno::EACCES  if result == 0
-    end
-  end
-
-  def expand_special_folders(dir)
-    specials = %w[(?:AllUsers)?(?:Desktop|Programs|Start(?:Menu|up)) Favorites
-    Fonts MyDocuments NetHood PrintHood Recent SendTo Templates]
-
-    pattern = Regexp.compile(sprintf('^@(%s)', specials.join('|')))
-
-    dir.sub(pattern) do |match|
-      WIN32OLE.new("WScript.Shell").SpecialFolders(match)
-    end.tr('\\', File::SEPARATOR)
-  end
-
-  GetVolumeInformation = Win32API.new("kernel32", "GetVolumeInformation", "PPLPPPPL", "I")
-  def get_filesystem_type(path)
-    return nil unless(FileTest.exist?(path))
-
-    drive = File.expand_path(path)[0..2]
-    buff = "\0" * 1024
-    GetVolumeInformation.call(drive, nil, 0, nil, nil, nil, buff, 1024)
-
-    buff.sub(/\000+/, '')
-  end
-
-  def ntfs?(dir)
-    get_filesystem_type(dir) == "NTFS"
-  end
-
-  GetLocaltime = Win32API.new("kernel32", "GetLocalTime", "P", 'V')
-  SystemTimeToFileTime = Win32API.new("kernel32", "SystemTimeToFileTime", "PP", 'I')
-  def get_file_time(time)
-    pSYSTEMTIME = ' ' * 2 * 8     # 2byte x 8
-    pFILETIME = ' ' * 2 * 8       # 2byte x 8
-
-    GetLocaltime.call(pSYSTEMTIME)
-    t1 = pSYSTEMTIME.unpack("S8")
-    t1[0..1] = time.year, time.month
-    t1[3..6] = time.day, time.hour, time.min, time.sec
-
-    SystemTimeToFileTime.call(t1.pack("S8"), pFILETIME)
-
-    pFILETIME
-  end
-
-  GENERIC_WRITE   = 0x40000000
-  OPEN_EXISTING = 3
-  FILE_FLAG_BACKUP_SEMANTICS =  0x02000000
-
-  class << File
-    alias_method(:utime_orig, :utime)
-  end
-
-  CreateFile  = Win32API.new("kernel32", "CreateFileA","PLLLLLL", "L")
-  SetFileTime = Win32API.new("kernel32", "SetFileTime", "LPPP", "I")
-  CloseHandle = Win32API.new("kernel32", "CloseHandle", "L", "I")
-
-  def File.utime(a, m, dir)
-    File.utime_orig(a, m, dir)  unless(File.directory?(dir))
-
-    atime = get_file_time(a.dup.utc)
-    mtime = get_file_time(m.dup.utc)
-
-    hDir = CreateFile.Call(dir.dup, GENERIC_WRITE, 0, 0, OPEN_EXISTING,
-    FILE_FLAG_BACKUP_SEMANTICS, 0)
-    SetFileTime.call(hDir, 0, atime, mtime)
-    CloseHandle.Call(hDir)
-
-    return 0
-  end
-
-  LOCALE_USER_DEFAULT    = 0x400
-  LOCALE_SABBREVLANGNAME = 3
-  LOCALE_USE_CP_ACP      = 0x40000000
-  GetLocaleInfo = Win32API.new("kernel32", "GetLocaleInfo", "IIPI", "I")
-
-  def get_locale_name
-    locale_name = " " * 32
-    status = GetLocaleInfo.call(LOCALE_USER_DEFAULT,
-    LOCALE_SABBREVLANGNAME | LOCALE_USE_CP_ACP,
-    locale_name, 32)
-    if status == 0
-      return nil
-    else
-      return locale_name.split("\x00").first
-    end
-  end
-
-  SW_HIDE                = 0
-  SW_SHOWNORMAL          = 1
-
-  ShellExecute      = Win32API.new("shell32",  "ShellExecute", "LPPPPL", 'L')
-  LoadIcon          = Win32API.new("user32",   "LoadIcon", "II", "I")
-  GetModuleFileName = Win32API.new("kernel32", "GetModuleFileName","IPI","I")
-
-  def get_exe_file_name
-    path = "\0" * 1024
-    length = GetModuleFileName.call(0 ,path, path.length)
-    return path[0, length].tr('\\', File::SEPARATOR)
-  end
-
-  def get_program_file_name
-    exe_file_name = get_exe_file_name
-    if File.basename(exe_file_name) == "ruby.exe"
-      return File.expand_path($0).gsub('\\', File::SEPARATOR)
-    else
-      return exe_file_name
-    end
-  end
-
-  def get_program_directory
-    program_file_name = get_program_file_name
-    return File.dirname(program_file_name)
-  end
-
-  def init
-    locale_name = get_locale_name
-    #    $KCODE = "SJIS" if locale_name == "JPN"
-  end
-  
-  init
-end

data/lib/qdumpfs.rb

@@ -241,15 +241,15 @@ module Qdumpfs
         
     def sync_latest(src, dst, base = nil)
       # pdumpfsのバックアップフォルダを同期する
-      
+
       #コピー元のスナップショット
       src_snapshots = BackupDir.scan_backup_dirs(src)
       @opt.detect_expire_dirs(src_snapshots)
-      
+
       # コピー先の最新スナップショット
       dst_snapshots = BackupDir.scan_backup_dirs(dst)
       dst_snapshot = dst_snapshots[-1]
-      
+
       # コピー元フォルダの決定
       src_snapshot = nil
       src_snapshots.each do |snapshot|
@@ -259,7 +259,7 @@ module Qdumpfs
           break
         end
       end
-      
+
       if src_snapshot.nil?
         return false, nil, nil
       end

data/run_sync.cmd

@@ -1,6 +1,6 @@
 @echo off
 
-call uru 265p114
+call uru 306p216
 
-bundle exec ruby exe/qdumpfs  --command sync d:/test2 d:/test3
+bundle exec ruby exe/qdumpfs  -d --command sync --keep=2Y0M1W0D r:/pc1/pdumpfs/opt v:/pc1/pdumpfs/opt
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qdumpfs
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.5.1
 platform: ruby
 authors:
 - src
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-21 00:00:00.000000000 Z
+date: 2023-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -63,6 +63,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- ".vscode/settings.json"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -120,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: qdumpfs