ykxutils 0.1.7 → 0.1.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (47) hide show
  1. checksums.yaml +4 -4
  2. data/.rubocop.yml +1 -1
  3. data/.rubocop_todo.yml +125 -51
  4. data/Gemfile +13 -9
  5. data/Gemfile.lock +18 -6
  6. data/Rakefile +25 -8
  7. data/lib/ykxutils/erubyx.rb +52 -0
  8. data/lib/ykxutils/gridlist.rb +49 -0
  9. data/lib/ykxutils/nginxconfig.rb +40 -0
  10. data/lib/ykxutils/nginxconfigfiles.rb +33 -0
  11. data/lib/ykxutils/pstorex.rb +1 -1
  12. data/lib/ykxutils/version.rb +1 -1
  13. data/lib/ykxutils/yamlx.rb +24 -47
  14. data/lib/ykxutils.rb +4 -0
  15. data/test_data/4servers.erb +7 -0
  16. data/test_data/v103-3-189-127/4servers.erb +0 -0
  17. data/test_data/v103-3-189-127/a.northern-cross.net/base.yml +28 -0
  18. data/test_data/v103-3-189-127/a.northern-cross.net/value_host.yml +1 -0
  19. data/test_data/v103-3-189-127/b.northern-cross.net/base.yml +28 -0
  20. data/test_data/v103-3-189-127/b.northern-cross.net/value_host.yml +1 -0
  21. data/test_data/v103-3-189-127/c.northern-cross.net/base.yml +28 -0
  22. data/test_data/v103-3-189-127/c.northern-cross.net/value_host.yml +1 -0
  23. data/test_data/v103-3-189-127/d.northern-cross.info/base.yml +28 -0
  24. data/test_data/v103-3-189-127/d.northern-cross.info/value_host.yml +1 -0
  25. data/test_data/v103-3-189-127/d.northern-cross.net/base.yml +28 -0
  26. data/test_data/v103-3-189-127/d.northern-cross.net/value_host.yml +1 -0
  27. data/test_data/v103-3-189-127/e.northern-cross.info/base.yml +28 -0
  28. data/test_data/v103-3-189-127/e.northern-cross.info/value_host.yml +1 -0
  29. data/test_data/v103-3-189-127/e.northern-cross.net/base.yml +28 -0
  30. data/test_data/v103-3-189-127/e.northern-cross.net/value_host.yml +1 -0
  31. data/test_data/v103-3-189-127/f.northern-cross.info/base.yml +28 -0
  32. data/test_data/v103-3-189-127/f.northern-cross.info/value_host.yml +1 -0
  33. data/test_data/v103-3-189-127/f.northern-cross.net/base.yml +28 -0
  34. data/test_data/v103-3-189-127/f.northern-cross.net/value_host.yml +1 -0
  35. data/test_data/v103-3-189-127/t_server_1.erb +7 -0
  36. data/test_data/v103-3-189-127/template.erb +21 -0
  37. data/test_data/v103-3-189-127/template_ssl.erb +22 -0
  38. data/test_data/v103-3-189-127/template_ssl_www.erb +12 -0
  39. data/test_data/v103-3-189-127/template_www.erb +24 -0
  40. data/test_data/v103-3-189-127/value.yml +3 -0
  41. data/test_data/v103-3-189-127/value_ssl.yml +5 -0
  42. data/ykxutils.gemspec +33 -26
  43. metadata +86 -17
  44. data/.github/workflows/main.yml +0 -16
  45. data/.gitignore +0 -14
  46. data/bin/console +0 -15
  47. data/bin/setup +0 -8
data/lib/ykxutils.rb CHANGED
@@ -2,8 +2,12 @@
2
2
 
3
3
  require_relative "ykxutils/version"
4
4
  require_relative "ykxutils/yamlx"
5
+ require_relative "ykxutils/erubyx"
5
6
  require_relative "ykxutils/pstorex"
6
7
  require_relative "ykxutils/gitcmd"
