gli 2.21.1 → 2.21.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c5897528d1a6f46c909f258df73970b5d91b23442fabbbe3324266462e61153
-  data.tar.gz: fe51d0fdfed0f4ee886f13d0cc70d02b346dd5e2243323927b0641e724173a15
+  metadata.gz: 4090c5ae7772cf0833abb4eda596a2eb558577de6493a1389e90e68327f41093
+  data.tar.gz: 8f18bf74f7ac11bf544ac28be9c326355199a138364b7189a10537c7eb2903f4
 SHA512:
-  metadata.gz: 7877fdd663edee99a4df3a6c18c4df51fda9058382736583b22fac289834642eec9088800323df8168cf2d726ac8dcc7411f8686a1b5c57e2aa226fa7fc99312
-  data.tar.gz: d8f84289b949bd8d92ed1716327e8c8446b9bef71a596d9c9d30f5a098957c1b53bd48b3b9d848d005e6543139222514bda226476b50054d644eb2e2846070b3
+  metadata.gz: '02638fe45837c6e17d83d8e1afaf3a90e94da181419b1dfc6f53db9487a90566ff281a2e9adc4155bd4baa379f5f43f379a716e788330e12f828ad2d9a233f99'
+  data.tar.gz: fbd6c9281eaf31a203cf5f6331ce21f4241eeb6b7e8cfafc5c3c4d63e81455a60246d76aa411ec4c3ffee3137c48921c569b819f6e0b7cc0e95225c5cdf18a1f

data/.gitignore

@@ -11,3 +11,7 @@ results.html
 .DS_Store
 Session.vim
 scaffold_test
+dx/docker-compose.local.env
+docker-compose.dx.yml
+.tool-versions
+.ruby-version

data/CONTRIBUTING.md

