ykutils 0.1.4 → 0.1.7

data/lib/ykutils/debugutils.rb

@@ -3,43 +3,55 @@ require "pp"
 module Ykutils
   module DebugUtils
     class DebugMes
+      @debug = false
+      @warn = false
+      @buf = []
+
       def self.init(debug = false)
-        @@debug = debug
-        @@buf = []
+        @debug = debug
+        @buf = []
       end
 
       def self.set_debug(debug)
-        @@debug = debug
+        @debug = debug
+      end
+
+      def self.get_debug
+        @debug
+      end
+
+      def self.set_warn(warn)
+        @warn = warn
+      end
+
+      def self.get_warn
+        @warn
       end
 
       def self.puts_x(mes)
-        @@buf ||= []
-        @@buf << mes
-        #      puts "#{@@buf.size} |#{mes}"
+        @buf << mes
       end
 
       def self.get
-        @@buf
-        #      DebugMes.clear
+        @buf
       end
 
       def self.clear
-        @@buf ||= []
-        @@buf.clear
+        @buf.clear
       end
     end
 
     def clear_d
-      DebugMes.clear
+      Ykutils::DebugUtils::DebugMes..clear
     end
 
     def puts_d(mes)
-      DebugMes.puts_x(mes)
+      Ykutils::DebugUtils::DebugMes..puts_x(mes)
       #    puts mes
     end
 
     def get_d
-      DebugMes.get
+      self.class.get
     end
 
     def puts_current_method
@@ -56,46 +68,46 @@ module Ykutils
       set_debug(false)
       set_warn(0)
 
-      DebugMes.init(false)
+      Ykutils::DebugUtils::DebugMes.init(false)
     end
 
     def set_debug(val)
-      @debugutils = val
-      DebugMes.set_debug(val)
+      # self.class.set_debug(val)
+      Ykutils::DebugUtils::DebugMes.set_debug(val)
     end
 
     def get_debug
-      @debugutils
+      Ykutils::DebugUtils::DebugMes.get_debug
     end
 
     def set_warn(val)
-      @warn = val
+      Ykutils::DebugUtils::DebugMes.set_warn(val)
     end
 
-    def debug
-      @debugutils
+    def get_warn
+      Ykutils::DebugUtils::DebugMes..get_warn
     end
 
     def d_exit(num)
-      exit(num) if @debugutils
+      exit(num) if get_debug
     end
 
     def d_puts(str)
-      puts(str) if @debugutils
+      puts(str) if get_debug
     end
 
     def w1_puts(str)
-      set_warn(0) unless @warn
-      puts(str) if @debugutils or @warn >= 1
+      set_warn(0) unless get_warn
+      puts(str) if get_debug or get_warn >= 1
     end
 
     def w2_puts(str)
-      set_warn(0) unless @warn
-      puts(str) if @debugutils or @warn >= 2
+      set_warn(0) unless get_warn
+      puts(str) if get_debug or get_warn >= 2
     end
 
     def d_caller(_num)
-      pp caller(0) if @debugutils
+      pp caller(0) if get_debug
     end
 
     def puts_no_empty(mes)
@@ -103,20 +115,20 @@ module Ykutils
     end
 
     def d_puts_no_empty(mes)
-      puts mes if mes != "" and @debugutils
+      puts mes if mes != "" and get_debug
     end
 
     def d_p(it)
-      p it if @debugutils
+      p it if get_debug
     end
 
     def d_pp(it)
-      if @debugutils
-        pp "@debugutils=#{@debugutils}"
+      if get_debug
+        pp "debug=#{get_debug}"
         pp caller(0)
         exit
       end
-      pp it if @debugutils
+      pp it if get_debug
     end
   end
 end

data/lib/ykutils/erubyx.rb

@@ -5,37 +5,48 @@ module Ykutils
   module Erubyx
     module_function
 
-    def erubi_render(template_hash, scope, value_hash)
+    def erubi_render(template_hash, scope, value_hash = {})
       unless template_hash[:OBJ]
-        template_hash[:OBJ] = Tilt::ErubiTemplate.new{ template_hash[:TEMPLATE] }
+        template_hash[:OBJ] = Tilt::ErubiTemplate.new { template_hash[:TEMPLATE] }
       end
-      template_hash[:OBJ].render( scope, value_hash )
+      template_hash[:OBJ].render(scope, value_hash)
     end
 
