ykutils 0.1.0 → 0.1.1

data/lib/ykutils/nkfutil.rb

@@ -1,155 +1,147 @@
-# -*- coding utf-8 -*-
-
-require 'nkf'
-
-module Ykutils
-  module NKFUTIL
-    CODE_TO_NAME = Hash.new("ASCII")
-    CODE_TO_NAME[NKF::JIS] = "JIS"
-    CODE_TO_NAME[NKF::EUC] = "EUC"
-    CODE_TO_NAME[NKF::SJIS] = "SJIS"
-    CODE_TO_NAME[NKF::BINARY] = "BINARY"
-    CODE_TO_NAME[NKF::UTF8] = "UTF8" if NKF.const_defined?(:UTF8)
-    
-    def NKFUTIL.guess_encoding(str)
-      CODE_TO_NAME[NKF.guess(str)]
-    end
-
-    class Assoc
-      @@hs = {}
-      @@config = nil
-
-      def Assoc.set( key, value )
-        if value
-          @@hs[key] = Assoc.convert( value )
-        else
-          @@hs[key] = value
-        end
-      end
-
-      def Assoc.get( key )
-        @@hs[key]
-      end
-
-      def Assoc.to_nkf_encoding_format( encoding )
-        case encoding
-        when "UTF8"
-          "w"
-        else
-          encoding[0,1]
-        end
-      end
-
-      
-      def Assoc.config( src_encoding, dest_encoding , misc_option = nil )
-        @@config = "-#{(dest_encoding.to_s)[0,1].downcase}#{(src_encoding.to_s)[0,1].upcase}" 
-        if misc_option != nil
-          @@config += " #{misc_option}"
-        end
-      end
-
-      def Assoc.auto_config_to_inner( str , misc_option = nil )
-        if str
-          src_encoding = Assoc.to_nkf_encoding_format( NKFUTIL.guess_encoding( str ) )
-        else
-          src_encoding = "A"
-        end
-
-        inner_encoding = Assoc.to_nkf_encoding_format( Assoc.get_inner_encoding )
-        if inner_encoding != "A"
-          @@config = "-#{inner_encoding.downcase}#{src_encoding.upcase}" 
-          if misc_option != nil
-            @@config += " #{misc_option}"
-          end
-        end
-        src_encoding
-      end
-
-      def Assoc.auto_config_from_inner( dest_enc , misc_option = nil )
-        dest_encoding = Assoc.to_nkf_encoding_format( dest_enc )
-        inner_encoding = Assoc.to_nkf_encoding_format( Assoc.get_inner_encoding )
-        if inner_encoding != "A"
-          @@config = "-#{dest_encoding.downcase}#{inner_encoding.upcase}" 
-          if misc_option != nil
-            @@config += " #{misc_option}"
-          end
-        end
-      end
-
-      def Assoc.convert( str )
-        nstr = nil
-        if str != nil 
-          if @@config != nil
-            begin
-              nstr = NKF.nkf( @@config , str )
-            rescue => ex
-              puts ex
-              puts "========="
-              pp caller(0)
-            end
-          else
-            nstr = str
-          end
-        end
-        nstr
-      end
-
-      def Assoc.get_inner_encoding
-        @@inner_encoding = ($KCODE != "NONE") ? $KCODE : "ASCII"
-      end
-    end
-
-    def NKFUTIL.set( key, value )
-      Assoc.set( key , value )
-    end
-
-    def NKFUTIL.get( key )
-      Assoc.get( key )
-    end
-
-    def NKFUTIL.convert( str )
-      if str != nil
-        Assoc.convert( str )
-      else
-        ""
-      end
-    end
-
-    def NKFUTIL.assoc_equal( target , key )
-      target == key || target == Assoc.get( key )
-    end
-
-    def NKFUTIL.config( src_encoding, dest_encoding , misc_option = nil )
-      Assoc.config( src_encoding, dest_encoding , misc_option )
-    end  
-
-    def NKFUTIL.auto_config_to_inner( str, misc_option = nil )
-      Assoc.auto_config_to_inner( str , misc_option )
-    end
-
-    def NKFUTIL.auto_config_from_inner( dest_encoding ,  misc_option = nil )
-      Assoc.auto_config_to_inner( dest_encoding , misc_option )
-    end  
-
-    def puts_sj( line )
-      puts NKF.nkf( "-Ws -m0" , line )
-    end
-
-    def puts_u( line )
-      puts NKF.nkf( "-Sw -m0" , line )
-    end
-
-    def nkf_utf8_file( infname , outfname )
-      File.open( outfname ){|outf|
-        File.open( infname ){|file|
-          while line = file.gets
-            line.chomp!
-            oline = NKF.nkf( "-w -m0" , line )
-            outf.printf("%s\n" , oline )
-          end
-        }
-      }
-    end
-  end
-  
-end
+# -*- coding utf-8 -*-
+
+require "nkf"
+
+module Ykutils
+  module NKFUTIL
+    CODE_TO_NAME = Hash.new("ASCII")
+    CODE_TO_NAME[NKF::JIS] = "JIS"
+    CODE_TO_NAME[NKF::EUC] = "EUC"
+    CODE_TO_NAME[NKF::SJIS] = "SJIS"
+    CODE_TO_NAME[NKF::BINARY] = "BINARY"
+    CODE_TO_NAME[NKF::UTF8] = "UTF8" if NKF.const_defined?(:UTF8)
+
+    def self.guess_encoding(str)
+      CODE_TO_NAME[NKF.guess(str)]
+    end
+
+    class Assoc
+      @@hs = {}
+      @@config = nil
+
+      def self.set(key, value)
+        @@hs[key] = if value
+            Assoc.convert(value)
+          else
+            value
+          end
+      end
+
+      def self.get(key)
+        @@hs[key]
+      end
+
+      def self.to_nkf_encoding_format(encoding)
+        case encoding
+        when "UTF8"
+          "w"
+        else
+          encoding[0, 1]
+        end
+      end
+
+      def self.config(src_encoding, dest_encoding, misc_option = nil)
+        @@config = "-#{dest_encoding.to_s[0, 1].downcase}#{src_encoding.to_s[0, 1].upcase}"
+        @@config += " #{misc_option}" unless misc_option.nil?
+      end
+
+      def self.auto_config_to_inner(str, misc_option = nil)
+        src_encoding = if str
+            Assoc.to_nkf_encoding_format(NKFUTIL.guess_encoding(str))
+          else
+            "A"
+          end
+
+        inner_encoding = Assoc.to_nkf_encoding_format(Assoc.get_inner_encoding)
+        if inner_encoding != "A"
+          @@config = "-#{inner_encoding.downcase}#{src_encoding.upcase}"
+          @@config += " #{misc_option}" unless misc_option.nil?
+        end
+        src_encoding
+      end
+
+      def self.auto_config_from_inner(dest_enc, misc_option = nil)
+        dest_encoding = Assoc.to_nkf_encoding_format(dest_enc)
+        inner_encoding = Assoc.to_nkf_encoding_format(Assoc.get_inner_encoding)
+        if inner_encoding != "A"
+          @@config = "-#{dest_encoding.downcase}#{inner_encoding.upcase}"
+          @@config += " #{misc_option}" unless misc_option.nil?
+        end
+      end
+
+      def self.convert(str)
+        nstr = nil
+        unless str.nil?
+          if @@config.nil?
+            nstr = str
+          else
+            begin
+              nstr = NKF.nkf(@@config, str)
+            rescue StandardError => e
+              puts e
+              puts "========="
+              pp caller(0)
+            end
+          end
+        end
+        nstr
+      end
+
+      def self.get_inner_encoding
+        @@inner_encoding = $KCODE == "NONE" ? "ASCII" : $KCODE
+      end
+    end
+
+    def self.set(key, value)
+      Assoc.set(key, value)
+    end
+
+    def self.get(key)
+      Assoc.get(key)
+    end
+
+    def self.convert(str)
+      if str.nil?
+        ""
+      else
+        Assoc.convert(str)
+      end
+    end
+
+    def self.assoc_equal(target, key)
+      target == key || target == Assoc.get(key)
+    end
+
+    def self.config(src_encoding, dest_encoding, misc_option = nil)
+      Assoc.config(src_encoding, dest_encoding, misc_option)
+    end
+
+    def self.auto_config_to_inner(str, misc_option = nil)
+      Assoc.auto_config_to_inner(str, misc_option)
+    end
+
+    def self.auto_config_from_inner(dest_encoding, misc_option = nil)
+      Assoc.auto_config_to_inner(dest_encoding, misc_option)
+    end
+
+    def puts_sj(line)
+      puts NKF.nkf("-Ws -m0", line)
+    end
+
+    def puts_u(line)
+      puts NKF.nkf("-Sw -m0", line)
+    end
+
+    def nkf_utf8_file(infname, outfname)
+      File.open(outfname) do |outf|
+        File.open(infname) do |file|
+          while line = file.gets
+            line.chomp!
+            oline = NKF.nkf("-w -m0", line)
+            outf.printf("%s\n", oline)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ykutils/nkfutil19.rb

