diskcatalog 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e0ad770b5bfab040d17787bfe39cb4f58b6a529c97ef1794bfa02cae9dc2534
-  data.tar.gz: cf0fab667155ab200608b10727f56efbf360cdb947ade106bd5b9065a3c9087a
+  metadata.gz: c7c8ddc1906b8ca79255a5850497c59fbffc2947532aa12789fa98117a61df85
+  data.tar.gz: 352a15b84afa52091fb9ba80c3f842d6f3a31e8d85788445e5c9a4416a06d881
 SHA512:
-  metadata.gz: 2474841f69413fc77f299293088b19ce423faa63dea352d47927b24f28eeaa6cdc54a38f044e458e08f6ed1eaf401966c59e45b9816c6b60992e8c9ef82b3570
-  data.tar.gz: 0e6f952649a11a2cfc851262a71c3654af582eaa9f334680c98015e6ede2968794c10ba3e7e8b2b2c1dcf3fd38da73fd7378c4e394dff12a482abb396a4d24a2
+  metadata.gz: b9bbcc6f4ab0049983f34254cfdcec9e40c2e0897898c6da06d3af70fca9a4d7ef67d304194a7dce9e70a7d106d3bab36e48a1614e9680faf49cf88616a824d3
+  data.tar.gz: a24adb072e08c24748ba38f1540f8aa9e96af383f0cf0f905dceed234adee8e53db09ffc3321ccbd5adec02e6964b68ee41f6e0afcb0623a3e3f6c12adbb38a5

data/.idea/diskcatalog.iml

@@ -10,7 +10,7 @@
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/bundle/ruby/3.2.0/cache" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="rbenv: 3.2.6" jdkType="RUBY_SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module-library">
       <library name="ffi (v1.17.1) [path][gem]" type="rubylib">
@@ -204,6 +204,6 @@
         </excluded>
       </library>
     </orderEntry>
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v2.4.19, rbenv: 3.2.5) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v2.4.19, rbenv: 3.2.6) [gem]" level="application" />
   </component>
 </module>

data/Gemfile.lock

@@ -1,22 +1,23 @@
 PATH
   remote: .
   specs:
-    diskcatalog (1.3.1)
+    diskcatalog (1.4.0)
       sys-filesystem
       zlib
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ffi (1.17.1)
+    ffi (1.17.2)
     minitest (5.25.5)
-    rake (13.2.1)
+    rake (13.3.0)
     sys-filesystem (1.5.3)
       ffi (~> 1.1)
     zlib (3.2.1)
 
 PLATFORMS
   arm64-darwin-22
+  arm64-darwin-24
   x64-mingw-ucrt
   x64-mingw32
   x86_64-darwin-22

data/lib/diskcatalog/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Diskcatalog
-  VERSION = "1.3.1"
+  VERSION = "1.4.0"
 end

data/lib/diskcatalog.rb

@@ -88,9 +88,21 @@ module Diskcatalog
     end
     attr_reader :dir, :search, :debug, :output, :output_files, :output_info, :compress, :debug
 
-    def output_files
+    # def output_files
+    #   if compress
+    #     @output_files + '.gz'
+    #   else
+    #     @output_files
+    #   end
+    # end
+
+    def compress_output_files
+      @output_files + '.gz'
+    end
+
+    def real_output_files
       if compress
-        @output_files + '.gz'
+        compress_output_files
       else
         @output_files
       end
@@ -100,13 +112,14 @@ module Diskcatalog
   class SearchOption < Option
     def initialize(opts, argv, config)
       super
+      @dcatz = @opts[:dcatz]
       @search = nil
       if argv.size > 0
         @search = argv[0]
       end      
       raise "SEARCH is not specified" unless @search
     end
-    attr_reader :search
+    attr_reader :search, :dcatz
   end
 
   class Command
@@ -184,13 +197,16 @@ module Diskcatalog
 
     private
     def make_files
-      puts "Create catalog file for #{@option.dir}: #{@option.output_files}"
+      puts "Create catalog file for #{@option.dir}: #{@option.real_output_files}"
       unless FileTest.directory?(@option.dir)
 	       raise RuntimeError
       end
 
+      File.unlink(@option.output_files) if FileTest.file?(@option.output_files)
+      File.unlink(@option.compress_output_files) if FileTest.file?(@option.compress_output_files)
+
       if @option.compress
-        out = File.open(@option.output_files, "w:utf-8")
+        out = File.open(@option.compress_output_files, "w:utf-8")
         out = Zlib::GzipWriter.open(out)
       else
         out = File.open(@option.output_files, "w:utf-8")
@@ -254,6 +270,7 @@ module Diskcatalog
       end
       opt.on('-v', '--verbose', 'verbose message') {|v| opts[:v] = v}
       opt.on('--config=CONFIGFILE', 'Config file') {|v| opts[:c] = v }
+      opt.on('--dcatz', 'enable dcatz.bat(alternative gzip.exe)') {|v| opts[:dcatz] = v}
       opt.on('-d', '--debug', 'debug message') {|v| opts[:d] = v}
       opt.parse!(argv)
       config = load_yaml(opts[:c])
@@ -295,7 +312,7 @@ module Diskcatalog
 
     def search      
       precmd = "-z"
-      if Diskcatalog::Utils.windows?
+      if Diskcatalog::Utils.windows? && @option.dcatz
 #        zcat_path=write_zcat
         precmd = "--pre=dcatz.bat" # .batを指定しないとエラーとなる。
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diskcatalog
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - src
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-04-01 00:00:00.000000000 Z
+date: 2025-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sys-filesystem