slop 4.9.1 → 4.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7b0c61e7c1636499757933c40267cb03c8762eeddc928ed49859de31eae21ab
-  data.tar.gz: a3dcbf06cb7af2ab4edac0664de185553781a59137fdf8602986ef92cb86d3a9
+  metadata.gz: 9e59ff0d4bd9fa111d71e057b9e3ae9aa1aebef93937fcf7f1e1d57fb789c010
+  data.tar.gz: 1628f1e9cfa67ca737b494b65d135d4b28ee7f16fb9b9bfeb746d54a2d83b1b4
 SHA512:
-  metadata.gz: a4a7a0c057d34ef83972cf56ccda260af5b349adc0c91922898cee4d2b7841d6e5bc8a31b1a83477a2b0404853de053250a34de2e27a4a8d07657bd157faa703
-  data.tar.gz: 96d2291b6b6504aceb7485f79ae3f035fdfa3b8a0aa8a7c84fb41e620b30f6ff5e8903b6c1c57e00cd855ea1fe1c54fac0629fde8a56cde5c816927637d4fa20
+  metadata.gz: 1f1aea5c8faeb6d7d6a995f3853b97f9c8c80ed57fcaf692c3113fb5b7b4886323677e4adf5e6595975748beaca585d700949f3739dc82f81913563bc7b9a318
+  data.tar.gz: c75a58a1341a177152ae5d8827d3f980d6a395854123c2ab5612837835c723123c38d84239e299a50012f5b3ce017566244efa41bcfb97bfbc53a077867e9bea

data/.github/workflows/ci.yml

@@ -0,0 +1,35 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+    paths:
+      - "lib/**"
+      - "test/**"
+      - ".github/**"
+      - "Rakefile"
+  pull_request:
+    branches: ["**"]
+    paths:
+      - "lib/**"
+      - "test/**"
+      - ".github/**"
+      - "Rakefile"
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ "2.0", "2.1", "2.2", "2.3", "2.4", "2.5", "2.6", "2.7", "3.0", "3.1", head, jruby, truffleruby ]
+    name: Ruby ${{ matrix.ruby }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler: none
+      - name: Run tests
+        run: rake test

data/CHANGELOG.md

@@ -1,6 +1,18 @@
 Changelog
 =========
 
+v4.9.3 (2022-09-30)
+-------------------
+
+Bug fixes:
+  * Fix explicitly false boolean options and allow for additional false arguments [#276](https://github.com/leejarvis/slop/pull/276) (Eugene Otto)
+
+v4.9.2 (2022-03-26)
+-------------------
+
+Bug fixes:
+  * Handle flag arguments that contain equals character [#275](https://github.com/leejarvis/slop/pull/275) (ConnorWGarvey)
+
 v4.9.1 (2021-05-28)
 -------------------
 

data/README.md

@@ -3,7 +3,7 @@ Slop
 
 Slop is a simple option parser with an easy to remember syntax and friendly API.
 
-[![Build Status](https://travis-ci.org/leejarvis/slop.svg?branch=master)](http://travis-ci.org/leejarvis/slop)
+[![Build Status](https://github.com/leejarvis/slop/actions/workflows/ci.yml/badge.svg)](https://github.com/leejarvis/slop/actions/workflows/ci.yml)
 
 Installation
 ------------
@@ -22,17 +22,19 @@ opts = Slop.parse do |o|
   o.bool '-v', '--verbose', 'enable verbose mode'
   o.bool '-q', '--quiet', 'suppress output (quiet mode)'
   o.bool '-c', '--check-ssl-certificate', 'check SSL certificate for host'
+  o.bool '-k', '--use-keychain', 'store passphrase in OS keychain'
   o.on '--version', 'print the version' do
     puts Slop::VERSION
     exit
   end
 end
 
-ARGV #=> -v --login alice --host 192.168.0.1 -m post --check-ssl-certificate
+ARGV #=> -v --login alice --host 192.168.0.1 -m post --check-ssl-certificate --use-keychain false
 
 opts[:host]                 #=> 192.168.0.1
 opts[:login]                #=> alice
 opts[:method]               #=> :post
+opts[:use_keychain]         #=> false
 opts.verbose?               #=> true
 opts.quiet?                 #=> false
 opts.check_ssl_certificate? #=> true
@@ -53,7 +55,7 @@ Built in Option types are as follows:
 
 ```ruby
 o.string  #=> Slop::StringOption, expects an argument
-o.bool    #=> Slop::BoolOption, no argument, aliased to BooleanOption
+o.bool    #=> Slop::BoolOption, argument optional, aliased to BooleanOption
 o.integer #=> Slop::IntegerOption, expects an argument, aliased to IntOption
 o.float   #=> Slop::FloatOption, expects an argument
 o.array   #=> Slop::ArrayOption, expects an argument

data/lib/slop/parser.rb

@@ -52,7 +52,7 @@ module Slop
 
         # support `foo=bar`
         orig_flag = flag.dup
-        if match = flag.match(/([^=]+)=([^=]*)/)
+        if match = flag.match(/([^=]+)=(.*)/)
           flag, arg = match.captures
         end
 

data/lib/slop/types.rb

@@ -21,6 +21,8 @@ module Slop
   class BoolOption < Option
     attr_accessor :explicit_value
 
+    FALSE_VALUES = [false, 'false', 'no', 'off', '0'].freeze
+
     def call(value)
       self.explicit_value = value
       !force_false?
@@ -35,7 +37,7 @@ module Slop
     end
 
     def force_false?
-      explicit_value == false
+      FALSE_VALUES.include?(explicit_value)
     end
 
     def default_value

data/lib/slop.rb

@@ -6,7 +6,7 @@ require 'slop/types'
 require 'slop/error'
 
 module Slop
-  VERSION = '4.9.1'
+  VERSION = '4.9.3'
 
   # Parse an array of options (defaults to ARGV). Accepts an
   # optional hash of configuration options and block.

data/test/parser_test.rb

@@ -17,16 +17,25 @@ describe Slop::Parser do
     assert_equal ["-v", "--name", "lee"], @parser.arguments
   end
 
-  it "parses flag=argument" do
-    @options.integer "-p", "--port"
-    @result.parser.parse %w(--name=bob -p=123)
-    assert_equal "bob", @result[:name]
-    assert_equal 123, @result[:port]
+  describe "for flag=argument" do
+    it "parses names and values" do
+      @options.integer "-p", "--port"
+      @result.parser.parse %w(--name=bob -p=123)
+      assert_equal "bob", @result[:name]
+      assert_equal 123, @result[:port]
+    end
 
-    @options.string "--foo"
-    @result.parser.parse %w(--foo = =)
-    assert_equal "=", @result[:foo]
-    assert_equal %w(=), @result.args
+    it "treats an = separated by a space as a value" do
+      @options.string "--foo"
+      @result.parser.parse %w(--foo = =)
+      assert_equal "=", @result[:foo]
+      assert_equal %w(=), @result.args
+    end
+
+    it "includes = in strings" do
+      @result.parser.parse(%w(--name=b=b))
+      assert_equal "b=b", @result[:name]
+    end
   end
 
   it "parses flag=''" do

data/test/types_test.rb

@@ -34,9 +34,11 @@ describe Slop::BoolOption do
     @verbose  = @options.bool "--verbose"
     @quiet    = @options.bool "--quiet"
     @inversed = @options.bool "--inversed", default: true
+    @explicit = @options.bool "--explicit"
     @bloc     = @options.bool("--bloc"){|val| (@bloc_val ||= []) << val}
     @result   = @options.parse %w(--verbose --no-inversed
-                                  --bloc --no-bloc)
+                                  --bloc --no-bloc
+                                  --explicit=false)
   end
 
   it "returns true if used" do
@@ -54,6 +56,10 @@ describe Slop::BoolOption do
   it "will invert the value passed to &block via --no- prefix" do
     assert_equal [true, false], @bloc_val
   end
+
+  it "returns false when explicitly false" do
+    assert_equal false, @result[:explicit]
+  end
 end
 
 describe Slop::IntegerOption do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slop
 version: !ruby/object:Gem::Version
-  version: 4.9.1
+  version: 4.9.3
 platform: ruby
 authors:
 - Lee Jarvis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-28 00:00:00.000000000 Z
+date: 2022-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,8 +44,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Simple Lightweight Option Parsing

data/.travis.yml

@@ -1,30 +0,0 @@
-cache: bundler
-before_install:
-  - |
-    export RVM_CURRENT=`rvm current|cut -c6-8`
-    if [ "${RVM_CURRENT}" = "2.0" ] || \
-       [ "${RVM_CURRENT}" = "2.1" ] || \
-       [ "${RVM_CURRENT}" = "2.2" ]; then
-      gem install bundler -v '< 2'
-    fi
-
-rvm:
-  - 2.0.0
-  - 2.1
-  - 2.2
-  - 2.3.4
-  - 2.4.10
-  - 2.5.9
-  - 2.6.7
-  - 2.7.3
-  - 3.0.1
-  - jruby-9.2.17.0
-  - jruby-head
-  - ruby-head
-  - truffleruby-head
-jdk:
-  - openjdk8
-notifications:
-  email:
-    on_success: change
-    on_failure: always