wordlist 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09442b4fa26d163890845f9ba05bb3620d081ede1aeea4f4681e3292023a329e'
-  data.tar.gz: d69e26ee74fef00403afdbd2acddbc617398132d75074fe6cf8546704540ce83
+  metadata.gz: 1e732c8a8b2aa358e9c21c46fd9b5f509b5aeef52d51477ceb49111f94a4102d
+  data.tar.gz: 0cb119f423d984b5538b5547f972a7c6c54e1e96e52e461acf3ba13328e8f4d5
 SHA512:
-  metadata.gz: f96fd76cbccdeab025ec9bf7c46946f7d684f91e5e01e7a3c68820b9bcbb1c80ec9e50a8d39fea61cbd5e757a0bfffca8e8e2ab1b435b91327d365efeac0f971
-  data.tar.gz: a99ea8d51f2e0ffd6b8a5a444870c28bee24698fdce3b44474c1c66acc000ebdba009493b267e68e68d592bd668189e5b77dff971f7e03f08ef7921032071a1c
+  metadata.gz: b060a80fafcd2e24a1771537030085d19b70722b8436a62e810b2cc2ab876ac3c132b036d625ae496b2b2c2f18c11a75761b0ab6933878a29207f28cfb1b8a73
+  data.tar.gz: edef70fcf4bbcf6ab3d0ff4f78281bd4c1edca5535c057a515f662c5cd0efcae254a492d301d7d583ac622c0177961c3b028c2431d94a95da3d03116579824f1

data/.github/workflows/ruby.yml

@@ -4,18 +4,22 @@ on: [ push, pull_request ]
 
 jobs:
   tests:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
+        os:
+          - ubuntu-latest
+          - macos-latest
         ruby:
           - 2.6
           - 2.7
           - 3.0
           - 3.1
+          - 3.2
           - jruby
           - truffleruby
-    name: Ruby ${{ matrix.ruby }}
+    name: OS ${{ matrix.os }} / Ruby ${{ matrix.ruby }}
     steps:
       - uses: actions/checkout@v2
       - name: Set up Ruby

data/ChangeLog.md

@@ -1,3 +1,10 @@
+### 1.0.3 / 2023-08-04
+
+* Fix reading of compressed wordlists on macOS.
+  * macOS's version of `zcat`, `bzcat`, and `xzcat` do not accept a file path
+    argument, but instead require the compressed input be piped or redirected
+    into them (ex: `zcat < path/to/file.gz`).
+
 ### 1.0.2 / 2023-07-18
 
 #### CLI

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2021 Hal Brodigan
+Copyright (c) 2009-2023 Hal Brodigan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -332,6 +332,6 @@ Wordlist::File#mutate_case (N=1000)       24.178521   0.000000  24.178521 ( 24.2
 
 ## License
 
-Copyright (c) 2009-2021 Hal Brodigan
+Copyright (c) 2009-2023 Hal Brodigan
 
 See {file:LICENSE.txt} for details.

data/lib/wordlist/compression/reader.rb

@@ -37,7 +37,7 @@ module Wordlist
           raise(UnknownFormat,"unsupported format: #{format.inspect}")
         end
 
-        Shellwords.shelljoin([command, path])
+        "#{command} < #{Shellwords.shellescape(path)}"
       end
 
       #

data/lib/wordlist/version.rb

@@ -2,5 +2,5 @@
 
 module Wordlist
   # wordlist version
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

data/spec/compression/reader_spec.rb

@@ -8,15 +8,15 @@ describe Wordlist::Compression::Reader do
     context "when given format: :gzip" do
       subject { described_class.command(path, format: :gzip) }
 
-      it "must return 'zcat path/to/file'" do
-        expect(subject).to eq("zcat #{path}")
+      it "must return 'zcat < path/to/file'" do
+        expect(subject).to eq("zcat < #{path}")
       end
 
       context "and the file contains special characters" do
         let(:path) { 'path/to/the file' }
 
         it "must shellescape them" do
-          expect(subject).to eq("zcat #{Shellwords.shellescape(path)}")
+          expect(subject).to eq("zcat < #{Shellwords.shellescape(path)}")
         end
       end
     end
@@ -24,15 +24,15 @@ describe Wordlist::Compression::Reader do
     context "when given format: :bzip2" do
       subject { described_class.command(path, format: :bzip2) }
 
-      it "must return 'bzcat path/to/file'" do
-        expect(subject).to eq("bzcat #{path}")
+      it "must return 'bzcat < path/to/file'" do
+        expect(subject).to eq("bzcat < #{path}")
       end
 
       context "and the file contains special characters" do
         let(:path) { 'path/to/the file' }
 
         it "must shellescape them" do
-          expect(subject).to eq("bzcat #{Shellwords.shellescape(path)}")
+          expect(subject).to eq("bzcat < #{Shellwords.shellescape(path)}")
         end
       end
     end
@@ -40,15 +40,15 @@ describe Wordlist::Compression::Reader do
     context "when given format: :xz" do
       subject { described_class.command(path, format: :xz) }
 
-      it "must return 'xzcat path/to/file'" do
-        expect(subject).to eq("xzcat #{path}")
+      it "must return 'xzcat < path/to/file'" do
+        expect(subject).to eq("xzcat < #{path}")
       end
 
       context "and the file contains special characters" do
         let(:path) { 'path/to/the file' }
 
         it "must shellescape them" do
-          expect(subject).to eq("xzcat #{Shellwords.shellescape(path)}")
+          expect(subject).to eq("xzcat < #{Shellwords.shellescape(path)}")
         end
       end
     end
@@ -69,7 +69,7 @@ describe Wordlist::Compression::Reader do
 
     context "when given format: :gzip" do
       let(:path) { ::File.join(fixtures_dir,'wordlist.txt.gz') }
-      let(:expected_contents) { `zcat #{Shellwords.shellescape(path)}` }
+      let(:expected_contents) { `zcat < #{Shellwords.shellescape(path)}` }
 
       subject { described_class.open(path, format: :gzip) }
 
@@ -86,7 +86,7 @@ describe Wordlist::Compression::Reader do
 
     context "when given format: :bzip2" do
       let(:path) { ::File.join(fixtures_dir,'wordlist.txt.bz2') }
-      let(:expected_contents) { `bzcat #{Shellwords.shellescape(path)}` }
+      let(:expected_contents) { `bzcat < #{Shellwords.shellescape(path)}` }
 
       subject { described_class.open(path, format: :bzip2) }
 
@@ -103,7 +103,7 @@ describe Wordlist::Compression::Reader do
 
     context "when given format: :xz" do
       let(:path) { ::File.join(fixtures_dir,'wordlist.txt.xz') }
-      let(:expected_contents) { `xzcat #{Shellwords.shellescape(path)}` }
+      let(:expected_contents) { `xzcat < #{Shellwords.shellescape(path)}` }
 
       subject { described_class.open(path, format: :xz) }
 
@@ -120,7 +120,7 @@ describe Wordlist::Compression::Reader do
 
     context "when the command is not installed" do
       let(:format)  { :gzip  }
-      let(:command) { Shellwords.shelljoin(['zcat', path]) }
+      let(:command) { "zcat < #{Shellwords.shellescape(path)}" }
       let(:path)    { 'path/to/wordlist.gz' }
 
       before do

data/spec/compression/writer_spec.rb

@@ -110,7 +110,7 @@ describe Wordlist::Compression::Writer do
           subject.close
         end
 
-        let(:written_contents) { `zcat #{Shellwords.shellescape(path)}` }
+        let(:written_contents) { `zcat < #{Shellwords.shellescape(path)}` }
         let(:written_words)    { written_contents.lines.map(&:chomp)    }
 
         it "must writing gzip compressed data to the file" do
@@ -136,7 +136,7 @@ describe Wordlist::Compression::Writer do
           subject.close
         end
 
-        let(:written_contents) { `bzcat #{Shellwords.shellescape(path)}` }
+        let(:written_contents) { `bzcat < #{Shellwords.shellescape(path)}` }
         let(:written_words)    { written_contents.lines.map(&:chomp)    }
 
         it "must writing bzip2 compressed data to the file" do
@@ -162,7 +162,7 @@ describe Wordlist::Compression::Writer do
           subject.close
         end
 
-        let(:written_contents) { `xzcat #{Shellwords.shellescape(path)}` }
+        let(:written_contents) { `xzcat < #{Shellwords.shellescape(path)}` }
         let(:written_words)    { written_contents.lines.map(&:chomp)    }
 
         it "must writing xz compressed data to the file" do

data/spec/file_spec.rb