@@ -1,21 +1,63 @@
-Contributions are welcome as long as they are part of my vision for GLI (or can be treated as optional to the user).  I am obsessive about backwards-compatibility, so you may need to default things to disable your features.  Sorry, not ready to bump a major version any time soon.
-
-1. Fork my Repository
-2. Create a branch off of main
-3. Make your changes:
-   * Please include tests and watch out for reek and roodi; i.e. keep your code clean
-   * If you make changes to the gli executable or the scaffolding, please update the cucumber features
-   * Please rubydoc any new methods and update the rubydoc to methods you change in the following format:
-```ruby
-          # Short description
-          #
-          # Longer description if needed
-          #
-          # +args+:: get documented using this syntax
-          # +args+:: please state the TYPE of every arg
-          #
-          # Returns goes here, please state the TYPE of what's returned, if anything
-```
-   * Use <code># :nodoc:</code> for methods that a _user_ of GLI should not call (but still please do document all methods)
-4. Make sure your branch will merge with my gli-2 branch (or just rebase your branch from my gli-2 branch)
-5. Create a pull request explaining your change
+# Contributing/Developing
+
+## Types of Contributions
+
+GLI is relatively stable.  As such:
+
+* No major new features should be added
+* No refactorings or "modernization" is desired
+* No runtime dependencies should be added.
+
+If you really want to make a change like this, open an issue first to discuss.
+
+That said, I welcome:
+
+* Bugfixes
+* Doc changes
+* Minor improvements
+
+I am responsive on issues, so reach out there if you have a question.
+
+## How to Do Development
+
+GLI us using a Docker-based development system to ensure consistency.  To use it, you will need to have Docker installed, as well
+as Bash.  This should all work under Windows Subsystem for Linux.
+
+### Setting Up
+
+1. Install Docker
+2. `dx/build`
+
+   This will use `Dockerfile.dx` to create one Docker image for each supported Ruby version (see `dx/docker-compose.env`'s `RUBY_VERSIONS` variable for the current list).  This will also generate `docker-compose.dx.yml` which will run all versions of Ruby for GLI at the same time.
+3. `dx/start`
+
+   This will start Docker using `docker-compose.dx.yml`, which will run containers for all the images generated by `dx/build`
+
+4. From here, you can run commands inside the running containers, or you can run `bash` inside a container to effectively "log
+   in" and run commands.
+
+### Doing Development
+
+Once you are set up, you should run `dx/exec bash`.  This will log you into the container running the oldest supported version of
+Ruby.  This is the version where you should do your basic work. This container has access to the source code you cloned from
+GitHub.
+
+1. `on-your-computer> dx/exec bash`
+2. `inside-docker-container> bin/setup # installs all gems`
+3. `inside-docker-container> bin/rake  # runs all tests`
+
+Once you have stuff working, run tests on the other versions.  Since the container you were working in was operating on your
+checked-out files, the other containers will have access as well.
+
+1. `on-your-computer> dx/exec -v 3.3 bash # connects to the conatiner where Ruby 3.3 is installed`
+2. `inside-docker-container> bin/setup # installs all gems`
+3. `inside-docker-container> bin/rake  # runs all tests`
+
+You can also try using `bin/ci` on your computer (not inside a Docker container), which will run tests across the entire build
+matrix.
+
+#### If You Want To Use Your Local Computer
+
+In theory, GLI can be worked on using RVM, RBEnv, asdf, or whatever other way you want to manage Ruby.  You can create a
+`.ruby-version` or `.tool-versions`. These are ignored so you can keep them on your machine.  I don't support this setup, so if
+something is wrong, I probably can't help.  This is why I have it set up with Docker.

data/Dockerfile.dx

@@ -0,0 +1,28 @@
+ARG RUBY_VERSION
+FROM ruby:${RUBY_VERSION}
+
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get -y update
+
+
+# dx.snippet.start=templates/snippets/bundler/latest__bundler.dockerfile-snippet
+# Based on documentation at https://guides.rubygems.org/command-reference/#gem-update
+# based on the vendor's documentation
+RUN echo "gem: --no-document" >> ~/.gemrc && \
+    gem update --system && \
+    gem install bundler
+
+# dx.snippet.end=templates/snippets/bundler/latest__bundler.dockerfile-snippet
+
+
+# dx.snippet.start=templates/snippets/vim/bullseye_vim.dockerfile-snippet
+# Based on documentation at https://packages.debian.org/search?keywords=vim
+# based on the vendor's documentation
+ENV EDITOR=vim
+RUN apt-get install -y vim && \
+    echo "set -o vi" >> /root/.bashrc
+# dx.snippet.end=templates/snippets/vim/bullseye_vim.dockerfile-snippet
+
+# This entrypoint produces a nice help message and waits around for you to do
+# something with the container.
+COPY dx/show-help-in-app-container-then-wait.sh /root

data/README.rdoc

@@ -92,9 +92,9 @@ Get a more detailed walkthrough on the {main site}[http://davetron5000.github.io
 
 == Supported Platforms
 
-See `.circleci/config.yml` for the supported rubies, but general we're running tests on the all MRI rubies receiving support, which tends to be the most recent four versions.
+See `dx/docker-compose.env` and the variable `RUBY_VERSIONS` for the versions that are supported.  This should generally track with the supported version of Ruby from Ruby's maintainers.
 
-GLI should work on older Rubies and JRuby, but it's too much work to keep tests passing for those.
+That said, GLI should generally work on other Rubies as it doesn't have any runtime dependencies and there are no plans to use more modern features of Ruby in the codebase.
 
 == Documentation
 
@@ -102,6 +102,10 @@ Extensive documentation is {available at the wiki}[https://github.com/davetron50
 
 API Documentation is available {here}[http://davetron5000.github.io/gli/rdoc/index.html].  Recommend starting with GLI::DSL or GLI::App.
 
+== Developing
+
+See `CONTRIBUTING.md`
+
 == Credits
 
 Author::  Dave Copeland (mailto:davetron5000 at g mail dot com)

data/Rakefile

@@ -80,6 +80,9 @@ Rake::TestTask.new("test:unit") do |t|
   ENV["RUBYOPT"].split(/\s/).each do |opt|
     t.ruby_opts << opt
   end
+  if t.ruby_opts.none? { |x| x =~ /^\-W/ }
+    t.ruby_opts << "-W0"
+  end
   t.test_files = FileList["test/unit/**/*_test.rb"]
 end
 
@@ -89,6 +92,9 @@ Rake::TestTask.new("test:integration") do |t|
   ENV["RUBYOPT"].split(/\s/).each do |opt|
     t.ruby_opts << opt
   end
+  if t.ruby_opts.none? { |x| x =~ /^\-W/ }
+    t.ruby_opts << "-W0"
+  end
   explicitly_named_files = ARGV[1..-1]
   if Array(explicitly_named_files).size == 0
     t.test_files = FileList["test/integration/**/*_test.rb"]

data/bin/ci

@@ -1,29 +1,17 @@
 #!/bin/bash
 
 set -e
-if [ -z $1 ]; then
-  echo "[bin/ci] Running with default warnings"
-  export RUBYOPT=
-else
-  if [ $1 == 'warnings' ]; then
-    echo "[bin/ci] Running with all warnings on"
-    export RUBYOPT=-w
-  else
-    if [ $1 == 'none' ]; then
-      echo "[bin/ci] Running with all warnings off"
-      export RUBYOPT='-W0'
-    else
-      echo "[bin/ci] '$1' is not a supported option"
-      echo "[bin/ci] usage: $0          # run with default warnings"
-      echo "[bin/ci] usage: $0 warnings # run with all warnings"
-      echo "[bin/ci] usage: $0 none     # run with warnings disabled"
-      exit 1
-    fi
-  fi
-fi
 
-echo "[bin/ci] Running unit tests"
-bin/rake test:unit
+SCRIPT_DIR=$( cd -- "$( dirname -- "${0}" )" > /dev/null 2>&1 && pwd )
+DX_DIR="${SCRIPT_DIR}/../dx"
+
+. "${DX_DIR}/docker-compose.env"
+. "${DX_DIR}/setupkit.sh.lib"
+
+for ruby_version in ${RUBY_VERSIONS[@]}; do
+  log "Setting up for Ruby version '${ruby_version}'"
+  dx/exec -v ${ruby_version} bin/setup
+  log "Running tests for Ruby version '${ruby_version}'"
+  dx/exec -v ${ruby_version} bin/rake
+done
 
-echo "[bin/ci] Running integration tests"
-bin/rake test:integration

data/bin/setup

@@ -1,5 +1,11 @@
 #!/bin/bash
 
 set -e
-
-bundle check || bundle install
+if [ Gemfile.lock -ot gli.gemspec ] ; then
+  echo "[ bin/setup ] gli.gemspec has been modified - deleting Gemfile.lock"
+  rm Gemfile.lock
+  bundle install
+else
+  echo "[ bin/setup ] checking bundle and updating as necessary"
+  bundle check || bundle install
+fi

data/dx/build

@@ -0,0 +1,60 @@
+#!/bin/bash
+
+set -e
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${0}" )" > /dev/null 2>&1 && pwd )
+
+. "${SCRIPT_DIR}/dx.sh.lib"
+
+require_command "docker"
+load_docker_compose_env
+
+usage_on_help "Builds the Docker image based on the Dockerfile" "" "build.pre" "build.post" "${@}"
+
+for ruby_version in ${RUBY_VERSIONS[@]}; do
+  dockerfile="Dockerfile.dx"
+  docker_image_name="${IMAGE}:ruby-${ruby_version}"
+
+  log "Building for Ruby '${ruby_version}' using Docker image name '${docker_image_name}'"
+
+  exec_hook_if_exists "build.pre" "${dockerfile}" "${docker_image_name}"
+
+  docker build \
+    --file "${dockerfile}" \
+    --build-arg="RUBY_VERSION=${ruby_version}" \
+    --tag "${docker_image_name}" \
+    ./
+
+  exec_hook_if_exists "build.post" "${dockerfile}" "${docker_image_name}"
+  log "🌈" "Your Docker image has been built tagged '${docker_image_name}'"
+done
+
+log "✅" "All images built"
+
+log "✨" "Creating docker-compose.dx.yml"
+compose_file="docker-compose.dx.yml"
+log "🗑️" "Deleting previous ${compose_file}"
+
+rm -f "${compose_file}"
+echo "# THIS IS GENERATED - DO NOT EDIT" > "${compose_file}"
+echo "" >> "${compose_file}"
+echo "services:" >> "${compose_file}"
+
+for ruby_version in ${RUBY_VERSIONS[@]}; do
+  log "Generating stanza for version '${ruby_version}'"
+  docker_image_name="${IMAGE}:ruby-${ruby_version}"
+  echo "  gli-${ruby_version}:" >> "${compose_file}"
+  echo "    image: ${docker_image_name}" >> "${compose_file}"
+  echo "    init: true" >> "${compose_file}"
+  echo "    volumes:" >> "${compose_file}"
+  echo "      - type: bind" >> "${compose_file}"
+  echo "        source: \"./\"" >> "${compose_file}"
+  echo "        target: \"/root/work\"" >> "${compose_file}"
+  echo "        consistency: \"consistent\"" >> "${compose_file}"
+  echo "    entrypoint: /root/show-help-in-app-container-then-wait.sh" >> "${compose_file}"
+  echo "    working_dir: /root/work" >> "${compose_file}"
+done
+log "🎼" "${compose_file} is now created"
+log "🔄" "You can run dx/start to start it up, though you may need to stop it first with Ctrl-C"
+
+# vim: ft=bash

data/dx/docker-compose.env

@@ -0,0 +1,5 @@
+# This array must include the oldest Ruby first!
+RUBY_VERSIONS=("3.1" "3.2" "3.3")
+IMAGE=davetron5000/gli-dev
+PROJECT_NAME=gli
+# vim: ft=bash

data/dx/dx.sh.lib

@@ -0,0 +1,24 @@
+# shellcheck shell=bash
+
+. "${SCRIPT_DIR}/setupkit.sh.lib"
+
+require_command "realpath"
+require_command "cat"
+
+ENV_FILE=$(realpath "${SCRIPT_DIR}")/docker-compose.env
+
+load_docker_compose_env() {
+  . "${ENV_FILE}"
+}
+
+exec_hook_if_exists() {
+  script_name=$1
+  shift
+  if [ -x "${SCRIPT_DIR}"/"${script_name}" ]; then
+    log "🪝" "${script_name} exists - executing"
+    "${SCRIPT_DIR}"/"${script_name}" "${@}"
+  else
+    debug "${script_name} does not exist"
+  fi
+}
+# vim: ft=bash

data/dx/exec

@@ -0,0 +1,59 @@
+#!/bin/bash
+
+set -e
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${0}" )" > /dev/null 2>&1 && pwd )
+
+. "${SCRIPT_DIR}/dx.sh.lib"
+
+require_command "docker"
+load_docker_compose_env
+
+usage_description="Execute a command inside the app's container."
+usage_args="[-s service] [-v ruby_version] command"
+usage_pre="exec.pre"
+usage_on_help "${usage_description}" "${usage_args}" "${usage_pre}" "" "${@}"
+
+LATEST_RUBY=${RUBY_VERSIONS[0]}
+DEFAULT_SERVICE=gli-${LATEST_RUBY}
+SERVICE="${SERVICE_NAME:-${DEFAULT_SERVICE}}"
+while getopts "v:s:" opt "${@}"; do
+  case ${opt} in
+    v )
+      SERVICE="gli-${OPTARG}"
+      ;;
+    s )
+      SERVICE="${OPTARG}"
+      ;;
+    \? )
+      log "🛑" "Unknown option: ${opt}"
+      usage "${description}" "${usage_args}" "${usage_pre}"
+      ;;
+    : )
+      log "🛑" "Invalid option: ${opt} requires an argument"
+      usage "${description}" "${usage_args}" "${usage_pre}"
+      ;;
+  esac
+done
+shift $((OPTIND -1))
+
+if [ $# -eq 0 ]; then
+  log "🛑" "You must provide a command e.g. bash or ls -l"
+  usage "${description}" "${usage_args}" "${usage_pre}"
+fi
+
+
+exec_hook_if_exists "exec.pre"
+
+log "🚂" "Running '${*}' inside container with service name '${SERVICE}'"
+
+docker \
+  compose \
+    --file docker-compose.dx.yaml \
+    --project-name "${PROJECT_NAME}" \
+    --env-file "${ENV_FILE}" \
+  exec \
+    "${SERVICE}" \
+    "${@}"
+
+# vim: ft=bash

data/dx/prune

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -e
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${0}" )" > /dev/null 2>&1 && pwd )
+
+. "${SCRIPT_DIR}/dx.sh.lib"
+require_command "docker"
+load_docker_compose_env
+
+usage_on_help "Prune containers for this repo" "" "" "" "${@}"
+
+for container_id in $(docker container ls -a -f "name=^${PROJECT_NAME}-.*-1$" --format="{{.ID}}"); do
+  log "🗑" "Removing container with id '${container_id}'"
+  docker container rm "${container_id}"
+done
+echo "🧼" "Containers removed"
+
+# vim: ft=bash