@@ -1,70 +1,74 @@
 # -*- coding utf-8 -*-
 
-require 'nkf'
+require "nkf"
 
 module Ykutils
   module NKFUTIL
-    #ASCII-8BIT
-    #US-ASCII
-    CODE_TO_NAME = Hash.new("ASCII")
-    CODE_TO_NAME["US-ASCII"] = "ASCII"
-    CODE_TO_NAME["stateless-ISO-2022-JP"] = "JIS"
-    CODE_TO_NAME["ISO-2022-JP"] = "JIS"
-    CODE_TO_NAME["ISO-2022-JP-2"] = "JIS"
-    CODE_TO_NAME["EUC-JP"] = "EUC"
-    CODE_TO_NAME["eucJP-ms"] = "EUC"
-    CODE_TO_NAME["Shift_JIS"] = "SJIS"
-    CODE_TO_NAME["Windows-31J"] = "SJIS"
-    CODE_TO_NAME["ASCII-8BIT"] = "BINARY"
-    CODE_TO_NAME["UTF-8"] = "UTF8"
-
-    NAME_TO_ENCODING = Hash.new("US-ASCII")
-    NAME_TO_ENCODING["UTF8"] = "UTF-8"
-    NAME_TO_ENCODING["ASCII"] = "US-ASCII"
-    NAME_TO_ENCODING["JIS"] = "ISO-2022-JP"
-    NAME_TO_ENCODING["EUC"] = "EUC-JP"
-    NAME_TO_ENCODING["SJIS"] = "Winodws-31J"
-    NAME_TO_ENCODING["BINARY"] = "ASCII-8BIT"
-
-    def NKFUTIL.guess_encoding(str)
-      puts "**#{str.encoding}"
-      CODE_TO_NAME[ str.encoding.to_s ]
+    # ASCII-8BIT
+    # US-ASCII
+    unless CODE_TO_NAME
+      CODE_TO_NAME = Hash.new("ASCII")
+      CODE_TO_NAME["US-ASCII"] = "ASCII"
+      CODE_TO_NAME["stateless-ISO-2022-JP"] = "JIS"
+      CODE_TO_NAME["ISO-2022-JP"] = "JIS"
+      CODE_TO_NAME["ISO-2022-JP-2"] = "JIS"
+      CODE_TO_NAME["EUC-JP"] = "EUC"
+      CODE_TO_NAME["eucJP-ms"] = "EUC"
+      CODE_TO_NAME["Shift_JIS"] = "SJIS"
+      CODE_TO_NAME["Windows-31J"] = "SJIS"
+      CODE_TO_NAME["ASCII-8BIT"] = "BINARY"
+      CODE_TO_NAME["UTF-8"] = "UTF8"
+    end
+
+    begin
+      NAME_TO_ENCODING
+    rescue => ex
+      NAME_TO_ENCODING = Hash.new("US-ASCII")
+      NAME_TO_ENCODING["UTF8"] = "UTF-8"
+      NAME_TO_ENCODING["ASCII"] = "US-ASCII"
+      NAME_TO_ENCODING["JIS"] = "ISO-2022-JP"
+      NAME_TO_ENCODING["EUC"] = "EUC-JP"
+      NAME_TO_ENCODING["SJIS"] = "Winodws-31J"
+      NAME_TO_ENCODING["BINARY"] = "ASCII-8BIT"
     end
 
