ykutils 0.1.0 → 0.1.4

data/lib/ykutils/yamlxop.rb

@@ -1,34 +1,35 @@
-require 'debugutils'
-require 'stextx'
-require 'yamlop'
-
-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
+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/lib/ykutils.rb

@@ -1,5 +1,33 @@
 require "ykutils/version"
 
+require "ykutils/datastructop"
+require "ykutils/debugutils"
+require "ykutils/erubyx"
+require "ykutils/gridlist"
+require "ykutils/fileoputils"
+require "ykutils/filepermision"
+require "ykutils/hasharray"
+require "ykutils/lines"
+require "ykutils/lsutils"
+require "ykutils/nginxconfig"
+require "ykutils/nginxconfigfiles"
+require "ykutils/nkfutil"
+require "ykutils/nkfutil19"
+require "ykutils/osutil"
+require "ykutils/pathop"
+require "ykutils/retcodex"
+require "ykutils/specfileop"
+require "ykutils/stext"
+require "ykutils/stextx"
+require "ykutils/stringutils"
+require "ykutils/treemanager"
+require "ykutils/treemanagera"
+require "ykutils/xlines"
+require "ykutils/yamlop"
+require "ykutils/yamlxop"
+
+require 'pathname'
 module Ykutils
+  TEST_DATA_DIR = Pathname.new(__dir__).parent + "test_data"
   # Your code goes here...
 end

data/sig/ykutils.rbs

@@ -0,0 +1,4 @@
+module Ykutils
+  VERSION: String
+  # See the writing guide of rbs: https://github.com/ruby/rbs#guides
+end

data/test_data/4servers.erb

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

data/test_data/a.bat

@@ -0,0 +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

data/test_data/a_ncn.bat

@@ -0,0 +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

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

@@ -0,0 +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

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

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

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

@@ -0,0 +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

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

@@ -0,0 +1 @@
+host: b.northern-cross.net

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

@@ -0,0 +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

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

@@ -0,0 +1 @@
+host: c.northern-cross.net

data/test_data/v103-3-189-127/d.northern-cross.info/base.yml

@@ -0,0 +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

data/test_data/v103-3-189-127/d.northern-cross.info/value_host.yml

@@ -0,0 +1 @@
+host: d.northern-cross.info

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

@@ -0,0 +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

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

@@ -0,0 +1 @@
+host: d.northern-cross.net

data/test_data/v103-3-189-127/e.northern-cross.info/base.yml

@@ -0,0 +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

data/test_data/v103-3-189-127/e.northern-cross.info/value_host.yml

@@ -0,0 +1 @@
+host: e.northern-cross.info

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

@@ -0,0 +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

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

@@ -0,0 +1 @@
+host: e.northern-cross.net

data/test_data/v103-3-189-127/f.northern-cross.info/base.yml

@@ -0,0 +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

data/test_data/v103-3-189-127/f.northern-cross.info/value_host.yml

@@ -0,0 +1 @@
+host: f.northern-cross.info

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

@@ -0,0 +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

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

@@ -0,0 +1 @@
+host: f.northern-cross.net

data/test_data/v103-3-189-127/t_server_1.erb

@@ -0,0 +1,7 @@
+<%= server_ssl %>
+
+<%= server_ssl_www %>
+
+<%= server %>
+
+<%= server_www %>

data/test_data/v103-3-189-127/template.erb

@@ -0,0 +1,21 @@
+server {
+    if ($host = <%= host %>) {
+        return 301 https://$host$request_uri;
+    }
+
+    listen 80;
+    server_name  <%= host %>;
+
+    error_log   /var/www/vhosts/<%= host %>/statistics/logs/<%= error_log %>;
+    access_log   /var/www/vhosts/<%= host %>/statistics/logs/<%= access_log %>;
+
+    root   /var/www/vhosts/<%= host %>/httpdocs;
+    location / {
+        index index.html;
+    }
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html/;
+        index 50x.html;
+    }
+}

data/test_data/v103-3-189-127/template_ssl.erb

