ykutils 0.1.7 → 0.1.10

data/lib/ykutils/nginxconfigfiles.rb

@@ -1,31 +1,29 @@
 module Ykutils
-  require 'find'
   class Nginxconfigfiles
-    def get_file_list(start_dir, re)
+    def get_file_list(start_dir_pn, reg)
       @file_list = []
 
-      Find.find(start_dir) { |x|
-        if x =~ re
-          # puts x
-          @file_list << x
-          Find.prune
-        end
+      start_dir_pn.find { |x|
+        next unless x.to_s =~ reg
+
+        # puts x
+        @file_list << x
       }
       @file_list
     end
 
     def output(file_list)
-      file_list.map { |fname|
+      file_list.map do |fname|
         parent_dir_pn = Pathname.new(fname).cleanpath.parent
         vdomain = parent_dir_pn.basename
         output_fname = "#{vdomain}.conf"
         cli = Nginxconfig.new(fname)
         scope = nil
-        File.open(output_fname, "w") { |f|
+        File.open(output_fname, "w") do |f|
           x = cli.extract(scope)
           f.write(x)
-        }
-      }
+        end
+      end
     end
   end
 end

data/lib/ykutils/nkfutil.rb

@@ -16,19 +16,19 @@ module Ykutils
     end
 
     class Assoc
-      @@hs = {}
-      @@config = nil
+      @hs = {}
+      @config = nil
 
       def self.set(key, value)
-        @@hs[key] = if value
-                      Assoc.convert(value)
-                    else
-                      value
-                    end
+        @hs[key] = if value
+                     Assoc.convert(value)
+                   else
+                     value
+                   end
       end
 
       def self.get(key)
-        @@hs[key]
+        @hs[key]
       end
 
       def self.to_nkf_encoding_format(encoding)
@@ -41,8 +41,8 @@ module Ykutils
       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?
+        @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)
@@ -55,8 +55,8 @@ module Ykutils
 
         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?
+          @config = "-#{inner_encoding.downcase}#{src_encoding.upcase}"
+          @config += " #{misc_option}" unless misc_option.nil?
         end
         src_encoding
       end
@@ -64,20 +64,20 @@ module Ykutils
       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
+        return unless inner_encoding != "A"
+
+        @config = "-#{dest_encoding.downcase}#{inner_encoding.upcase}"
+        @config += " #{misc_option}" unless misc_option.nil?
       end
 
       def self.convert(str)
         nstr = nil
         unless str.nil?
-          if @@config.nil?
+          if @config.nil?
             nstr = str
           else
             begin
-              nstr = NKF.nkf(@@config, str)
+              nstr = NKF.nkf(@config, str)
             rescue StandardError => e
               puts e
               puts "========="
@@ -88,8 +88,8 @@ module Ykutils
         nstr
       end
 
-      def self.get_inner_encoding
-        @@inner_encoding = $KCODE == "NONE" ? "ASCII" : $KCODE
+      def self.inner_encoding
+        @inner_encoding = $KCODE == "NONE" ? "ASCII" : $KCODE
       end
     end
 

data/lib/ykutils/nkfutil19.rb

@@ -22,7 +22,7 @@ module Ykutils
 
     begin
       NAME_TO_ENCODING
-    rescue => ex
+    rescue StandardError
       NAME_TO_ENCODING = Hash.new("US-ASCII")
       NAME_TO_ENCODING["UTF8"] = "UTF-8"
       NAME_TO_ENCODING["ASCII"] = "US-ASCII"
@@ -38,19 +38,19 @@ module Ykutils
     end
 
     class Assoc
-      @@hs = {}
-      @@config = nil
+      @hs = {}
+      @config = nil
 
       def self.set(key, value)
-        @@hs[key] = if value
-                      Assoc.convert(value)
-                    else
-                      value
-                    end
+        @hs[key] = if value
+                     Assoc.convert(value)
+                     # else
+                     #  value
+                   end
       end
 
       def self.get(key)
-        @@hs[key]
+        @hs[key]
       end
 
       def self.to_nkf_encoding_format(encoding)
@@ -58,7 +58,7 @@ module Ykutils
       end
 
       def self.config(_src_encoding, dest_encoding, _misc_option = nil)
-        @@config = dest_encoding
+        @config = dest_encoding
       end
 
       def self.auto_config_to_inner(str, _misc_option = nil)
@@ -70,8 +70,8 @@ module Ykutils
 
         #      inner_encoding = Assoc.to_nkf_encoding_format( Assoc.get_inner_encoding )
         #      if inner_encoding != "US-ASCII"
-        #      @@config = inner_encoding
-        @@config = nil
+        #      @config = inner_encoding
+        @config = nil
         #      end
         src_encoding
       end
@@ -80,20 +80,20 @@ module Ykutils
         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
-        @@config = dest_encoding
+        #      @config = dest_encoding.downcase
+        @config = dest_encoding
         #      end
       end
 
       def self.convert(str)
         nstr = nil
         unless str.nil?
-          if @@config.nil?
+          if @config.nil?
             nstr = str
           else
             begin
               #            nstr = NKF.nkf( @@config , str )
-              nstr = str.encode(@@config)
+              nstr = str.encode(@config)
             rescue StandardError => e
               puts e
               puts "========="

data/lib/ykutils/nkfutil20.rb

@@ -0,0 +1,167 @@
+# -*- coding utf-8 -*-
+
+require "nkf"
+
+module Ykutils
+  module NKFUTIL
+    # 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 StandardError
+      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 self.guess_encoding(str)
+      puts "**#{str.encoding}"
+      CODE_TO_NAME[str.encoding.to_s]
+    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)
+        NAME_TO_ENCODING[encoding]
+      end
+
+      def self.config(_src_encoding, dest_encoding, _misc_option = nil)
+        @config = dest_encoding
+      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"
+        #      @config = inner_encoding
+        @config = 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 != "US-ASCII"
+        #      @config = dest_encoding.downcase
+        @config = dest_encoding
+        #      end
+      end
+
+      def self.convert(str)
+        nstr = nil
+        unless str.nil?
+          if @config.nil?
+            nstr = str
+          else
+            begin
+              #            nstr = NKF.nkf( @@config , str )
+              nstr = str.encode(@config)
+            rescue StandardError => e
+              puts e
+              puts "========="
+              pp caller(0)
+            end
+          end
+        end
+        nstr
+      end
+
+      #    def Assoc.get_inner_encoding
+      #      @@inner_encoding = ($KCODE != "NONE") ? $KCODE : "ASCII"
+      #    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 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)
+    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 )
+            oline = line.encode(NAME_TO_ENCODING["UTF8"])
+            outf.printf("%s\n", oline)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ykutils/osutil.rb

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

data/lib/ykutils/pathop.rb

@@ -6,7 +6,7 @@ module Ykutils
       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? || extname.empty?
       extname ||= one_path.extname
 
       [one_path, dir_path.join(base_path.to_s + append_name + extname)]
@@ -19,10 +19,11 @@ module Ykutils
     def determine_fname_for_update2(fname)
       begin
         ctime = File.ctime(fname)
-      rescue StandardError => e
+      rescue YkutilsError => e
+        puts e
       end
       ctime ||= Time.now
-      ary = ctime.to_s.split(" ")
+      ary = ctime.to_s.split
       extname = File.extname(fname)
       append = ["", ary[0], ary[1].gsub(":", "-")].join("-")
       get_buddy_path(fname, append, extname)

data/lib/ykutils/retcodex.rb

@@ -1,6 +1,7 @@
 module Ykutils
   class RetCode
-    attr_reader :val, :mes, :ret, :bool
+    attr_reader :val
+    attr_accessor :bool, :mes, :ret
 
     def initialize(obj)
       @val = obj
@@ -16,22 +17,6 @@ module Ykutils
     def to_s
       @bool
     end
-
-    def set_bool(val)
-      @bool = val
-    end
-
-    def get_bool
-      @bool
-    end
-
-    def set_mes(val)
-      @mes = val
-    end
-
-    def set_ret(val)
-      @ret = val
-    end
   end
 
   class RetCode2 < RetCode

data/lib/ykutils/specfileop.rb

@@ -1,14 +1,14 @@
 # -*- coding utf-8 -*-
 
-require "pp"
 require "yaml"
 require "csv"
 require "ykutils/treemanagera"
-if RUBY_VERSION >= "1.8.7"
-  require "ykutils/nkfutil19"
-else
-  require "ykutils/nkfutil"
-end
+#if RUBY_VERSION >= "1.8.7"
+#  require "ykutils/nkfutil19"
+#else
+#  require "ykutils/nkfutil"
+#end
+require "ykutils/nkfutil20"
 require "ykutils/debugutils"
 
 module Ykutils
@@ -63,7 +63,7 @@ module Ykutils
 
     def parse_yaml_file(fname)
       begin
-        @data = YAML.parse(File.read(fname))
+        @data = YAML.parse_file(fname)
       rescue StandardError => e
         pp e
         pp e.backtrace
@@ -82,7 +82,7 @@ module Ykutils
         v.scan(re).flatten.each do |it|
           if it
             tm.add(it, k)
-            tm.addTag(k, it)
+            tm.tag(k, it)
           else
             tm.add(nil, k)
           end
@@ -92,10 +92,9 @@ module Ykutils
       tm.tsort.reverse.each do |k|
         next unless data[k]
 
-        tag = tm.getTag(k)
+        tag = tm.tag(k)
         next unless tag
 
-        i = 0
         tag.each do |it|
           ntag = Regexp.new(separator + it + separator)
           data[k] = data[k].sub(ntag, data[it]) if data[it]
@@ -107,12 +106,12 @@ module Ykutils
 
         ary = v.scan(re).flatten
         i = 0
-        if ary and ary.size > 0
+        if ary && !ary.empty?
           except_ary.each do |it|
             i += 1 unless ary.index(it)
           end
         end
-        if i > 0
+        if i.positive?
           puts "#{k} fails to exapnd data. value is #{v}"
           @valid = false
         end
@@ -123,7 +122,7 @@ module Ykutils
 
     def make_data_complement(item_ary, data, common)
       item_ary.each do |it|
-        data[it] = common[it] unless data[it] and data[it].strip != ""
+        data[it] = common[it] unless data[it] && (data[it].strip != "")
       end
     end
 
@@ -182,9 +181,9 @@ module Ykutils
 
       begin
         ary0 = File.readlines(fname)
-        senc = NKFUTIL.auto_config_to_inner(ary0.join)
+        NKFUTIL.auto_config_to_inner(ary0.join)
 
-        ary = ary0.select { |x| !x.nil? }.collect do |x|
+        ary = ary0.compact.collect do |x|
           if x.nil?
             ""
           else