ykutils 0.1.7 → 0.1.8

data/SECURITY.md

@@ -0,0 +1,21 @@
+# Security Policy
+
+## Supported Versions
+
+Use this section to tell people about which versions of your project are
+currently being supported with security updates.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 5.1.x   | :white_check_mark: |
+| 5.0.x   | :x:                |
+| 4.0.x   | :white_check_mark: |
+| < 4.0   | :x:                |
+
+## Reporting a Vulnerability
+
+Use this section to tell people how to report a vulnerability.
+
+Tell them where to go, how often they can expect to get an update on a
+reported vulnerability, what to expect if the vulnerability is accepted or
+declined, etc.

data/bin/erubix

@@ -13,5 +13,5 @@ while ARGV.size > ind
 end
 
 scope = nil
-content = Ykutils::Erubyx::erubi_render_with_file(template_file_path, scope, value_file_path_array)
+content = Ykutils::Erubyx.erubi_render_with_file(template_file_path, scope, value_file_path_array)
 puts content

data/bin/erubix2

@@ -3,8 +3,8 @@
 
 require "bundler/setup"
 require "ykutils"
-require 'yaml'
-require 'find'
+require "yaml"
+require "find"
 
 ncf = Ykutils::Nginxconfigfiles.new
 re = /base.yml$/

data/bin/makegrid

@@ -20,4 +20,4 @@ min_row = ARGV[0].to_i
 max_row = ARGV[1].to_i
 min_colum = ARGV[2].to_i
 max_colum = ARGV[3].to_i
-puts Ykutils::Gridlist::make_grid_list_x(min_row, max_row, min_colum, max_colum)
+puts Ykutils::Gridlist.make_grid_list_x(min_row, max_row, min_colum, max_colum)

data/lib/ykutils/debugutils.rb

@@ -1,5 +1,3 @@
-require "pp"
-
 module Ykutils
   module DebugUtils
     class DebugMes
@@ -7,25 +5,17 @@ module Ykutils
       @warn = false
       @buf = []
 
-      def self.init(debug = false)
+      def self.init(debug: false)
         @debug = debug
         @buf = []
       end
 
-      def self.set_debug(debug)
-        @debug = debug
-      end
-
-      def self.get_debug
-        @debug
-      end
-
-      def self.set_warn(warn)
-        @warn = warn
+      class << self
+        attr_accessor :debug
       end
 
-      def self.get_warn
-        @warn
+      class << self
+        attr_accessor :warn
       end
 
       def self.puts_x(mes)
@@ -50,43 +40,43 @@ module Ykutils
       #    puts mes
     end
 
-    def get_d
+    def d
       self.class.get
     end
 
     def puts_current_method
-      d_puts (caller(1)[0].split)[-1]
+      d_puts caller(1)[0].split[-1]
     end
 
-    def error_exit(n)
-      puts "error(#{n})"
+    def error_exit(num)
+      puts "error(#{num})"
       pp caller(0)
       exit(n)
     end
 
     def debug_utils_init
-      set_debug(false)
+      debug(false)
       set_warn(0)
 
       Ykutils::DebugUtils::DebugMes.init(false)
     end
 
-    def set_debug(val)
-      # self.class.set_debug(val)
-      Ykutils::DebugUtils::DebugMes.set_debug(val)
-    end
+    # def debug(val)
+    #   # self.class.set_debug(val)
+    #   Ykutils::DebugUtils::DebugMes.debug(val)
+    # end
 
-    def get_debug
-      Ykutils::DebugUtils::DebugMes.get_debug
-    end
+    # def debug
+    #   Ykutils::DebugUtils::DebugMes.get_debug
+    # end
 
-    def set_warn(val)
-      Ykutils::DebugUtils::DebugMes.set_warn(val)
-    end
+    # def warn(val)
+    #   Ykutils::DebugUtils::DebugMes.set_warn(val)
+    # end
 
-    def get_warn
-      Ykutils::DebugUtils::DebugMes..get_warn
-    end
+    # def warn
+    #  Ykutils::DebugUtils::DebugMes..get_warn
+    # end
 
     def d_exit(num)
       exit(num) if get_debug