-    def NKFUTIL.config( src_encoding, dest_encoding , misc_option = nil )
+    def self.guess_encoding(str)
+      puts "**#{str.encoding}"
+      CODE_TO_NAME[str.encoding.to_s]
     end
 
+    def self.config(src_encoding, dest_encoding, misc_option = nil); end
+
     class Assoc
       @@hs = {}
       @@config = nil
 
-      def Assoc.set( key, value )
-        if value
-          @@hs[key] = Assoc.convert( value )
-        else
-          @@hs[key] = value
-        end
+      def self.set(key, value)
+        @@hs[key] = if value
+            Assoc.convert(value)
+          else
+            value
+          end
       end
 
-      def Assoc.get( key )
+      def self.get(key)
         @@hs[key]
       end
 
-      def Assoc.to_nkf_encoding_format( encoding )
-        NAME_TO_ENCODING[ encoding ]
+      def self.to_nkf_encoding_format(encoding)
+        NAME_TO_ENCODING[encoding]
       end
 
-      
-      def Assoc.config( src_encoding, dest_encoding , misc_option = nil )
+      def self.config(_src_encoding, dest_encoding, _misc_option = nil)
         @@config = dest_encoding
       end
 
-      def Assoc.auto_config_to_inner( str , misc_option = nil )
-        if str
-          src_encoding = Assoc.to_nkf_encoding_format( NKFUTIL.guess_encoding( str ) )
-        else
-          src_encoding = "US-ASCII"
-        end
+      def self.auto_config_to_inner(str, _misc_option = nil)
+        src_encoding = if str
+            Assoc.to_nkf_encoding_format(NKFUTIL.guess_encoding(str))
+          else
+            "US-ASCII"
+          end
 
         #      inner_encoding = Assoc.to_nkf_encoding_format( Assoc.get_inner_encoding )
         #      if inner_encoding != "US-ASCII"