data/dx/setupkit.sh.lib

@@ -0,0 +1,144 @@
+# shellcheck shell=bash
+
+fatal() {
+  remainder=${*:2}
+  if [ -z "$remainder" ]; then
+    log "🛑" "${@}"
+  else
+    log "${@}"
+  fi
+  exit 1
+}
+
+log() {
+  emoji=$1
+  remainder=${*:2}
+  if [ -z "${NO_EMOJI}" ]; then
+    echo "[ ${0} ] ${*}"
+  else
+    # if remainder is empty that means no emoji was passed
+    if [ -z "$remainder" ]; then
+      echo "[ ${0} ] ${*}"
+    else # emoji was passed, but we ignore it
+      echo "[ ${0} ] ${remainder}"
+    fi
+  fi
+}
+
+debug() {
+  message=$1
+  if [ -z "${DOCKBOX_DEBUG}" ]; then
+    return
+  fi
+  log "🐛" "${message}"
+}
+
+usage() {
+  description=$1
+  arg_names=$2
+  pre_hook=$3
+  post_hook=$4
+  echo "usage: ${0} [-h] ${arg_names}"
+  if [ -n "${description}" ]; then
+    echo
+    echo "DESCRIPTION"
+    echo "    ${description}"
+  fi
+  if [ -n "${pre_hook}" ] || [ -n "${post_hook}" ]; then
+    echo
+    echo "HOOKS"
+    if [ -n "${pre_hook}" ]; then
+      echo "    ${pre_hook} - if present, called before the main action"
+    fi
+    if [ -n "${post_hook}" ]; then
+      echo "    ${post_hook} - if present, called after the main action"
+    fi
+  fi
+  exit 0
+}
+
+usage_on_help() {
+  description=$1
+  arg_names=$2
+  pre_hook=$3
+  post_hook=$4
+  # These are the args passed to the invocation so this
+  # function can determine if the user requested help
+  cli_args=( "${@:5}" ) 
+
+  for arg in "${cli_args[@]}"; do
+    if [ "${arg}" = "-h" ] || [ "${arg}" = "--help" ]; then
+      usage "${description}" "${arg_names}" "${pre_hook}" "${post_hook}"
+    fi
+  done
+}
+
+# Read user input into the variable 'INPUT'
+#
+# Args:
+#
+# [1] - an emoji to use for messages
+# [2] - the message explaining what input is being requested
+# [3] - a default value to use if no value is provided
+#
+# Respects NO_EMOJI when outputing messages to the user
+user_input() {
+  emoji=$1
+  message=$2
+  default=$3
+  prompt=$4
+
+  if [ -z "$message" ]; then
+    echo "user_input requires a message"
+    exit 1
+  fi
+
+  INPUT=
+
+  if [ -z "${prompt}" ]; then
+    prompt=$(log "${emoji}" "Value: ")
+    if [ -n "${default}" ]; then
+      prompt=$(log "${emoji}" "Value (or hit return to use '${default}'): ")
+    fi
+  fi
+
+  while [ -z "${INPUT}" ]; do
+
+    log "$emoji" "$message"
+    read -r -p "${prompt}" INPUT
+    if [ -z "$INPUT" ]; then
+      INPUT=$default
+    fi
+    if [ -z "$INPUT" ]; then
+      log "😶", "You must provide a value"
+    fi
+  done
+}
+
+user_confirm() {
+  user_input "$1" "$2" "$3" "y/n> "
+}
+
+require_not_exist() {
+  file=$1
+  message=$2
+  if [ -e "${file}" ]; then
+    fatal "$message"
+  fi
+}
+require_exist() {
+  file=$1
+  message=$2
+  if [ ! -e "${file}" ]; then
+    fatal "$message"
+  fi
+}
+
+require_command() {
+  command_name=$1
+  if ! command -v "${command_name}" >/dev/null 2>&1; then
+    fatal "Command '${command_name}' not found - it is required for this script to run"
+  fi
+}
+
+# vim: ft=bash