@@ -98,12 +88,12 @@ module Ykutils
 
     def w1_puts(str)
       set_warn(0) unless get_warn
-      puts(str) if get_debug or get_warn >= 1
+      puts(str) if get_debug || (get_warn >= 1)
     end
 
     def w2_puts(str)
       set_warn(0) unless get_warn
-      puts(str) if get_debug or get_warn >= 2
+      puts(str) if get_debug || (get_warn >= 2)
     end
 
     def d_caller(_num)
@@ -115,20 +105,20 @@ module Ykutils
     end
 
     def d_puts_no_empty(mes)
-      puts mes if mes != "" and get_debug
+      puts mes if (mes != "") && get_debug
     end
 
-    def d_p(it)
-      p it if get_debug
+    def d_p(mes)
+      p mes if get_debug
     end
 
-    def d_pp(it)
-      if get_debug
-        pp "debug=#{get_debug}"
+    def d_pp(mes)
+      if debug
+        pp "debug=#{debug}"
         pp caller(0)
         exit
       end
-      pp it if get_debug
+      pp mes if get_debug
     end
   end
 end

data/lib/ykutils/erubyx.rb

@@ -1,14 +1,12 @@
-require 'tilt'
-require 'yaml'
+require "tilt"
+require "yaml"
 
 module Ykutils
   module Erubyx
     module_function
 
     def erubi_render(template_hash, scope, value_hash = {})
-      unless template_hash[:OBJ]
-        template_hash[:OBJ] = Tilt::ErubiTemplate.new { template_hash[:TEMPLATE] }
-      end
+      template_hash[:OBJ] = Tilt::ErubiTemplate.new { template_hash[:TEMPLATE] } unless template_hash[:OBJ]
       template_hash[:OBJ].render(scope, value_hash)
     end
 
@@ -25,14 +23,14 @@ module Ykutils
       template_text = File.read(template_file_path)
       template_hash = { TEMPLATE: template_text,
                         OBJ: nil }
-      value_hash = value_file_path_array.reduce({}) { |hash, path|
+      value_hash = value_file_path_array.reduce({}) do |hash, path|
         # p path
         hash0 = YAML.load_file(path)
         # p hash0
         hash = hash.merge(hash0)
         # p hash
         hash
-      }
+      end
       # puts value_hash
       erubi_render(template_hash, scope, value_hash)
     end

data/lib/ykutils/fileoputils.rb

@@ -84,7 +84,7 @@ module Ykutils
 
     def valid_readable_fname?(fname)
       ret = false
-      ret = true if normal_string?(fname) and File.file?(fname) and File.readable?(fname)
+      ret = true if normal_string?(fname) && File.file?(fname) && File.readable?(fname)
       ret
     end
 
@@ -130,7 +130,7 @@ module Ykutils
           ret = true if File.writable?(fname)
         else
           unless File.directory?(fname)
-            dir, filename = File.split(fname)
+            dir, = File.split(fname)
             ret = valid_writable_directory?(dir)
           end
         end
@@ -164,33 +164,33 @@ module Ykutils
         pp e.traceback
         @valid = false
       end
-      if @valid
-        content = ary.join("\n")
-        begin
-          output_file.write(content)
-        rescue StandardError => e
-          pp e
-          pp e.traceback
-          @valid = false
-        end
+      return unless @valid
+
+      content = ary.join("\n")
+      begin
+        output_file.write(content)
+      rescue StandardError => e
+        pp e
+        pp e.traceback
+        @valid = false
       end
     end
 
-    def rewrite_file(from_path_1, from_path_2, to_path_1, to_path_2)
+    def rewrite_file(from_path1, from_path2, to_path1, to_path2)
       d_p("rewrite_file")
