curlyq 0.0.14 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfa73d5ba1b30f6b49b593c65306034ea6ce4e93d9d306e5a535009583f45638
-  data.tar.gz: 76f451e89e6d9f5c3ffe3c1fb87621e1e90fec91ec259fa1d513d8fc6ddd5d40
+  metadata.gz: 38b735c7b0ead432ad659482e59c4e9385e82fc71063eedda37440dac537e211
+  data.tar.gz: f3337ceb067ec0460c8d5ad6fee7b1d088ac07ba15833f550b5b6ea19afc9e4c
 SHA512:
-  metadata.gz: 5cb5c0aa1e5907a524328e3931cb01a501b9a49b36ddc45388e97a115c81c58e16b05c99dffc95870e47eab5ff81db9af809f4d962f8e33ae42a0c90c0bc7d55
-  data.tar.gz: da161b3b81821bfc6c09615c66927905d1a4f590879613aba0ed526015f06c281c372528ed597c488afd7933ab78c116247ab5545c29099e160e2e49293af90f
+  metadata.gz: ac88bdf60364d157efbefdaa425c8467bd93a65d70ff884f9a6322172a6b3d1858f474eb2ebf30708a9bef18deb8a0cba6358e46e7c9c5af6f9ff80099461701
+  data.tar.gz: e2b2894bd450158aba7f62f778a34ac29958a3eef25d13db0b3b37b539165f00d2ea39515be57eb169ba7af93a602f06af6a7dc4d768201c9c5a90ad949580ab

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+### 0.0.16
+
+2024-11-07 06:45
+
+#### FIXED
+
+- Encoding error
+
+### 0.0.15
+
+2024-10-25 10:31
+
+#### IMPROVED
+
+- Better error when no results, return nothing to STDOUT
+
 ### 0.0.14
 
 2024-10-25 10:26

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    curlyq (0.0.14)
+    curlyq (0.0.16)
       gli (~> 2.21.0)
       nokogiri (~> 1.16.0)
       selenium-webdriver (~> 4.16.0)
@@ -13,16 +13,16 @@ GEM
     gli (2.21.5)
     nokogiri (1.16.7-arm64-darwin)
       racc (~> 1.4)
-    parallel (1.23.0)
+    parallel (1.26.3)
     parallel_tests (3.13.0)
       parallel
     pastel (0.8.0)
       tty-color (~> 0.5)
-    power_assert (2.0.3)
+    power_assert (2.0.4)
     racc (1.8.1)
-    rake (13.1.0)
-    rdoc (6.3.3)
-    rexml (3.3.7)
+    rake (13.2.1)
+    rdoc (6.3.4.1)
+    rexml (3.3.9)
     rubyzip (2.3.2)
     selenium-webdriver (4.16.0)
       rexml (~> 3.2, >= 3.2.5)
@@ -42,12 +42,13 @@ GEM
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     tty-which (0.5.0)
-    unicode-display_width (2.5.0)
-    websocket (1.2.10)
-    yard (0.9.34)
+    unicode-display_width (2.6.0)
+    websocket (1.2.11)
+    yard (0.9.37)
 
 PLATFORMS
   arm64-darwin-20
+  x86_64-darwin-20
 
 DEPENDENCIES
   curlyq!

data/README.md

@@ -13,7 +13,7 @@ _If you find this useful, feel free to [buy me some coffee][donate]._
 [jq]: https://github.com/jqlang/jq "Command-line JSON processor"
 [yq]: https://github.com/mikefarah/yq "yq is a portable command-line YAML, JSON, XML, CSV, TOML and properties processor"
 
-The current version of `curlyq` is 0.0.14.
+The current version of `curlyq` is 0.0.16.
 
 CurlyQ is a utility that provides a simple interface for curl, with additional features for things like extracting images and links, finding elements by CSS selector or XPath, getting detailed header info, and more. It's designed to be part of a scripting pipeline, outputting everything as structured data (JSON or YAML). It also has rudimentary support for making calls to JSON endpoints easier, but it's expected that you'll use something like [jq] to parse the output.
 
