ykutils 0.1.7 → 0.1.8

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.8"
 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.8
 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
@@ -157,7 +159,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.