-##
-# `erubi_render_with_file` takes a template file path, a scope, and a value file path, reads the
-# template file, loads the value file, and then calls `erubi_render` with the template hash, scope,
-# and value hash
-# 
-# Args:
-#   template_file_path: The path to the template file.
-#   scope: the scope of the template. This is the name of the directory that the template is in.
-#   value_file_path: The path to the YAML file that contains the values to be used in the template.
+    ##
+    # `erubi_render_with_file` takes a template file path, a scope, and a value file path, reads the
+    # template file, loads the value file, and then calls `erubi_render` with the template hash, scope,
+    # and value hash
+    #
+    # Args:
+    #   template_file_path: The path to the template file.
+    #   scope: the scope of the template. This is the name of the directory that the template is in.
+    #   value_file_path: The path to the YAML file that contains the values to be used in the template.
     def erubi_render_with_file(template_file_path, scope, value_file_path_array)
       template_text = File.read(template_file_path)
       template_hash = { TEMPLATE: template_text,
-                        OBJ: nil
-                      }
-      value_hash = value_file_path_array.reduce({}){ |hash, path|
-        #p path
+                        OBJ: nil }
+      value_hash = value_file_path_array.reduce({}) { |hash, path|
+        # p path
         hash0 = YAML.load_file(path)
-        #p hash0
+        # p hash0
         hash = hash.merge(hash0)
-        #p hash
+        # p hash
         hash
       }
-      #puts value_hash
+      # puts value_hash
       erubi_render(template_hash, scope, value_hash)
     end
+
+    def erubi_render_with_template_file(template_file_path, scope, value_hash = {})
+      template_text = File.read(template_file_path)
+      template_hash = make_template_hash(template_text)
+      # puts value_hash
+      erubi_render(template_hash, scope, value_hash)
+    end
+
+    def make_template_hash(text)
+      { TEMPLATE: text,
+        OBJ: nil }
+    end
   end
 end

data/lib/ykutils/fileoputils.rb

@@ -154,7 +154,7 @@ module Ykutils
       ary = []
       begin
         File.open(input_file_path, "r") do |file|
-          while line = file.gets
+          while (line = file.gets)
             line.chomp!
             ary << file_content_process(line)
           end
@@ -194,7 +194,7 @@ module Ykutils
       ary = []
       begin
         File.open(from_path, "r") do |file|
-          while line = file.gets
+          while (line = file.gets)
             line.chomp!
             ary << file_content_process(line)
           end

data/lib/ykutils/gridlist.rb

@@ -1,49 +1,49 @@
-require 'ykutils/erubyx'
-
-module Ykutils
-  module Gridlist
-    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 } }
-
-    module_function
-
-    def make_one_grid(hash, row, colum)
-      unless hash[:OBJ]
-        hash[:OBJ] = Tilt::ErubiTemplate.new{ hash[:TEMPLATE] }
-      end
-      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|
-          #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)
-        }
-      }
-    end
-
-    def make_grid_list(min_row, max_row, min_colum, max_colum)
-      template_hash = TAMPLETES[:GRID_DEF]
-      scope = nil
-      make_grid(template_hash, scope, min_row, max_row, min_colum, max_colum)
-    end
-
-    def make_grid_list_x(min_row, max_row, min_colum, max_colum)
-      template_hash = TAMPLETES[:GRID_DEF]
-      scope = nil
-      make_grid(template_hash, scope, min_row, max_row, min_colum, max_colum)
-    end
-  end
-end
+require 'ykutils/erubyx'
+
+module Ykutils
+  module Gridlist
+    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 } }
+
+    module_function
+
+    def make_one_grid(hash, row, colum)
+      unless hash[:OBJ]
+        hash[:OBJ] = Tilt::ErubiTemplate.new { hash[:TEMPLATE] }
+      end
+      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|
+          # 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)
+        }
+      }
+    end
+
+    def make_grid_list(min_row, max_row, min_colum, max_colum)
+      template_hash = TAMPLETES[:GRID_DEF]
+      scope = nil
+      make_grid(template_hash, scope, min_row, max_row, min_colum, max_colum)
+    end
+
+    def make_grid_list_x(min_row, max_row, min_colum, max_colum)
+      template_hash = TAMPLETES[:GRID_DEF]
+      scope = nil
+      make_grid(template_hash, scope, min_row, max_row, min_colum, max_colum)
+    end
+  end
+end

data/lib/ykutils/lines.rb

