ykutils 0.1.7 → 0.1.10

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

data/lib/ykutils/stringutils.rb

@@ -4,8 +4,8 @@ module Ykutils
       str || ""
     end
 
-    def get_basename_ext(it)
-      bn0 = it.basename.to_s
+    def get_basename_ext(itx)
+      bn0 = itx.basename.to_s
       if RUBY_VERSION > "1.9"
         #      bn0.encode!( "internal" )
         bn0.encode! "UTF-8"
@@ -48,7 +48,7 @@ module Ykutils
       content_ary = []
 
       reg_hash = {}
-      tag_value_hash.each do |k, _v|
+      tag_value_hash.each_key do |k|
         reg_hash[k] = Regexp.new(separator + k + separator)
       end
 
@@ -61,17 +61,17 @@ module Ykutils
       content_ary
     end
 
-    def indent(n)
+    def indent(num)
       n ||= 0
       @indent_hash ||= {}
-      @indent_hash[n] ||= " " * n
-      @indent_hash[n]
+      @indent_hash[num] ||= " " * n
+      @indent_hash[num]
     end
 
     def print_hier(data, level)
       case data.class.to_s
       when "Hash"
-        data.each do |_k, v|
+        data.each_value do |v|
           #        puts "#{indent(level)}#{k}|#{v.class} #{if v.class.to_s == 'String' then v.size else '' end }"
           #        puts "#{indent(level)}#{k}|#{v.class}"
           print_hier(v, level + 1)
@@ -80,12 +80,12 @@ module Ykutils
         data.each do |v|
           print_hier(v, level + 1)
         end
-      else
+        # else
         #      puts "#{indent(level)}|#{data.class}"
       end
     end
 
-    def print_hier_2(data, level)
+    def print_hier2(data, level)
       case data.class.to_s
       when "Hash"
         data.each do |k, v|
@@ -93,8 +93,8 @@ module Ykutils
           str = "#{indent(level)}#{k}|#{v.class}"
           if v.instance_of?(Array)
             num = v.size
-            str += ("|" + num.to_s)
-            str += "###################" if num > 1
+            str += "|#{num}"
+            "#{str}###################" if num > 1
           end
           #        puts str
           print_hier_2(v, level + 1) if k != "group"
@@ -103,7 +103,7 @@ module Ykutils
         data.each do |v|
           print_hier_2(v, level + 1)
         end
-      else
+        # else
         #      puts "#{indent(level)}|#{data.class}"
       end
     end

data/lib/ykutils/treemanager.rb

@@ -23,7 +23,7 @@ module Ykytils
 
     def tsort_each_child(node, &block)
       ary = @table[node]
-      ary.each(&block) if ary
+      ary&.each(&block)
     end
 
     def tsort_each_node(&block)

data/lib/ykutils/treemanagera.rb

@@ -2,7 +2,7 @@ require "ykutils/treemanager"
 
 module Ykutils
   class TreeManager
-    def addTag(node_name, tag_name)
+    def add_tag(node_name, tag_name)
       @tag ||= {}
 
       if @tag[node_name]
@@ -12,7 +12,7 @@ module Ykutils
       end
     end
 
-    def getTag(node_name)
+    def tag(node_name)
       ret = nil
       ret = @tag[node_name] if @tag
       ret

data/lib/ykutils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ykutils
-  VERSION = "0.1.7"
+  VERSION = "0.1.10"
 end

data/lib/ykutils/yamlop.rb

@@ -12,7 +12,7 @@ module Ykutils
     TEST_ID_NO_VALUE = 0
     TEST_ID_LISTUP_ALL = 1
 
-    def initialize(opts = {}, _argv = [], _debug = false)
+    def initialize(opts = {}, _argv = [], _debug: false)
       @fname = nil
       @check_flag = opts["check"]
       @ifname = opts["input_file"]
@@ -30,7 +30,7 @@ module Ykutils
     def exec
       if @reform_flag
         reform
-      elsif @test_id > 0
+      elsif @test_id.positive?
         case @test_id
         when TEST_ID_LISTUP_ALL
           test_listup
@@ -104,8 +104,8 @@ module Ykutils
 
     def import(fname)
       ret = false
-      if File.file?(fname) and File.readable?(fname)
-        @ptext = load_plain_text_file(fname).collect { |it| it.chomp }
+      if File.file?(fname) && File.readable?(fname)
+        @ptext = load_plain_text_file(fname).collect(&:chomp)
         ret = false
       end
       ret
@@ -115,10 +115,9 @@ module Ykutils
       ret = import(fname)
       if ret
         @ptext_hash = {}