data/dx/show-help-in-app-container-then-wait.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+set -e
+
+# Ideally, the message below is shown after everything starts up. We can't
+# achieve this using healtchecks because the interval for a healtcheck is
+# also an initial delay, and we don't really want to do healthchecks on 
+# our DB or Redis every 2 seconds.  So, we sleep just a bit to let
+# the other containers start up and vomit out their output first.
+sleep 2
+# Output some helpful messaging when invoking `dx/start` (which itself is
+# a convenience script for `docker compose up`.
+#
+# Adding this to work around the mild inconvenience of the `app` container's
+# entrypoint generating no output.
+#
+cat <<-'PROMPT'
+
+
+
+ 🎉  Dev Environment Initialized! 🎉
+
+ ℹ️   To use this environment, open a new terminal and run
+
+     dx/exec bash
+
+ 🕹  Use `ctrl-c` to exit.
+
+
+
+PROMPT
+
+# Using `sleep infinity` instead of `tail -f /dev/null`. This may be a 
+# performance improvement based on the conversation on a semi-related
+# StackOverflow page.
+#
+# @see https://stackoverflow.com/a/41655546
+sleep infinity

data/dx/start

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -e
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${0}" )" > /dev/null 2>&1 && pwd )
+
+. "${SCRIPT_DIR}/dx.sh.lib"
+require_command "docker"
+load_docker_compose_env
+
+usage_on_help "Starts all services, including a container in which to run your app" "" "" "" "${@}"
+
+log "🚀" "Starting docker-compose.dx.yml"
+
+BUILD=--build
+if [ "${1}" == "--no-build" ]; then
+    BUILD=
+fi
+
+docker \
+  compose \
+    --file docker-compose.dx.yml \
+    --project-name "${PROJECT_NAME}" \
+    --env-file "${ENV_FILE}" \
+  up \
+    "${BUILD}" \
+    --timestamps \
+    --force-recreate
+
+# vim: ft=bash

data/dx/stop

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -e
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${0}" )" > /dev/null 2>&1 && pwd )
+
+. "${SCRIPT_DIR}/dx.sh.lib"
+require_command "docker"
+load_docker_compose_env
+
+usage_on_help "Stops all services, the container in which to run your app and removes any volumes" "" "" "" "${@}"
+
+log "🚀" "Stopping docker-compose.dx.yml"
+
+docker \
+  compose \
+    --file docker-compose.dx.yml \
+    --project-name "${PROJECT_NAME}" \
+    --env-file "${ENV_FILE}" \
+  down \
+    --volumes
+
+# vim: ft=bash

data/gli.gemspec

@@ -12,6 +12,15 @@ spec = Gem::Specification.new do |s|
   s.summary = "Build command-suite CLI apps that are awesome."
   s.description = "Build command-suite CLI apps that are awesome.  Bootstrap your app, add commands, options and documentation while maintaining a well-tested idiomatic command-line app"
 
+  s.metadata = {
+    'bug_tracker_uri'   => 'https://github.com/davetron5000/gli/issues',
+    'changelog_uri'     => 'https://github.com/davetron5000/gli/releases',
+    'documentation_uri' => 'https://davetron5000.github.io/gli/rdoc/index.html',
+    'homepage_uri'      => 'https://davetron5000.github.com/gli/',
+    'source_code_uri'   => 'https://github.com/davetron5000/gli/',
+    'wiki_url'          => 'https://github.com/davetron5000/gli/wiki',
+  }
+
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
@@ -26,5 +35,5 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency("rdoc")
   s.add_development_dependency("rainbow", "~> 1.1", "~> 1.1.1")
   s.add_development_dependency("sdoc")
-  s.add_development_dependency("minitest")
+  s.add_development_dependency("minitest", "~> 5")
 end

data/lib/gli/commands/scaffold.rb

@@ -121,7 +121,7 @@ Rake::RDocTask.new do |rd|
   rd.title = 'Your application title'
 end
 
-spec = eval(File.read('#{project_name}.gemspec'))
+spec = Gem::Specification.load("#{project_name}.gemspec")
 
 Gem::PackageTask.new(spec) do |pkg|
 end

data/lib/gli/gli_option_parser.rb

@@ -109,9 +109,10 @@ module GLI
       def verify_required_options!(flags, command, options)
         missing_required_options = flags.values.
           select(&:required?).
-          reject { |option|
-            options[option.name] != nil
-        }
+          select { |option|
+            options[option.name] == nil ||
+            ( options[option.name].kind_of?(Array) && options[option.name].empty? )
+          }
         unless missing_required_options.empty?
           missing_required_options.sort!
           raise MissingRequiredArgumentsException.new(missing_required_options.map { |option|

data/lib/gli/version.rb

@@ -1,5 +1,5 @@
 module GLI
   unless const_defined? :VERSION
-    VERSION = '2.21.1'
+    VERSION = '2.21.5'
   end
 end

data/test/integration/gli_cli_test.rb

@@ -1,7 +1,7 @@
 require_relative "test_helper"
 require "open3"
 
-class GLICLITest < MiniTest::Test
+class GLICLITest < Minitest::Test
   include TestHelper
 
   class AppHelp < GLICLITest

data/test/integration/gli_powered_app_test.rb

@@ -1,7 +1,7 @@
 require_relative "test_helper"
 require "open3"
 
-class GLIPoweredAppTest < MiniTest::Test
+class GLIPoweredAppTest < Minitest::Test
   include TestHelper
 
   def teardown

data/test/integration/scaffold_test.rb

@@ -1,7 +1,7 @@
 require_relative "test_helper"
 require "open3"
 
-class ScaffoldCommandTest < MiniTest::Test
+class ScaffoldCommandTest < Minitest::Test
   include TestHelper
 
   def test_scaffolded_app_has_reasonable_setup

data/test/unit/command_finder_test.rb

@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class CommandFinderTest < MiniTest::Test
+class CommandFinderTest < Minitest::Test
   include TestHelper
 
   def setup

data/test/unit/command_test.rb

@@ -1,7 +1,7 @@
 require_relative "test_helper"
 require_relative "support/fake_std_out"
 
-class CommandTest < MiniTest::Test
+class CommandTest < Minitest::Test
   include TestHelper
   def setup
     @fake_stdout = FakeStdOut.new

data/test/unit/compound_command_test.rb

@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class CompoundCommandFinderTest < MiniTest::Test
+class CompoundCommandFinderTest < Minitest::Test
   include TestHelper
 
   def test_exception_for_missing_commands

data/test/unit/doc_test.rb

@@ -18,7 +18,7 @@ class Object
   end
 end
 
-class DocTest < MiniTest::Test
+class DocTest < Minitest::Test
   include TestHelper
 
   class TestApp

data/test/unit/flag_test.rb

@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class FlagTest < MiniTest::Test
+class FlagTest < Minitest::Test
   include TestHelper
 
   def test_basics_simple

data/test/unit/gli_test.rb

@@ -1,7 +1,7 @@
 require_relative "test_helper"
 require_relative "support/fake_std_out"
 
-class GLITest < MiniTest::Test
+class GLITest < Minitest::Test
   include TestHelper
 
   def setup
@@ -81,6 +81,25 @@ class GLITest < MiniTest::Test
 
   end
 
+  def test_command_options_accepting_multiple_values_can_be_required
+    @app.reset
+    @called = false
+    @app.command :foo do |c|
+      c.flag :flag, :required => true, :multiple => true
+      c.action do |global, options, arguments|
+        @called = true
+      end
+    end
+    assert_equal 64, @app.run(['foo']), "Expected exit status to be 64"
+    assert  @fake_stderr.contained?(/flag is required/), @fake_stderr.strings.inspect
+    assert  @fake_stderr.contained?(/flag is required/), @fake_stderr.strings.inspect
+    assert !@called
+
+    assert_equal 0, @app.run(['foo','--flag=bar']), "Expected exit status to be 0 #{@fake_stderr.strings.join(',')}"
+    assert @called
+
+  end
+
   def test_global_options_can_be_required
     @app.reset
     @called = false
@@ -102,6 +121,25 @@ class GLITest < MiniTest::Test
 
   end
 
+  def test_global_options_accepting_multiple_can_be_required
+    @app.reset
+    @called = false
+    @app.flag :flag, :required => true, :multiple => true
+    @app.command :foo do |c|
+      c.action do |global, options, arguments|
+        @called = true
+      end
+    end
+    assert_equal 64, @app.run(['foo']), "Expected exit status to be 64"
+    assert  @fake_stderr.contained?(/flag is required/), @fake_stderr.strings.inspect
+    assert  @fake_stderr.contained?(/flag is required/), @fake_stderr.strings.inspect
+    assert !@called
+
+    assert_equal 0, @app.run(['--flag=bar','foo']), "Expected exit status to be 0 #{@fake_stderr.strings.join(',')}"
+    assert @called
+
+  end
+
   def test_global_required_options_are_ignored_on_help
     @app.reset
     @called = false
@@ -161,6 +199,7 @@ class GLITest < MiniTest::Test
     raise failure if !failure.nil?
   end
 
+
   def test_command_line_overrides_config
     failure = nil
     @app.reset

data/test/unit/help_test.rb

@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class HelpTest < MiniTest::Test
+class HelpTest < Minitest::Test
   include TestHelper
 
   def setup

data/test/unit/options_test.rb

@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class OptiosnTest < MiniTest::Test
+class OptiosnTest < Minitest::Test
   include TestHelper
 
   def test_by_method

data/test/unit/subcommand_parsing_test.rb

@@ -1,7 +1,7 @@
 require_relative "test_helper"
 require_relative "support/fake_std_out"
 
-class SubcommandParsingTest < MiniTest::Test
+class SubcommandParsingTest < Minitest::Test
   include TestHelper
 
   def setup

data/test/unit/subcommands_test.rb

@@ -1,7 +1,7 @@
 require_relative "test_helper"
 require_relative "support/fake_std_out"
 
-class SubcommandsTest < MiniTest::Test
+class SubcommandsTest < Minitest::Test
   include TestHelper
 
   def setup

data/test/unit/switch_test.rb

@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class SwitchTest < MiniTest::Test
+class SwitchTest < Minitest::Test
   include TestHelper
 
   def test_basics_simple

data/test/unit/terminal_test.rb

@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class TerminalTest < MiniTest::Test
+class TerminalTest < Minitest::Test
   include TestHelper
 
   # TODO: Make this test not mess with the internals of the class

data/test/unit/verbatim_wrapper_test.rb

@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class TerminalTest < MiniTest::Test
+class TerminalTest < Minitest::Test
   include TestHelper
 
   def test_handles_nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gli
 version: !ruby/object:Gem::Version
-  version: 2.21.1
+  version: 2.21.5
 platform: ruby
 authors:
 - David Copeland
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-23 00:00:00.000000000 Z
+date: 2024-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -76,16 +76,16 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
 description: Build command-suite CLI apps that are awesome.  Bootstrap your app, add
   commands, options and documentation while maintaining a well-tested idiomatic command-line
   app
@@ -97,10 +97,9 @@ extra_rdoc_files:
 - README.rdoc
 - gli.rdoc
 files:
-- ".circleci/config.yml"
 - ".gitignore"
-- ".tool-versions"
 - CONTRIBUTING.md
+- Dockerfile.dx
 - Gemfile
 - LICENSE.txt
 - README.rdoc
@@ -109,6 +108,15 @@ files:
 - bin/gli
 - bin/rake
 - bin/setup
+- dx/build
+- dx/docker-compose.env
+- dx/dx.sh.lib
+- dx/exec
+- dx/prune
+- dx/setupkit.sh.lib
+- dx/show-help-in-app-container-then-wait.sh
+- dx/start
+- dx/stop
 - exe/gli
 - gli.cheat
 - gli.gemspec
@@ -204,8 +212,14 @@ files:
 homepage: http://davetron5000.github.io/gli
 licenses:
 - Apache-2.0
-metadata: {}
-post_install_message: 
+metadata:
+  bug_tracker_uri: https://github.com/davetron5000/gli/issues
+  changelog_uri: https://github.com/davetron5000/gli/releases
+  documentation_uri: https://davetron5000.github.io/gli/rdoc/index.html
+  homepage_uri: https://davetron5000.github.com/gli/
+  source_code_uri: https://github.com/davetron5000/gli/
+  wiki_url: https://github.com/davetron5000/gli/wiki
+post_install_message:
 rdoc_options:
 - "--title"
 - Git Like Interface
@@ -224,8 +238,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.17
-signing_key: 
+rubygems_version: 3.5.15
+signing_key:
 specification_version: 4
 summary: Build command-suite CLI apps that are awesome.
 test_files: []

data/.circleci/config.yml

@@ -1,30 +0,0 @@
-version: 2.1
-orbs:
-  # See https://circleci.com/developer/orbs/orb/circleci/ruby
-  ruby: circleci/ruby@2.0.1
-jobs:                # keyword
-  test:              # my name for the job
-    parameters:      # keyword
-      ruby-version:  # my parameter name
-        type: string # type is a keyword
-    docker:          # keyword
-      - image: cimg/base:stable
-    steps:                                       # keyword
-      - checkout                                 # magic name
-      - ruby/install:                            # ruby/ is from the orb name, install is a command in that orb
-          version: << parameters.ruby-version >> # magic nonsense for param subst (version param to the command)
-      - run:
-          command: "bin/setup"
-      - run:
-          command: "bin/ci none"
-workflows:              # keyword
-  all-rubies:           # my name for the workflow
-    jobs:               # keyword
-      - test:           # my name for the job
-          matrix:       # keyword
-            parameters: # keyword
-              # All rubies being maintained per this page:
-              # https://www.ruby-lang.org/en/downloads/branches/
-              # These also need to have complete version numbers
-              # or rvm won't install
-              ruby-version: [ "3.0.4", "3.1.3", "3.2.2" ]

data/.tool-versions

@@ -1 +0,0 @@
-ruby 2.7.1