-      d_p("from_path_1=#{from_path_1}")
-      d_p("from_path_2=#{from_path_2}")
-      d_p("to_path_1=#{to_path_1}")
-      d_p("to_path_2=#{to_path_2}")
+      d_p("from_path_1=#{from_path1}")
+      d_p("from_path_2=#{from_path2}")
+      d_p("to_path_1=#{to_path1}")
+      d_p("to_path_2=#{to_path2}")
 
-      mes = prepare_file_copy(from_path_1, from_path_2, to_path_1, to_path_2)
+      mes = prepare_file_copy(from_path1, from_path2, to_path1, to_path2)
 
       puts_no_empty(mes)
 
       return false unless @valid
 
-      from_path = File.join(from_path_1, from_path_2)
-      to_path = File.join(to_path_1, to_path_2)
+      from_path = File.join(from_path1, from_path2)
+      to_path = File.join(to_path1, to_path2)
       ary = []
       begin
         File.open(from_path, "r") do |file|
@@ -218,66 +218,66 @@ module Ykutils
       end
     end
 
-    def prepare_file_copy(from_path_1, from_path_2, to_path_1, to_path_2)
+    def prepare_file_copy(from_path1, from_path2, to_path1, to_path2)
       mes = ""
 
       d_p("prepare_file_copy")
-      d_p("from_path_1=#{from_path_1}")
-      d_p("from_path_2=#{from_path_2}")
-      d_p("to_path_1=#{to_path_1}")
-      d_p("to_path_2=#{to_path_2}")
-
-      if prepare_source_dir(from_path_1, from_path_2)
-        unless prepare_dest_dir(to_path_1, to_path_2)
-          mes = "Can't write #{to_path_1}/#{to_path_1}"
+      d_p("from_path_1=#{from_path1}")
+      d_p("from_path_2=#{from_path2}")
+      d_p("to_path_1=#{to_path1}")
+      d_p("to_path_2=#{to_path2}")
+
+      if prepare_source_dir(from_path1, from_path2)
+        unless prepare_dest_dir(to_path1, to_path2)
+          mes = "Can't write #{to_path1}/#{to_path1}"
           d_caller(0)
           @valid = false
         end
       else
-        mes = "Can't read #{from_path_1}/#{from_path_2}"
+        mes = "Can't read #{from_path1}/#{from_path2}"
         @valid = false
       end
 
       mes
     end
 
-    def prepare_source_dir(from_path_1, from_path_2)
+    def prepare_source_dir(from_path1, from_path2)
       state = false
-      from_path = File.join(from_path_1, from_path_2)
-      if valid_readable_directory?(from_path_1)
-        dirname, filename = File.split(from_path)
+      from_path = File.join(from_path1, from_path2)
+      if valid_readable_directory?(from_path1)
+        dirname, = File.split(from_path)
         state = true if valid_readable_directory?(dirname) && valid_readable_fname?(from_path)
       end
       state
     end
 
-    def prepare_dest_dir(to_path_1, to_path_2)
+    def prepare_dest_dir(to_path1, to_path2)
       state = true
-      unless valid_writable_directory?(to_path_1)
-        if File.exist?(to_path_1)
+      unless valid_writable_directory?(to_path1)
+        if File.exist?(to_path1)
           d_caller(0)
           return false
         end
 
         begin
-          FileUtils.mkdir_p(to_path_1)
+          FileUtils.mkdir_p(to_path1)
         rescue StandardError => e
           state = false
           pp e
           pp e.traceback
         end
       end
-      unless valid_writable_directory?(to_path_1)
+      unless valid_writable_directory?(to_path1)
         d_caller(0)
         return false
       end
 
-      to_path = File.join(to_path_1, to_path_2)
-      dirname, filename = File.split(to_path)
+      to_path = File.join(to_path1, to_path2)
+      dirname, = File.split(to_path)
       unless File.exist?(dirname)
         begin
           FileUtils.mkdir_p(dirname)
-        rescue StandardError => e
+        rescue StandardError
           state = false
           pp caller(0)
         end
@@ -301,22 +301,22 @@ module Ykutils
       true
     end
 