8
+ require_relative "ykxutils/nginxconfig"
9
+ require_relative "ykxutils/nginxconfigfiles"
10
+ require_relative "ykxutils/gridlist"
7
11
 
8
12
  module Ykxutils
9
13
  class Error < StandardError; end
@@ -0,0 +1,7 @@
1
+ <%= server1 %>
2
+
3
+ <%= server2 %>
4
+
5
+ <%= server3 %>
6
+
7
+ <%= server4 %>
File without changes
@@ -0,0 +1,28 @@
1
+ _root:
2
+ template: 4servers.erb
3
+ server1:
4
+ protocol: ssl
5
+ template: template_ssl.erb
6
+ value:
7
+ - value_host.yml
8
+ - ../value_ssl.yml
9
+ server2:
10
+ protocol: ssl
11
+ domain: www
12
+ template: template_ssl_www.erb
13
+ value:
14
+ - value_host.yml
15
+ - ../value_ssl.yml
16
+ server3:
17
+ protocol:
18
+ template: template.erb
19
+ value:
20
+ - value_host.yml
21
+ - ../value.yml
22
+ server4:
23
+ protocol:
24
+ domain: www
25
+ template: template_www.erb
26
+ value:
27
+ - value_host.yml
28
+ - ../value.yml
@@ -0,0 +1 @@
1
+ host: a.northern-cross.net
@@ -0,0 +1,28 @@
1
+ _root:
2
+ template: 4servers.erb
3
+ server1:
4
+ protocol: ssl
5
+ template: template_ssl.erb
6
+ value:
7
+ - value_host.yml
8
+ - ../value_ssl.yml
9
+ server2:
10
+ protocol: ssl
11
+ domain: www
12
+ template: template_ssl_www.erb
13
+ value:
14
+ - value_host.yml
15
+ - ../value_ssl.yml
16
+ server3:
17
+ protocol:
18
+ template: template.erb
19
+ value:
20
+ - value_host.yml
21
+ - ../value.yml
22
+ server4:
23
+ protocol:
24
+ domain: www
25
+ template: template_www.erb
26
+ value:
27
+ - value_host.yml
28
+ - ../value.yml
@@ -0,0 +1 @@
1
+ host: b.northern-cross.net
@@ -0,0 +1,28 @@
1
+ _root:
2
+ template: 4servers.erb
3
+ server1:
4
+ protocol: ssl
5
+ template: template_ssl.erb
6
+ value:
7
+ - value_host.yml
8
+ - ../value_ssl.yml
9
+ server2:
10
+ protocol: ssl
11
+ domain: www
12
+ template: template_ssl_www.erb
13
+ value:
14
+ - value_host.yml
15
+ - ../value_ssl.yml
16
+ server3:
17
+ protocol:
18
+ template: template.erb
19
+ value:
20
+ - value_host.yml
21
+ - ../value.yml
22
+ server4:
23
+ protocol:
24
+ domain: www
25
+ template: template_www.erb
26
+ value:
27
+ - value_host.yml
28
+ - ../value.yml
@@ -0,0 +1 @@
1
+ host: c.northern-cross.net
@@ -0,0 +1,28 @@
1
+ _root:
2
+ template: 4servers.erb
3
+ server1:
4
+ protocol: ssl
5
+ template: template_ssl.erb
6
+ value:
7
+ - value_host.yml
8
+ - ../value_ssl.yml
9
+ server2:
10
+ protocol: ssl
11
+ domain: www
12
+ template: template_ssl_www.erb
13
+ value:
14
+ - value_host.yml
15
+ - ../value_ssl.yml
16
+ server3:
17
+ protocol:
18
+ template: template.erb
19
+ value:
20
+ - value_host.yml
21
+ - ../value.yml
22
+ server4:
23
+ protocol:
24
+ domain: www
25
+ template: template_www.erb
26
+ value:
27
+ - value_host.yml
28
+ - ../value.yml
@@ -0,0 +1 @@
1
+ host: d.northern-cross.info
@@ -0,0 +1,28 @@
1
+ _root:
2
+ template: 4servers.erb
3
+ server1:
4
+ protocol: ssl
5
+ template: template_ssl.erb
6
+ value:
7
+ - value_host.yml
8
+ - ../value_ssl.yml
9
+ server2:
10
+ protocol: ssl
11
+ domain: www
12
+ template: template_ssl_www.erb
13
+ value:
14
+ - value_host.yml
15
+ - ../value_ssl.yml
16
+ server3:
17
+ protocol:
18
+ template: template.erb
19
+ value:
20
+ - value_host.yml
21
+ - ../value.yml
22
+ server4:
23
+ protocol:
24
+ domain: www
25
+ template: template_www.erb
26
+ value:
27
+ - value_host.yml
28
+ - ../value.yml
@@ -0,0 +1 @@
1
+ host: d.northern-cross.net
@@ -0,0 +1,28 @@
1
+ _root:
2
+ template: 4servers.erb
3
+ server1:
4
+ protocol: ssl
5
+ template: template_ssl.erb
6
+ value:
7
+ - value_host.yml
8
+ - ../value_ssl.yml
9
+ server2:
10
+ protocol: ssl
11
+ domain: www
12
+ template: template_ssl_www.erb
13
+ value:
14
+ - value_host.yml
15
+ - ../value_ssl.yml
16
+ server3:
17
+ protocol:
18
+ template: template.erb
19
+ value:
20
+ - value_host.yml
21
+ - ../value.yml
22
+ server4:
23
+ protocol:
24
+ domain: www
25
+ template: template_www.erb
26
+ value:
27
+ - value_host.yml
28
+ - ../value.yml
@@ -0,0 +1 @@
1
+ host: e.northern-cross.info
@@ -0,0 +1,28 @@
1
+ _root:
2
+ template: 4servers.erb
3
+ server1:
4
+ protocol: ssl
5
+ template: template_ssl.erb
6
+ value:
7
+ - value_host.yml
8
+ - ../value_ssl.yml
9
+ server2:
10
+ protocol: ssl
11
+ domain: www
12
+ template: template_ssl_www.erb
13
+ value:
14
+ - value_host.yml
15
+ - ../value_ssl.yml
16
+ server3:
17
+ protocol:
18
+ template: template.erb
19
+ value:
20
+ - value_host.yml
21
+ - ../value.yml
22
+ server4:
23
+ protocol:
24
+ domain: www
25
+ template: template_www.erb
26
+ value:
27
+ - value_host.yml
28
+ - ../value.yml
@@ -0,0 +1 @@
1
+ host: e.northern-cross.net
@@ -0,0 +1,28 @@
1
+ _root:
2
+ template: 4servers.erb
3
+ server1:
4
+ protocol: ssl
5
+ template: template_ssl.erb
6
+ value:
7
+ - value_host.yml
8
+ - ../value_ssl.yml
9
+ server2:
10
+ protocol: ssl
11
+ domain: www
12
+ template: template_ssl_www.erb
13
+ value:
14
+ - value_host.yml
15
+ - ../value_ssl.yml
16
+ server3:
17
+ protocol:
18
+ template: template.erb
19
+ value:
20
+ - value_host.yml
21
+ - ../value.yml
22
+ server4:
23
+ protocol:
24
+ domain: www
25
+ template: template_www.erb
26
+ value:
27
+ - value_host.yml
28
+ - ../value.yml
@@ -0,0 +1 @@
1
+ host: f.northern-cross.info
@@ -0,0 +1,28 @@
1
+ _root:
2
+ template: 4servers.erb
3
+ server1:
4
+ protocol: ssl
5
+ template: template_ssl.erb
6
+ value:
7
+ - value_host.yml
8
+ - ../value_ssl.yml
9
+ server2:
10
+ protocol: ssl
11
+ domain: www
12
+ template: template_ssl_www.erb
13
+ value:
14
+ - value_host.yml
15
+ - ../value_ssl.yml
16
+ server3:
17
+ protocol:
18
+ template: template.erb
19
+ value:
20
+ - value_host.yml
21
+ - ../value.yml
22
+ server4:
23
+ protocol:
24
+ domain: www
25
+ template: template_www.erb
26
+ value:
27
+ - value_host.yml
28
+ - ../value.yml
@@ -0,0 +1 @@
1
+ host: f.northern-cross.net
@@ -0,0 +1,7 @@
1
+ <%= server_ssl %>
2
+
3
+ <%= server_ssl_www %>
4
+
5
+ <%= server %>
6
+
7
+ <%= server_www %>
@@ -0,0 +1,21 @@
1
+ server {
2
+ if ($host = <%= host %>) {
3
+ return 301 https://$host$request_uri;
4
+ }
5
+
6
+ listen 80;
7
+ server_name <%= host %>;
8
+
9
+ error_log /var/www/vhosts/<%= host %>/statistics/logs/<%= error_log %>;
10
+ access_log /var/www/vhosts/<%= host %>/statistics/logs/<%= access_log %>;
11
+
12
+ root /var/www/vhosts/<%= host %>/httpdocs;
13
+ location / {
14
+ index index.html;
15
+ }
16
+ error_page 500 502 503 504 /50x.html;
17
+ location = /50x.html {
18
+ root /usr/share/nginx/html/;
19
+ index 50x.html;
20
+ }
21
+ }
@@ -0,0 +1,22 @@
1
+ server {
2
+ listen <%= ssl_port %>;
3
+ ssl_certificate <%= ssl_certificate %>;
4
+ ssl_certificate_key <%= ssl_certificate_key %>;
5
+ server_name <%= host %>;
6
+
7
+ error_log /var/www/vhosts/<%= host %>/statistics/logs/<%= error_log %>;
8
+ access_log /var/www/vhosts/<%= host %>/statistics/logs/<%= access_log %>;
9
+
10
+ # rewrite_log on;
11
+
12
+ root /var/www/vhosts/<%= host %>/httpdocs;
13
+ location / {
14
+ index index.html;
15
+ }
16
+ error_page 500 502 503 504 /50x.html;
17
+ #error_page 500 /50x.html;
18
+ location = /50x.html {
19
+ root /usr/share/nginx/html/;
20
+ index 50x.html;
21
+ }
22
+ }
@@ -0,0 +1,12 @@
1
+ server {
2
+ listen <%= ssl_port %>;
3
+ server_name www.<%= host %>;
4
+ #
5
+ return 301 https://<%= host %>;
6
+
7
+ ssl_certificate <%= ssl_certificate %>;
8
+ ssl_certificate_key <%= ssl_certificate_key %>;
9
+ include /etc/letsencrypt/options-ssl-nginx.conf;
10
+ ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
11
+
12
+ }
@@ -0,0 +1,24 @@
1
+ server {
2
+ if ($host = northern-cross.net) {
3
+ return 301 https://$host$request_uri;
4
+ }
5
+
6
+
7
+ listen <%= port %>;
8
+ server_name <%= host %>;
9
+
10
+ error_log /var/www/vhosts/<%= host %>/statistics/logs/<%= error_log %>;
11
+ access_log /var/www/vhosts/<%= host %>/statistics/logs/<%= access_log %>;
12
+
13
+ rewrite_log on;
14
+
15
+ root /var/www/vhosts/<%= host %>/httpdocs;
16
+ location / {
17
+ index index.html;
18
+ }
19
+ error_page 500 502 503 504 /50x.html;
20
+ location = /50x.html {
21
+ root /usr/share/nginx/html/;
22
+ index 50x.html;
23
+ }
24
+ }
@@ -0,0 +1,3 @@
1
+ error_log: error_log
2
+ access_log: access_log
3
+ port: 80
@@ -0,0 +1,5 @@
1
+ error_log: ssl_error_log
2
+ access_log: ssl_access_log
3
+ ssl_port: 443 ssl
4
+ ssl_certificate: /etc/letsencrypt/live/v103-3-189-127.myvps.jp/fullchain.pem
5
+ ssl_certificate_key: /etc/letsencrypt/live/v103-3-189-127.myvps.jp/privkey.pem
data/ykxutils.gemspec CHANGED
@@ -1,47 +1,54 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require_relative "lib/ykxutils/version"
3
+ require_relative 'lib/ykxutils/version'
4
4
 
