ykutils 0.1.4 → 0.1.6

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

data/lib/ykutils/lsutils.rb

@@ -1,71 +1,71 @@
-require "ykutils/filepermision"
-require "pathname"
-
-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)
-      ary = str.split(/\s+/)
-      perm = ary[0]
-      @type = if perm[0].chr == "d"
-          :DIRECTORY
-        else
-          :FILE
-        end
-      @perm = FilePermision.new(ary[0][1..9])
-      @value = ary[1]
-      @user = ary[2]
-      @group = ary[3]
-      @size = ary[4]
-      @month = ary[5]
-      @day = ary[6]
-      str = ary[7]
-      if str =~ /:/
-        @year = Time.now.year
-        @time = str
-      else
-        @year = str
-        @time = "00:00:00"
-      end
-
-      @time = ary[7]
-      @name = ary[8]
-      @path = File.join(parent_dir, @name)
-      @parent_dir = parent_dir
-      @valid = valid
-    end
-
-    def to_hash
-      { "type" => @type, "perm" => @perm.to_hash, "value" => @value, "user" => @user, "group" => @group,
-        "size" => @size, "month" => @month, "day" => @day, "year" => @year,
-        "time" => @time, "name" => @name, "path" => @path, "parent_dir" => @parent_dir, "valid" => @valid }
-    end
-
-    def to_csv
-      "#{@type},#{@perm},#{@value},#{@user},#{@group},#{@size},#{@year},#{@month},#{@day},#{@time},#{@name},#{@parent_dir},#{@valid}"
-    end
-
-    def directory?
-      @type === :DIRECTORY
-    end
-
-    def file?
-      @type === :FILE
-    end
-
-    def owner_perm
-      @perm.owner
-    end
-
-    def group_perm
-      @perm.group
-    end
-
-    def otherr_perm
-      @perm.other
-    end
-  end
-end
+require "ykutils/filepermision"
+require "pathname"
+
+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)
+      ary = str.split(/\s+/)
+      perm = ary[0]
+      @type = if perm[0].chr == "d"
+                :DIRECTORY
+              else
+                :FILE
+              end
+      @perm = FilePermision.new(ary[0][1..9])
+      @value = ary[1]
+      @user = ary[2]
+      @group = ary[3]
+      @size = ary[4]
+      @month = ary[5]
+      @day = ary[6]
+      str = ary[7]
+      if str =~ /:/
+        @year = Time.now.year
+        @time = str
+      else
+        @year = str
+        @time = "00:00:00"
+      end
+
+      @time = ary[7]
+      @name = ary[8]
+      @path = File.join(parent_dir, @name)
+      @parent_dir = parent_dir
+      @valid = valid
+    end
+
+    def to_hash
+      { "type" => @type, "perm" => @perm.to_hash, "value" => @value, "user" => @user, "group" => @group,
+        "size" => @size, "month" => @month, "day" => @day, "year" => @year,
+        "time" => @time, "name" => @name, "path" => @path, "parent_dir" => @parent_dir, "valid" => @valid }
+    end
+
+    def to_csv
+      "#{@type},#{@perm},#{@value},#{@user},#{@group},#{@size},#{@year},#{@month},#{@day},#{@time},#{@name},#{@parent_dir},#{@valid}"
+    end
+
+    def directory?
+      @type === :DIRECTORY
+    end
+
+    def file?
+      @type === :FILE
+    end
+
+    def owner_perm
+      @perm.owner
+    end
+
+    def group_perm
+      @perm.group
+    end
+
+    def otherr_perm
+      @perm.other
+    end
+  end
+end

data/lib/ykutils/nginxconfig.rb

@@ -1,41 +1,40 @@
-module Ykutils
-  class Nginxconfig
-    def initialize(yaml_path)
-      #p "yaml_path=#{yaml_path}"
-      yaml_pn = Pathname.new(yaml_path).cleanpath
-      @virtual_domain_dir_pn = yaml_pn.parent
-      @server_dir_pn = @virtual_domain_dir_pn.parent
-      @common_dir_pn = @server_dir_pn.parent
-      @hash = YAML.load_file(yaml_pn)
-      #p @hash
-      @root = @hash["_root"]
-      #p @root
-      root_template_0_pn = Pathname.new(@root["template"]).cleanpath
-      @root_template_pn = @common_dir_pn + root_template_0_pn
-      # puts "@root_template_pn=#{@root_template_pn}"
-    end
-
-    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)
-        end
-      end
-      template = File.read(@root_template_pn)
-      template_hash = { TEMPLATE: template,
-        OBJ: nil
-      }
-      Ykutils::Erubyx::erubi_render(template_hash, scope, hashx)
-    end
-  end
-end
+module Ykutils
+  class Nginxconfig
+    def initialize(yaml_path)
+      # p "yaml_path=#{yaml_path}"
+      yaml_pn = Pathname.new(yaml_path).cleanpath
+      @virtual_domain_dir_pn = yaml_pn.parent
+      @server_dir_pn = @virtual_domain_dir_pn.parent
+      @common_dir_pn = @server_dir_pn.parent
+      @hash = YAML.load_file(yaml_pn)
+      # p @hash
+      @root = @hash["_root"]
+      # p @root
+      root_template_0_pn = Pathname.new(@root["template"]).cleanpath
+      @root_template_pn = @common_dir_pn + root_template_0_pn
+      # puts "@root_template_pn=#{@root_template_pn}"
+    end
+
+    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)
+        end
+      end
+      template = File.read(@root_template_pn)
+      template_hash = { TEMPLATE: template,
+                        OBJ: nil }
+      Ykutils::Erubyx::erubi_render(template_hash, scope, hashx)
+    end
+  end
+end

data/lib/ykutils/nginxconfigfiles.rb

@@ -1,31 +1,31 @@
-module Ykutils
-  require 'find'
-  class Nginxconfigfiles
-    def get_file_list(start_dir, re)
-      @file_list = []
-
-      Find.find(start_dir){|x|
-        if x =~ re
-            #puts x
-            @file_list << x
-            Find.prune
-        end
-      }
-      @file_list
-    end
-
-    def output(file_list)
-      file_list.map{ |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|
-          x = cli.extract(scope)
-          f.write(x)
-        }
-      }
-    end
-  end
-end
+module Ykutils
+  require 'find'
+  class Nginxconfigfiles
+    def get_file_list(start_dir, re)
+      @file_list = []
+
+      Find.find(start_dir) { |x|
+        if x =~ re
+          # puts x
+          @file_list << x
+          Find.prune
+        end
+      }
+      @file_list
+    end
+
+    def output(file_list)
+      file_list.map { |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|
+          x = cli.extract(scope)
+          f.write(x)
+        }
+      }
+    end
+  end
+end