-    def copy_file(from_path_1, from_path_2, to_path_1, to_path_2)
+    def copy_file(from_path1, from_path2, to_path1, to_path2)
       retry_flag = false
       begin
-        from_path = File.join(from_path_1, from_path_2)
-        to_path = File.join(to_path_1, to_path_2)
+        from_path = File.join(from_path1, from_path2)
+        to_path = File.join(to_path1, to_path2)
         FileUtils.cp(from_path, to_path)
         d_puts("Copy #{from_path} -> #{to_path}")
-      rescue StandardError => e
-        retry_flag = prepare_file_copy(from_path_1, from_path_2, to_path_1, to_path_2)
+      rescue StandardError
+        retry_flag = prepare_file_copy(from_path1, from_path2, to_path1, to_path2)
       end
 
       if retry_flag
         begin
           FileUtils.cp(from_path, to_path)
           d_puts("Copy #{from_path} -> #{to_path}")
-        rescue StandardError => e
+        rescue StandardError
           @valid = false
         end
       end
@@ -331,8 +331,8 @@ module Ykutils
       d_p(ary)
       d_p(left)
       if left
-        sub_ary = ary[(left + 1)..-1]
-        ret = true if sub_ary && sub_ary.index(filename)
+        sub_ary = ary[(left + 1)..]
+        ret = true if sub_ary&.index(filename)
       end
 
       ret
@@ -376,20 +376,20 @@ module Ykutils
       dirname.join(basename.to_s + add_string + extname.to_s)
     end
 
-    def determine_encoding(pn)
+    def determine_encoding(pathn)
       encodings = [Encoding::UTF_8, Encoding::EUC_JP, Encoding::Shift_JIS, Encoding::CP932]
 
       valid_enc = nil
       encodings.each do |enc|
         next if valid_enc
 
-        s = pn.expand_path.read(encoding: enc)
+        s = pathn.expand_path.read(encoding: enc)
         next unless s.valid_encoding?
 
         begin
-          cs = s.encode(Encoding::CP932)
+          s.encode(Encoding::CP932)
           valid_enc = enc
-        rescue StandardError => e
+        rescue StandardError
           #        puts "Conversion Error! #{y}"
           #            puts y
         end

data/lib/ykutils/filepermision.rb

@@ -29,7 +29,7 @@ module Ykutils
     end
 
     def to_hash
-      h = { "owner" => @owner.to_hash, "group" => @group.to_hash, "other" => @other.to_hash }
+      { "owner" => @owner.to_hash, "group" => @group.to_hash, "other" => @other.to_hash }
     end
   end
 end

data/lib/ykutils/gridlist.rb

@@ -1,37 +1,34 @@
-require 'ykutils/erubyx'
+require "ykutils/erubyx"
 
 module Ykutils
   module Gridlist
-    TAMPLETES = { :GRID_DEF =>
-      { :TEMPLATE => %!
+    TAMPLETES = { GRID_DEF: { TEMPLATE: %(
     .g-<%= row %>-<%= colum %> {
       grid-row-start: <%= row %>;
       grid-row-end: ,<%= row + 1 %>;
       grid-column-start: <%= colum %>;
       grid-column-end: <%= colum + 1 %>;
     }
-    !, :OBJ => nil } }
+    ), OBJ: nil } }.freeze
 
     module_function
 
     def make_one_grid(hash, row, colum)
-      unless hash[:OBJ]
-        hash[:OBJ] = Tilt::ErubiTemplate.new { hash[:TEMPLATE] }
-      end
+      hash[:OBJ] = Tilt::ErubiTemplate.new { hash[:TEMPLATE] } unless hash[:OBJ]
       hash[:OBJ].render(Object.new, { row: row, colum: colum })
     end
 
     def make_grid(template_hash, scope, min_row, max_row, min_colum, max_colum)