@@ -1,143 +1,143 @@
-module Ykutils
-  class BasicLines
-    def initialize(line_ary)
-      @line_ary = line_ary
-    end
-
-    def get_line
-      @line_ary.shift if @line_ary.size > -1
-    end
-  end
-
-  class Lines
-    def initialize(line_ary)
-      @lines = BasicLines.new(line_ary)
-      @line_stack = []
-      @status = nil
-
-      setup
-    end
-
-    def setup; end
-
-    def get_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
-        end
-      end
-    end
-  end
-
-  class FtpOpLines < BasicLines
-  end
-
-  # class AccountLines < BasicLines
-  class AccountLines < Lines
-    HOST_ACCOUNT_START = 10
-    HOST_ACCOUNT = 11
-    HOST_ACCOUNT_END = 12
-    DOMAIN_ACCOUNT_START = 20
-    DOMAIN_ACCOUNT = 21
-    DOMAIN_ACCOUNT_END = 22
-    SEPARATOR = 30
-    ETC = 100
-
-    def setup
-      while line = @lines.get_line
-        next if line.strip == ""
-
-        if line =~ /^---/
-          case @status
-          when HOST_ACCOUNT_START, HOST_ACCOUNT
-            @line_stack.push({ "STATUS" => HOST_ACCOUNT_END,
-                               "CONTENT" => nil })
-          when DOMAIN_ACCOUNT_START, DOMAIN_ACCOUNT
-            @line_stack.push({ "STATUS" => DOMAIN_ACCOUNT_END,
-                               "CONTENT" => nil })
-          end
-
-          @line_stack.push({ "STATUS" => SEPARATOR,
-                             "CONTENT" => line })
-          @status = SEPARATOR
-        elsif line =~ /^\s/
-          case @status
-          when HOST_ACCOUNT_START, HOST_ACCOUNT
-            @line_stack.push({ "STATUS" => HOST_ACCOUNT,
-                               "CONTENT" => line })
-            @status = HOST_ACCOUNT
-          when HOST_ACCOUNT_END
-            puts("error!")
-            puts(line)
-            @line_stack.push({ "STATUS" => HOST_ACCOUNT,
-                               "CONTENT" => line })
-            @status = HOST_ACCOUNT
-          when DOMAIN_ACCOUNT_START, DOMAIN_ACCOUNT
-            @line_stack.push({ "STATUS" => DOMAIN_ACCOUNT,
-                               "CONTENT" => line })
-            @status = DOMAIN_ACCOUNT
-          when DOMAIN_ACCOUNT_END
-            puts("error!")
-            puts(line)
-            @line_stack.push({ "STATUS" => DOMAIN_ACCOUNT,
-                               "CONTENT" => line })
-            @status = DOMAIN_ACCOUNT
-          else
-            @line_stack.push({ "STATUS" => ETC,
-                               "CONTENT" => line })
-            @status = ETC
-          end
-        elsif line =~ /^==/
-          case @status
-          when HOST_ACCOUNT_START, HOST_ACCOUNT
-            @line_stack.push({ "STATUS" => HOST_ACCOUNT_END,
-                               "CONTENT" => nil })
-          when DOMAIN_ACCOUNT_START, DOMAIN_ACCOUNT
-            @line_stack.push({ "STATUS" => DOMAIN_ACCOUNT_END,
-                               "CONTENT" => nil })
-          end
-          @line_stack.push({ "STATUS" => DOMAIN_ACCOUNT_START,
-                             "CONTENT" => line })
-          @status = DOMAIN_ACCOUNT_START
-        else
-          case @status
-          when HOST_ACCOUNT_START, HOST_ACCOUNT
-            @line_stack.push({ "STATUS" => HOST_ACCOUNT_END,
-                               "CONTENT" => nil })
-          when DOMAIN_ACCOUNT_START, DOMAIN_ACCOUNT
-            @line_stack.push({ "STATUS" => DOMAIN_ACCOUNT_END,
-                               "CONTENT" => nil })
-          end
-          @line_stack.push({ "STATUS" => HOST_ACCOUNT_START,
-                             "CONTENT" => line })
-          @status = HOST_ACCOUNT_START
-        end
-      end
-
-      i = @line_stack.size - 1
-      seeking = true
-      while i >= 0 and seeking
-        case @line_stack[i]["STATUS"]
-        when DOMAIN_ACCOUNT_START, DOMAIN_ACCOUNT
-          @line_stack.push({ "STATUS" => DOMAIN_ACCOUNT_END,
-                             "CONTENT" => nil })
-          seeking = false
-        when HOST_ACCOUNT_START, HOST_ACCOUNT
-          @line_stack.push({ "STATUS" => HOST_ACCOUNT_END,
-                             "CONTENT" => nil })
-          seeking = false
-        when ETC
-        else
-          seeking = false
-        end
-        i -= 1
-      end
-    end
-  end
-end
+module Ykutils
+  class BasicLines
+    def initialize(line_ary)
+      @line_ary = line_ary
+    end
+
+    def get_line
+      @line_ary.shift if @line_ary.size > -1
+    end
+  end
+
+  class Lines
+    def initialize(line_ary)
+      @lines = BasicLines.new(line_ary)
+      @line_stack = []
+      @status = nil
+
+      setup
+    end
+
+    def setup; end
+
+    def get_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
+        end
+      end
+    end
+  end
+
+  class FtpOpLines < BasicLines
+  end
+
+  # class AccountLines < BasicLines
+  class AccountLines < Lines
+    HOST_ACCOUNT_START = 10
+    HOST_ACCOUNT = 11
+    HOST_ACCOUNT_END = 12
+    DOMAIN_ACCOUNT_START = 20
+    DOMAIN_ACCOUNT = 21
+    DOMAIN_ACCOUNT_END = 22
+    SEPARATOR = 30
+    ETC = 100
+
+    def setup
+      while (line = @lines.get_line)
+        next if line.strip == ""
+
+        if line =~ /^---/
+          case @status
+          when HOST_ACCOUNT_START, HOST_ACCOUNT
+            @line_stack.push({ "STATUS" => HOST_ACCOUNT_END,
+                               "CONTENT" => nil })
+          when DOMAIN_ACCOUNT_START, DOMAIN_ACCOUNT
+            @line_stack.push({ "STATUS" => DOMAIN_ACCOUNT_END,
+                               "CONTENT" => nil })
+          end
+
+          @line_stack.push({ "STATUS" => SEPARATOR,
+                             "CONTENT" => line })
+          @status = SEPARATOR
+        elsif line =~ /^\s/
+          case @status
+          when HOST_ACCOUNT_START, HOST_ACCOUNT
+            @line_stack.push({ "STATUS" => HOST_ACCOUNT,
+                               "CONTENT" => line })
+            @status = HOST_ACCOUNT
+          when HOST_ACCOUNT_END
+            puts("error!")
+            puts(line)
+            @line_stack.push({ "STATUS" => HOST_ACCOUNT,
+                               "CONTENT" => line })
+            @status = HOST_ACCOUNT
+          when DOMAIN_ACCOUNT_START, DOMAIN_ACCOUNT
+            @line_stack.push({ "STATUS" => DOMAIN_ACCOUNT,
+                               "CONTENT" => line })
+            @status = DOMAIN_ACCOUNT
+          when DOMAIN_ACCOUNT_END
+            puts("error!")
+            puts(line)
+            @line_stack.push({ "STATUS" => DOMAIN_ACCOUNT,
+                               "CONTENT" => line })
+            @status = DOMAIN_ACCOUNT
+          else
+            @line_stack.push({ "STATUS" => ETC,
+                               "CONTENT" => line })
+            @status = ETC
+          end
+        elsif line =~ /^==/
+          case @status
+          when HOST_ACCOUNT_START, HOST_ACCOUNT
+            @line_stack.push({ "STATUS" => HOST_ACCOUNT_END,
+                               "CONTENT" => nil })
+          when DOMAIN_ACCOUNT_START, DOMAIN_ACCOUNT
+            @line_stack.push({ "STATUS" => DOMAIN_ACCOUNT_END,
+                               "CONTENT" => nil })
+          end
+          @line_stack.push({ "STATUS" => DOMAIN_ACCOUNT_START,
+                             "CONTENT" => line })
+          @status = DOMAIN_ACCOUNT_START
+        else
+          case @status
+          when HOST_ACCOUNT_START, HOST_ACCOUNT
+            @line_stack.push({ "STATUS" => HOST_ACCOUNT_END,
+                               "CONTENT" => nil })
+          when DOMAIN_ACCOUNT_START, DOMAIN_ACCOUNT
+            @line_stack.push({ "STATUS" => DOMAIN_ACCOUNT_END,
+                               "CONTENT" => nil })
+          end
+          @line_stack.push({ "STATUS" => HOST_ACCOUNT_START,
+                             "CONTENT" => line })
+          @status = HOST_ACCOUNT_START
+        end
+      end
+
+      i = @line_stack.size - 1
+      seeking = true
+      while i >= 0 and seeking
+        case @line_stack[i]["STATUS"]
+        when DOMAIN_ACCOUNT_START, DOMAIN_ACCOUNT
+          @line_stack.push({ "STATUS" => DOMAIN_ACCOUNT_END,
+                             "CONTENT" => nil })
+          seeking = false
+        when HOST_ACCOUNT_START, HOST_ACCOUNT
+          @line_stack.push({ "STATUS" => HOST_ACCOUNT_END,
+                             "CONTENT" => nil })
+          seeking = false
+        when ETC
+        else
+          seeking = false
+        end
+        i -= 1
+      end
+    end
+  end
+end