kscript 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c849a066ee71710301195b2291bdfc84ef1e94544273010bc081c2654af9a198
-  data.tar.gz: ec56f9ebe0ad082112060f6d53a63efae05c7095ecd0ead03bbd237c78001db7
+  metadata.gz: 587c4a1f08230cd5085bace44a9fbb4035f52a62a4f1fdb35e00fb5ef4e52567
+  data.tar.gz: efb3539204a0b0dddb0a8a375a6d58574d668b96bdef01dacd0d1e394f309542
 SHA512:
-  metadata.gz: '0068635e992da14c93ac3525a631157c62eb57f66271cdea4818672e7a05afe35507a87c0eee713fecbfe17941bf0cba617a89038581b928f76a7c7165c99f2b'
-  data.tar.gz: 2e708a65ccb4de60db91990360f3705e1545b1d51fbe81973e2dd78ce6f510a22c3237d9b69f8051805af56e12c82e50e5e6218cd1af2ee90264e6ef4850776f
+  metadata.gz: 54c44443112073b48dda6b9d4c7f9707ab99b94b8fb5e4a04c1320cdcd1becaacd34c81c452d21bd84bc20be797900e05fed004d07e5423c7081e49a96379b66
+  data.tar.gz: c155b0a6eb3c047c73e5b90c0c6353aaff99e47eab12acdab905cfa287090475ff35c681d95674a92b85268f886ad4351e0ce58209d0b00f727e696d3ff4ffe3

data/lib/kscript/base.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'kscript'
+require_relative '../kscript'
 
 module Kscript
   # Base class for all kscript scripts

data/lib/kscript/completions/kscript.bash

