ykxutils 0.1.7 → 0.1.11

data/lib/ykxutils/nginxconfigfiles.rb

@@ -0,0 +1,32 @@
+require "find"
+require_relative "nginxconfig"
+
+module Ykxutils
+  class Nginxconfigfiles
+    def get_file_list(start_dir, rex)
+      @file_list = []
+
+      Find.find(start_dir) do |x|
+        if x =~ rex
+          @file_list << x
+          Find.prune
+        end
+      end
+      @file_list
+    end
+
+    def output(file_list)
+      file_list.map do |fname|
+        parent_dir_pn = Pathname.new(fname).cleanpath.parent
+        vdomain = parent_dir_pn.basename
+        output_fname = "#{vdomain}.conf"
+        cli = ::Ykxutils::Nginxconfig.new(fname)
+        scope = nil
+        File.open(output_fname, "w") do |f|
+          x = cli.extract(scope)
+          f.write(x)
+        end
+      end
+    end
+  end
+end

data/lib/ykxutils/pstorex.rb

@@ -3,7 +3,7 @@ require "fileutils"
 
 module Ykxutils
   class Pstorex
-    def initialize(store_dir, dump_file="pstore.dump")
+    def initialize(store_dir, dump_file = "pstore.dump")
       FileUtils.mkdir_p(store_dir)
       @store_db = PStore.new(Pathname.new(store_dir).join(dump_file))
     end

data/lib/ykxutils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ykxutils
-  VERSION = "0.1.7"
+  VERSION = "0.1.11"
 end

data/lib/ykxutils/yamlx.rb

@@ -1,68 +1,51 @@
 require "yaml"
 
 module Ykxutils
+  SUCCESS = 0
+  ARGUMENT_ERROR = 1
+  STANDARD_ERROR = 2
+  
   module_function
 
-  def yaml_load_file_compati(yaml_file_path)
-    setting = {}
-    valid = false
+  def yaml_load_file_aliases(yaml_file_path, use_aliases: true)
+    converted = nil
     begin
-      setting = YAML.load_file(yaml_file_path, aliases: true)
-      valid = true
+      converted = use_aliases ? YAML.load_file(yaml_file_path, aliases: true) : YAML.load_file(yaml_file_path)
+      value = SUCCESS
     rescue ArgumentError
-      # p "yaml_load_file_compat 1"
-      # p ex.class
-      # p ex.inspect
-      # p ex.message
-      # p ex.backtrace
-      # exit#
+      # puts e.message
+      value = ARGUMENT_ERROR
     rescue StandardError
-      # p "yaml_load_file_compat 1-2"
-      # p ex.class
-      # p ex.inspect
-      # p ex.message
-      # p ex.backtrace
+      # puts e.message8
+      value = STANDARD_ERROR
     end
+    [converted, value]
+  end
 
-    if valid != true
-      begin
-        setting = YAML.load_file(yaml_file_path)
-        # valid = true
-      rescue ArgumentError
-        # p "yaml_load_file_compat 2"
-        # p ex.class
-        # p ex.inspect
-        # p ex.message
-        # p ex.backtrace
-        #
-      rescue StandardError
-        # p "yaml_load_file_compat 2-2"
-        # p ex.class
-        # p ex.inspect
-        # p ex.message
-        # p ex.backtrace
-      end
-    end
+  def yaml_load_file_compati(yaml_file_path)
+    setting = yaml_load_file_aliases(yaml_file_path, use_aliases: true)
+    setting = yaml_load_file_aliases(yaml_file_path, use_aliases: false) if setting.nil?
     setting
   end
 
-  def yaml_load_compati(content)
-    setting = {}
-    valid = false
+  def yaml_load_aliases(content, use_aliases: true)
+    converted = nil
     begin
-      setting = YAML.load(content, aliases: true)
-      valid = true
+      converted = use_aliases ? YAML.safe_load(content, use_aliases) : YAML.safe_load(content)
+      result = SUCCESS
     rescue ArgumentError
+      # puts e.message
+      result = ARGUMENT_ERROR
     rescue StandardError
+      # puts e.message
+      result = STANDARD_ERROR
     end
+    [converted, result]
+  end
 
-    if valid != true
-      begin
-        setting = YAML.load(content)
-      rescue ArgumentError
-      rescue StandardError
-      end
-    end
-    setting
+  def yaml_load_compati(content)
+    ret_array = yaml_load_aliases(content, use_aliases: true)
+    ret_array = yaml_load_aliases(content, use_aliases: false) if ret_array[1] != 0
+    ret_array[0]
   end
 end

data/lib/ykxutils.rb

@@ -2,10 +2,15 @@
 
 require_relative "ykxutils/version"
 require_relative "ykxutils/yamlx"
+require_relative "ykxutils/erubyx"
 require_relative "ykxutils/pstorex"
 require_relative "ykxutils/gitcmd"
+require_relative "ykxutils/nginxconfig"
+require_relative "ykxutils/nginxconfigfiles"
+require_relative "ykxutils/gridlist"
 
 module Ykxutils
   class Error < StandardError; end
+
   # Your code goes here...
 end

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

@@ -3,18 +3,18 @@
 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"
@@ -23,25 +23,32 @@ Gem::Specification.new do |spec|
   # 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.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 "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"
+
   # 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"
 end