diskcatalog 1.2.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7ddc88277ad9dbe845cd06082fbf2528726a396615f8401a204e05de2b34de7
-  data.tar.gz: 8f4553aa1a3271b5a87c4e8d851dc1387b7b0e05def65574b35528726abdc194
+  metadata.gz: 26a374df61fddd36c051c3267e53b0e3f09a035cbc618dbbbf0e722ff9307cfd
+  data.tar.gz: b36e80b8eecae674c36e10fefbd4c06dd8f4b5b5f495fc58294f0c7126385e1f
 SHA512:
-  metadata.gz: 544b93da6f793096690c9a234171476debbb5740bf8081ed2563716ebbd92bdf3a54d441d7237094c959adba20e94f3fe17d316a66badcd39192a40049dfccfd
-  data.tar.gz: 64ce3f6c8697fe0df5fb94bce160320ae137ccd67dbd9bc7d6494238c92b0f5d3963d63b073f412b8ea01a99aa93f193a6ed10cb28c4861864afb69ac850b4d1
+  metadata.gz: 86a9b0c5acd35dff29f4a8ca7b9d2ca81663a884d3bfd6ea13aa6565197716c20214890736e27261ac418ba27b8fe69d8293b37b3f7e217a40b7861bb9a4b9d1
+  data.tar.gz: 0e215f7367b9f8b3641aa7856bbeaa79e2b2ab2c741ea3fd1d0a26659036fa4ae166bbfae8609d1778a3e473f3b1d0d7d02e30e548cc22fae0bf70d6b06e8951

data/.idea/diskcatalog.iml

@@ -8,6 +8,7 @@
       <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$/vendor/bundle/ruby/3.2.0/cache" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    diskcatalog (1.2.0)
+    diskcatalog (1.2.2)
       sys-filesystem
 
 GEM

data/build.sh

@@ -1,18 +1,24 @@
 #!/bin/sh
 # rmagick for sierra
-export PKG_CONFIG_PATH=/usr/local/opt/imagemagick@6/lib/pkgconfig
+#export PKG_CONFIG_PATH=/usr/local/opt/imagemagick@6/lib/pkgconfig
 #export PATH=/usr/local/Cellar/imagemagick@6/6.9.7-5/bin:$PATH
 
 bundle_dir=./vendor/bundle
-if [ -d "$bundle_dir" ] ; then
-    /bin/rm -rf "$bundle_dir"
-    bundle update    
-else
+bundle config --local path $bundle_dir
+
+if [ "$1" = "clean" ]; then
+    echo "rm -rf $bundle_dir"
     /bin/rm -rf "$bundle_dir"
-    bundle install --path "$bundle_dir"
+    /bin/rm Gemfile.lock
+    exit 0
 fi
 
-
-
-
-
+if [ -d "$bundle_dir" ] ; then
+    echo "bunlde update"
+    bundle update
+    bundle clean
+else
+    echo "bundle install"
+    /bin/rm -rf "$bundle_dir"
+    bundle install
+fi

data/lib/diskcatalog/version.rb

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

data/lib/diskcatalog.rb

@@ -110,8 +110,8 @@ module Diskcatalog
     end
 
     def list
-      puts "List catalog in #{@opt.catalogdir}"
-      Dir.glob(File.join(@opt.catalogdir, "*.info")).each do |path|
+      puts "List catalog in #{@option.catalogdir}"
+      Dir.glob(File.join(@option.catalogdir, "*.info")).each do |path|
         puts File.basename(path)
       end
     end
@@ -153,14 +153,14 @@ module Diskcatalog
     end
 
     def initialize(option)
-      @opt = option
+      @option = option
     end
 
     def run
-      if @opt.list
+      if @option.list
         list
       else
-        unless @opt.dir
+        unless @option.dir
           raise "directory is not specified"
         end
         make_files
@@ -170,13 +170,13 @@ module Diskcatalog
 
     private
     def make_files
-      puts "Create catalog file for #{@opt.dir}: #{@opt.output_files}"
-      unless FileTest.directory?(@opt.dir)
+      puts "Create catalog file for #{@option.dir}: #{@option.output_files}"
+      unless FileTest.directory?(@option.dir)
 	       raise RuntimeError
       end
-      out = File.open(@opt.output_files, "w:utf-8")
+      out = File.open(@option.output_files, "w:utf-8")
       begin
-        MyFind.find(@opt.dir, ignore_error: true) do |f|
+        MyFind.find(@option.dir, ignore_error: true) do |f|
           if FileTest.file?(f)
             size = File.size(f)
             mtime = File.mtime(f).strftime("%Y-%m-%d")
@@ -196,12 +196,12 @@ module Diskcatalog
     end    
 
     def make_info
-      puts "Create info for #{@opt.dir}: #{@opt.output_info}"
-      unless FileTest.directory?(@opt.dir)
+      puts "Create info for #{@option.dir}: #{@option.output_info}"
+      unless FileTest.directory?(@option.dir)
         raise RuntimeError
       end
 
-      stat = Sys::Filesystem.stat(@opt.dir)
+      stat = Sys::Filesystem.stat(@option.dir)
       free_bytes = Utils::number_to_human_size(stat.blocks_available * stat.block_size)
       #      puts number_to_human_size(free_bytes)
       puts "total=#{stat.blocks * stat.block_size}"
@@ -209,10 +209,10 @@ module Diskcatalog
       puts "total_bytes=#{total_bytes}"
       #puts number_to_human_size(total_bytes)
 
-      out = File.open(@opt.output_info, "w:utf-8")
+      out = File.open(@option.output_info, "w:utf-8")
       created = Time.now.strftime("%Y-%m-%dT%H:%M:%S")
       out.puts "Created: #{created}"
-      out.puts "Volume: #{@opt.dir}"
+      out.puts "Volume: #{@option.dir}"
       out.puts "Total: #{total_bytes}"
       out.puts "Free: #{free_bytes}"
       out.close if out
@@ -233,6 +233,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('-d', '--debug', 'debug message') {|v| opts[:d] = v}
       opt.parse!(argv)
       config = load_yaml(opts[:c])
       option = SearchOption.new(opts, argv, config)
@@ -249,11 +250,11 @@ module Diskcatalog
     end
 
     def initialize(option)
-      @opt = option
+      @option = option
     end
 
     def run
-      if @opt.list
+      if @option.list
         list
       else
         search
@@ -261,7 +262,9 @@ module Diskcatalog
     end
 
     def search
-      system("#{SEARCH_CMD} #{@opt.search} #{@opt.catalogdir}")
+      cmd = "#{SEARCH_CMD} #{@option.search} #{@option.catalogdir}"
+      puts cmd if @option.debug
+      system(cmd)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diskcatalog
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.2
 platform: ruby
 authors:
 - src