-      (min_row..max_row).map { |row|
-        (min_colum..max_colum).map { |colum|
+      (min_row..max_row).map do |row|
+        (min_colum..max_colum).map do |colum|
           # puts "#{row} #{colum}"
           value_hash = { row: row, colum: colum }
           # make_one_grid(template_hash, value_hash)
           # p template_hash
           # p value_hash
-          Ykutils::Erubyx::erubi_render(template_hash, scope, value_hash)
-        }
-      }
+          Ykutils::Erubyx.erubi_render(template_hash, scope, value_hash)
+        end
+      end
     end
 
     def make_grid_list(min_row, max_row, min_colum, max_colum)

data/lib/ykutils/hasharray.rb

@@ -34,7 +34,7 @@ module Ykutils
     def replace(*args)
       super(*args)
       @ary = super.keys
-      @ary ||= []
+      @replace ||= []
     end
 
     def delete(ind, &block)
@@ -50,9 +50,5 @@ module Ykutils
 
       super
     end
-
-    def reject(&block)
-      super
-    end
   end
 end

data/lib/ykutils/lines.rb

@@ -4,7 +4,7 @@ module Ykutils
       @line_ary = line_ary
     end
 
-    def get_line
+    def line
       @line_ary.shift if @line_ary.size > -1
     end
   end
@@ -20,16 +20,16 @@ module Ykutils
 
     def setup; end
 
-    def get_line
+    def line
       @line_stack.shift if @line_stack.size > -1
     end
 
     def output_f(fname)
-      if fname
-        File.open(fname, "w") do |file|
-          @line_stack.each do |it|
-            file.write(it.to_s)
-          end
+      return unless fname
+
+      File.open(fname, "w") do |file|
+        @line_stack.each do |it|
+          file.write(it.to_s)
         end
       end
     end
@@ -50,10 +50,11 @@ module Ykutils
     ETC = 100
 
     def setup
-      while (line = @lines.get_line)
+      while (line = @lines.line)
         next if line.strip == ""
 
-        if line =~ /^---/
+        case line
+        when /^---/
           case @status
           when HOST_ACCOUNT_START, HOST_ACCOUNT
             @line_stack.push({ "STATUS" => HOST_ACCOUNT_END,
@@ -66,7 +67,7 @@ module Ykutils
           @line_stack.push({ "STATUS" => SEPARATOR,
                              "CONTENT" => line })
           @status = SEPARATOR
-        elsif line =~ /^\s/
+        when /^\s/
           case @status
           when HOST_ACCOUNT_START, HOST_ACCOUNT
             @line_stack.push({ "STATUS" => HOST_ACCOUNT,
@@ -93,7 +94,7 @@ module Ykutils
                                "CONTENT" => line })
             @status = ETC
           end
-        elsif line =~ /^==/
+        when /^==/
           case @status
           when HOST_ACCOUNT_START, HOST_ACCOUNT
             @line_stack.push({ "STATUS" => HOST_ACCOUNT_END,
@@ -122,7 +123,7 @@ module Ykutils
 
       i = @line_stack.size - 1
       seeking = true
-      while i >= 0 and seeking
+      while (i >= 0) && seeking
         case @line_stack[i]["STATUS"]
         when DOMAIN_ACCOUNT_START, DOMAIN_ACCOUNT
           @line_stack.push({ "STATUS" => DOMAIN_ACCOUNT_END,
@@ -133,6 +134,7 @@ module Ykutils
                              "CONTENT" => nil })
           seeking = false
         when ETC
+          seeking = true
         else
           seeking = false
         end

data/lib/ykutils/lsutils.rb

@@ -5,9 +5,7 @@ module Ykytils
   class DirEntryItem
     attr_accessor :name, :user, :group, :size, :month, :day, :time, :year, :path, :type, :parent_dir, :valid
 
-    def initialize; end
-
-    def parse(str, parent_dir, valid = true)
+    def parse(str, parent_dir, valid: true)
       ary = str.split(/\s+/)
       perm = ary[0]
       @type = if perm[0].chr == "d"
@@ -49,11 +47,11 @@ module Ykytils
     end
 
     def directory?
-      @type === :DIRECTORY
+      @type == :DIRECTORY
     end
 
     def file?
-      @type === :FILE
+      @type == :FILE
     end
 
     def owner_perm

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