5
5
  Gem::Specification.new do |spec|
6
- spec.name = "ykxutils"
7
- spec.version = Ykxutils::VERSION
8
- spec.authors = ["ykominami"]
9
- spec.email = ["ykominami@gmail.com"]
6
+ spec.name = 'ykxutils'
7
+ spec.version = Ykxutils::VERSION
8
+ spec.authors = ['ykominami']
9
+ spec.email = ['ykominami@gmail.com']
10
10
 
11
- spec.summary = "New version of utilty function created by yk."
12
- spec.description = "New version of utilty function created by yk."
13
- spec.homepage = "https://ykominami.github.io/ykxutils"
14
- spec.license = "MIT"
15
- spec.required_ruby_version = Gem::Requirement.new(">= 2.6")
11
+ spec.summary = 'New version of utilty function created by yk.'
12
+ spec.description = 'New version of utilty function created by yk.'
13
+ spec.homepage = 'https://ykominami.github.io/ykxutils'
14
+ spec.license = 'MIT'
15
+ spec.required_ruby_version = '>= 2.7'
16
16
 
17
- # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
17
+ # spec.metadata["allowed_push_host"] = "TODO: Set to your gem server 'https://example.com'"
18
18
 
19
- spec.metadata["homepage_uri"] = spec.homepage
20
- spec.metadata["source_code_uri"] = "https://github.com/ykominami/ykxutils"
19
+ spec.metadata['homepage_uri'] = spec.homepage
20
+ spec.metadata['source_code_uri'] = 'https://github.com/ykominami/ykxutils'
21
21
  # spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