@@ -132,7 +132,7 @@ describe Wordlist::File do
 
       context "and the wordlist format is gzip" do
         let(:path) { ::File.join(fixtures_dir,'wordlist.txt.gz') }
-        let(:expected_contents) { `zcat #{Shellwords.shellescape(path)}` }
+        let(:expected_contents) { `zcat < #{Shellwords.shellescape(path)}` }
 
         it "must read the uncompressed gzip data" do
           expect { |b|
@@ -143,7 +143,7 @@ describe Wordlist::File do
 
       context "and the wordlist format is bzip2" do
         let(:path) { ::File.join(fixtures_dir,'wordlist.txt.bz2') }
-        let(:expected_contents) { `bzcat #{Shellwords.shellescape(path)}` }
+        let(:expected_contents) { `bzcat < #{Shellwords.shellescape(path)}` }
 
         it "must read the uncompressed gzip data" do
           expect { |b|
@@ -154,7 +154,7 @@ describe Wordlist::File do
 
       context "and the wordlist format is xz" do
         let(:path) { ::File.join(fixtures_dir,'wordlist.txt.xz') }
-        let(:expected_contents) { `xzcat #{Shellwords.shellescape(path)}` }
+        let(:expected_contents) { `xzcat < #{Shellwords.shellescape(path)}` }
 
         it "must read the uncompressed gzip data" do
           expect { |b|
@@ -172,7 +172,7 @@ describe Wordlist::File do
 
       context "and the wordlist format is gzip" do
         let(:path) { ::File.join(fixtures_dir,'wordlist.txt.gz') }
-        let(:expected_contents) { `zcat #{Shellwords.shellescape(path)}` }
+        let(:expected_contents) { `zcat < #{Shellwords.shellescape(path)}` }
 
         it "must return an Enumerator of the uncompressed gzip data" do
           expect(subject.each_line).to be_kind_of(Enumerator)
@@ -182,7 +182,7 @@ describe Wordlist::File do
 
       context "and the wordlist format is bzip2" do
         let(:path) { ::File.join(fixtures_dir,'wordlist.txt.bz2') }
-        let(:expected_contents) { `bzcat #{Shellwords.shellescape(path)}` }
+        let(:expected_contents) { `bzcat < #{Shellwords.shellescape(path)}` }
 
         it "must return an Enumerator of the compressed gzip data" do
           expect(subject.each_line).to be_kind_of(Enumerator)
@@ -192,7 +192,7 @@ describe Wordlist::File do
 
       context "and the wordlist format is xz" do
         let(:path) { ::File.join(fixtures_dir,'wordlist.txt.xz') }
-        let(:expected_contents) { `xzcat #{Shellwords.shellescape(path)}` }
+        let(:expected_contents) { `xzcat < #{Shellwords.shellescape(path)}` }
 
         it "must return an Enumerator of the compressed gzip data" do
           expect(subject.each_line).to be_kind_of(Enumerator)
@@ -211,7 +211,7 @@ describe Wordlist::File do
 
     context "and the wordlist format is gzip" do
       let(:path) { ::File.join(fixtures_dir,'wordlist.txt.gz') }
-      let(:expected_contents) { `zcat #{Shellwords.shellescape(path)}` }
+      let(:expected_contents) { `zcat < #{Shellwords.shellescape(path)}` }
 
       it "must read the uncompressed gzip data" do
         expect { |b|
@@ -222,7 +222,7 @@ describe Wordlist::File do
 
     context "and the wordlist format is bzip2" do
       let(:path) { ::File.join(fixtures_dir,'wordlist.txt.bz2') }
-      let(:expected_contents) { `bzcat #{Shellwords.shellescape(path)}` }
+      let(:expected_contents) { `bzcat < #{Shellwords.shellescape(path)}` }
 
       it "must read the uncompressed gzip data" do
         expect { |b|
@@ -233,7 +233,7 @@ describe Wordlist::File do
 
     context "and the wordlist format is xz" do
       let(:path) { ::File.join(fixtures_dir,'wordlist.txt.xz') }
-      let(:expected_contents) { `xzcat #{Shellwords.shellescape(path)}` }
+      let(:expected_contents) { `xzcat < #{Shellwords.shellescape(path)}` }
 
       it "must read the uncompressed gzip data" do
         expect { |b|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wordlist
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Postmodern
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-19 00:00:00.000000000 Z
+date: 2023-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler