ykutils 0.1.4 → 0.1.6

data/lib/ykutils/yamlop.rb

@@ -1,227 +1,227 @@
-require "ykutils/specfileop"
-require "ykutils/stext"
-require "ykutils/datastructop"
-
-module Ykutils
-  class YamlOp
-    attr_accessor :valid, :yaml, :ofname
-
-    include SpecFileOp
-    include DataStructOp
-
-    TEST_ID_NO_VALUE = 0
-    TEST_ID_LISTUP_ALL = 1
-
-    def initialize(opts = {}, _argv = [], _debug = false)
-      @fname = nil
-      @check_flag = opts["check"]
-      @ifname = opts["input_file"]
-      @ofname = opts["output_file"]
-      @reform_flag = opts["reform"]
-      @test_id = opts["test_id"]
-      @valid = true
-      @ptext = []
-    end
-
-    def valid?
-      @valid
-    end
-
-    def exec
-      if @reform_flag
-        reform
-      elsif @test_id > 0
-        case @test_id
-        when TEST_ID_LISTUP_ALL
-          test_listup
-        end
-      end
-
-      true
-    end
-
-    def test_listup
-      import(@ifname)
-      puts "###listup_all"
-      ary = listup_all
-      ary.each do |it|
-        puts(it)
-      end
-
-      puts "###listup_host"
-      ary = listup_host
-      ary.each do |it|
-        puts(it)
-      end
-
-      puts "###listup_domain"
-      ary = listup_domain
-      ary.each do |it|
-        puts(it)
-      end
-    end
-
-    def load_yaml(fname)
-      @yaml = load_yaml_file(fname)
-    end
-
-    def load_yaml_ifname
-      @yaml = load_yaml_file(@ifname)
-    end
-
-    def load(fname)
-      ret = false
-      if File.file?(fname)
-        @fname = fname
-        @pstext = StructuredTextForAccount.new
-        #    @pstext.load_analyze( fname , "C-#{fname}-#{Time.now.to_i}.txt" )
-        @pstext.load_analyze(fname)
-        @yaml = load_yaml_file(fname)
-        ret = true
-      end
-
-      ret
-    end
-
-    def yaml2stext(yaml = @yaml)
-      #    begin
-      yaml_str = YAML.dump(yaml)
-      #    puts yaml_str
-      #     rescue => ex
-      #       pp ex
-      #       pp caller(0)
-      #       exit 1000
-      #     end
-      yaml_ary = yaml_str.split("\n")
-
-      @yamlstext = StructuredTextForAccount.new
-      @yamlstext.analyze(yaml_ary)
-    end
-
-    def sort
-      @yamlstext.sort_by(@pstext)
-    end
-
-    def import(fname)
-      ret = false
-      if File.file?(fname) and File.readable?(fname)
-        @ptext = load_plain_text_file(fname).collect { |it| it.chomp }
-        ret = false
-      end
-      ret
-    end
-
-    def importex(fname)
-      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(":")
-            [key, { "CONTENT" => l, "INDEX" => i }]
-          end
-        end
-        ret = false
-      end
-      ret
-    end
-
-    def listup_all
-      @ptext.select { |l| l !~ /^\s/ and l !~ /^#/ }
-    end
-
-    def listup_host
-      @ptext.select { |l| l !~ /^\s/ and l !~ /^=/ and l !~ /^#/ }
-    end
-
-    def listup_domain
-      @ptext.select { |l| l =~ /^==/ }
-    end
-
-    def output_yaml(obj, fname)
-      File.open(fname, "w") do |file|
-        YAML.dump(obj, file)
-      end
-    rescue StandardError => e
-      pp e
-      pp e.backtrace
-      @valid = false
-    end
-
-    def update_yaml(yaml)
-      buf = File.read(@ifname)
-      File.write(@ofname, buf)
-      File.open(@ifname, "w") do |file|
-        YAML.dump(yaml, file)
-      end
-    rescue StandardError => e
-      pp e
-      pp e.backtrace
-      @valid = false
-    end
-
-    def dump_to_file(fname)
-      File.open(fname, "w") do |file|
-        @yamlstext.dump(file)
-      end
-    rescue StandardError => e
-      pp e
-      pp e.backtrace
-      @valid = false
-    end
-
-    def dump_ptext_to_file(fname)
-      file = File.open(fname, "w") do |file|
-        @ptext.each do |l|
-          file.write(l + "\n")
-        end
-      end
-    rescue StandardError => e
-      pp e
-      pp e.backtrace
-      @valid = false
-    end
-
-    def exchange_ptext(key, value)
-      @ptext[@ptext_hash[key]["INDEX"]] = value
-      @ptext_hash[key]["CONTENT"] = value
-    end
-
-    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)
-      end
-    end
-
-    def extract_value(ary)
-      ary.collect do |x|
-        x2 = x
-        x.scan(/{([^}]+)}/).each do |y|
-          y.each do |z|
-            re = Regexp.new(%({#{z}}))
-            x2 = x2.gsub(re, @yaml[z])
-          end
-        end
-        x2
-      end
-    end
-  end
-end
+require "ykutils/specfileop"
+require "ykutils/stext"
+require "ykutils/datastructop"
+
+module Ykutils
+  class YamlOp
+    attr_accessor :valid, :yaml, :ofname
+
+    include SpecFileOp
+    include DataStructOp
+
+    TEST_ID_NO_VALUE = 0
+    TEST_ID_LISTUP_ALL = 1
+
+    def initialize(opts = {}, _argv = [], _debug = false)
+      @fname = nil
+      @check_flag = opts["check"]
+      @ifname = opts["input_file"]
+      @ofname = opts["output_file"]
+      @reform_flag = opts["reform"]
+      @test_id = opts["test_id"]
+      @valid = true
+      @ptext = []
+    end
+
+    def valid?
+      @valid
+    end
+
+    def exec
+      if @reform_flag
+        reform
+      elsif @test_id > 0
+        case @test_id
+        when TEST_ID_LISTUP_ALL
+          test_listup
+        end
+      end
+
+      true
+    end
+
+    def test_listup
+      import(@ifname)
+      puts "###listup_all"
+      ary = listup_all
+      ary.each do |it|
+        puts(it)
+      end
+
+      puts "###listup_host"
+      ary = listup_host
+      ary.each do |it|
+        puts(it)
+      end
+
+      puts "###listup_domain"
+      ary = listup_domain
+      ary.each do |it|
+        puts(it)
+      end
+    end
+
+    def load_yaml(fname)
+      @yaml = load_yaml_file(fname)
+    end
+
+    def load_yaml_ifname
+      @yaml = load_yaml_file(@ifname)
+    end
+
+    def load(fname)
+      ret = false
+      if File.file?(fname)
+        @fname = fname
+        @pstext = StructuredTextForAccount.new
+        #    @pstext.load_analyze( fname , "C-#{fname}-#{Time.now.to_i}.txt" )
+        @pstext.load_analyze(fname)
+        @yaml = load_yaml_file(fname)
+        ret = true
+      end
+
+      ret
+    end
+
+    def yaml2stext(yaml = @yaml)
+      #    begin
+      yaml_str = YAML.dump(yaml)
+      #    puts yaml_str
+      #     rescue => ex
+      #       pp ex
+      #       pp caller(0)
+      #       exit 1000
+      #     end
+      yaml_ary = yaml_str.split("\n")
+
+      @yamlstext = StructuredTextForAccount.new
+      @yamlstext.analyze(yaml_ary)
+    end
+
+    def sort
+      @yamlstext.sort_by(@pstext)
+    end
+
+    def import(fname)
+      ret = false
+      if File.file?(fname) and File.readable?(fname)
+        @ptext = load_plain_text_file(fname).collect { |it| it.chomp }
+        ret = false
+      end
+      ret
+    end
+
+    def importex(fname)
+      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(":")
+            [key, { "CONTENT" => l, "INDEX" => i }]
+          end
+        end
+        ret = false
+      end
+      ret
+    end
+
+    def listup_all
+      @ptext.select { |l| l !~ /^\s/ and l !~ /^#/ }
+    end
+
+    def listup_host
+      @ptext.select { |l| l !~ /^\s/ and l !~ /^=/ and l !~ /^#/ }
+    end
+
+    def listup_domain
+      @ptext.select { |l| l =~ /^==/ }
+    end
+
+    def output_yaml(obj, fname)
+      File.open(fname, "w") do |file|
+        YAML.dump(obj, file)
+      end
+    rescue StandardError => e
+      pp e
+      pp e.backtrace
+      @valid = false
+    end
+
+    def update_yaml(yaml)
+      buf = File.read(@ifname)
+      File.write(@ofname, buf)
+      File.open(@ifname, "w") do |file|
+        YAML.dump(yaml, file)
+      end
+    rescue StandardError => e
+      pp e
+      pp e.backtrace
+      @valid = false
+    end
+
+    def dump_to_file(fname)
+      File.open(fname, "w") do |file|
+        @yamlstext.dump(file)
+      end
+    rescue StandardError => e
+      pp e
+      pp e.backtrace
+      @valid = false
+    end
+
+    def dump_ptext_to_file(fname)
+      file = File.open(fname, "w") do |file|
+        @ptext.each do |l|
+          file.write(l + "\n")
+        end
+      end
+    rescue StandardError => e
+      pp e
+      pp e.backtrace
+      @valid = false
+    end
+
+    def exchange_ptext(key, value)
+      @ptext[@ptext_hash[key]["INDEX"]] = value
+      @ptext_hash[key]["CONTENT"] = value
+    end
+
+    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)
+      end
+    end
+
+    def extract_value(ary)
+      ary.collect do |x|
+        x2 = x
+        x.scan(/{([^}]+)}/).each do |y|
+          y.each do |z|
+            re = Regexp.new(%({#{z}}))
+            x2 = x2.gsub(re, @yaml[z])
+          end
+        end
+        x2
+      end
+    end
+  end
+end

data/lib/ykutils/yamlxop.rb

@@ -1,35 +1,35 @@
-require "ykutils/debugutils"
-require "ykutils/stextx"
-require "ykutils/yamlop"
-
-module Ykutils
-  class YamlXOp < YamlOp
-    attr_accessor :yaml
-
-    include DebugUtils
-
-    def initialize(_opt, _args, debug)
-      debug_utils_init
-      set_debug(debug)
-    end
-
-    def load(fname)
-      #    d_puts "3"
-      #    puts_current_method
-
-      #    d_puts "fname=#{fname}"
-      @fname = fname
-      #    @pstext = StructuredTextForX.new
-      #    puts "fname=#{fname}"
-      #    @pstext.load_analyze( fname )
-      @yaml = load_yaml_file(fname)
-    end
-
-    def yaml2stext
-      yaml_str = YAML.dump(@yaml)
-      yaml_ary = yaml_str.split("\n")
-      @yamlstext = StructuredTextForAccount.new
-      @yamlstext.analyze(yaml_ary)
-    end
-  end
-end
+require "ykutils/debugutils"
+require "ykutils/stextx"
+require "ykutils/yamlop"
+
+module Ykutils
+  class YamlXOp < YamlOp
+    attr_accessor :yaml
+
+    include DebugUtils
+
+    def initialize(_opt, _args, debug)
+      debug_utils_init
+      set_debug(debug)
+    end
+
+    def load(fname)
+      #    d_puts "3"
+      #    puts_current_method
+
+      #    d_puts "fname=#{fname}"
+      @fname = fname
+      #    @pstext = StructuredTextForX.new
+      #    puts "fname=#{fname}"
+      #    @pstext.load_analyze( fname )
+      @yaml = load_yaml_file(fname)
+    end
+
+    def yaml2stext
+      yaml_str = YAML.dump(@yaml)
+      yaml_ary = yaml_str.split("\n")
+      @yamlstext = StructuredTextForAccount.new
+      @yamlstext.analyze(yaml_ary)
+    end
+  end
+end

data/test_data/4servers.erb

@@ -1,7 +1,7 @@
-<%= server1 %>
-
-<%= server2 %>
-
-<%= server3 %>
-
-<%= server4 %>
+<%= server1 %>
+
+<%= server2 %>
+
+<%= server3 %>
+
+<%= server4 %>

data/test_data/a.bat

@@ -1,5 +1,5 @@
-set TOP_DIR=C:\Users\ykomi\cur\ruby\ykutils
-set TD_DIR=%TOP_DIR%\test_data
-set V103_DIR=%TD_DIR%\v103-3-189-127
-set A_DIR=%V103_dir%\a.northern-cross.net
-bundle exec ruby %TOP_DIR%\bin\erubix  %V103_DIR%\template_ssl.erb %A_DIR%\value_host.yml %V103_DIR%\value_ssl.yml
+set TOP_DIR=C:\Users\ykomi\cur\ruby\ykutils
+set TD_DIR=%TOP_DIR%\test_data
+set V103_DIR=%TD_DIR%\v103-3-189-127
+set A_DIR=%V103_dir%\a.northern-cross.net
+bundle exec ruby %TOP_DIR%\bin\erubix  %V103_DIR%\template_ssl.erb %A_DIR%\value_host.yml %V103_DIR%\value_ssl.yml

data/test_data/a_ncn.bat

@@ -1,12 +1,12 @@
-@echo off
-set TOP_DIR=C:\Users\ykomi\cur\ruby\ykutils
-set TD_DIR=%TOP_DIR%\test_data
-set V103_DIR=%TD_DIR%\v103-3-189-127
-set A_DIR=%V103_dir%\a.northern-cross.net
-REM bundle exec ruby %TOP_DIR%\bin\erubix  %V103_DIR%\template_ssl.erb %A_DIR%\value_host.yml %V103_DIR%\value_ssl.yml
-
-REM bundle exec ruby %TOP_DIR%\bin\erubix  %V103_DIR%\template_ssl_www.erb %A_DIR%\value_host.yml %V103_DIR%\value_ssl.yml
-REM bundle exec ruby %TOP_DIR%\bin\erubix  %V103_DIR%\template.erb %A_DIR%\value_host.yml %V103_DIR%\value.yml
-REM bundle exec ruby %TOP_DIR%\bin\erubix  %V103_DIR%\template_www.erb %A_DIR%\value_host.yml %V103_DIR%\value.yml
-REM bundle exec ruby %TOP_DIR%\bin\erubix2  %A_DIR%\base.yml
-bundle exec ruby %TOP_DIR%\bin\erubix2  %1
+@echo off
+set TOP_DIR=C:\Users\ykomi\cur\ruby\ykutils
+set TD_DIR=%TOP_DIR%\test_data
+set V103_DIR=%TD_DIR%\v103-3-189-127
+set A_DIR=%V103_dir%\a.northern-cross.net
+REM bundle exec ruby %TOP_DIR%\bin\erubix  %V103_DIR%\template_ssl.erb %A_DIR%\value_host.yml %V103_DIR%\value_ssl.yml
+
+REM bundle exec ruby %TOP_DIR%\bin\erubix  %V103_DIR%\template_ssl_www.erb %A_DIR%\value_host.yml %V103_DIR%\value_ssl.yml
+REM bundle exec ruby %TOP_DIR%\bin\erubix  %V103_DIR%\template.erb %A_DIR%\value_host.yml %V103_DIR%\value.yml
+REM bundle exec ruby %TOP_DIR%\bin\erubix  %V103_DIR%\template_www.erb %A_DIR%\value_host.yml %V103_DIR%\value.yml
+REM bundle exec ruby %TOP_DIR%\bin\erubix2  %A_DIR%\base.yml
+bundle exec ruby %TOP_DIR%\bin\erubix2  %1

data/test_data/v103-3-189-127/a.northern-cross.net/base.yml

@@ -1,28 +1,28 @@
-_root:
-  template: 4servers.erb
-server1:
-  protocol: ssl
-  template: template_ssl.erb
-  value:
-    - value_host.yml
-    - ../value_ssl.yml
-server2:
-  protocol: ssl
-  domain: www
-  template: template_ssl_www.erb
-  value:
-    - value_host.yml
-    - ../value_ssl.yml
-server3:
-  protocol:
-  template: template.erb
-  value:
-    - value_host.yml
-    - ../value.yml
-server4:
-  protocol:
-  domain: www
-  template: template_www.erb
-  value:
-    - value_host.yml
-    - ../value.yml
+_root:
+  template: 4servers.erb
+server1:
+  protocol: ssl
+  template: template_ssl.erb
+  value:
+    - value_host.yml
+    - ../value_ssl.yml
+server2:
+  protocol: ssl
+  domain: www
+  template: template_ssl_www.erb
+  value:
+    - value_host.yml
+    - ../value_ssl.yml
+server3:
+  protocol:
+  template: template.erb
+  value:
+    - value_host.yml
+    - ../value.yml
+server4:
+  protocol:
+  domain: www
+  template: template_www.erb
+  value:
+    - value_host.yml
+    - ../value.yml

data/test_data/v103-3-189-127/a.northern-cross.net/value_host.yml

@@ -1 +1 @@
-host: a.northern-cross.net
+host: a.northern-cross.net