minitar-cli 0.12 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0482a3390a7e9c09b0dcb78448c831e610ace48ce7c5fa619c192236ffee43a2'
-  data.tar.gz: 34dc951de20c2da47402233c7553226d263dcc5f10f72a0de791642f1a52c795
+  metadata.gz: 11572498bcd45ede5ca69b29310d1e087c69b83dae809496a4e0e457a0a794e8
+  data.tar.gz: 2822a3ffc81ed9ceb622f06a4f631677294b40e3ecca8cd728fb2a95dc7fadb3
 SHA512:
-  metadata.gz: 367f0a0e0a69b2a51a8ee6bdf9793b6419cdbdbde063e47731438a2de087d4e189f5c18f5e507d316f42135b423974f6473c7b22b2e902e829279ac9cb4f6aa4
-  data.tar.gz: aff64bd90c2e7392a75cff9829ea081cc816d419bb95aaab1917393f52bc1a8fec196aa6f2a9f344e804d290e2b6d77f01bdb0c905b3b027dd51e907c32317af
+  metadata.gz: 40558f4b57f502b7139d463c2bbf0e4355b73395ea127ac625f8ce57b3eba6a952cd44303c46c61a437d1b08ecea41041c7939e55f6c08ace85d32205f7bea69
+  data.tar.gz: 6657646298c8f16c7926362f04ae5c6c04572f6b8868b95fc4a0c60d5123db5312bb261318f8885a29ed2b249cf0b3652c43591a8758be56538ac2ed8287f544

data/Code-of-Conduct.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual
+identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+- Demonstrating empathy and kindness toward other people
+- Being respectful of differing opinions, viewpoints, and experiences
+- Giving and gracefully accepting constructive feedback
+- Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+- Focusing on what is best not just for us as individuals, but for the overall
+  community
+
+Examples of unacceptable behavior include:
+
+- The use of sexualized language or imagery, and sexual attention or advances of
+  any kind
+- Trolling, insulting or derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or email address,
+  without their explicit permission
+- Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official email address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at [INSERT CONTACT
+METHOD]. All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of
+actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or permanent
+ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the
+community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.1, available at
+<https://www.contributor-covenant.org/version/2/1/code_of_conduct.html>.
+
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+
+For answers to common questions about this code of conduct, see the FAQ at
+<https://www.contributor-covenant.org/faq>. Translations are available at
+<https://www.contributor-covenant.org/translations>.
+
+[homepage]: https://www.contributor-covenant.org
+[Mozilla CoC]: https://github.com/mozilla/diversity

data/Contributing.md

@@ -1,24 +1,24 @@
 ## Contributing
 
-I value any contribution to minitar-cli you can provide: a bug report, a
-feature request, or code contributions. There are a few guidelines for
-contributing to minitar:
-
-*   Code changes *will not* be accepted without tests. The test suite is
-    written with [Minitest][].
-*   Match my coding style.
-*   Use a thoughtfully-named topic branch that contains your change. Rebase
-    your commits into logical chunks as necessary.
-*   Use [quality commit messages][].
-*   Do not change the version number; when your patch is accepted and a release
-    is made, the version will be updated at that point.
-*   Submit a GitHub pull request with your changes.
-*   New or changed behaviours require appropriate documentation.
+I value any contribution to minitar-cli you can provide: a bug report, a feature
+request, or code contributions. There are a few guidelines for contributing to
+minitar-cli:
+
+- Code changes _will not_ be accepted without tests. The test suite is
+  written with [Minitest][].
+- Match my coding style.
+- Use a thoughtfully-named topic branch that contains your change. Rebase
+  your commits into logical chunks as necessary.
+- Use [quality commit messages][].
+- Do not change the version number; when your patch is accepted and a release
+  is made, the version will be updated at that point.
+- Submit a GitHub pull request with your changes.
+- New or changed behaviours require appropriate documentation.
 
 ### Test Dependencies
 
-minitar-cli uses Ryan Davis’s [Hoe][] to manage the release process, and it
-adds a number of rake tasks. You will mostly be interested in:
+minitar-cli uses Ryan Davis’s [Hoe][] to manage the release process, and it adds
+a number of rake tasks. You will mostly be interested in:
 
     $ rake
 
@@ -29,14 +29,14 @@ which runs the tests the same way that:
 
 will do.
 
-To assist with the installation of the development dependencies for
-minitar-cli, I have provided the simplest possible Gemfile pointing to the
-(generated) `minitar-cli.gemspec` file. This will permit you to do:
+To assist with the installation of the development dependencies for minitar-cli,
+I have provided the simplest possible Gemfile pointing to the (generated)
+`minitar-cli.gemspec` file. This will permit you to do:
 
     $ bundle install
 
-to get the development dependencies. If you aleady have `hoe` installed, you
-can accomplish the same thing with:
+to get the development dependencies. If you aleady have `hoe` installed, you can
+accomplish the same thing with:
 
     $ rake newb
 
@@ -51,21 +51,20 @@ You can run tests with code coverage analysis by running:
 
 Here's the most direct way to get your work merged into the project:
 
