kscript 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a21e42184ac49fa0c908bbb72ab90645120c9f30d7990afd195b4ebb2b36b15
-  data.tar.gz: 6109ca879f18c78b01cae044611112d01a3195cb8e963447e4258fd42db1a7ff
+  metadata.gz: 29c49db2c8133bbc61a27f182bd4aa2920a3f6ba44aa957e989c81ea1ebde95b
+  data.tar.gz: f5bb31a125f117daffa3b4613c694e09982d396810e9ca089772e562115d6b38
 SHA512:
-  metadata.gz: 53cfbde7c40af91e2d44a707743affc870b23b0c74abc486003793096883a6664c26f37d378230d831e42ca3a198523bc2e041f1d3f593efb11499e36eb2ebf6
-  data.tar.gz: 1831f66a704e1aa55186b8944e7c7641e7c8882f68644234d644c5918833121ec473b77ef51040cffb9d7aa5eab261942b3a11b2b3db5773df0fe7dcbf4c3d56
+  metadata.gz: 7f1c01ad2eb82ed4dc323ed9e926a4fd89ac9e9ad2c204fec077938bde8f98d50698e2f68cc08bcc3210947feb2d11e8408b567eea2aee95c0c9d800eb5384a8
+  data.tar.gz: 9c1f9ac7c23b94611ee489304ec32ee5e77c8d2c643acc107bab41e0c8476760d17f0c3728a6ee6310cca7806989e6e7f0f8faf0a79a033171073e9abf6758f3

data/lib/kscript/plugins/kk_sh_utils.rb

@@ -6,6 +6,7 @@
 # https://opensource.org/licenses/MIT
 
 require 'kscript'
+require 'httpx'
 
 module Kscript
   class KkShUtils < Base
@@ -17,12 +18,17 @@ module Kscript
     # @param command [String] command to get help for
     def initialize(*args, **opts)
       super(*args, **opts)
-      @command = args.first
+      @command = args.join(' ').strip
     end
 
-    def run
+    def run(*args, **_opts)
+      command = args.join(' ').strip
       with_error_handling do
-        help
+        if command.nil? || command.strip.empty?
+          logger.kwarn("Usage: #{self.class.usage}")
+        else
+          fetch_help(command)
+        end
       end
     end
 
@@ -36,10 +42,11 @@ module Kscript
     end
 
     # Fetch and display command documentation
-    def fetch_help
-      response = make_request
-      display_result(response)
-    rescue HTTP::Error => e
+    def fetch_help(command)
+      response = make_request(command)
+      response = response.is_a?(Array) ? response.first : response
+      puts response.body
+    rescue StandardError => e
       display_error(e)
     end
 
@@ -65,41 +72,15 @@ module Kscript
 
     private
 
-    # Make HTTP request to cht.sh
-    # @return [HTTP::Response] response from cht.sh
-    def make_request
-      HTTP.get("#{CHT_SH_URL}/#{command}")
-    end
-
-    # Display command documentation
-    # @param response [HTTP::Response] response from cht.sh
-    def display_result(response)
-      if response.status.success?
-        text = extract_plain_text(response.body)
-        logger.kinfo(text)
-      else
-        logger.kerror("Failed to retrieve data: #{response.status}")
-      end
-    end
-
-    # 提取纯文本内容
-    def extract_plain_text(body)
-      body = body.to_s
-      begin
-        doc = Nokogiri::HTML(body)
-        doc.search('script,style').remove
-        text = doc.text.lines.map(&:strip)
-        # 过滤掉包含广告/社交/Follow等内容的行
-        text = text.reject { |line| line =~ /Follow @|twitter|github|sponsor|donate|chubin|^!function/ }
-        text.reject!(&:empty?)
-        # 去除顶部多余空白行，只保留正文
-        text = text.drop_while(&:empty?)
-        text.join("\n")
-      rescue StandardError
-        body.gsub(/\e\[[\d;]*m/, '').lines.reject do |line|
-          line =~ /Follow @|twitter|github|sponsor|donate|chubin|^!function/
-        end.drop_while { |line| line.strip.empty? }.join
-      end
+    # Make HTTP request to cheat.sh
+    # @return [HTTPX::Response] response from cheat.sh
+    def make_request(command)
+      HTTPX.with(
+        headers: {
+          'User-Agent' => 'curl/8.0.1',
+          'Accept' => 'text/plain'
+        }
+      ).get("https://cheat.sh/#{URI.encode_www_form_component(command)}")
     end
 
     # Display error message

data/lib/kscript/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kscript
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Kk
@@ -59,25 +59,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: http
+  name: httpx
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement