sinew 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c16f880ce1bf6454b10c34dd1f071daf1a758eebb52e598262d6357cebb2e9f2
-  data.tar.gz: 4e57acae70775805a96fd5e6bd7ed00ebd5d74dbc0e6daa3348fd9161118d00d
+  metadata.gz: 30b6d7da43f53885bd23a2d283ec2dc34f0f38640d4bac3c5f3275deed4f8e84
+  data.tar.gz: dfb86670352efb63ddad965418b619ab74edf8738a7ae55ed4c8ea521c2f625c
 SHA512:
-  metadata.gz: 99bf3da2db47a04dbd6f18dfb7aa3f2bc5f706bbe460633f3f8e3589c85377ae14b35d43c750d384fbdeac0883247b5dbab696127700c6fee71731818df57e74
-  data.tar.gz: 1ecda4412fc9f2384bf01aa38ed40327ac5855c37eb3c82ce65d21779a8a582880c6afaffa5d68954759ddccaa04cec9a6f36f8460c96849722ecafe4ac2ba6e
+  metadata.gz: 230c4c81b27dd5087bb44ac3b89b29bed65222d81327c4dd8580c5762e50cb1d54d5521d5d3349f7d40a228244e9fc436d502fa22e879909ce2b983b9d1cee0f
+  data.tar.gz: ce76f649971d961bd22de2f8b71f1226838b9e8385dd269fe2e695e93164e850b16fff3a6c4c42b5fb961beff9a6675deb6fa5e66060053274a464d878cd0d35

data/.github/workflows/test.yml

@@ -2,11 +2,7 @@ name: test
 
 on:
   push:
-    paths-ignore:
-      - '**.md'
   pull_request:
-    paths-ignore:
-      - '**.md'
   workflow_dispatch:
 
 jobs:
@@ -15,12 +11,12 @@ jobs:
       max-parallel: 3
       matrix:
         os: [ubuntu, macos]
-        ruby-version: [3.0, 2.7]
+        ruby-version: [head, 3.2, 3.1]
     runs-on: ${{ matrix.os }}-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+      - uses: taiki-e/install-action@just
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
-      - run: bundle install
-      - run: bundle exec rake test
+      - run: just ci

data/.rubocop.yml

@@ -1,34 +1,17 @@
+require:
+  - standard
+
+inherit_gem:
+  standard: config/base.yml
+
 AllCops:
   NewCops: enable
   SuggestExtensions: false
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.1
 
-# this is buggy in 2.7.0
-Style/HashTransformValues: { Enabled: false }
+#
+# fight with standardrb!
+#
 
-# minimal personal preference
-Layout/CaseIndentation: { Enabled: false }
-Layout/EndAlignment: { EnforcedStyleAlignWith: variable }
-Lint/AssignmentInCondition: { Enabled: false }
-Lint/NonLocalExitFromIterator: { Enabled: false }
-Metrics: { Enabled: false }
-Naming/HeredocDelimiterNaming: { Enabled: false }
-Naming/MethodParameterName: { Enabled: false }
-Naming/VariableNumber: { Enabled: false }
-Style/AsciiComments: { Enabled: false }
-Style/ClassVars: { Enabled: false }
-Style/CommentAnnotation: { Enabled: false }
-Style/Documentation: { Enabled: false }
-Style/DoubleNegation: { Enabled: false }
-Style/EmptyCaseCondition: { Enabled: false }
-Style/FormatStringToken: { Enabled: false }
-Style/FrozenStringLiteralComment: { Enabled: false }
-Style/GuardClause: { Enabled: false }
-Style/IfUnlessModifier: { Enabled: false }
-Style/NegatedIf: { Enabled: false }
-Style/NumericPredicate: { Enabled: false }
-Style/ParallelAssignment: { Enabled: false }
-Style/StderrPuts: { Enabled: false }
-Style/StringConcatenation: { Enabled: false }
-Style/TrailingCommaInArrayLiteral: { EnforcedStyleForMultiline: consistent_comma }
-Style/TrailingCommaInHashLiteral: { EnforcedStyleForMultiline: consistent_comma }
+Style/RedundantReturn: { Enabled: false }
+Style/HashSyntax: { EnforcedShorthandSyntax: always }

data/Gemfile

@@ -1,11 +1,11 @@
-source 'http://rubygems.org'
+source "http://rubygems.org"
 gemspec
 
 group :development, :test do
-  gem 'minitest'
-  gem 'mocha'
-  gem 'pry'
-  gem 'rake'
-  gem 'rubocop', '~> 1.18'
-  gem 'webmock'
+  gem "minitest"
+  gem "mocha"
+  gem "pry"
+  gem "rake"
+  gem "standard", require: false
+  gem "webmock"
 end

data/Gemfile.lock

@@ -1,124 +1,132 @@
 PATH
   remote: .
   specs:
-    sinew (4.0.0)
-      amazing_print (~> 1.3)
-      faraday (~> 1.4)
-      faraday-encoding (~> 0)
+    sinew (4.0.1)
+      amazing_print (~> 1.5)
+      faraday (~> 2.7)
+      faraday-encoding (~> 0.0)
       faraday-rate_limiter (~> 0.0)
-      hashie (~> 4.1)
-      httpdisk (~> 0.5)
-      nokogiri (~> 1.11)
-      slop (~> 4.8)
+      faraday-retry (~> 2.0)
+      hashie (~> 5.0)
+      httpdisk (~> 1.0)
+      nokogiri (~> 1.15)
+      slop (~> 4.10)
       sterile (~> 1.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    amazing_print (1.3.0)
+    addressable (2.8.5)
+      public_suffix (>= 2.0.2, < 6.0)
+    amazing_print (1.5.0)
     ast (2.4.2)
     coderay (1.1.3)
-    content-type (0.0.1)
-      parslet (~> 1.5)
+    content-type (0.0.2)
+      parslet (~> 2.0)
     crack (0.4.5)
       rexml
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    faraday (1.5.0)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      faraday-patron (~> 1.0)
-      multipart-post (>= 1.2, < 3)
+    faraday (2.7.10)
+      faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-cookie_jar (0.0.7)
       faraday (>= 0.8.0)
       http-cookie (~> 1.0.0)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
     faraday-encoding (0.0.5)
       faraday
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.1.0)
-    faraday-patron (1.0.0)
+    faraday-follow_redirects (0.3.0)
+      faraday (>= 1, < 3)
+    faraday-net_http (3.0.2)
     faraday-rate_limiter (0.0.4)
       faraday
-    faraday_middleware (1.0.0)
-      faraday (~> 1.0)
+    faraday-retry (2.0.0)
+      faraday (~> 2.0)
     hashdiff (1.0.1)
-    hashie (4.1.0)
-    http-cookie (1.0.4)
+    hashie (5.0.0)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
-    httpdisk (0.5.2)
+    httpdisk (1.0.0)
       content-type (~> 0.0)
-      faraday (~> 1.4)
+      faraday (~> 2.7)
       faraday-cookie_jar (~> 0.0)
-      faraday_middleware (~> 1.0)
-      slop (~> 4.8)
+      faraday-follow_redirects (~> 0.0)
+      slop (~> 4.10)
+    json (2.6.3)
+    language_server-protocol (3.17.0.3)
+    lint_roller (1.1.0)
     method_source (1.0.0)
-    mini_portile2 (2.5.3)
-    minitest (5.14.4)
-    mocha (1.13.0)
-    multipart-post (2.1.1)
-    nokogiri (1.11.7)
-      mini_portile2 (~> 2.5.0)
+    minitest (5.19.0)
+    mocha (2.1.0)
+      ruby2_keywords (>= 0.0.5)
+    nokogiri (1.15.4-arm64-darwin)
       racc (~> 1.4)
-    parallel (1.20.1)
-    parser (3.0.2.0)
+    parallel (1.23.0)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
-    parslet (1.8.2)
-    pry (0.14.1)
+      racc
+    parslet (2.0.0)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.6)
-    racc (1.5.2)
-    rainbow (3.0.0)
+    public_suffix (5.0.3)
+    racc (1.7.1)
+    rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.1.1)
-    rexml (3.2.5)
-    rubocop (1.18.3)
+    regexp_parser (2.8.1)
+    rexml (3.2.6)
+    rubocop (1.52.1)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.7.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.7.0)
-      parser (>= 3.0.1.1)
-    ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.4)
-    slop (4.9.1)
-    sterile (1.0.23)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
+    rubocop-performance (1.18.0)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    slop (4.10.1)
+    standard (1.30.1)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.52.0)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.1.0)
+    standard-custom (1.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.50)
+    standard-performance (1.1.2)
+      lint_roller (~> 1.1)
+      rubocop-performance (~> 1.18.0)
+    sterile (1.0.25)
       nokogiri (>= 1.11.7)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.7)
-    unicode-display_width (2.0.0)
-    webmock (3.13.0)
-      addressable (>= 2.3.6)
+    unf_ext (0.0.8.2)
+    unicode-display_width (2.4.2)
+    webmock (3.18.1)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
-  ruby
+  arm64-darwin-20
 
 DEPENDENCIES
   minitest
   mocha
   pry
   rake
-  rubocop (~> 1.18)
   sinew!
+  standard
   webmock
 
 BUNDLED WITH
-   2.1.4
+   2.4.19

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2018 Adam Doppelt
+Copyright (c) 2012-2023 Adam Doppelt
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://github.com/gurgeous/sinew/workflows/test/badge.svg?branch=master)](https://github.com/gurgeous/sinew/action)
+[![Build Status](https://github.com/gurgeous/sinew/workflows/test/badge.svg?branch=main)](https://github.com/gurgeous/sinew/action)
 
 ## Welcome to Sinew
 
@@ -221,7 +221,11 @@ end.map(&:text)
 
 ## Changelog
 
-#### 4.0.0 (July 2021)
+#### 4.0.1 (Aug 2023)
+
+- Updated dependencies, added justfile
+
+#### 4.0.0 (Jul 2021)
 
 - Rewritten to use simpler DSL
 - Upgraded to httpdisk 0.5 to take advantage of the new encoding support

data/Rakefile

@@ -1,54 +1,5 @@
-require 'bundler/setup'
-require 'rake/testtask'
+require "bundler/setup"
+require "minitest/test_task"
 
-# load the spec, we use it below
-spec = Gem::Specification.load('sinew.gemspec')
-
-#
-# testing
-# don't forget about TESTOPTS="--verbose" rake
-# also: rake install && rm -rf ~/.sinew/www.amazon.com && /usr/local/bin/sinew sample.sinew
-#
-
-# test (default)
-Rake::TestTask.new
 task default: :test
-
-# Watch rb files, run tests whenever something changes
-task :watch do
-  sh "find . -name '*.rb' -o -name '*.sinew' | entr -c rake"
-end
-
-#
-# pry
-#
-
-task :pry do
-  sh 'pry -I lib -r sinew.rb'
-end
-
-#
-# rubocop
-#
-
-task :rubocop do
-  sh 'bundle exec rubocop -A .'
-end
-
-#
-# gem
-#
-
-task :build do
-  sh 'gem build --quiet sinew.gemspec'
-end
-
-task install: :build do
-  sh "gem install --quiet sinew-#{spec.version}.gem"
-end
-
-task release: %i[rubocop test build] do
-  sh "git tag -a #{spec.version} -m 'Tagging #{spec.version}'"
-  sh 'git push --tags'
-  sh "gem push sinew-#{spec.version}.gem"
-end
+Minitest::TestTask.create

data/bin/sinew

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH.unshift(File.join(__dir__, '../lib'))
+$LOAD_PATH.unshift(File.join(__dir__, "../lib"))
 
 BIN = File.basename($PROGRAM_NAME)
 
@@ -8,12 +8,12 @@ BIN = File.basename($PROGRAM_NAME)
 # Load the bare minimum and parse args with slop. For speed.
 #
 
-require 'sinew/args'
+require "sinew/args"
 begin
   slop = Sinew::Args.slop(ARGV)
 rescue Slop::Error => e
-  $stderr.puts "#{BIN}: #{e}" if e.message != ''
-  $stderr.puts("#{BIN}: try '#{BIN} --help' for more information")
+  warn "#{BIN}: #{e}" if e.message != ""
+  warn("#{BIN}: try '#{BIN} --help' for more information")
   exit 1
 end
 
@@ -21,5 +21,5 @@ end
 # now load everything and run
 #
 
-require 'sinew'
+require "sinew"
 Sinew::Main.new(slop).run

data/justfile

@@ -0,0 +1,59 @@
+
+# read gem version
+gemver := `cat lib/sinew/version.rb | grep -Eo "[0-9]+\.[0-9]+\.[0-9]+"`
+
+#
+# dev
+#
+
+default: test
+
+check: lint test
+
+fmt:
+  bundle exec rubocop -a
+
+lint:
+  @just banner lint...
+  bundle exec rubocop
+
+pry:
+  bundle exec pry -I lib -r sinew.rb
+
+test:
+  @just banner test...
+  bundle exec rake test
+
+watch:
+  @watchexec --watch lib --watch test --clear bundle exec rake test
+
+#
+# ci
+#
+
+ci:
+  bundle install
+  just check
+
+#
+# gem tasks
+#
+
+gem-push: check-git-status
+  @just banner gem build...
+  gem build sinew.gemspec
+  @just banner tag...
+  git tag -a "v{{gemver}}" -m "Tagging {{gemver}}"
+  git push --tags
+  @just banner gem push...
+  gem push "sinew-{{gemver}}.gem"
+
+#
+# util
+#
+
+banner *ARGS:
+  @printf '\e[42;37;1m[%s] %-72s \e[m\n' "$(date +%H:%M:%S)" "{{ARGS}}"
+
+check-git-status:
+  @if [ ! -z "$(git status --porcelain)" ]; then echo "git status is dirty, bailing."; exit 1; fi

data/lib/sinew/args.rb

@@ -1,7 +1,7 @@
 # manually load dependencies here since this is loaded standalone by bin
-require 'httpdisk/slop_duration'
-require 'sinew/version'
-require 'slop'
+require "httpdisk/slop_duration"
+require "sinew/version"
+require "slop"
 
 #
 # This is used to parse command line arguments with Slop. We don't set any
@@ -13,26 +13,26 @@ module Sinew
   module Args
     def self.slop(args)
       slop = Slop.parse(args) do |o|
-        o.banner = 'Usage: sinew [options] [recipe.sinew]'
-        o.integer '-l', '--limit', 'quit after emitting this many rows'
-        o.string '--proxy', 'use host[:port] as HTTP proxy (can be a comma-delimited list)'
-        o.integer '--timeout', 'maximum time allowed for the transfer'
-        o.bool '-s', '--silent', 'suppress some output'
-        o.bool '-v', '--verbose', 'dump emitted rows while running'
+        o.banner = "Usage: sinew [options] [recipe.sinew]"
+        o.integer "-l", "--limit", "quit after emitting this many rows"
+        o.string "--proxy", "use host[:port] as HTTP proxy (can be a comma-delimited list)"
+        o.integer "--timeout", "maximum time allowed for the transfer"
+        o.bool "-s", "--silent", "suppress some output"
+        o.bool "-v", "--verbose", "dump emitted rows while running"
 
-        o.separator 'From httpdisk:'
-        o.string '--dir', 'set custom cache directory'
+        o.separator "From httpdisk:"
+        o.string "--dir", "set custom cache directory"
         # note: uses slop_duration from HTTPDisk
-        o.duration '--expires', 'when to expire cached requests (ex: 1h, 2d, 3w)'
-        o.bool '--force', "don't read anything from cache (but still write)"
-        o.bool '--force-errors', "don't read errors from cache (but still write)"
+        o.duration "--expires", "when to expire cached requests (ex: 1h, 2d, 3w)"
+        o.bool "--force", "don't read anything from cache (but still write)"
+        o.bool "--force-errors", "don't read errors from cache (but still write)"
 
         # generic
-        o.boolean '--version', 'show version' do
+        o.boolean "--version", "show version" do
           puts "sinew #{Sinew::VERSION}"
           exit
         end
-        o.on('--help', 'show this help') do
+        o.on("--help", "show this help") do
           puts o
           exit
         end
@@ -40,9 +40,9 @@ module Sinew
 
       # recipe argument
       recipe = slop.args.first
-      raise Slop::Error, '' if args.empty?
-      raise Slop::Error, 'no RECIPE specified' if !recipe
-      raise Slop::Error, 'more than one RECIPE specified' if slop.args.length > 1
+      raise Slop::Error, "" if args.empty?
+      raise Slop::Error, "no RECIPE specified" if !recipe
+      raise Slop::Error, "more than one RECIPE specified" if slop.args.length > 1
       raise Slop::Error, "#{recipe} not found" if !File.exist?(recipe)
 
       slop.to_h.tap do

data/lib/sinew/base.rb

@@ -1,8 +1,9 @@
-require 'amazing_print'
-require 'faraday-encoding'
-require 'faraday/logging/formatter'
-require 'faraday-rate_limiter'
-require 'httpdisk'
+require "amazing_print"
+require "faraday-encoding"
+require "faraday-rate_limiter"
+require "faraday/logging/formatter"
+require "faraday/retry"
+require "httpdisk"
 
 module Sinew
   # Sinew base class, for in standalone scripts or via the sinew binary.
@@ -17,7 +18,7 @@ module Sinew
       #
 
       # default :rate_limit, typically 1
-      default_rate_limit = ENV['SINEW_TEST'] ? 0 : 1
+      default_rate_limit = ENV["SINEW_TEST"] ? 0 : 1
 
       #
       # note: uses HTTPDisk::Sloptions
@@ -32,7 +33,7 @@ module Sinew
         _1.boolean :verbose
 
         # httpdisk
-        _1.string :dir, default: File.join(ENV['HOME'], '.sinew')
+        _1.string :dir, default: File.join(ENV["HOME"], ".sinew")
         _1.integer :expires
         _1.boolean :force
         _1.boolean :force_errors
@@ -75,7 +76,7 @@ module Sinew
     # http post json, returns a Response
     def post_json(url, body = nil, headers = nil)
       body = body.to_json
-      headers = (headers || {}).merge('Content-Type' => 'application/json')
+      headers = (headers || {}).merge("Content-Type" => "application/json")
       post(url, body, headers)
     end
 
@@ -93,7 +94,7 @@ module Sinew
     # Returns true if request is cached. Defaults to form body type.
     def cached?(method, url, params = nil, body = nil)
       status = status(method, url, params, body)
-      status[:status] != 'miss'
+      status[:status] != "miss"
     end
 
     # Remove cache file, if any. Defaults to form body type.
@@ -159,8 +160,8 @@ module Sinew
 
     # Print a nice green banner.
     def banner(msg, color: GREEN)
-      msg = "#{msg} ".ljust(72, ' ')
-      msg = "[#{Time.new.strftime('%H:%M:%S')}] #{msg}"
+      msg = "#{msg} ".ljust(72, " ")
+      msg = "[#{Time.new.strftime("%H:%M:%S")}] #{msg}"
       msg = "#{color}#{msg}#{RESET}" if $stdout.tty?
       puts msg
     end
@@ -178,7 +179,7 @@ module Sinew
       return if !options[:proxy]
 
       proxies = options[:proxy]
-      proxies = proxies.split(',') if !proxies.is_a?(Array)
+      proxies = proxies.split(",") if !proxies.is_a?(Array)
       proxies.sample
     end
 
@@ -186,7 +187,7 @@ module Sinew
     def create_faraday
       faraday_options = options.slice(:headers, :params)
       if options[:insecure]
-        faraday_options[:ssl] = { verify: false }
+        faraday_options[:ssl] = {verify: false}
       end
       Faraday.new(nil, faraday_options) do
         # options
@@ -233,7 +234,7 @@ module Sinew
           max: options[:retries],
           methods: %w[delete get head options patch post put trace],
           retry_statuses: (500..600).to_a,
-          retry_if: ->(_env, _err) { true },
+          retry_if: ->(_env, _err) { true }
         }
         _1.request :retry, retry_options
       end

data/lib/sinew/csv.rb

@@ -1,5 +1,5 @@
-require 'csv'
-require 'sterile'
+require "csv"
+require "sterile"
 
 module Sinew
   class CSV
@@ -13,11 +13,11 @@ module Sinew
 
     # start writing the csv
     def start(columns)
-      raise 'started twice' if started?
+      raise "started twice" if started?
 
       @columns = columns
       @tally = columns.map { [_1, 0] }.to_h
-      @csv = ::CSV.open(path, 'wb').tap do
+      @csv = ::CSV.open(path, "wb").tap do
         _1 << columns
       end
     end
@@ -50,7 +50,7 @@ module Sinew
     end
 
     ASCII_ONLY = begin
-      chars = (33..126).map(&:chr) - ['&']
+      chars = (33..126).map(&:chr) - ["&"]
       /\A[#{Regexp.escape(chars.join)}\s]+\Z/
     end.freeze
 
@@ -59,14 +59,14 @@ module Sinew
       s = if s.respond_to?(:inner_html)
         s.inner_html
       elsif s.is_a?(Array)
-        s.join('|')
+        s.join("|")
       else
         s.to_s
       end
       return if s.empty?
 
       # simple attempt to strip tags. Note that we replace tags with spaces
-      s = s.gsub(/<[^>]+>/, ' ')
+      s = s.gsub(/<[^>]+>/, " ")
 
       if s !~ ASCII_ONLY
         # Converts MS Word 'smart punctuation' to ASCII
@@ -80,7 +80,7 @@ module Sinew
       end
 
       # squish
-      s = s.strip.gsub(/\s+/, ' ')
+      s = s.strip.gsub(/\s+/, " ")
       return if s.empty?
 
       s

data/lib/sinew/main.rb

@@ -8,7 +8,7 @@ module Sinew
       options[:output] ||= begin
         src = options[:recipe]
         dst = File.join(File.dirname(src), "#{File.basename(src, File.extname(src))}.csv")
-        dst = dst.sub(%r{^./}, '') # nice to clean this up
+        dst = dst.sub(%r{^./}, "") # nice to clean this up
         dst
       end
 
@@ -21,7 +21,7 @@ module Sinew
       recipe = sinew.options[:recipe]
       dsl = DSL.new(sinew)
       begin
-        dsl.instance_eval(File.read(recipe, mode: 'rb'), recipe)
+        dsl.instance_eval(File.read(recipe, mode: "rb"), recipe)
       rescue LimitError
         # ignore - this is flow control for --limit
       end
@@ -43,12 +43,12 @@ module Sinew
       count = csv.count
 
       if count == 0
-        sinew.banner(format('Done in %ds. Nothing written.', elapsed))
+        sinew.banner(format("Done in %ds. Nothing written.", elapsed))
         return
       end
 
       # summary
-      msg = format('Done in %ds. Wrote %d rows to %s. Summary:', elapsed, count, csv.path)
+      msg = format("Done in %ds. Wrote %d rows to %s. Summary:", elapsed, count, csv.path)
       sinew.banner(msg)
 
       # tally

data/lib/sinew/middleware/log_formatter.rb

@@ -3,7 +3,7 @@ module Sinew
     # Minimalist Formatter that logs proxy if present.
     class LogFormatter < Faraday::Logging::Formatter
       def request(env)
-        info('req') do
+        info("req") do
           # Only log the initial request, not the redirects
           return if env[:redirect]
 

data/lib/sinew/nokogiri_ext.rb

@@ -1,18 +1,18 @@
-require 'nokogiri'
+require "nokogiri"
 
 # modify NodeSet to join with SPACE instead of empty string
 module Nokogiri
   module XML
     class NodeSet
-      alias old_inner_html inner_html
-      alias old_inner_text inner_text
+      alias_method :old_inner_html, :inner_html
+      alias_method :old_inner_text, :inner_text
 
       def inner_text
-        map(&:inner_text).join(' ')
+        map(&:inner_text).join(" ")
       end
 
       def inner_html(*args)
-        map { _1.inner_html(*args) }.join(' ')
+        map { _1.inner_html(*args) }.join(" ")
       end
     end
   end

data/lib/sinew/response.rb

@@ -1,7 +1,7 @@
-require 'delegate'
-require 'hashie/mash'
-require 'json'
-require 'nokogiri'
+require "delegate"
+require "hashie/mash"
+require "json"
+require "nokogiri"
 
 module Sinew
   # A wrapper around Faraday::Response, with some parsing helpers.
@@ -11,12 +11,12 @@ module Sinew
       @html ||= body.dup.tap do
         # fix invalid utf8
         if _1.encoding == Encoding::UTF_8
-          _1.encode!('UTF-8', invalid: :replace, undef: :replace, replace: '?')
+          _1.encode!("UTF-8", invalid: :replace, undef: :replace, replace: "?")
         end
 
         # squish
         _1.strip!
-        _1.gsub!(/\s+/, ' ')
+        _1.gsub!(/\s+/, " ")
 
         # kill whitespace around tags
         _1.gsub!(/ ?<([^>]+)> ?/, '<\\1>')

data/lib/sinew/version.rb

@@ -1,4 +1,4 @@
 module Sinew
   # Gem version
-  VERSION = '4.0.0'.freeze
+  VERSION = "4.0.1".freeze
 end

data/lib/sinew.rb

@@ -1,14 +1,14 @@
 # sinew
-require 'sinew/args'
-require 'sinew/base'
-require 'sinew/csv'
-require 'sinew/main'
-require 'sinew/nokogiri_ext'
-require 'sinew/response'
-require 'sinew/version'
+require "sinew/args"
+require "sinew/base"
+require "sinew/csv"
+require "sinew/main"
+require "sinew/nokogiri_ext"
+require "sinew/response"
+require "sinew/version"
 
 # custom faraday middleware
-require 'sinew/middleware/log_formatter'
+require "sinew/middleware/log_formatter"
 
 module Sinew
   # flow control for --limit

data/sample.rb

@@ -1,13 +1,13 @@
-require_relative 'lib/sinew'
+require_relative "lib/sinew"
 
-sinew = Sinew.new(output: 'sample.csv', verbose: true)
+sinew = Sinew.new(output: "sample.csv", verbose: true)
 
-response = sinew.get 'http://httpbingo.org'
-response.noko.css('ul li a').each do |a|
+response = sinew.get "http://httpbingo.org"
+response.noko.css("ul li a").each do |a|
   row = {}
   row[:url] = a[:href]
   row[:title] = a.text
   sinew.csv_emit(row)
 end
 
-sinew.get 'http://httpbingo.org/redirect/2'
+sinew.get "http://httpbingo.org/redirect/2"

data/sinew.gemspec

@@ -1,35 +1,36 @@
 $LOAD_PATH.unshift("#{__dir__}/lib")
 
-require 'sinew/version'
+require "sinew/version"
 
 Gem::Specification.new do |s|
-  s.name = 'sinew'
+  s.name = "sinew"
   s.version = Sinew::VERSION
-  s.authors = ['Adam Doppelt', 'Nathan Kriege']
-  s.email = ['amd@gurge.com']
+  s.authors = ["Adam Doppelt", "Nathan Kriege"]
+  s.email = ["amd@gurge.com"]
 
-  s.summary = 'Sinew - structured web crawling using recipes.'
-  s.description = 'Crawl web sites easily using ruby recipes, with caching and nokogiri.'
-  s.homepage = 'http://github.com/gurgeous/sinew'
-  s.license = 'MIT'
-  s.required_ruby_version = '>= 2.7'
+  s.summary = "Sinew - structured web crawling using recipes."
+  s.description = "Crawl web sites easily using ruby recipes, with caching and nokogiri."
+  s.homepage = "http://github.com/gurgeous/sinew"
+  s.license = "MIT"
+  s.required_ruby_version = ">= 3.1"
 
   # what's in the gem?
   s.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { _1.match(%r{^test/}) }
   end
-  s.bindir = 'bin'
+  s.bindir = "bin"
   s.executables = s.files.grep(%r{^#{s.bindir}/}) { File.basename(_1) }
-  s.require_paths = ['lib']
+  s.require_paths = ["lib"]
 
   # gem dependencies
-  s.add_dependency 'amazing_print', '~> 1.3'
-  s.add_dependency 'faraday', '~> 1.4'
-  s.add_dependency 'faraday-encoding', '~> 0'
-  s.add_dependency 'faraday-rate_limiter', '~> 0.0'
-  s.add_dependency 'hashie', '~> 4.1'
-  s.add_dependency 'httpdisk', '~> 0.5'
-  s.add_dependency 'nokogiri', '~> 1.11'
-  s.add_dependency 'slop', '~> 4.8'
-  s.add_dependency 'sterile', '~> 1.0'
+  s.add_dependency "amazing_print", "~> 1.5"
+  s.add_dependency "faraday", "~> 2.7"
+  s.add_dependency "faraday-encoding", "~> 0.0"
+  s.add_dependency "faraday-rate_limiter", "~> 0.0"
+  s.add_dependency "faraday-retry", "~> 2.0"
+  s.add_dependency "hashie", "~> 5.0"
+  s.add_dependency "httpdisk", "~> 1.0"
+  s.add_dependency "nokogiri", "~> 1.15"
+  s.add_dependency "slop", "~> 4.10"
+  s.add_dependency "sterile", "~> 1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinew
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Adam Doppelt
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-09 00:00:00.000000000 Z
+date: 2023-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print
@@ -17,42 +17,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: faraday-encoding
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: faraday-rate_limiter
   requirement: !ruby/object:Gem::Requirement
@@ -67,62 +67,76 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: faraday-retry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: httpdisk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: '4.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: '4.10'
 - !ruby/object:Gem::Dependency
   name: sterile
   requirement: !ruby/object:Gem::Requirement
@@ -154,6 +168,7 @@ files:
 - README.md
 - Rakefile
 - bin/sinew
+- justfile
 - lib/sinew.rb
 - lib/sinew/args.rb
 - lib/sinew/base.rb
@@ -178,14 +193,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Sinew - structured web crawling using recipes.