ykxutils 0.1.6 → 0.1.8

data/test_data/4servers.erb

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

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/ykxutils.gemspec

@@ -1,47 +1,54 @@
 # frozen_string_literal: true
 
-require_relative "lib/ykxutils/version"
+require_relative 'lib/ykxutils/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "ykxutils"
-  spec.version       = Ykxutils::VERSION
-  spec.authors       = ["ykominami"]
-  spec.email         = ["ykominami@gmail.com"]
+  spec.name = 'ykxutils'
+  spec.version = Ykxutils::VERSION
+  spec.authors = ['ykominami']
+  spec.email = ['ykominami@gmail.com']
 
-  spec.summary       = "New version of utilty function created by yk."
-  spec.description   = "New version of utilty function created by yk."
-  spec.homepage      = "https://ykominami.github.io/ykxutils"
-  spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.6")
+  spec.summary = 'New version of utilty function created by yk.'
+  spec.description = 'New version of utilty function created by yk.'
+  spec.homepage = 'https://ykominami.github.io/ykxutils'
+  spec.license = 'MIT'
+  spec.required_ruby_version = '>= 2.7'
 
-  # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
+  # 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/ykxutils"
+  spec.metadata['homepage_uri'] = spec.homepage
+  spec.metadata['source_code_uri'] = 'https://github.com/ykominami/ykxutils'
   # 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 = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features)/}) }
+    `git ls-files -z`.split("\x0").reject do |f|
+      (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
+    end
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.bindir = 'exe'
+  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_runtime_dependency 'bundler'
+  # spec.add_runtime_dependency 'debug'
+  spec.add_runtime_dependency 'erubi'
+  spec.add_runtime_dependency 'rake', '~> 13.0'
+  spec.add_runtime_dependency 'tilt'
 
-  spec.add_development_dependency "rubocop", "~> 1.7"
-  spec.add_development_dependency "rubocop-rake"
-  spec.add_development_dependency "rubocop-rspec"
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-performance'
+  spec.add_development_dependency 'rubocop-rake'
+  spec.add_development_dependency 'rubocop-rspec'
+
+  spec.add_development_dependency 'yard'
 
-  spec.add_development_dependency "yard"
   # Uncomment to register a new dependency of your gem
   # spec.add_dependency "example-gem", "~> 1.0"
 
-  # For more information and examples about making a new gem, checkout our
+  # 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"
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ykxutils
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - ykominami
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-16 00:00:00.000000000 Z
+date: 2022-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -17,7 +17,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: erubi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -31,13 +45,27 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +84,30 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -115,8 +157,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/main.yml"
-- ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -127,14 +167,43 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
 - lib/ykxutils.rb
+- lib/ykxutils/erubyx.rb
 - lib/ykxutils/gitcmd.rb
+- lib/ykxutils/gridlist.rb
+- lib/ykxutils/nginxconfig.rb
+- lib/ykxutils/nginxconfigfiles.rb
 - lib/ykxutils/pstorex.rb
 - lib/ykxutils/version.rb
 - lib/ykxutils/yamlx.rb
+- test_data/4servers.erb
 - test_data/test.yaml
+- test_data/v103-3-189-127/4servers.erb
+- test_data/v103-3-189-127/a.northern-cross.net/base.yml
+- test_data/v103-3-189-127/a.northern-cross.net/value_host.yml
+- test_data/v103-3-189-127/b.northern-cross.net/base.yml
+- test_data/v103-3-189-127/b.northern-cross.net/value_host.yml
+- test_data/v103-3-189-127/c.northern-cross.net/base.yml
+- test_data/v103-3-189-127/c.northern-cross.net/value_host.yml
+- test_data/v103-3-189-127/d.northern-cross.info/base.yml
+- test_data/v103-3-189-127/d.northern-cross.info/value_host.yml
+- test_data/v103-3-189-127/d.northern-cross.net/base.yml
+- test_data/v103-3-189-127/d.northern-cross.net/value_host.yml
+- test_data/v103-3-189-127/e.northern-cross.info/base.yml
+- test_data/v103-3-189-127/e.northern-cross.info/value_host.yml
+- test_data/v103-3-189-127/e.northern-cross.net/base.yml
+- test_data/v103-3-189-127/e.northern-cross.net/value_host.yml
+- test_data/v103-3-189-127/f.northern-cross.info/base.yml
+- test_data/v103-3-189-127/f.northern-cross.info/value_host.yml
+- test_data/v103-3-189-127/f.northern-cross.net/base.yml
+- test_data/v103-3-189-127/f.northern-cross.net/value_host.yml
+- test_data/v103-3-189-127/t_server_1.erb
+- test_data/v103-3-189-127/template.erb
+- test_data/v103-3-189-127/template_ssl.erb
+- test_data/v103-3-189-127/template_ssl_www.erb
+- test_data/v103-3-189-127/template_www.erb
+- test_data/v103-3-189-127/value.yml
+- test_data/v103-3-189-127/value_ssl.yml
 - ykxutils.gemspec
 homepage: https://ykominami.github.io/ykxutils
 licenses:
@@ -143,7 +212,7 @@ metadata:
   homepage_uri: https://ykominami.github.io/ykxutils
   source_code_uri: https://github.com/ykominami/ykxutils
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -151,15 +220,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: New version of utilty function created by yk.
 test_files: []