@@ -46,7 +46,7 @@ SYNOPSIS
     curlyq [global options] command [command options] [arguments...]
 
 VERSION
-    0.0.14
+    0.0.16
 
 GLOBAL OPTIONS
     --help          - Show this message

data/bin/curlyq

@@ -149,10 +149,7 @@ command %i[html curl] do |c|
     output.delete_if(&:nil?)
     output.delete_if(&:empty?)
 
-    if output.nil? || output.empty?
-      print_out([], global_options[:yaml], raw: options[:raw], pretty: global_options[:pretty])
-      Process.exit 1
-    end
+    exit_now!('No results') if output.nil? || output.empty?
 
     output.map! { |o| o[options[:raw].to_sym] } if options[:raw]
 
@@ -492,10 +489,7 @@ command :images do |c|
       end
     end
 
-    if output.nil? || output.empty?
-      print_out([], global_options[:yaml], raw: options[:raw], pretty: global_options[:pretty])
-      Process.exit 1
-    end
+    exit_now!('No results') if output.nil? || output.empty?
 
     print_out(output, global_options[:yaml], pretty: global_options[:pretty])
   end

data/lib/curly/curl/html.rb

@@ -731,10 +731,11 @@ module Curl
         ]
         headers = @headers.nil? ? '' : @headers.map { |h, v| %(-H "#{h}: #{v}") }.join(' ')
         compress = @compressed ? '--compressed' : ''
-        @source = `#{@curl} -#{flags} #{compress} #{headers} '#{@url}' 2>/dev/null`
+        @source = `#{@curl} -#{flags} #{compress} #{headers} '#{@url}' 2>/dev/null`.strip.utf8
         agent = 0
+
         while @source.nil? || @source.empty?
-          @source = `#{@curl} -#{flags} #{compress} -A "#{agents[agent]}" #{headers} '#{@url}' 2>/dev/null`
+          @source = `#{@curl} -#{flags} #{compress} -A "#{agents[agent]}" #{headers} '#{@url}' 2>/dev/null`.strip.utf8
           break if agent >= agents.count - 1
         end
 

data/lib/curly/string.rb

@@ -6,6 +6,24 @@
 ## @return     [String] cleaned string
 ##
 class ::String
+   ##
+  ## Discard invalid characters and output a UTF-8 String
+  ##
+  ## @return     [String] UTF-8 encoded string
+  ##
+  def utf8
+    encode('utf-16', invalid: :replace).encode('utf-8')
+  end
+
+  ##
+  ## Destructive version of #utf8
+  ##
+  ## @return     [String] UTF-8 encoded string, in place
+  ##
+  def utf8!
+    replace utf8
+  end
+
   ## Remove extra spaces and newlines, compress space
   ## between tags
   ##

data/lib/curly/version.rb

@@ -1,5 +1,5 @@
 # Top level module for CurlyQ
 module Curly
   # Current version number
-  VERSION = '0.0.14'
+  VERSION = '0.0.16'
 end

data/src/_README.md

@@ -13,7 +13,7 @@ _If you find this useful, feel free to [buy me some coffee][donate]._
 [jq]: https://github.com/jqlang/jq "Command-line JSON processor"
 [yq]: https://github.com/mikefarah/yq "yq is a portable command-line YAML, JSON, XML, CSV, TOML and properties processor"
 
-The current version of `curlyq` is <!--VER-->0.0.13<!--END VER-->.
+The current version of `curlyq` is <!--VER-->0.0.15<!--END VER-->.
 
 CurlyQ is a utility that provides a simple interface for curl, with additional features for things like extracting images and links, finding elements by CSS selector or XPath, getting detailed header info, and more. It's designed to be part of a scripting pipeline, outputting everything as structured data (JSON or YAML). It also has rudimentary support for making calls to JSON endpoints easier, but it's expected that you'll use something like [jq] to parse the output.
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: curlyq
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.16
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-25 00:00:00.000000000 Z
+date: 2024-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake