ykutils 0.1.6 → 0.1.8

data/lib/ykutils/nginxconfig.rb

@@ -18,23 +18,23 @@ module Ykutils
     def extract(scope)
       hashx = {}
       @hash.each do |k, v|
-        if k !~ /^_/
-          # puts k
-          # puts v
-          pn = Pathname.new(v["template"]).cleanpath
-          # Pathname.new(v).cleanpath
-          template_pn = @server_dir_pn + pn
-          # puts(template_pn)
-          value_file_path_array = v["value"].map { |x|
-            @virtual_domain_dir_pn + Pathname.new(x).cleanpath
-          }
-          hashx[k] = Ykutils::Erubyx::erubi_render_with_file(template_pn, scope, value_file_path_array)
+        next unless k !~ /^_/
+
+        # puts k
+        # puts v
+        pn = Pathname.new(v["template"]).cleanpath
+        # Pathname.new(v).cleanpath
+        template_pn = @server_dir_pn + pn
+        # puts(template_pn)
+        value_file_path_array = v["value"].map do |x|
+          @virtual_domain_dir_pn + Pathname.new(x).cleanpath
         end
+        hashx[k] = Ykutils::Erubyx.erubi_render_with_file(template_pn, scope, value_file_path_array)
       end
       template = File.read(@root_template_pn)
       template_hash = { TEMPLATE: template,
                         OBJ: nil }
-      Ykutils::Erubyx::erubi_render(template_hash, scope, hashx)
+      Ykutils::Erubyx.erubi_render(template_hash, scope, hashx)
     end
   end
 end

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/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,6 +1,5 @@
 # -*- coding utf-8 -*-
 
-require "pp"
 require "yaml"
 require "csv"
 require "ykutils/treemanagera"
@@ -63,7 +62,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 +81,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 +91,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 +105,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 +121,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 +180,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

data/lib/ykutils/stext.rb

@@ -14,13 +14,13 @@ module Ykutils
     include DataStructOp
     include DebugUtils
 
-    def initialize(debug = false)
+    def initialize(debug: false)
       @text = nil
       @fname = nil
       @text_ary = []
 
       debug_utils_init
-      set_debug(debug)
+      debug(debug)
     end
 
     def load_analyze(fname, subfname = nil)
@@ -34,15 +34,15 @@ module Ykutils
     end
 
     def load(fname)
-      load_plain_text_file(fname).collect { |it| it.chomp }
+      load_plain_text_file(fname).collect(&:chomp)
     end
 
     def analyze(line_ary, subfname = nil); end
 
     def dump_to_file(fname)
-      file = FileX.open(fname, "w") do |file|
+      FileX.open(fname, "w") do |file|
         @text_ary.each do |l|
-          file.write(l + "\n")
+          file.write("#{l}\n")
         end
       end
     rescue StandardError => e
@@ -94,13 +94,13 @@ module Ykutils
         case line["STATUS"]
         when AccountLines::HOST_ACCOUNT_START, AccountLines::HOST_ACCOUNT, AccountLines::HOST_ACCOUNT_END
           key, value = line["CONTENT"].split(":") if line["CONTENT"]
-          key.strip! if key
-          value.strip! if value
+          key&.strip!
+          value&.strip!
           host.analyze(line["STATUS"], line, key, value, @main_host_ary, @main_host_hash)
         when AccountLines::DOMAIN_ACCOUNT_START, AccountLines::DOMAIN_ACCOUNT, AccountLines::DOMAIN_ACCOUNT_END
           key, value = line["CONTENT"].split(":") if line["CONTENT"]
-          key.strip! if key
-          value.strip! if value
+          key&.strip!
+          value&.strip!
           domain.analyze(line["STATUS"], line, key, value, @main_domain_ary, @main_domain_hash)
         when AccountLines::SEPARATOR
           key, value = line["CONTENT"].split(":") if line["CONTENT"]
@@ -118,15 +118,13 @@ module Ykutils
     def sort_by(other)
       diff_main_host_ary = @main_host_ary - other.main_host_ary
       diff_main_domain_ary = @main_domain_ary - other.main_domain_ary
-
-      n_main_sep_ary = []
       n_main_sep_hash = {}
       n_main_host_ary = []
       n_main_host_hash = {}
       n_main_domain_ary = []
       n_main_domain_hash = {}
 
-      if other.main_sep_ary.size > 0
+      unless other.main_sep_ary.empty?
         @main_sep_ary |= other.main_sep_ary
         @main_sep_hash |= n_main_sep_hash
       end
@@ -155,33 +153,33 @@ module Ykutils
       @main_domain_hash = n_main_domain_hash
     end
 
-    def sort_by_sub(it, item_hash, item_ary, n_hash, n_ary)
-      h = item_hash[it]
-      if h
-        n_ary << it
-        title = h["TITLE"]
-        hash = h["CONTENT"]
-        ary = []
-        if hash
-          item_ary.each do |ai|
-            v = hash[ai]
-            ary << ai if v
-          end
+    def sort_by_sub(itx, item_hash, item_ary, n_hash, n_ary)
+      h = item_hash[itx]
+      return unless h
+
+      n_ary << itx
+      title = h["TITLE"]
+      hash = h["CONTENT"]
+      ary = []
+      if hash
+        item_ary.each do |ai|
+          v = hash[ai]
+          ary << ai if v
         end
-        n_hash[it] = { "TITLE" => title, "META" => ary, "CONTENT" => hash }
       end
+      n_hash[itx] = { "TITLE" => title, "META" => ary, "CONTENT" => hash }
     end
 
-    def sort_by_sub_for_array(it, item_hash, n_hash, n_ary)
-      h = item_hash[it]
-      if h
-        n_ary << it
-        title = h["TITLE"]
-        ary = h["META"]
-        hash = h["CONTENT"]
+    def sort_by_sub_for_array(itx, item_hash, n_hash, n_ary)
+      h = item_hash[itx]
+      return unless h
 
-        n_hash[it] = { "TITLE" => title, "META" => ary, "CONTENT" => hash }
-      end
+      n_ary << itx
+      title = h["TITLE"]
+      ary = h["META"]
+      hash = h["CONTENT"]
+
+      n_hash[it] = { "TITLE" => title, "META" => ary, "CONTENT" => hash }
     end
 
     def dump(file = nil)
@@ -269,10 +267,6 @@ module Ykutils
   end
 
   class StructuredTextForAccountOneLayerHost < StructuredTextForAccountOneLayer
-    def initialize
-      super
-    end
-
     def analyze(status, line, key, _value, main_ary, main_hash)
       case status
       when AccountLines::HOST_ACCOUNT_START
@@ -312,23 +306,23 @@ module Ykutils
       @item_ary = {}
     end
 
-    def get_event
+    def event
       value = nil
       line = @line_ary.shift
 
       if line
         content = line.strip
-        if content.length == 0
+        if content.empty?
           ret = :EMPTY_LINE
           value = ""
         elsif content =~ /^-(.*)/
           title = Regexp.last_match(1)
-          if title.length > 0
-            ret = :TITLE_LINE
-            value = title
-          else
+          if title.empty?
             ret = :EMPTY_TITLE_LINE
             value = ""
+          else
+            ret = :TITLE_LINE
+            value = title
           end
         else
           ret = :NON_EMPTY_LINE
@@ -385,34 +379,13 @@ module Ykutils
 
       @item_ary = []
       item = nil
-      while state != :BAD and event[0] != :EOF
+      while (state != :BAD) && (event[0] != :EOF)
         case state
-        when :NONE
-          case event[0]
-          when :EMPTY_LINE
-          when :TITLE_LINE
-            @item_ary << (item = Item.new(event[1]))
-          when :EMPTY_TITLE_LINE
-            @item_ary << (item = Item.new(""))
-          when :NON_EMPTY_LINE
-            item.add(event[1])
-          end
-        when :ITEM
-          case event[0]
-          when :EMPTY_LINE
-          when :TITLE_LINE
-            @item_ary << (item = Item.new(event[1]))
-          when :EMPTY_TITLE_LINE
-            @item_ary << (item = Item.new(""))
-          when :NON_EMPTY_LINE
-            item.add(event[1])
-          end
+        when :NONE, :ITEM
+          procx
         else
           case event[0]
-          when :EMPTY_LINE
-          when :TITLE_LINE
-          when :EMPTY_TITLE_LINE
-          when :NON_EMPTY_LINE
+          when :EMPTY_LINE, :TITLE_LINE, :EMPTY_TITLE_LINE, :NON_EMPTY_LINE
             item.add(event[1])
           end
         end
@@ -423,5 +396,16 @@ module Ykutils
 
       @item_ary
     end
+
+    def procx
+      case event[0]
+      when :EMPTY_LINE, :TITLE_LINE
+        @item_ary << (Item.new(event[1]))
+      when :EMPTY_TITLE_LINE
+        @item_ary << (Item.new(""))
+      when :NON_EMPTY_LINE
+        item.add(event[1])
+      end
+    end
   end
 end

data/lib/ykutils/stextx.rb

@@ -6,26 +6,26 @@ module Ykutils
   class StructuredTextForX < StructuredText
     include DebugUtils
 
-    def initialize(debug = false)
+    def initialize(debug: false)
       super()
 
       debug_utils_init
-      set_debug(debug)
+      debug(debug)
       ends
+    end
 
-      def analyze(line_ary, _fname = nil)
-        lines = XLines.new(line_ary)
-        #    lines.output_f( fname )
+    def analyze(line_ary, _fname = nil)
+      lines = XLines.new(line_ary)
+      #    lines.output_f( fname )
 
-        analyze_sub(lines)
-      end
+      analyze_sub(lines)
+    end
 
-      def analyze_sub(lines)
-        puts_current_method
+    def analyze_sub(lines)
+      puts_current_method
 
-        while (line = lines.get_line)
-          #      p line
-        end
+      while lines.get_line
+        #      p line
       end
     end
   end