curlyq 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 376f17c2844a60ca0932187b1fe2c4c3f487c0bc63fbb44abe3062036b8c394f
-  data.tar.gz: 9b84f93db1c13dabc20f33b394506619c77272cccb4d2e85f70f6e74cb6238dd
+  metadata.gz: 92b27e3065435d17fd5d6129bd640481dee8acf66f9ed82b2b68ae6a7589f463
+  data.tar.gz: a5cd5299248fd01d8f12a80a1c9982de4f8e0160ea5033ab96b60677bb9ea2c8
 SHA512:
-  metadata.gz: 909543c28f2192856e0168fdd7da20383892a0c8cde67503209bfbbf69831edd79bdd03884426af0e8a78743d3b7344ce4e70a175c059e4c1356eaf949199d01
-  data.tar.gz: e242883b09cae56ba55df004afe9febba753cdd21d46639b328e0df73322eb18d37187ecdbfc47030ff84c0d46540b4ee7acabffd7aecf4a28facfc4af8e0a24
+  metadata.gz: 1348b97fdf89faf44cd0cfc0f2aecc05a679606f19fe57392d588209da26fc3a5c2407569173d41e1497bdf409d762adee0d2533089b5ce27854e298fe98cc13
+  data.tar.gz: c80ecd381e1d941d8e8e5ead0dd925682e26a2f8cc639f0202d5b5cd30f025582fc5d5a2665daca3e5e7d0f2099066d3ca3d9ad8ad00b07d2ee5673b122bae01

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 0.0.7
+
+2024-01-12 17:03
+
+#### FIXED
+
+- Revert back to offering single response (no array) in cases where there are single results (for some commands)
+
 ### 0.0.6
 
 2024-01-12 14:44

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    curlyq (0.0.6)
+    curlyq (0.0.7)
       gli (~> 2.21.0)
       nokogiri (~> 1.16.0)
       selenium-webdriver (~> 4.16.0)

data/README.md

@@ -10,7 +10,7 @@ _If you find this useful, feel free to [buy me some coffee][donate]._
 [donate]: https://brettterpstra.com/donate
 
 
-The current version of `curlyq` is 0.0.6
+The current version of `curlyq` is 0.0.7
 .
 
 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.
@@ -44,7 +44,7 @@ SYNOPSIS
     curlyq [global options] command [command options] [arguments...]
 
 VERSION
-    0.0.6
+    0.0.7
 
 GLOBAL OPTIONS
     --help          - Show this message

data/bin/curlyq

@@ -144,7 +144,7 @@ command %i[html curl] do |c|
     end
     output.delete_if(&:nil?)
     output.delete_if(&:empty?)
-    output = output[0] if output.count == 1
+    # output = output[0] if output.count == 1
     output.map! { |o| o[options[:raw].to_sym] } if options[:raw]
 
     print_out(output, global_options[:yaml], raw: options[:raw], pretty: global_options[:pretty])
@@ -240,7 +240,7 @@ command :json do |c|
       end
     end
 
-    output = output[0] if output.count == 1
+    # output = output[0] if output.count == 1
 
     print_out(output, global_options[:yaml], pretty: global_options[:pretty])
   end

data/lib/curly/version.rb

@@ -1,3 +1,3 @@
 module Curly
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/src/_README.md

@@ -10,7 +10,7 @@ _If you find this useful, feel free to [buy me some coffee][donate]._
 [donate]: https://brettterpstra.com/donate
 <!--END GITHUB-->
 
-The current version of `curlyq` is <!--VER-->0.0.4<!--END VER-->.
+The current version of `curlyq` is <!--VER-->0.0.6<!--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.
 

data/test/curlyq_html_test.rb

@@ -12,7 +12,7 @@ class CurlyQHtmlTest < Test::Unit::TestCase
 
   def test_html_search_query
     result = curlyq('html', '-s', '#main article .aligncenter', '-q', 'images[1]', 'https://brettterpstra.com')
-    json = JSON.parse(result)
+    json = JSON.parse(result)[0]
 
     assert_match(/aligncenter/, json[0]['class'], 'Should have found an image with class "aligncenter"')
   end

data/test/curlyq_json_test.rb

@@ -13,9 +13,9 @@ class CurlyQJsonTest < Test::Unit::TestCase
   def setup
   end
 
-  def test_json    
+  def test_json
     result = curlyq('json', 'https://brettterpstra.com/scripts/giveaways_wrapper.cgi?v=203495&giveaway=hazel2023&action=count')
-    json = JSON.parse(result)
+    json = JSON.parse(result)[0]
 
     assert_equal(json.class, Hash, 'Single result should be a hash')
     assert_equal(286, json['json']['total'], 'json.total should match 286')
@@ -24,8 +24,8 @@ class CurlyQJsonTest < Test::Unit::TestCase
   def test_query
     result1 = curlyq('json', '-q', 'total', 'https://brettterpstra.com/scripts/giveaways_wrapper.cgi?v=203495&giveaway=hazel2023&action=count')
     result2 = curlyq('json', '-q', 'json.total', 'https://brettterpstra.com/scripts/giveaways_wrapper.cgi?v=203495&giveaway=hazel2023&action=count')
-    json1 = JSON.parse(result1)
-    json2 = JSON.parse(result2)
+    json1 = JSON.parse(result1)[0]
+    json2 = JSON.parse(result2)[0]
 
     assert_equal(286, json1, 'Should be 286')
     assert_equal(286, json2, 'Including json in dot path should yeild same result')

data/test/helpers/threaded_tests.rb

@@ -132,7 +132,7 @@ class ThreadedTests
 
     unless status.success? && !count['fails'].to_i.positive? && !count['errs'].to_i.positive?
       s[2] = if count
-               ": #{paste.red(count['fails'])} #{pastel.red('failures')}, #{pastel.red(count['errs'])} #{pastel.red('errors')}"
+               ": #{pastel.red(count['fails'])} #{pastel.red('failures')}, #{pastel.red(count['errs'])} #{pastel.red('errors')}"
              else
                ": #{pastel.red('Unknown Error')}"
              end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curlyq
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Brett Terpstra