@@ -74,8 +78,8 @@ module Ykutils
         src_encoding
       end
 
-      def Assoc.auto_config_from_inner( dest_enc , misc_option = nil )
-        dest_encoding = Assoc.to_nkf_encoding_format( dest_enc )
+      def self.auto_config_from_inner(dest_enc, _misc_option = nil)
+        dest_encoding = Assoc.to_nkf_encoding_format(dest_enc)
         #      inner_encoding = Assoc.to_nkf_encoding_format( Assoc.get_inner_encoding )
         #      if inner_encoding != "US-ASCII"
         #      @@config = dest_encoding.downcase
@@ -83,20 +87,20 @@ module Ykutils
         #      end
       end
 
-      def Assoc.convert( str )
+      def self.convert(str)
         nstr = nil
-        if str != nil 
-          if @@config != nil
+        unless str.nil?
+          if @@config.nil?
+            nstr = str
+          else
             begin
               #            nstr = NKF.nkf( @@config , str )
-              nstr = str.encode( @@config )
-            rescue => ex
-              puts ex
+              nstr = str.encode(@@config)
+            rescue StandardError => e
+              puts e
               puts "========="
               pp caller(0)
             end
-          else
-            nstr = str
           end
         end
         nstr
@@ -107,59 +111,59 @@ module Ykutils
       #    end
     end
 
-    def NKFUTIL.set( key, value )
-      Assoc.set( key , value )
+    def self.set(key, value)
+      Assoc.set(key, value)
     end
 
-    def NKFUTIL.get( key )
-      Assoc.get( key )
+    def self.get(key)
+      Assoc.get(key)
     end
 
-    def NKFUTIL.convert( str )
-      if str != nil
-        Assoc.convert( str )
-      else
+    def self.convert(str)
+      if str.nil?
         ""
+      else
+        Assoc.convert(str)
       end
     end
 
-    def NKFUTIL.assoc_equal( target , key )
-      target == key || target == Assoc.get( key )
+    def self.assoc_equal(target, key)
+      target == key || target == Assoc.get(key)
     end
 
-    def NKFUTIL.config( src_encoding, dest_encoding , misc_option = nil )
-      Assoc.config( src_encoding, dest_encoding , misc_option )
-    end  
+    def self.config(src_encoding, dest_encoding, misc_option = nil)
+      Assoc.config(src_encoding, dest_encoding, misc_option)
+    end
 
-    def NKFUTIL.auto_config_to_inner( str, misc_option = nil )
-      Assoc.auto_config_to_inner( str , misc_option )
+    def self.auto_config_to_inner(str, misc_option = nil)
+      Assoc.auto_config_to_inner(str, misc_option)
     end
 
-    def NKFUTIL.auto_config_from_inner( dest_encoding ,  misc_option = nil )
-      Assoc.auto_config_to_inner( dest_encoding , misc_option )
-    end  
+    def self.auto_config_from_inner(dest_encoding, misc_option = nil)
+      Assoc.auto_config_to_inner(dest_encoding, misc_option)
+    end
 
-    def puts_sj( line )
-      puts line.encod(  NAME_TO_ENCODING["SJIS"] )
+    def puts_sj(line)
+      puts line.encod(NAME_TO_ENCODING["SJIS"])
       #    puts NKF.nkf( "-Ws -m0" , line )
     end
 
-    def puts_u( line )
-      puts line.encod(  NAME_TO_ENCODING["UTF8"] )
-      puts NKF.nkf( "-Sw -m0" , line )
+    def puts_u(line)
+      puts line.encod(NAME_TO_ENCODING["UTF8"])
+      puts NKF.nkf("-Sw -m0", line)
     end
 
-    def nkf_utf8_file( infname , outfname )
-      File.open( outfname ){|outf|
-        File.open( infname ){|file|
+    def nkf_utf8_file(infname, outfname)
+      File.open(outfname) do |outf|
+        File.open(infname) do |file|
           while line = file.gets
             line.chomp!
             #          oline = NKF.nkf( "-w -m0" , line )
-            oline = line.encode( NAME_TO_ENCODING["UTF8"] )
-            outf.printf("%s\n" , oline )
+            oline = line.encode(NAME_TO_ENCODING["UTF8"])
+            outf.printf("%s\n", oline)
           end
-        }
-      }
+        end
+      end
     end
   end
 end

data/lib/ykutils/osutil.rb

@@ -1,19 +1,16 @@
-require 'pathname'
-
-module Ykutils
-  class OSUtil
-    @@os = nil
-
-    def OSUtil.runtime
-      unless @@os
-        if Pathname.pwd.to_s =~ /^\/cygdrive/
-          @@os=:CYGWIN
-        else
-          @@os=:ELSE
-        end
-      end
-      @@os
-    end
-  end
-end
-
+require "pathname"
+
+module Ykutils
+  class OSUtil
+    @@os = nil
+
+    def self.runtime
+      @@os ||= if Pathname.pwd.to_s =~ %r{^/cygdrive}
+          :CYGWIN
+        else
+          :ELSE
+        end
+      @@os
+    end
+  end
+end

data/lib/ykutils/pathop.rb

@@ -1,37 +1,35 @@
-require 'pathname'
+require "pathname"
 
 module Ykutils
   module PathOp
-    def get_buddy_path( fname , append_name = "" , extname = "" )
-      one_path = Pathname.new( fname ).expand_path
+    def get_buddy_path(fname, append_name = "", extname = "")
+      one_path = Pathname.new(fname).expand_path
       dir_path = one_path.dirname
       base_path = one_path.basename(".*")
-      append_name = "-2" unless (append_name.empty? or extname.empty?)
+      append_name = "-2" unless append_name.empty? or extname.empty?
       extname ||= one_path.extname
 
-      [one_path , dir_path.join( base_path.to_s + append_name + extname )]
+      [one_path, dir_path.join(base_path.to_s + append_name + extname)]
     end
 
-    def determine_fname_for_update( fname , ext = ".bak")
-      get_buddy_path( fname , "" , ext )
+    def determine_fname_for_update(fname, ext = ".bak")
+      get_buddy_path(fname, "", ext)
     end
 
-    def determine_fname_for_update2( fname )
+    def determine_fname_for_update2(fname)
       begin
-        ctime = File.ctime( fname )
-      rescue => ex
+        ctime = File.ctime(fname)
+      rescue StandardError => e
       end
-      ctime = Time.now unless ctime
+      ctime ||= Time.now
       ary = ctime.to_s.split(" ")
-      extname = File.extname( fname )
-      append = ["", ary[0] , ary[1].gsub(":","-")].join("-")
-      get_buddy_path( fname , append , extname )
+      extname = File.extname(fname)
+      append = ["", ary[0], ary[1].gsub(":", "-")].join("-")
+      get_buddy_path(fname, append, extname)
     end
 
-    def file_ensure( fname )
-      File.open( fname , "w" ).close unless File.exist?( fname )
+    def file_ensure(fname)
+      File.open(fname, "w").close unless File.exist?(fname)
     end
-
   end
 end
-