@@ -8,7 +8,7 @@ _kscript_completions() {
 
     # Main command list as array
     local opts=(
-        version help list apnic cleaner es_fingerprint ffmpeg ip jenkins kibana lvm optimize portscan projscan rename sh syscheck top usd wg_acl wg_pass
+        apnic_ip aws_s3 cursor_rules elastic_cert_finger ffmpeg_install file_rename ip_lookup jenkins_manage kibana_manage lvm_manage mac_optimize mac_status port_scan project_scan shell_helper usd_rate vcs_cleaner wg_acl wg_pass
     )
 
     if [[ ${COMP_CWORD} == 1 ]]; then

data/lib/kscript/completions/kscript.zsh

@@ -2,28 +2,26 @@
 _kscript() {
   local -a commands
   commands=(
-    'version:kscript command'
-    'help:kscript command'
-    'list:kscript command'
-    'apnic:kscript command'
-    'cleaner:kscript command'
-    'es_fingerprint:kscript command'
-    'ffmpeg:kscript command'
-    'ip:kscript command'
-    'jenkins:kscript command'
-    'kibana:kscript command'
-    'lvm:kscript command'
-    'optimize:kscript command'
-    'portscan:kscript command'
-    'projscan:kscript command'
-    'rename:kscript command'
-    'sh:kscript command'
-    'syscheck:kscript command'
-    'top:kscript command'
-    'usd:kscript command'
+    'apnic_ip:kscript command'
+    'aws_s3:kscript command'
+    'cursor_rules:kscript command'
+    'elastic_cert_finger:kscript command'
+    'ffmpeg_install:kscript command'
+    'file_rename:kscript command'
+    'ip_lookup:kscript command'
+    'jenkins_manage:kscript command'
+    'kibana_manage:kscript command'
+    'lvm_manage:kscript command'
+    'mac_optimize:kscript command'
+    'mac_status:kscript command'
+    'port_scan:kscript command'
+    'project_scan:kscript command'
+    'shell_helper:kscript command'
+    'usd_rate:kscript command'
+    'vcs_cleaner:kscript command'
     'wg_acl:kscript command'
     'wg_pass:kscript command'
   )
   _describe 'command' commands
 }
-compdef _kscript kscript
+compdef _kscript kscript

data/lib/kscript/plugins/kk_apnic_ip_utils.rb

@@ -5,10 +5,10 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
-require 'kscript'
+# require 'kscript' # 移除此行
 
 module Kscript
-  class KkApnicIpUtils < Base
+  class KkApnicIpUtils < Kscript::Base
     attr_reader :country_sn, :cache_file
 
     # Initialize class instance, set country code and cache file path
@@ -21,16 +21,20 @@ module Kscript
     # Download data from APNIC or read from cache
     def download_data
       if File.exist?(cache_file) && File.size?(cache_file)
-        logger.kinfo("Using cached data from #{cache_file}")
-      else
-        url = 'https://ftp.apnic.net/stats/apnic/delegated-apnic-latest'
-        response = HTTP.get(url)
-
-        raise "Failed to download the APNIC data. HTTP Status: #{response.status}" unless response.status.success?
-
-        File.write(cache_file, response.body.to_s)
-        logger.kinfo("Data downloaded and saved to #{cache_file}")
+        mtime = File.mtime(cache_file)
+        if Time.now - mtime < 86_400
+          logger.kinfo("Using cached data from #{cache_file} (updated #{mtime})")
+          return
+        else
+          logger.kinfo("Cache expired (last updated #{mtime}), downloading new data...")
+        end
       end
+      url = 'https://ftp.apnic.net/stats/apnic/delegated-apnic-latest'
+      response = HTTP.get(url)
+      raise "Failed to download the APNIC data. HTTP Status: #{response.status}" unless response.status.success?
+
+      File.write(cache_file, response.body.to_s)
+      logger.kinfo("Data downloaded and saved to #{cache_file}")
     end
 
     # Parse data and return IPv4 address ranges (CIDR format) for specified country
@@ -58,8 +62,9 @@ module Kscript
       32 - Math.log2(hosts).to_i
     end
 
-    def run
+    def run(*args, **_opts)
       with_error_handling do
+        @country_sn = args[0] if args[0]
         parse_ip_ranges
       end
     end

data/lib/kscript/plugins/kk_aws_s3_utils.rb

@@ -5,7 +5,7 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
-require 'kscript'
+# require 'kscript'
 
 # AWS S3 文件上传测试工具
 # 用法示例：
@@ -14,7 +14,7 @@ require 'kscript'
 # 依赖：aws-sdk-s3（已在主入口 require）
 
 module Kscript
-  class KkAwsS3Utils < Base
+  class KkAwsS3Utils < Kscript::Base
     # 初始化，支持所有参数通过 CLI 传递
     def initialize(*args, **opts)
       super

data/lib/kscript/plugins/kk_cursor_rules_utils.rb

@@ -5,11 +5,10 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
-require 'fileutils'
-require 'kscript'
+# require 'kscript'
 
 module Kscript
-  class KkCursorRulesUtils < Base
+  class KkCursorRulesUtils < Kscript::Base
     def initialize(*_args, **opts)
       super(**opts.merge(service: 'kk_cursor_rules'))
     end

data/lib/kscript/plugins/kk_elastic_cert_finger_utils.rb

@@ -5,10 +5,10 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
-require 'kscript'
+# require 'kscript'
 
 module Kscript
-  class KkElasticCertFingerUtils < Base
+  class KkElasticCertFingerUtils < Kscript::Base
     DEFAULT_CERT_PATH = 'elasticsearch.crt'
 
     attr_reader :cert_path

data/lib/kscript/plugins/kk_ffmpeg_install_utils.rb

@@ -5,10 +5,10 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
-require 'kscript'
+# require 'kscript'
 
 module Kscript
-  class KkFfmpegInstallUtils < Base
+  class KkFfmpegInstallUtils < Kscript::Base
     def initialize(*args, **opts)
       super
     end

data/lib/kscript/plugins/kk_file_rename_utils.rb

@@ -5,10 +5,10 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
-require 'kscript'
+# require 'kscript'
 
 module Kscript
-  class KkFileRenameUtils < Base
+  class KkFileRenameUtils < Kscript::Base
     attr_reader :source_pattern, :target_pattern, :directory
 
     def initialize(*args, **opts)

data/lib/kscript/plugins/kk_ip_lookup_utils.rb

@@ -5,10 +5,10 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
-require 'kscript'
+# require 'kscript'
 
 module Kscript
-  class KkIpLookupUtils < Base
+  class KkIpLookupUtils < Kscript::Base
     IP_API_BASE_URL = 'http://ip-api.com/json'
     IP_CHECK_URL = 'https://api.ipify.org?format=json'
 

data/lib/kscript/plugins/kk_jenkins_manage_utils.rb

@@ -5,10 +5,10 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
-require 'kscript'
+# require 'kscript'
 
 module Kscript
-  class KkJenkinsManageUtils < Base
+  class KkJenkinsManageUtils < Kscript::Base
     def initialize(*args, **opts)
       super
       jenkins_url, user, password = args

data/lib/kscript/plugins/kk_kibana_manage_utils.rb

@@ -5,10 +5,10 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
-require 'kscript'
+# require 'kscript'
 
 module Kscript
-  class KkKibanaManageUtils < Base
+  class KkKibanaManageUtils < Kscript::Base
     def initialize(*args, **opts)
       super
       project_name, project_env, base_url, username, password = args

data/lib/kscript/plugins/kk_lvm_manage_utils.rb

@@ -5,10 +5,10 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
-require 'kscript'
+# require 'kscript'
 
 module Kscript
-  class KkLvmManageUtils < Base
+  class KkLvmManageUtils < Kscript::Base
     DEFAULT_CONFIG = {
       device: '/dev/sdb',
       volume_group: 'vg_data',

data/lib/kscript/plugins/kk_mac_optimize_utils.rb

@@ -5,10 +5,10 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
-require 'kscript'
+# require 'kscript'
 
 module Kscript
-  class KkMacOptimizeUtils < Base
+  class KkMacOptimizeUtils < Kscript::Base
     def initialize(*args, **opts)
       super
     end

data/lib/kscript/plugins/kk_mac_status_utils.rb

@@ -5,10 +5,10 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
-require 'kscript'
+# require 'kscript'
 
 module Kscript
-  class KkMacStatusUtils < Base
+  class KkMacStatusUtils < Kscript::Base
     def initialize(*_args, **opts)
       super(**opts.merge(service: 'kk_mac_status'))
     end

data/lib/kscript/plugins/kk_port_scan_utils.rb

@@ -5,10 +5,10 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
-require 'kscript'
+# require 'kscript'
 
 module Kscript
-  class KkPortScanUtils < Base
+  class KkPortScanUtils < Kscript::Base
     attr_reader :host, :ports, :thread_count
 
     # Initialize the scanner with target host and port range

data/lib/kscript/plugins/kk_project_scan_utils.rb

@@ -5,10 +5,10 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
-require 'kscript'
+# require 'kscript'
 
 module Kscript
-  class KkProjectScanUtils < Base
+  class KkProjectScanUtils < Kscript::Base
     def initialize(*args, **opts)
       super
     end

data/lib/kscript/plugins/kk_shell_helper_utils.rb

@@ -5,10 +5,10 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
-require 'kscript'
+# require 'kscript'
 
 module Kscript
-  class KkShellHelperUtils < Base
+  class KkShellHelperUtils < Kscript::Base
     CHT_SH_URL = 'https://cht.sh'
 
     attr_reader :command

data/lib/kscript/plugins/kk_usd_rate_utils.rb

@@ -5,13 +5,11 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
-require 'kscript'
-
 require 'net/http'
 require 'json'
 
 module Kscript
-  class KkUsdRateUtils < Base
+  class KkUsdRateUtils < Kscript::Base
     API_URL = 'https://api.exchangerate-api.com/v4/latest/USD'
 
     def initialize(currency_code = 'CNY', *args, **opts)

data/lib/kscript/plugins/kk_vcs_cleaner_utils.rb

@@ -5,10 +5,10 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
-require 'kscript'
+# require 'kscript'
 
 module Kscript
-  class KkVcsCleanerUtils < Base
+  class KkVcsCleanerUtils < Kscript::Base
     DEFAULT_RETAIN_VERSIONS = 10
 
     attr_reader :source_path, :retain_count

data/lib/kscript/plugins/kk_wg_acl_utils.rb

@@ -5,10 +5,10 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
-require 'kscript'
+# require 'kscript'
 
 module Kscript
-  class KkWgAclUtils < Base
+  class KkWgAclUtils < Kscript::Base
     WIREGUARD_PORT = 51_821
     ALLOWED_IPS = %w[127.0.0.1].freeze
 

data/lib/kscript/plugins/kk_wg_pass_utils.rb

@@ -5,10 +5,10 @@
 # This software is released under the MIT License.
 # https://opensource.org/licenses/MIT
 
-require 'kscript'
+# require 'kscript'
 
 module Kscript
-  class KkWgPassUtils < Base
+  class KkWgPassUtils < Kscript::Base
     def initialize(*args, **opts)
       super
     end

data/lib/kscript/version.rb

@@ -6,5 +6,5 @@
 # https://opensource.org/licenses/MIT
 
 module Kscript
-  VERSION = '1.0.8'
+  VERSION = '1.0.9'
 end

data/lib/kscript.rb

@@ -27,11 +27,11 @@ require 'thor'
 require 'aws-sdk-s3'
 require 'dotenv'
 
-require 'kscript/config'
-require 'kscript/plugins'
-require 'kscript/base'
-require 'kscript/logger'
-require 'kscript/version'
+require_relative 'kscript/config'
+require_relative 'kscript/base'
+require_relative 'kscript/plugins'
+require_relative 'kscript/logger'
+require_relative 'kscript/version'
 
 module Kscript
   # fluentd 风格插件注册机制

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kscript
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Kk