@@ -0,0 +1,22 @@
+server {
+    listen <%= ssl_port %>;
+    ssl_certificate <%= ssl_certificate %>;
+    ssl_certificate_key <%= ssl_certificate_key %>;
+    server_name  <%= host %>;
+
+    error_log   /var/www/vhosts/<%= host %>/statistics/logs/<%= error_log %>;
+    access_log   /var/www/vhosts/<%= host %>/statistics/logs/<%= access_log %>;
+
+#    rewrite_log on;
+
+    root   /var/www/vhosts/<%= host %>/httpdocs;
+    location  / {
+        index index.html;
+    }
+    error_page   500 502 503 504  /50x.html;
+    #error_page   500  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html/;
+        index 50x.html;
+    }
+}

data/test_data/v103-3-189-127/template_ssl_www.erb

@@ -0,0 +1,12 @@
+server {
+    listen <%= ssl_port %>;
+    server_name www.<%= host %>;
+        #
+    return 301 https://<%= host %>;
+
+    ssl_certificate <%= ssl_certificate %>;
+    ssl_certificate_key <%= ssl_certificate_key %>;
+    include /etc/letsencrypt/options-ssl-nginx.conf;
+    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
+
+}

data/test_data/v103-3-189-127/template_www.erb

@@ -0,0 +1,24 @@
+server {
+    if ($host = northern-cross.net) {
+        return 301 https://$host$request_uri;
+    }
+
+
+    listen <%= port %>;
+    server_name  <%= host %>;
+
+    error_log   /var/www/vhosts/<%= host %>/statistics/logs/<%= error_log %>;
+    access_log   /var/www/vhosts/<%= host %>/statistics/logs/<%= access_log %>;
+
+    rewrite_log on;
+
+    root   /var/www/vhosts/<%= host %>/httpdocs;
+    location / {
+        index index.html;
+    }
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html/;
+        index 50x.html;
+    }
+}

data/test_data/v103-3-189-127/value.yml

@@ -0,0 +1,3 @@
+error_log: error_log
+access_log: access_log
+port: 80

data/test_data/v103-3-189-127/value_ssl.yml

@@ -0,0 +1,5 @@
+error_log: ssl_error_log
+access_log: ssl_access_log
+ssl_port: 443 ssl
+ssl_certificate: /etc/letsencrypt/live/v103-3-189-127.myvps.jp/fullchain.pem
+ssl_certificate_key: /etc/letsencrypt/live/v103-3-189-127.myvps.jp/privkey.pem

data/ykutils.gemspec

@@ -1,27 +1,43 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'ykutils/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "ykutils"
-  spec.version       = Ykutils::VERSION
-  spec.authors       = ["yasuo kominami"]
-  spec.email         = ["ykominami@gmail.com"]
-
-  spec.summary       = %q{utilty function created by yk.}
-  spec.description   = %q{utilty function created by yk.}
-  spec.homepage      = ""
-
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  if spec.respond_to?(:metadata)
-#    spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com' to prevent pushes to rubygems.org, or delete to allow pushes to any server."
-  end
-
-  spec.add_development_dependency "bundler", "~> 1.9"
-  spec.add_development_dependency "rake", "~> 10.0"
-end
+# frozen_string_literal: true
+
+lib = File.expand_path("lib", __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+require_relative "lib/ykutils/version"
+
+Gem::Specification.new do |spec|
+  spec.name = "ykutils"
+  spec.version = Ykutils::VERSION
+  spec.authors = ["yasuo kominami"]
+  spec.email = ["ykominami@gmail.com"]
+
+  spec.summary       = "utilty function created by yk."
+  spec.description   = "utilty function created by yk."
+  spec.homepage      = "https://ykominami.github.io/ykutils/"
+  spec.license = "MIT"
+  spec.required_ruby_version = ">= 2.6.0"
+
+  #spec.metadata["allowed_push_host"] = "TODO: Set to your gem server 'https://example.com'"
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://github.com/ykominami/ykutils"
+  #  spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  # Uncomment to register a new dependency of your gem
+  # spec.add_dependency "example-gem", "~> 1.0"
+  spec.add_dependency "filex"
+  spec.add_development_dependency "rubocop-rake"
+  spec.add_development_dependency "rubocop-rspec"
+
+  # For more information and examples about making a new gem, check out our
+  # guide at: https://bundler.io/guides/creating_gem.html
+  spec.metadata["rubygems_mfa_required"] = "true"
+end