-        i = 0
         @ptext_hash = make_hash(@ptext, 0) do |l, i|
-          if l !~ /^\s/ and l !~ /^==/
-            key, vale = l.split(":")
+          if l !~ (/^\s/) && l !~ (/^==/)
+            key, = l.split(":")
             [key, { "CONTENT" => l, "INDEX" => i }]
           end
         end
@@ -136,14 +135,14 @@ module Ykutils
     end
 
     def listup_domain
-      @ptext.select { |l| l =~ /^==/ }
+      @ptext.grep(/^==/)
     end
 
     def output_yaml(obj, fname)
       File.open(fname, "w") do |file|
         YAML.dump(obj, file)
       end
-    rescue StandardError => e
+    rescue YkutilsError => e
       pp e
       pp e.backtrace
       @valid = false
@@ -165,19 +164,19 @@ module Ykutils
       File.open(fname, "w") do |file|
         @yamlstext.dump(file)
       end
-    rescue StandardError => e
+    rescue YkutilsError => e
       pp e
       pp e.backtrace
       @valid = false
     end
 
     def dump_ptext_to_file(fname)
-      file = File.open(fname, "w") do |file|
+      File.open(fname, "w") do |file|
         @ptext.each do |l|
-          file.write(l + "\n")
+          file.write("#{l}\n")
         end
       end
-    rescue StandardError => e
+    rescue YkutilsdError => e
       pp e
       pp e.backtrace
       @valid = false
@@ -190,25 +189,25 @@ module Ykutils
 
     def reform
       ret = importex(@ifname)
-      if ret
-        ary = listup_host.collect do |it|
-          key, value = it.split(":")
-          key
-        end
-        str = ary.join(" , ")
-        new_host_list = "=-HOST_LIST: [#{str}]"
-        ary2 = listup_domain.collect do |it|
-          key, value = it.split(":")
-          key
-        end
-        str2 = ary2.join(" , ")
-        new_domain_list = "=-DOMAIN_LIST: [#{str2}]"
-        pp "==new_host_list"
-        pp new_host_list
-        exchange_ptext("=-HOST_LIST", new_host_list)
-        exchange_ptext("=-DOMAIN_LIST", new_domain_list)
-        dump_ptext_to_file(@ofname)
+      return unless ret
+
+      ary = listup_host.collect do |it|
+        key, = it.split(":")
+        key
+      end
+      str = ary.join(" , ")
+      new_host_list = "=-HOST_LIST: [#{str}]"
+      ary2 = listup_domain.collect do |it|
+        key, = it.split(":")
+        key
       end
+      str2 = ary2.join(" , ")
+      new_domain_list = "=-DOMAIN_LIST: [#{str2}]"
+      pp "==new_host_list"
+      pp new_host_list
+      exchange_ptext("=-HOST_LIST", new_host_list)
+      exchange_ptext("=-DOMAIN_LIST", new_domain_list)
+      dump_ptext_to_file(@ofname)
     end
 
     def extract_value(ary)

data/lib/ykutils/yamlxop.rb

@@ -8,11 +8,6 @@ module Ykutils
 
     include DebugUtils
 
-    def initialize(_opt, _args, debug)
-      debug_utils_init
-      set_debug(debug)
-    end
-
     def load(fname)
       #    d_puts "3"
       #    puts_current_method

data/lib/ykutils.rb

@@ -26,8 +26,11 @@ require "ykutils/xlines"
 require "ykutils/yamlop"
 require "ykutils/yamlxop"
 
-require 'pathname'
+require "pathname"
 module Ykutils
   TEST_DATA_DIR = Pathname.new(__dir__).parent + "test_data"
   # Your code goes here...
+
+  class YkutilsError < StandardError
+  end
 end

data/ykutils.gemspec

@@ -38,6 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency  "tilt"
   # spec.add_development_dependency "rubocop-rake"
   # spec.add_development_dependency "rubocop-rspec"
+  # spec.add_development_dependency 'yard'
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ykutils
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.10
 platform: ruby
 authors:
 - yasuo kominami
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-30 00:00:00.000000000 Z
+date: 2024-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi
@@ -59,6 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
@@ -71,6 +72,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- SECURITY.md
 - bin/console
 - bin/erubix
 - bin/erubix2
@@ -90,6 +92,7 @@ files:
 - lib/ykutils/nginxconfigfiles.rb
 - lib/ykutils/nkfutil.rb
 - lib/ykutils/nkfutil19.rb
+- lib/ykutils/nkfutil20.rb
 - lib/ykutils/osutil.rb
 - lib/ykutils/pathop.rb
 - lib/ykutils/retcodex.rb
@@ -157,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: utilty function created by yk.