22
22
 
23
23
  # Specify which files should be added to the gem when it is released.
24
24
  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
25
25
  spec.files = Dir.chdir(File.expand_path(__dir__)) do
26
- `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features)/}) }
26
+ `git ls-files -z`.split("\x0").reject do |f|
27
+ (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
28
+ end
27
29
  end
28
- spec.bindir = "exe"
29
- spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
30
- spec.require_paths = ["lib"]
30
+ spec.bindir = 'exe'
31
+ spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
32
+ spec.require_paths = ['lib']
31
33
 
32
- spec.add_development_dependency "bundler"
33
- spec.add_development_dependency "rake", "~> 13.0"
34
- spec.add_development_dependency "rspec", "~> 3.0"
34
+ spec.add_runtime_dependency 'bundler'
35
+ # spec.add_runtime_dependency 'debug'
36
+ spec.add_runtime_dependency 'erubi'
37
+ spec.add_runtime_dependency 'rake', '~> 13.0'
38
+ spec.add_runtime_dependency 'tilt'
35
39
 
36
- spec.add_development_dependency "rubocop", "~> 1.7"
37
- spec.add_development_dependency "rubocop-rake"
38
- spec.add_development_dependency "rubocop-rspec"
40
+ spec.add_development_dependency 'rspec', '~> 3.0'
41
+ spec.add_development_dependency 'rubocop'
42
+ spec.add_development_dependency 'rubocop-performance'
43
+ spec.add_development_dependency 'rubocop-rake'
44
+ spec.add_development_dependency 'rubocop-rspec'
45
+
46
+ spec.add_development_dependency 'yard'
39
47
 
40
- spec.add_development_dependency "yard"
41
48
  # Uncomment to register a new dependency of your gem
42
49
  # spec.add_dependency "example-gem", "~> 1.0"
43
50
 
44
- # For more information and examples about making a new gem, checkout our
51
+ # For more information and examples about making a new gem, check out our
45
52
  # guide at: https://bundler.io/guides/creating_gem.html
46
- spec.metadata["rubygems_mfa_required"] = "true"
53
+ spec.metadata['rubygems_mfa_required'] = 'true'
47
54
  end