-*   Fork the project.
-*   Clone down your fork (`git clone git://github.com/<username>/minitar-cli.git`).
-*   Create a topic branch to contain your change (`git checkout -b
-    my_awesome_feature`).
-*   Hack away, add tests. Not necessarily in that order.
-*   Make sure everything still passes by running `rake`.
-*   If necessary, rebase your commits into logical chunks, without errors.
-*   Push the branch up (`git push origin my_awesome_feature`).
-*   Create a pull request against halostatue/minitar-cli and describe what your
-    change does and the why you think it should be merged.
+- Fork the project.
+- Clone down your fork (`git clone git://github.com/<username>/minitar-cli.git`).
+- Create a topic branch to contain your change (`git checkout -b my_awesome_feature`).
+- Hack away, add tests. Not necessarily in that order.
+- Make sure everything still passes by running `rake`.
+- If necessary, rebase your commits into logical chunks, without errors.
+- Push the branch up (`git push origin my_awesome_feature`).
+- Create a pull request against halostatue/minitar-cli and describe what your
+  change does and the why you think it should be merged.
 
 ### Contributors
 
-* Austin Ziegler created minitar-cli, extracted from Archive::Tar::Minitar.
+- Austin Ziegler created minitar-cli, extracted from Archive::Tar::Minitar.
 
-[Minitest]: https://github.com/seattlerb/minitest
+[minitest]: https://github.com/seattlerb/minitest
 [quality commit messages]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
-[Hoe]: https://github.com/seattlerb/hoe
+[hoe]: https://github.com/seattlerb/hoe

data/History.md

@@ -1,10 +1,16 @@
+# History
+
+## 1.0.0 / 2024-08-07
+
+- Updated for compatibility with minitar 1.0.0.
+
 ## 0.12 / 2024-08-06
 
 - Updated for compatibility with minitar 0.12.
 
 ## 0.9 / 2024-07-02
 
-- Updated for compatibility with minitar 0.9. Provided in [#4][] by
+- Updated for compatibility with minitar 0.9. Provided in [#4][#4] by
   david22swan. Thanks!
 
 ## 0.8 / 2019-01-05
@@ -17,8 +23,7 @@
 
 ## 0.6.1 / 2017-02-08
 
-- Fixed an issue where `bin/minitar` was not loading zlib for compressed
-  files.
+- Fixed an issue where `bin/minitar` was not loading zlib for compressed files.
 
 ## 0.6 / 2017-02-07
 
@@ -27,15 +32,15 @@
 
 - Enhancements:
 
-  - Extracted `bin/minitar` from [minitar][].
-  - Replaced Satoru Takabayashi’s [Ruby Progress Bar][] with
-    [busyloop/powerbar][].
+  - Extracted `bin/minitar` from [minitar][minitar].
+  - Replaced Satoru Takabayashi’s [Ruby Progress Bar][Ruby Progress Bar] with
+    [busyloop/powerbar][busyloop/powerbar].
   - Added filename filtering to `minitar list`.
 
 - Bugs:
 
-  - Fixed a problem where `bin/minitar create` would not include dotfiles
-    on Unix systems.
+  - Fixed a problem where `bin/minitar create` would not include dotfiles on
+    Unix systems.
 
 - Development:
 

data/Licence.md

@@ -1,10 +1,10 @@
 ## Licence
 
-minitar-cli is free software that may be redistributed and/or modified under
-the terms of Ruby’s licence or the Simplified BSD licence.
+minitar-cli is free software that may be redistributed and/or modified under the
+terms of Ruby’s licence or the Simplified BSD licence.
 
-* Copyright 2004–2017 Austin Ziegler.
-* Portions copyright 2004 Mauricio Julio Fernández Pradier.
+- Copyright 2004–2024 Austin Ziegler.
+- Portions copyright 2004 Mauricio Julio Fernández Pradier.
 
 ### Simplified BSD Licence
 

data/Manifest.txt

@@ -1,3 +1,4 @@
+Code-of-Conduct.md
 Contributing.md
 History.md
 Licence.md

data/README.rdoc

@@ -3,10 +3,7 @@
 home :: https://github.com/halostatue/minitar-cli/
 code :: https://github.com/halostatue/minitar-cli/
 bugs :: https://github.com/halostatue/minitar-cli/issues
-rdoc :: http://rdoc.info/gems/minitar-cli/
-travis :: {<img src="https://travis-ci.org/halostatue/minitar-cli.svg" />}[https://travis-ci.org/halostatue/minitar-cli]
-appveyor :: {<img src="https://ci.appveyor.com/api/projects/status/bj4gqn3gp3gu45sa?svg=true" />}[https://ci.appveyor.com/project/halostatue/minitar-cli]
-coveralls :: {<img src="https://coveralls.io/repos/halostatue/minitar-cli/badge.svg" alt="Coverage Status" />}[https://coveralls.io/r/halostatue/minitar-cli]
+rdoc :: https://rdoc.info/gems/minitar-cli/
 
 == Description
 
@@ -14,8 +11,6 @@ coveralls :: {<img src="https://coveralls.io/repos/halostatue/minitar-cli/badge.
 {minitar}[https://github.com/halostatue/minitar] to provide a command-line
 tool, +minitar+, for working with POSIX tar(1) archive files.
 
-This is release 0.7, extracted from {minitar}[https://halostatue.ca/minitar],
-with modernizations.
 
 == Synopsis
 

data/Rakefile

@@ -10,19 +10,19 @@ Hoe.plugin :git2
 Hoe.plugin :minitest
 Hoe.plugin :rubygems
 
-spec = Hoe.spec "minitar-cli" do
+Hoe.spec "minitar-cli" do
   developer("Austin Ziegler", "halostatue@gmail.com")
 
   self.history_file = "History.md"
   self.readme_file = "README.rdoc"
 
-  require_ruby_version ">= 1.8"
+  require_ruby_version ">= 3.1"
 
   self.licenses = ["Ruby", "BSD-2-Clause"]
 
   spec_extras[:metadata] = ->(val) { val["rubygems_mfa_required"] = "true" }
 
-  extra_deps << ["minitar", "~> 0.12.0"]
+  extra_deps << ["minitar", "~> 1.0.0"]
   extra_deps << ["powerbar", "~> 1.0"]
 
   extra_dev_deps << ["hoe", "~> 4.0"]

data/bin/minitar

@@ -1,11 +1,11 @@
 #! /usr/bin/env ruby
 # coding: utf-8
 
-git_path = File.expand_path('../../.git', __FILE__)
+git_path = File.expand_path("../../.git", __FILE__)
 if File.exist?(git_path)
-  $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
+  $LOAD_PATH.unshift(File.expand_path("../../lib", __FILE__))
 end
 
-require 'minitar/cli'
+require "minitar/cli"
 
 exit Minitar::CLI.run(ARGV)

data/lib/minitar/cli/command/create.rb

@@ -5,14 +5,14 @@
 # 1.9 support have been dropped.
 class Minitar::CLI::Command::Create < Minitar::CLI::Command
   def name
-    'create'
+    "create"
   end
 
   def altname
-    'cr'
+    "cr"
   end
 
-  HELP = <<-EOH.freeze
+  HELP = <<-EOH
     minitar create [OPTIONS] <tarfile|-> <file|directory|-->+
 
 Creates a new tarfile. If the tarfile is named .tar.gz or .tgz, then it
@@ -37,7 +37,7 @@ create Options:
 
     while (arg = args.shift)
       case arg
-      when '--compress', '-z'
+      when "--compress", "-z"
         opts[:compress] = true
       else
         argv << arg
@@ -46,33 +46,33 @@ create Options:
 
     if argv.size < 2
       ioe[:output] << "Not enough arguments.\n\n"
-      commander.command('help').call(%w(create))
+      commander.command("help").call(%w(create))
       return 255
     end
 
     output = argv.shift
-    if '-' == output
-      opts[:name] = 'STDOUT'
+    if output == "-"
+      opts[:name] = "STDOUT"
       output = ioe[:output]
       opts[:output] = ioe[:error]
     else
       opts[:name] = output
-      output = File.open(output, 'wb')
+      output = File.open(output, "wb")
       opts[:output] = ioe[:output]
     end
 
-    if opts[:name] =~ /\.tar\.gz$|\.tgz$/ or opts[:compress]
-      require 'zlib'
+    if /\.tar\.gz$|\.tgz$/ =~ opts[:name] || opts[:compress]
+      require "zlib"
       output = Zlib::GzipWriter.new(output)
     end
 
     files = []
-    if argv.include?('--')
+    if argv.include?("--")
       # Read stdin for the list of files.
-      files = ''
+      files = ""
       files << ioe[:input].read until ioe[:input].eof?
       files = files.split(/\r\n|\n|\r/)
-      args.delete('--')
+      args.delete("--")
     end
 
     files << argv.to_a
@@ -87,7 +87,7 @@ create Options:
         silent
       end
 
-    Archive::Tar::Minitar.pack(files, output, &watcher)
+    Minitar.pack(files, output, &watcher)
     finisher.call
     0
   ensure
@@ -110,7 +110,7 @@ create Options:
   end
 
   def progress
-    require 'powerbar'
+    require "powerbar"
     progress = PowerBar.new(:msg => opts[:name], :total => 1)
     [
       lambda { |action, name, stats|
@@ -140,6 +140,6 @@ create Options:
   end
 
   def silent
-    [ lambda { |_, _, _| }, lambda {} ]
+    [lambda { |_, _, _| }, lambda {}]
   end
 end

data/lib/minitar/cli/command/extract.rb

@@ -5,14 +5,14 @@
 # and 1.9 support have been dropped.
 class Minitar::CLI::Command::Extract < Minitar::CLI::Command
   def name
-    'extract'
+    "extract"
   end
 
   def altname
-    'ex'
+    "ex"
   end
 
-  HELP = <<-EOH.freeze
+  HELP = <<-EOH
     minitar extract [OPTIONS] <tarfile|-> [<file>+]
 
 Extracts files from an existing tarfile. If the tarfile is named .tar.gz
@@ -36,19 +36,19 @@ extract Options:
   include CatchMinitarErrors
 
   def run(args, opts = {})
-    argv    = []
-    output  = nil
-    dest    = '.'
-    files   = []
+    argv = []
+    output = nil
+    dest = "."
+    files = []
 
     while (arg = args.shift)
       case arg
-      when '--uncompress', '-z'
+      when "--uncompress", "-z"
         opts[:uncompress] = true
-      when '--pipe'
+      when "--pipe"
         output = ioe[:output]
         ioe[:output] = ioe[:error]
-      when '--output', '-o'
+      when "--output", "-o"
         dest = args.shift
       else
         argv << arg
@@ -57,21 +57,21 @@ extract Options:
 
     if argv.empty?
       ioe[:output] << "Not enough arguments.\n\n"
-      commander.command('help').call(%w(extract))
+      commander.command("help").call(%w(extract))
       return 255
     end
 
     input = argv.shift
-    if '-' == input
-      opts[:name] = 'STDIN'
+    if input == "-"
+      opts[:name] = "STDIN"
       input = ioe[:input]
     else
       opts[:name] = input
-      input = File.open(input, 'rb')
+      input = File.open(input, "rb")
     end
 
-    if opts[:name] =~ /\.tar\.gz$|\.tgz$/ or opts[:uncompress]
-      require 'zlib'
+    if /\.tar\.gz$|\.tgz$/ =~ opts[:name] || opts[:uncompress]
+      require "zlib"
       input = Zlib::GzipReader.new(input)
     end
 
@@ -88,21 +88,21 @@ extract Options:
       end
 
     if output.nil?
-      Archive::Tar::Minitar.unpack(input, dest, files, &watcher)
+      Minitar.unpack(input, dest, files, &watcher)
       finisher.call
     else
-      Archive::Tar::Minitar::Input.each_entry(input) do |entry|
+      Minitar::Input.each_entry(input) do |entry|
         next unless files.empty? || files.include?(entry.full_name)
 
         stats = {
-          :mode     => entry.mode,
-          :mtime    => entry.mtime,
-          :size     => entry.size,
-          :gid      => entry.gid,
-          :uid      => entry.uid,
-          :current  => 0,
-          :currinc  => 0,
-          :entry    => entry
+          :mode => entry.mode,
+          :mtime => entry.mtime,
+          :size => entry.size,
+          :gid => entry.gid,
+          :uid => entry.uid,
+          :current => 0,
+          :currinc => 0,
+          :entry => entry
         }
 
         if entry.directory?
@@ -134,14 +134,14 @@ extract Options:
   def verbose
     [
       lambda { |action, name, _stats|
-        ioe[:output] << "#{name}\n" if action == :dir or action == :file_done
+        ioe[:output] << "#{name}\n" if action == :dir || action == :file_done
       },
       lambda { ioe[:output] << "\n" }
     ]
   end
 
   def progress
-    require 'powerbar'
+    require "powerbar"
     progress = PowerBar.new(:msg => opts[:name], :total => 1)
     [
       lambda { |action, name, stats|
@@ -170,6 +170,6 @@ extract Options:
   end
 
   def silent
-    [ lambda { |_, _, _| }, lambda {} ]
+    [lambda { |_, _, _| }, lambda {}]
   end
 end

data/lib/minitar/cli/command/help.rb

@@ -5,10 +5,10 @@
 # support have been dropped.
 class Minitar::CLI::Command::Help < Minitar::CLI::Command
   def name
-    'help'
+    "help"
   end
 
-  COMMANDS = <<-EOS.freeze
+  COMMANDS = <<-EOS
 The commands known to minitar are:
 
     minitar create          Creates a new tarfile.
@@ -25,24 +25,24 @@ mutually exclusive. In "minitar list", --progress means the same as
 
   EOS
 
-  BASIC = <<-EOS.freeze
+  BASIC = <<-EOS
 This is a basic help message containing pointers to more information on
 how to use this command-line tool. Try:
 
     minitar help commands       list all 'minitar' commands
     minitar help <COMMAND>      show help on <COMMAND>
                                   (e.g., 'minitar help create')
-EOS
+  EOS
 
   def call(args, _opts = {})
     help_on = args.shift
 
     if commander.command?(help_on)
       ioe[:output] << commander[help_on].help
-    elsif help_on == 'commands'
+    elsif help_on == "commands"
       ioe[:output] << COMMANDS
     else
-      unless help_on.nil? or help_on.empty?
+      unless help_on.nil? || help_on.empty?
         ioe[:output] << "Unknown command: #{help_on}\n"
       end
       ioe[:output] << help

data/lib/minitar/cli/command/list.rb

@@ -5,14 +5,14 @@
 # support have been dropped.
 class Minitar::CLI::Command::List < Minitar::CLI::Command
   def name
-    'list'
+    "list"
   end
 
   def altname
-    'ls'
+    "ls"
   end
 
-  HELP = <<-EOH.freeze
+  HELP = <<-EOH
     minitar list [OPTIONS] <tarfile|-> [<file>+]
 
 Lists files in an existing tarfile. If the tarfile is named .tar.gz or
@@ -36,32 +36,32 @@ Sort Fields:
   EOH
 
   def modestr(mode)
-    s = String.new('---')
-    s[0] = 'r' if (mode & 4) == 4
-    s[1] = 'w' if (mode & 2) == 2
-    s[2] = 'x' if (mode & 1) == 1
+    s = String.new("---")
+    s[0] = "r" if (mode & 4) == 4
+    s[1] = "w" if (mode & 2) == 2
+    s[2] = "x" if (mode & 1) == 1
     s
   end
 
   include CatchMinitarErrors
 
   def run(args, opts = {})
-    argv    = []
-    output  = nil
-    files   = []
-    opts[:field] = 'name'
+    argv = []
+    output = nil
+    files = []
+    opts[:field] = "name"
 
     while (arg = args.shift)
       case arg
-      when '--sort', '-S'
-        opts[:sort]   = true
-        opts[:field]  = args.shift
-      when '--reverse', '-R'
+      when "--sort", "-S"
+        opts[:sort] = true
+        opts[:field] = args.shift
+      when "--reverse", "-R"
         opts[:reverse] = true
-        opts[:sort]    = true
-      when '--uncompress', '-z'
+        opts[:sort] = true
+      when "--uncompress", "-z"
         opts[:uncompress] = true
-      when '-l'
+      when "-l"
         opts[:verbose] = true
       else
         argv << arg
@@ -70,35 +70,35 @@ Sort Fields:
 
     if argv.empty?
       ioe[:output] << "Not enough arguments.\n\n"
-      commander.command('help').call(%w(list))
+      commander.command("help").call(%w(list))
       return 255
     end
 
     input = argv.shift
-    if '-' == input
-      opts[:name] = 'STDIN'
+    if input == "-"
+      opts[:name] = "STDIN"
       input = ioe[:input]
     else
       opts[:name] = input
-      input = File.open(input, 'rb')
+      input = File.open(input, "rb")
     end
 
-    if opts[:name] =~ /\.tar\.gz$|\.tgz$/ or opts[:uncompress]
-      require 'zlib'
+    if /\.tar\.gz$|\.tgz$/ =~ opts[:name] || opts[:uncompress]
+      require "zlib"
       input = Zlib::GzipReader.new(input)
     end
 
     files << argv.to_a
     files.flatten!
 
-    if opts[:verbose] or opts[:progress]
-      format  = '%10s %4d %8s %8s %8d %12s %s'
-      datefmt = '%b %d  %Y'
-      timefmt = '%b %d %H:%M'
-      fields  = %w(permissions inodes user group size date fullname)
+    if opts[:verbose] || opts[:progress]
+      format = "%10s %4d %8s %8s %8d %12s %s"
+      datefmt = "%b %d  %Y"
+      timefmt = "%b %d %H:%M"
+      fields = %w(permissions inodes user group size date fullname)
     else
-      format  = '%s'
-      fields  = %w(fullname)
+      format = "%s"
+      fields = %w(fullname)
     end
 
     opts[:field] = opts[:field].to_sym
@@ -109,44 +109,44 @@ Sort Fields:
     today = Time.now
     oneyear = Time.mktime(today.year - 1, today.month, today.day)
 
-    Archive::Tar::Minitar::Input.each_entry(input) do |entry|
+    Minitar::Input.each_entry(input) do |entry|
       next unless files.empty? || files.include?(entry.full_name)
 
       value = format % fields.map { |ff|
         case ff
-        when 'permissions'
-          s = String.new(entry.directory? ? 'd' : '-')
+        when "permissions"
+          s = String.new(entry.directory? ? "d" : "-")
           s << modestr(entry.mode / 0o100)
           s << modestr(entry.mode / 0o010)
           s << modestr(entry.mode)
-        when 'inodes'
+        when "inodes"
           entry.size / 512
-        when 'user'
+        when "user"
           entry.uname || entry.uid || 0
-        when 'group'
+        when "group"
           entry.gname || entry.gid || 0
-        when 'size'
+        when "size"
           entry.size
-        when 'date'
+        when "date"
           if Time.at(entry.mtime) > oneyear
             Time.at(entry.mtime).strftime(timefmt)
           else
             Time.at(entry.mtime).strftime(datefmt)
           end
-        when 'fullname'
+        when "fullname"
           entry.full_name
         end
       }
 
       if opts[:sort]
-        output << [ entry.send(opts[:field]), value ]
+        output << [entry.send(opts[:field]), value]
       else
         ioe[:output] << value << "\n"
       end
     end
 
     if opts[:sort]
-      output = output.sort { |a, b| a[0] <=> b[0] }
+      output = output.sort_by { |a| a[0] }
       if opts[:reverse]
         output.reverse_each { |oo| ioe[:output] << oo[1] << "\n" }
       else

data/lib/minitar/cli/command.rb

@@ -20,7 +20,7 @@ class Minitar::CLI::Command
   module CatchMinitarErrors # :nodoc:
     def call(args, opts)
       run(args, opts)
-    rescue Archive::Tar::Minitar::Error => error
+    rescue Minitar::Error => error
       ioe[:error] << "#{error}\n"
       5
     end
@@ -38,7 +38,7 @@ class Minitar::CLI::Command
   def call(_args, _opts = {})
     raise Minitar::CLI::AbstractCommandError
   end
-  alias [] call
+  alias_method :[], :call
 
   def help
     raise Minitar::CLI::AbstractCommandError

data/lib/minitar/cli/commander.rb

@@ -15,7 +15,7 @@ class Minitar::CLI::Commander
   end
 
   def register(command)
-    command = command.new(self) if command.kind_of?(Class)
+    command = command.new(self) if command.is_a?(Class)
     raise CommandAlreadyExists if command.commander != self
     raise CommandAlreadyExists if command?(command.name)
 
@@ -29,10 +29,10 @@ class Minitar::CLI::Commander
   end
 
   def default_command=(command)
-    command = command.new if command.kind_of?(Class)
+    command = command.new if command.is_a?(Class)
 
     @default_command =
-      if command.kind_of?(Minitar::CLI::Command)
+      if command.is_a?(Minitar::CLI::Command)
         register(command) unless command?(command.name)
         command
       elsif command?(command)
@@ -53,12 +53,12 @@ class Minitar::CLI::Commander
       default_command
     end
   end
-  alias [] command
+  alias_method :[], :command
 
   def default_ioe(ioe = {})
-    ioe[:input]   ||= $stdin
-    ioe[:output]  ||= $stdout
-    ioe[:error]   ||= $stderr
+    ioe[:input] ||= $stdin
+    ioe[:output] ||= $stdout
+    ioe[:error] ||= $stderr
     ioe
   end
 end

data/lib/minitar/cli.rb

@@ -4,7 +4,7 @@ require "minitar"
 
 # The Minitar command-line application.
 class Minitar::CLI
-  VERSION = "0.12" # :nodoc:
+  VERSION = "1.0.0" # :nodoc:
 
   # rubocop:disable Lint/InheritException
   class AbstractCommandError < Exception; end
@@ -23,9 +23,9 @@ class Minitar::CLI
 
   def initialize(input = $stdin, output = $stdout, error = $stderr)
     @ioe = {
-      input: input,
-      output: output,
-      error: error
+      :input => input,
+      :output => output,
+      :error => error
     }
     @commander = Minitar::CLI::Commander.new(ioe)
     Minitar::CLI::Command.children.each do |command|
@@ -39,13 +39,13 @@ class Minitar::CLI
 
     output << "minitar #{VERSION}\n" if argv.include?("--version")
 
-    if argv.include?("--verbose") or argv.include?("-V")
+    if argv.include?("--verbose") || argv.include?("-V")
       opts[:verbose] = true
       argv.delete("--verbose")
       argv.delete("-V")
     end
 
-    if argv.include?("--progress") or argv.include?("-P")
+    if argv.include?("--progress") || argv.include?("-P")
       opts[:progress] = true
       opts[:verbose] = false
       argv.delete("--progress")

data/test/minitest_helper.rb

@@ -7,6 +7,6 @@ gem "minitest"
 require "minitest/autorun"
 require "minitest/focus"
 
-Dir.glob(File.join(File.dirname(__FILE__), "support/*.rb")).each do |support|
+Dir.glob(File.join(File.dirname(__FILE__), "support/*.rb")).sort.each do |support|
   require support
 end

data/test/support/minitar_cli_test_helper.rb

@@ -11,15 +11,10 @@ module MinitarCLITestHelper
     Regexp.union(*r)
   end
 
-  def assert_cli_output(patterns, &)
-    if patterns.is_a?(Array)
-      out, _err = capture_io(&)
-      patterns.each do |pattern|
-        assert_match pattern, out
-      end
-    else
-      assert_output(patterns, &)
-    end
+  def assert_cli_output(first, last, &block)
+    out, _err = capture_io(&block)
+    assert_match first, out, "first line of output"
+    assert_match last, out, "last line of output"
   end
 
   Minitest::Test.send(:include, self)

data/test/test_cli_help.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'minitest_helper'
+require "minitest_helper"
 
 class TestCLIHelp < Minitest::Test
   def test_help_output_with_no_args
@@ -11,61 +11,61 @@ class TestCLIHelp < Minitest::Test
 
   def test_help_output_with_help
     assert_output Minitar::CLI::Command::Help::BASIC do
-      assert_equal 0, cli('help')
+      assert_equal 0, cli("help")
     end
   end
 
   def test_help_output_with_bad_command
     assert_output Minitar::CLI::Command::Help::BASIC do
-      assert_equal 0, cli('foo')
+      assert_equal 0, cli("foo")
     end
   end
 
   def test_help_output_with_help_bad_command
     assert_output "Unknown command: foo\n#{Minitar::CLI::Command::Help::BASIC}" do
-      assert_equal 0, cli('help', 'foo')
+      assert_equal 0, cli("help", "foo")
     end
   end
 
   def test_help_output_commands
     assert_output Minitar::CLI::Command::Help::COMMANDS do
-      assert_equal 0, cli('help', 'commands')
+      assert_equal 0, cli("help", "commands")
     end
   end
 
   def test_help_output_create
     assert_output Minitar::CLI::Command::Create::HELP do
-      assert_equal 0, cli('help', 'create')
+      assert_equal 0, cli("help", "create")
     end
   end
 
   def test_help_output_create_minargs
     assert_output "Not enough arguments.\n\n#{Minitar::CLI::Command::Create::HELP}" do
-      assert_equal 255, cli('create')
+      assert_equal 255, cli("create")
     end
   end
 
   def test_help_output_list
     assert_output Minitar::CLI::Command::List::HELP do
-      assert_equal 0, cli('help', 'list')
+      assert_equal 0, cli("help", "list")
     end
   end
 
   def test_help_output_list_minargs
     assert_output "Not enough arguments.\n\n#{Minitar::CLI::Command::List::HELP}" do
-      assert_equal 255, cli('list')
+      assert_equal 255, cli("list")
     end
   end
 
   def test_help_output_extract
     assert_output Minitar::CLI::Command::Extract::HELP do
-      assert_equal 0, cli('help', 'extract')
+      assert_equal 0, cli("help", "extract")
     end
   end
 
   def test_help_output_extract_minargs
     assert_output "Not enough arguments.\n\n#{Minitar::CLI::Command::Extract::HELP}" do
-      assert_equal 255, cli('extract')
+      assert_equal 255, cli("extract")
     end
   end
 end

data/test/test_cli_list.rb

@@ -17,92 +17,76 @@ class TestCLIList < Minitest::Test
   end
 
   def test_list_output_bad_dir_fixture
-    assert_cli_output "../qwerty\n" do
+    assert_output "../qwerty\n" do
       assert_equal 0, list_bad_dir
     end
   end
 
   def test_list_output_spaces
-    assert_cli_output [%r{\A\./$}, %r{^\./bin/minitar\n\z}] do
+    assert_cli_output %r{\Afirst-added$}, %r{^last-added\n\z} do
       assert_equal 0, list_spaces
     end
   end
 
   def test_list_output_spaces_verbose
-    patterns = [
-      %r{\Adrwxr-xr-x\s+0\s+austin\s+staff\s+0\s+Feb\s+0[67]\s+2017\s+\./$},
-      %r{^-rwxr-xr-x\s+0\s+austin\s+staff\s+219\s+Feb\s+0[67]\s+2017\s+\./bin/minitar\n\z}
-    ]
-    assert_cli_output patterns do
+    first = %r{\A-rw-r--r--\s+0\s+austin\s+staff\s+2\s+Feb\s+15\s+2007\s+first-added$}
+    last = %r{^-rw-r--r--\s+0\s+austin\s+staff\s+3\s+Feb\s+15\s+2008\s+last-added\n\z}
+    assert_cli_output first, last do
       assert_equal 0, list_spaces("--verbose")
     end
   end
 
   def test_list_output_spaces_verbose_sort_size
-    patterns = [
-      %r{\Adrwxr-xr-x\s+0\s+austin\s+staff\s+0\s+Feb\s+0[67]\s+2017\s+\./$},
-      %r{^-rw-r--r--\s+8\s+austin\s+staff\s+4296\s+Feb\s+0[67]\s+2017\s+./lib/minitar/cli/command/extract.rb\n\z}
-    ]
-    assert_cli_output patterns do
+    first = %r{\A-rw-r--r--\s+0\s+austin\s+staff\s+0\s+Feb\s+15\s+2005\s+000-bytes$}
+    last = %r{^-rw-r--r--\s+0\s+austin\s+staff\s+16\s+Feb\s+15\s+2006\s+largest\n\z}
+
+    assert_cli_output first, last do
       assert_equal 0, list_spaces(%w[--verbose --sort size])
     end
   end
 
   def test_list_output_spaces_verbose_sort_size_reverse
-    patterns = [
-      %r{\A-rw-r--r--\s+8\s+austin\s+staff\s+4296\s+Feb\s+0[67]\s+2017\s+./lib/minitar/cli/command/extract.rb$},
-      %r{^drwxr-xr-x\s+0\s+austin\s+staff\s+0\s+Feb\s+0[67]\s+2017\s+\./\n\z}
-    ]
-
-    assert_cli_output patterns do
+    first = %r{\A-rw-r--r--\s+0\s+austin\s+staff\s+16\s+Feb\s+15\s+2006\s+largest$}
+    last = %r{^-rw-r--r--\s+0\s+austin\s+staff\s+0\s+Feb\s+15\s+2005\s+000-bytes\n\z}
+    assert_cli_output first, last do
       assert_equal 0, list_spaces(%w[--verbose --sort size --reverse])
     end
   end
 
   def test_list_output_spaces_verbose_sort_name
-    patterns = [
-      %r{\Adrwxr-xr-x\s+0\s+austin\s+staff\s+0\s+Feb\s+0[67]\s+2017\s+\./$},
-      %r{^-rw-r--r--\s+7\s+austin\s+staff\s+3974\s+Feb\s+0[67]\s+2017\s+./minitar-cli.gemspec\n\z}
-    ]
-    assert_cli_output patterns do
+    first = %r{\A-rw-r--r--\s+0\s+austin\s+staff\s+4\s+Feb\s+15\s+2009\s+00-name$}
+    last = %r{^-rw-r--r--\s+0\s+austin\s+staff\s+5\s+Feb\s+15\s+2010\s+zz-name\n\z}
+    assert_cli_output first, last do
       assert_equal 0, list_spaces(%w[--verbose --sort name])
     end
   end
 
   def test_list_output_spaces_verbose_sort_name_reverse
-    patterns = [
-      %r{\A-rw-r--r--\s+7\s+austin\s+staff\s+3974\s+Feb\s+0[67]\s+2017\s+./minitar-cli.gemspec$},
-      %r{^drwxr-xr-x\s+0\s+austin\s+staff\s+0\s+Feb\s+0[67]\s+2017\s+\./\n\z}
-    ]
-
-    assert_cli_output patterns do
+    first = %r{\A-rw-r--r--\s+0\s+austin\s+staff\s+5\s+Feb\s+15\s+2010\s+zz-name$}
+    last = %r{^-rw-r--r--\s+0\s+austin\s+staff\s+4\s+Feb\s+15\s+2009\s+00-name\n\z}
+    assert_cli_output first, last do
       assert_equal 0, list_spaces(%w[--verbose --sort name --reverse])
     end
   end
 
   def test_list_output_spaces_verbose_sort_mtime
-    patterns = [
-      %r{\Adrwxr-xr-x\s+0\s+austin\s+staff\s+0\s+Nov\s+0[23]\s+2016\s+\./docs/$},
-      %r{^-rw-r--r--\s+2\s+austin\s+staff\s+1319\s+Feb\s+0[67]\s+2017\s+./.pullreview.yml\n\z}
-    ]
-    assert_cli_output patterns do
+    first = %r{\A-rw-r--r--\s+0\s+austin\s+staff\s+6\s+Feb\s+15\s+2004\s+earliest$}
+    last = %r{^-rw-r--r--\s+0\s+austin\s+staff\s+7\s+Feb\s+15\s+2014\s+latest\n\z}
+    assert_cli_output first, last do
       assert_equal 0, list_spaces(%w[--verbose --sort mtime])
     end
   end
 
   def test_list_output_spaces_verbose_sort_mtime_reverse
-    patterns = [
-      %r{\A-rw-r--r--\s+2\s+austin\s+staff\s+1319\s+Feb\s+0[67]\s+2017\s+./.pullreview.yml$},
-      %r{^drwxr-xr-x\s+0\s+austin\s+staff\s+0\s+Nov\s+0[23]\s+2016\s+\./docs/\n\z}
-    ]
-
-    assert_cli_output patterns do
+    first = %r{\A-rw-r--r--\s+0\s+austin\s+staff\s+7\s+Feb\s+15\s+2014\s+latest$}
+    last = %r{^-rw-r--r--\s+0\s+austin\s+staff\s+6\s+Feb\s+15\s+2004\s+earliest\n\z}
+    assert_cli_output first, last do
       assert_equal 0, list_spaces(%w[--verbose --sort mtime --reverse])
     end
   end
 
   def test_list_stdin
-    assert_cli_output "../qwerty\n" do
+    assert_output "../qwerty\n" do
       File.open("test/fixtures/bad-dir.tar.gz") do |f|
         assert_equal 0, Minitar::CLI.run(%w[list - --uncompress], f)
       end
@@ -110,16 +94,15 @@ class TestCLIList < Minitest::Test
   end
 
   def test_list_output_spaces_filtered
-    assert_cli_output "./bin/minitar\n" do
-      assert_equal 0, list_spaces("./bin/minitar")
+    assert_output "zz-name\n" do
+      assert_equal 0, list_spaces("zz-name")
     end
   end
 
   def test_list_output_spaces_filtered_verbose
-    expected =
-      %r{\A-rwxr-xr-x\s+0\s+austin\s+staff\s+219\s+Feb\s+0[67]\s+2017\s+./bin/minitar\n\z}
-    assert_cli_output expected do
-      assert_equal 0, list_spaces(["./bin/minitar", "--verbose"])
+    pattern = %r{\A-rw-r--r--\s+0\s+austin\s+staff\s+5\s+Feb\s+15\s+2010\s+zz-name\n\z}
+    assert_output pattern do
+      assert_equal 0, list_spaces(["zz-name", "--verbose"])
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minitar-cli
 version: !ruby/object:Gem::Version
-  version: '0.12'
+  version: 1.0.0
 platform: ruby
 authors:
 - Austin Ziegler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-06 00:00:00.000000000 Z
+date: 2024-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitar
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: powerbar
   requirement: !ruby/object:Gem::Requirement
@@ -208,15 +208,13 @@ description: |-
   <tt>minitar-cli</tt> is a pure-Ruby command-line tool that uses
   {minitar}[https://github.com/halostatue/minitar] to provide a command-line
   tool, +minitar+, for working with POSIX tar(1) archive files.
-
-  This is release 0.7, extracted from {minitar}[https://halostatue.ca/minitar],
-  with modernizations.
 email:
 - halostatue@gmail.com
 executables:
 - minitar
 extensions: []
 extra_rdoc_files:
+- Code-of-Conduct.md
 - Contributing.md
 - History.md
 - Licence.md
@@ -225,6 +223,7 @@ extra_rdoc_files:
 - docs/bsdl.txt
 - docs/ruby.txt
 files:
+- Code-of-Conduct.md
 - Contributing.md
 - History.md
 - Licence.md
@@ -266,17 +265,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '1.8'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.17
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: "<tt>minitar-cli</tt> is a pure-Ruby command-line tool that uses {minitar}[https://github.com/halostatue/minitar]
   to provide a command-line tool, +minitar+, for working with POSIX tar(1) archive
-  files"
+  files."
 test_files: []