kaki-utils 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 992ee753aa44459ca58c709ef6a7e78a7e66bbdd
-  data.tar.gz: f2a285320513e1c920eb0d5133e0922b1d732983
+  metadata.gz: 15365e0061e2b715e3b4b10b4afca6afbbb9a53a
+  data.tar.gz: a4f5df6c961ebf0bc349b9ec96d7d40ac916561b
 SHA512:
-  metadata.gz: 28560cce70f89996f586baa06c99593e835f2c09b2f4304ea6ad3373f2f80691410c7058ee19ac025f4e5faca1fac3c97715dda65228ee710a4ce0c8aa94cb51
-  data.tar.gz: 0d76a60adc6bb949e6097831c2cbc89430bb27186439ecec06232b36b19430983181679ae01ca1baac7d3c2e7524665634ed063e19c9a1e4dc3742ab59e72a0b
+  metadata.gz: 52fbab242215c3ddc75849f2410c03182f3d548c258cea618c77cebf1de3586cf32588a03c83fbf9272e4a1d263f65b72abd77eeda213fae6fab93a955589267
+  data.tar.gz: cba8d597754852dde3a77590c83dfaf09e14960366d53371d75c534abaeb440edb907055c6d3c1d85c4a5b91ae20b1ef85b4239b0851be23a60b1bd0bf93e2f9

data/README.md

@@ -1,4 +1,4 @@
-## modele Utils
+## module Utils
 
 ```ruby
 require "kaki/utils"
@@ -44,3 +44,12 @@ method
 
 * Integer#times_retry(message: true, wait: 0)
 
+## check overlapping of file names
+
+```ruby
+require "kaki/utils/check\_fname_overlapping"
+```
+method
+
+* File.check\_fname\_overlapping(file_name)
+

data/lib/kaki/utils.rb

@@ -12,6 +12,7 @@ module Utils
   
   
   #Web上のバイナリファイルの保存
+  # @return [Boolean]
   def getfile(url, filename, max=0)
     count = 0
     begin
@@ -32,6 +33,7 @@ module Utils
   
   
   #一文字入力
+  # @return [String]
   def key_wait
     c = nil
     loop {break if (c = STDIN.getch)}
@@ -63,6 +65,7 @@ module Utils
   
   
   #画像ファイルでなければ削除
+  # @return [Boolean]
   def delete_non_img(fname)
     if Utils.imgexist?(fname)
       false

data/lib/kaki/utils/check_fname_overlapping.rb

@@ -0,0 +1,21 @@
+class File
+  #ファイル名が重複していれば (1) などを付加して返す
+  # @return [String]
+  def self.check_fname_overlapping(fname)
+    return fname unless File.exist?(fname)
+    dir = File.dirname(fname)
+    base = File.basename(fname)
+    m = /(.+)(\..+)$/.match(base)
+    result, suffix = m ? [m[1], m[2]] : [base, ""]
+    
+    begin
+      result = if (m1 = /(.+)\((\d+)\)$/.match(result))
+        m1[1] + "(#{m1[2].to_i + 1})"
+      else
+        result + "(1)"
+      end
+    end while File.exist?(r = File.join(dir, result + suffix))
+    r
+  end
+end
+

data/lib/kaki/utils/imgsuffix.rb

@@ -1,5 +1,6 @@
 class String 
   #拡張子が画像ならばその拡張子を返す
+  # @return [String]
   def imgsuffix
     [".jpg", ".gif", ".png", ".jpeg", ".bmp", ".JPG", ".GIF", ".PNG", ".JPEG", ".BMP"].each do |sf|
       return sf if include?(sf)

data/lib/kaki/utils/rec_decimal.rb

@@ -1,5 +1,6 @@
 class Rational
   #分数を循環小数に直す
+  # @return [String]
   def to_rec_decimal
     f, num = (self < 0) ? ["-", -self] : ["", self]
     
@@ -27,6 +28,7 @@ end
 class String
   alias :__to_r__ :to_r
   #循環小数を分数に直す
+  # @return [Rational]
   def to_r
     st = delete(" ")
     return st.__to_r__ unless (m = /^([^\d]?)(\d+)\.(\d*)\((\d+)\)$/.match(st))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaki-utils
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - obelisk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-12 00:00:00.000000000 Z
+date: 2017-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk2
@@ -46,6 +46,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/kaki/utils.rb
+- lib/kaki/utils/check_fname_overlapping.rb
 - lib/kaki/utils/imgsuffix.rb
 - lib/kaki/utils/rec_decimal.rb
 - lib/kaki/utils/retry.rb