nerd_dice 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f64389429514a7d0c2a8410b2e27575e5c11b316b50cee41b37c58d8f8af953
-  data.tar.gz: 4d2365e3ce8139d4675695dfe47edf9ef5d52b9cc873beb5c7c314b8955aaa33
+  metadata.gz: 2652443ce77d0c00ceb8ec2cb15151d7b03a15bba2ad592c44bb3f080f2e613c
+  data.tar.gz: 1c91a3545d42ce5d5627ddb87169a05316cff352e4931e4b6970f92e2c17e98a
 SHA512:
-  metadata.gz: d8bf0ea2c85e3aedf952d82d0f511463accedcad5122b14a7d6769a94100902887ca0e52cf85a6d8b69a75a6cd750858852ad71e34980e61624d39666bedff5b
-  data.tar.gz: ee2e8117b3071872a3d07353dabd4685c4a20e188591e80cbcb93609ba9f134ab22082ae01bee152c34c9cdd1a81a6a40aec2b1521d3e2a106d10f0c8fa313ae
+  metadata.gz: 39909d95757e9ebf2fa6848e87350a09aeb3b00ee8791aecc50ae083b5e541b2f6426a7a5e280c530a594f6b39179a6f32e70ba053817115992608ee205f662d
+  data.tar.gz: b6fd6502fb2a5beb79d6367f71b7039800138edc4d366e8b6e05030acf56875a37f2124ebc18eab08e9575cb232eb07b15f5d6528ad49c55dd7b997525343f36

data/.github/workflows/main.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.7', '3.0']
+        ruby-version: ['3.0', '3.1', '3.2']
 
     steps:
     - uses: actions/checkout@v2
@@ -39,7 +39,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.0'
+        ruby-version: '3.2'
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
     - name: Run rubocop
       run: bundle exec rubocop --parallel
@@ -51,7 +51,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.0'
+        ruby-version: '3.2'
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
     - name: Run benchmark script
       run: bin/nerd_dice_benchmark

data/.rubocop.yml

@@ -1,3 +1,11 @@
+# RuboCop configuration file for NerdDice gem
+#
+# This is the RuboCop configuration for the gem. By default new cops are enabled
+# by default when the RuboCop gems are updated in the bundle. Before the would
+# show up as warnings until they were added to the configuration file. Now they
+# will be enabled by default, and a case-by-case descision can be made whether
+# to exclude new violations in the configuration explicitly or update the
+# codebase to the gem to conform to the new standard.
 require:
     - rubocop-performance
     - rubocop-rake
@@ -8,14 +16,12 @@ AllCops:
   # RuboCop has a bunch of cops enabled by default. This setting tells RuboCop
   # to ignore them, so only the ones explicitly set in this file are enabled.
   #DisabledByDefault: true
+
+  # New cops are now enabled by default as of 2023-02-20
+  NewCops: enable
   Exclude:
     - '**/templates/**/*'
     - '**/vendor/**/*'
-    - 'node_modules/**/*'
-
-Performance:
-  Exclude:
-    - '**/test/**/*'
 
 # Prefer &&/|| over and/or.
 Style/AndOr:
@@ -111,15 +117,6 @@ Style/MethodDefParentheses:
 Style/FrozenStringLiteralComment:
   Enabled: true
   EnforcedStyle: always
-  Exclude:
-    - 'actionview/test/**/*.builder'
-    - 'actionview/test/**/*.ruby'
-    - 'actionpack/test/**/*.builder'
-    - 'actionpack/test/**/*.ruby'
-    - 'activestorage/db/migrate/**/*.rb'
-    - 'activestorage/db/update_migrate/**/*.rb'
-    - 'actionmailbox/db/migrate/**/*.rb'
-    - 'actiontext/db/migrate/**/*.rb'
 
 Style/RedundantFreeze:
   Enabled: true
@@ -191,30 +188,6 @@ Lint/UselessAssignment:
 Lint/DeprecatedClassMethods:
   Enabled: true
 
-Lint/DuplicateBranch: # (new in 1.3)
-  Enabled: true
-
-Lint/DuplicateRegexpCharacterClassElement: # (new in 1.1)
-  Enabled: true
-
-Lint/EmptyBlock: # (new in 1.1)
-  Enabled: true
-
-Lint/EmptyClass: # (new in 1.3)
-  Enabled: true
-
-Lint/NoReturnInBeginEndBlocks: # (new in 1.2)
-  Enabled: true
-
-Lint/ToEnumArguments: # (new in 1.1)
-  Enabled: true
-
-Lint/UnexpectedBlockArity: # (new in 1.5)
-  Enabled: true
-
-Lint/UnmodifiedReduceAccumulator: # (new in 1.1)
-  Enabled: true
-
 Style/ParenthesesAroundCondition:
   Enabled: true
 
@@ -236,27 +209,6 @@ Style/ColonMethodCall:
 Style/TrivialAccessors:
   Enabled: true
 
-Style/ArgumentsForwarding: # (new in 1.1)
-  Enabled: true
-
-Style/CollectionCompact: # (new in 1.2)
-  Enabled: true
-
-Style/DocumentDynamicEvalDefinition: # (new in 1.1)
-  Enabled: true
-
-Style/NegatedIfElseCondition: # (new in 1.2)
-  Enabled: true
-
-Style/NilLambda: # (new in 1.3)
-  Enabled: true
-
-Style/RedundantArgument: # (new in 1.4)
-  Enabled: true
-
-Style/SwapValues: # (new in 1.1)
-  Enabled: true
-
 Performance/FlatMap:
   Enabled: true
 
@@ -275,147 +227,9 @@ Performance/RegexpMatch:
 Performance/UnfreezeString:
   Enabled: true
 
-Performance/AncestorsInclude: # (new in 1.7)
-  Enabled: true
-
-Performance/BigDecimalWithNumericArgument: # (new in 1.7)
-  Enabled: true
-
-Performance/BlockGivenWithExplicitBlock: # (new in 1.9)
-  Enabled: true
-
-Performance/CollectionLiteralInLoop: # (new in 1.8)
-  Enabled: true
-
-Performance/ConstantRegexp: # (new in 1.9)
-  Enabled: true
-
-Performance/MethodObjectAsBlock: # (new in 1.9)
-  Enabled: true
-
-Performance/RedundantSortBlock: # (new in 1.7)
-  Enabled: true
-
-Performance/RedundantStringChars: # (new in 1.7)
-  Enabled: true
-
-Performance/ReverseFirst: # (new in 1.7)
-  Enabled: true
-
-Performance/SortReverse: # (new in 1.7)
-  Enabled: true
-
-Performance/Squeeze: # (new in 1.7)
-  Enabled: true
-
-Performance/StringInclude: # (new in 1.7)
-  Enabled: true
-
-Performance/Sum: # (new in 1.8)
-  Enabled: true
-
-Layout/SpaceBeforeBrackets: # (new in 1.7)
-  Enabled: true
-
-Lint/AmbiguousAssignment: # (new in 1.7)
-  Enabled: true
-
-Lint/DeprecatedConstants: # (new in 1.8)
-  Enabled: true
-
-Lint/LambdaWithoutLiteralBlock: # (new in 1.8)
-  Enabled: true
-
-Lint/RedundantDirGlobSort: # (new in 1.8)
-  Enabled: true
-
-Style/EndlessMethod: # (new in 1.8)
-  Enabled: true
-
-Style/HashExcept: # (new in 1.7)
-  Enabled: true
-
-# Added 2021-08-14
-Gemspec/DateAssignment: # (new in 1.10)
-  Enabled: true
-
-Layout/LineEndStringConcatenationIndentation: # (new in 1.18)
-  Enabled: true
-
-Lint/EmptyInPattern: # (new in 1.16)
-  Enabled: true
-
-Lint/NumberedParameterAssignment: # (new in 1.9)
-  Enabled: true
-
-Lint/OrAssignmentToConstant: # (new in 1.9)
-  Enabled: true
-
-Lint/SymbolConversion: # (new in 1.9)
-  Enabled: true
-
-Lint/TripleQuotes: # (new in 1.9)
-  Enabled: true
-
-Naming/InclusiveLanguage: # (new in 1.18)
-  Enabled: false
-
-Style/HashConversion: # (new in 1.10)
-  Enabled: true
-
-Style/IfWithBooleanLiteralBranches: # (new in 1.9)
-  Enabled: true
-
-Style/InPatternThen: # (new in 1.16)
-  Enabled: true
-
-Style/MultilineInPatternThen: # (new in 1.16)
-  Enabled: true
-
-Style/QuotedSymbols: # (new in 1.16)
-  Enabled: true
-
-Style/StringChars: # (new in 1.12)
-  Enabled: true
-
-Performance/MapCompact: # (new in 1.11)
-  Enabled: true
-
-Performance/RedundantEqualityComparisonBlock: # (new in 1.10)
-  Enabled: true
-
-Performance/RedundantSplitRegexpArgument: # (new in 1.10)
-  Enabled: true
-
-RSpec/IdenticalEqualityAssertion: # (new in 2.4)
-  Enabled: true
-
-RSpec/Rails/AvoidSetupHook: # (new in 2.4)
-  Enabled: true
-
 RSpec/MessageSpies:
   EnforcedStyle: receive
 
-Lint/AmbiguousRange: # new in 1.19
-  Enabled: true
-Style/RedundantSelfAssignmentBranch: # new in 1.19
-  Enabled: true
-
-Lint/AmbiguousOperatorPrecedence: # new in 1.21
-  Enabled: true
-Lint/IncompatibleIoSelectWithFiberScheduler: # new in 1.21
-  Enabled: true
-Lint/RequireRelativeSelfPath: # new in 1.22
-  Enabled: true
-Security/IoMethods: # new in 1.22
-  Enabled: true
-Style/NumberedParameters: # new in 1.22
-  Enabled: true
-Style/NumberedParametersLimit: # new in 1.22
-  Enabled: true
-Style/SelectByRegexp: # new in 1.22
-  Enabled: true
-RSpec/ExcessiveDocstringSpacing: # new in 2.5
-  Enabled: true
-RSpec/SubjectDeclaration: # new in 2.5
-  Enabled: true
+# Disable inclusive language cop. None of RuboCop's business
+Naming/InclusiveLanguage:
+  Enabled: false

data/CHANGELOG.md

@@ -1,82 +1,8 @@
 # Nerd Dice Changelog
 
-## master \(unreleased\)
-### Added
-### Changed
-### Fixed
+<img src="https://i.kym-cdn.com/photos/images/newsfeed/000/186/610/thankyou.png?1318726198" alt="Our CHANGELOG is in another castle" />
 
-## 0.4.0 \(2021-10-23\)
-### Added
-* Add `NerdDice::ConvenienceMethods` method_missing mixin module that allows for dynamic invocation of patterns in the method name that get converted into calls to `NerdDice.roll_dice` or `NerdDice.total_dice` along with allowing the advantage/disadvantage mechanic or bonuses to be parsed from the method name. Full documentation of the module can be found in the [Convenience Methods Mixin](README.md#convenience-methods-mixin) section of the README.
-* Add exensive specs to support the ConvenienceMethods module
-### Changed
-* Replace `Benchmark.bmbm` with `Benchmark.bm` in the nerd_dice_benchmark
-* Add convenience_methods to nerd_dice_benchmark
-* Extend `NerdDice::ConvenienceMethods` into top-level module as class methods
-### Fixed
-* Fix typos and horizontal scrolling in README
-* Fix CodeClimate Code Smell on harvest_totals
+## Legacy Branch: See master
+This is a legacy maintenance branch.
 
-## 0.3.0 \(2021-09-11\)
-### Added
-* Add new options to `NerdDice::Configuration`
-  - `ability_score_number_of_sides`
-  - `ability_score_dice_rolled`
-  - `ability_score_dice_kept`
-* Add `NerdDice.harvest_totals` method that takes in a collection and returns the results of calling `total` on each element
-* Add `NerdDice.roll_ability_scores` convenience method that returns an array of `DiceSet` objects based on options and/or configuration
-* Add `NerdDice.total_ability_scores` convenience method that returns an array of integers based on options and/or configuration
-* Add `NerdDice::Die` class that represents a single die object and mixes in the `Comparable` module
-* Add `NerdDice::DiceSet` class that represents a collection of `Die` objects and mixes in the `Enumerable` module
-* Add `NerdDice::SetsRandomizationTechnique` mixin module and include in the `DiceSet` and `Die` classes
-* Add `die_background_color` and `die_foreground_color` to `Configuration` class with defaults defined as constants
-* Add `NerdDice.roll_dice` method that behaves in a similar fashion to `total_dice` but returns a `DiceSet` object instead of an `Integer` and has additional optional arguments relating to the non-numeric attributes of the dice
-* Add `coveralls_reborn` to RSpec and GitHub actions
-* Add build badge to README
-* Add Code Climate maintainability integration and badge to README
-* Add `nerd_dice_benchmark` script to bin directory
-* Add GitHub Action CI build
-  - Run RSpec test suite, fail if specs fail, report coverage via Coveralls
-  - Run RuboCop and fail if violations
-  - Run benchmark suite and fail if outside of allowed ratios
-### Changed
-* Update RuboCop version and configuration
-* Break up the NerdDice source code file into several smaller files that are included by the module
-* Enforce that `NerdDice.configuration.ability_score_array_size` must be a positive duck-type integer
-### Fixed
-
-## 0.2.0 \(2021-01-28\)
-### Added
-* Add ability to configure with `NerdDice.configure` block or `NerdDice.configuration`
-  - Configure `randomization_technique` as `:random_rand`, `:securerandom`, `:random_object`, or `randomized`
-  - Configure `refresh_seed_interval` to allow a periodic refresh of the seed
-* Add `randomization_technique` option to `NerdDice.total_dice` method keyword arguments
-* Add a lower-level `execute_die_roll` method that allows you to roll a single die with a generator specified
-* Add ability to manually refresh or specify seed with `:refresh_seed!` method
-### Changed
-* Change `opts = {}` final argument to use keyword args `**opts` in the `NerdDice.total_dice` method. Now the method can be called as follows:
-```ruby
-# old
-NerdDice.total_dice(20, 1, {bonus: 5})
-NerdDice.total_dice(6, 3, {bonus: 1})
-
-# new
-NerdDice.total_dice(20, bonus: 5)
-NerdDice.total_dice(6, 3, bonus: 1)
-```
-* Call `:to_i` on bonus instead of using `:is_a?` and raise ArgumentError in the `NerdDice.total_dice` method if it doesn't respond to `:to_i`
-* Added `securerandom` as an explicit dependency due to Ruby 3.x change to bundled gem
-* `total_dice` no longer calls unqualified `.rand` which improves performance on all generators except for `:securerandom`
-### Fixed
-
-## 0.1.1 \(2020-12-12\)
-### Added
-### Changed
-### Fixed
-* Fix broken link to CHANGELOG in gemspec
-* Fix rubocop offenses from 0.1.0 and refactor specs
-
-## 0.1.0 \(2020-12-07\)
-
-### Added
-* Add NerdDice.total_dice class method with the ability to roll multiple polyhedral dice and add a bonus
+The [authoritative version of the CHANGELOG](https://github.com/statelesscode/nerd_dice/blob/master/CHANGELOG.md) is found on the master branch. All other release and maintenance branches are updated to point to master after being created.

data/Gemfile

@@ -6,4 +6,4 @@ source "https://rubygems.org"
 gemspec
 
 gem "rake", "~> 13.0"
-gem "rspec", "~> 3.10"
+gem "rspec", "~> 3.12"

data/Gemfile.lock

@@ -1,87 +1,92 @@
 PATH
   remote: .
   specs:
-    nerd_dice (0.4.0)
-      securerandom (~> 0.1, >= 0.1.1)
+    nerd_dice (0.4.1)
+      securerandom (~> 0.2, >= 0.2.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    coveralls_reborn (0.23.0)
-      simplecov (>= 0.18.1, < 0.22.0)
-      term-ansicolor (~> 1.6)
-      thor (>= 0.20.3, < 2.0)
-      tins (~> 1.16)
-    diff-lcs (1.4.4)
+    coveralls_reborn (0.27.0)
+      simplecov (~> 0.22.0)
+      term-ansicolor (~> 1.7)
+      thor (~> 1.2)
+      tins (~> 1.32)
+    diff-lcs (1.5.0)
     docile (1.4.0)
-    parallel (1.21.0)
-    parser (3.0.2.0)
+    json (2.6.3)
+    parallel (1.22.1)
+    parser (3.2.1.0)
       ast (~> 2.4.1)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.1.1)
+    regexp_parser (2.7.0)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.1)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.22.2)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.46.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.12.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.26.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.12.0)
-      parser (>= 3.0.1.1)
-    rubocop-performance (1.11.5)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.26.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.17.1)
+      rubocop (~> 1.41)
+    rubocop-performance (1.16.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.5.0)
-      rubocop (~> 1.19)
+    rubocop-rspec (2.18.1)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
     ruby-progressbar (1.11.0)
-    securerandom (0.1.1)
-    simplecov (0.21.2)
+    securerandom (0.2.2)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov-lcov (0.8.0)
-    simplecov_json_formatter (0.1.3)
+    simplecov_json_formatter (0.1.4)
     sync (0.5.0)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
-    thor (1.1.0)
-    tins (1.29.1)
+    thor (1.2.1)
+    tins (1.32.1)
       sync
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  coveralls_reborn (~> 0.23.0)
+  coveralls_reborn (~> 0.27.0)
   nerd_dice!
   rake (~> 13.0)
-  rspec (~> 3.10)
-  rubocop (~> 1.22, >= 1.22.2)
-  rubocop-performance (~> 1.11, >= 1.11.5)
+  rspec (~> 3.12)
+  rubocop (~> 1.46, >= 1.46.0)
+  rubocop-performance (~> 1.16, >= 1.16.0)
   rubocop-rake (~> 0.6, >= 0.6.0)
-  rubocop-rspec (~> 2.5, >= 2.5.0)
+  rubocop-rspec (~> 2.18, >= 2.18.1)
   simplecov-lcov (~> 0.8.0)
 
 BUNDLED WITH

data/README.md

@@ -406,8 +406,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/statelesscode/nerd_dice/issues. We welcome and encourage your participation in this open-source project. We welcome those of all backgrounds and abilities, but we refuse to adopt the Contributor Covenant for reasons outlined in [BURN_THE_CONTRIBUTOR_COVENANT_WITH_FIRE.md](https://github.com/statelesscode/nerd_dice/blob/master/BURN_THE_CONTRIBUTOR_COVENANT_WITH_FIRE.md)
-
+Bug reports and pull requests are welcome on GitHub at https://github.com/statelesscode/nerd_dice/issues. We welcome and encourage your participation in this open-source project. We welcome those of all backgrounds and abilities, but we refuse to adopt the Contributor Covenant for reasons outlined in [BURN_THE_CONTRIBUTOR_COVENANT_WITH_FIRE.md](BURN_THE_CONTRIBUTOR_COVENANT_WITH_FIRE.md)
 
 ## Unlicense, License, and Copyright
 

data/bin/generate_checksums

@@ -7,7 +7,7 @@ version = ARGV[0]
 built_gem_path = "pkg/nerd_dice-#{version}.gem"
 checksum = Digest::SHA512.new.hexdigest(File.read(built_gem_path))
 checksum_path = "checksum/nerd_dice-#{version}.gem.sha512"
-File.open(checksum_path, "w") { |f| f.write(checksum) }
+File.write(checksum_path, checksum)
 sha256 = Digest::SHA256.new.hexdigest(File.read(built_gem_path))
 checksum_256_path = "checksum/nerd_dice-#{version}.gem.sha256"
-File.open(checksum_256_path, "w") { |f| f.write(sha256) }
+File.write(checksum_256_path, sha256)

data/certs/msducheminjr.pem

@@ -1,26 +1,27 @@
 -----BEGIN CERTIFICATE-----
-MIIETTCCArWgAwIBAgIBATANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDDB1zdGF0
-ZWxlc3Njb2RlL0RDPWdtYWlsL0RDPWNvbTAeFw0yMDEyMDYyMzQ1NTZaFw0yMTEy
-MDYyMzQ1NTZaMCgxJjAkBgNVBAMMHXN0YXRlbGVzc2NvZGUvREM9Z21haWwvREM9
-Y29tMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAyHIMJi0o3bwBZsx5
-TQ35XByFsdDRsro3T+0NY7EAILtOiU04o9C2NPOp/RQE7BXQgMjGebwp6bT6QvzN
-6noV4jPL7Fi5pWw08QygG7f+73YUBb+8d8o+3xGrC+UO5h1PZEtVcZwUWUG18QBE
-fbDinQT6P4IDQoZwhfrPCB+aBfUyQp4Ok7oD7MEWqsq9SjrSxqxfk4+oZdXUySe7
-Vi5vnzVQ5uFf56NHwWnNKCzJzmH84mBO5MzHaQpHNzKGJPoUmzLU5RBlCH6YXqBG
-KhXTMUDBWKJmJ3RDry/FpGgJLKu4wzFRYjXla6IjeKozWGuPNNJ+2mesXKhsX7bo
-vVCzRxPEupbEg/0FkJiWpiGlSPOdd6oJiwX8E6rlEeV605xrbOQewkbovHkYTMtG
-+NH+u08x0z4Oj71kmDLwuj812uS0mtrCg2VhiYO0ZCQ4XrwBsBfK+/MtMlR+o6sG
-/zvz/vHVJKaLTQxRp5oGo4QH6HfbOnwzTkXdZnt5AlN31ErJAgMBAAGjgYEwfzAJ
-BgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUC7seYydsGO6O1qT4nVVD
-G/LkiHYwIgYDVR0RBBswGYEXc3RhdGVsZXNzY29kZUBnbWFpbC5jb20wIgYDVR0S
-BBswGYEXc3RhdGVsZXNzY29kZUBnbWFpbC5jb20wDQYJKoZIhvcNAQELBQADggGB
-ADPRFRB1cjqdcE2O0jtqiDRmrR62uEYBiUbkRPVhyoEp/cK0TVhAs9mGWAyCWu0M
-LewUeqNTUvQ9MgvagcKcnxa2RTjdrP3nGnwpStMr9bm3ArNJEzvWEs0Eusk9y73x
-fjy0qH2pw5WPfWcKYlDehMXqOP+a4udYsz0YSNiI8qEfkDCSqTJN11d5kSjVjwGB
-xkauxDT68j1JZRjPmQl3dl+DCgxkoziWX2mFTPLfGg5vZ0t6gmhdUtLvJtNIo0IX
-477E5UjmE1+rULQp/fsH6n5+H+t2eCED41ST+gkKbaQBUfIuUaCmdHz9sJaIIBw2
-6ordFa1nrLV4w5Uf6qYFnWVhIWX4GToyZSPO2s0DPYp3PWFJ4VtzKa2vp1TR5ZEA
-dkij2eQ9M8bzWWmW+A7RNaI0CzLl967bKGBSaMVCsZGBarggWD8UwJnBhTuOPZGR
-WQ4faXJSevxT+x9TgyUNJINPkz/KqreClzdL83cwxPzFFQto7zF6zMCsj0slqJjW
-EQ==
+MIIEhTCCAu2gAwIBAgIBATANBgkqhkiG9w0BAQsFADBEMRYwFAYDVQQDDA1zdGF0
+ZWxlc3Njb2RlMRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJk/IsZAEZ
+FgNjb20wHhcNMjMwMjIzMjMyMTQwWhcNMjQwMjIzMjMyMTQwWjBEMRYwFAYDVQQD
+DA1zdGF0ZWxlc3Njb2RlMRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJ
+k/IsZAEZFgNjb20wggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCxVzHS
+gYszan//tjTSO0z59UO1rUiT5G0//iyhiaYIiuwxhYFbfD+wOCou4M18pQtEb4qx
+o67tPfGimBAVak6fGfo8fo1ByHiKCvx3jgOjxNifT9pRFlBSr6ZvyXeu7zA0ddLr
+slw92DNqeRlZXqB0mxDtpKWONGc1XhAqEjEP3VL7g7x0xPQShcpXg/OyRPR5vyv8
+66pXdFrXYZGrySfIB6ZOWFV6wGBj603rPdXOeYVeks6hKvw3wb4G1s7tvwTA5MWI
+otw6Mp9TaMdms9zTc5A3N58pueKfBJfwkICkdAGJDWC6sIXECoaTDRqVK96RSH/1
+8tEPDoFYpJDOa5byX1j7srwO0B6WOtPxix7gW1wBbEp7eWSQf1k3k9XEh32SRsPq
+NJObRfhkzoa9p1tPkVP3nasDTK5gtisolwhb7Vimeup54yKfT/THv2iNEnGTvK1P
+sV4vC8nch88lBI1mIecmSh/mwED4Mb1dNtcyuB/+XnSI8vIzXJKAAKaT0eMCAwEA
+AaOBgTB/MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBRP42hSa0JV
+QGDSobiGTYyfM570hjAiBgNVHREEGzAZgRdzdGF0ZWxlc3Njb2RlQGdtYWlsLmNv
+bTAiBgNVHRIEGzAZgRdzdGF0ZWxlc3Njb2RlQGdtYWlsLmNvbTANBgkqhkiG9w0B
+AQsFAAOCAYEANtaR6OV7p1IJOsvVgGQzVg88NIOeXrfOaEDUPb6eg4JMOSL0Cvvl
+2F7lB/ykbQcO4Oe7NucuavC7ClyG3c/V5eQ5TtPNWkMbVN9ESVR8wk5SjhiI8L35
+MBxJ6YU27eyDmazQJ7eCYcRJkuyWt3KcqgsEh7JyNnKcJ/3rgf1QW0IyJiGsXM1I
+SssQ/t7Ia2tVMrVMsvs834v9FRpVbO3dHdCO4t7zQBIADVcj4NqCDV10D6aji/Aa
+35YJHwlkhuZH6AYC45QHt9dW0/OLmbFwoJqW7syrso2PParyMr4YcJwucXViRiL7
+l5aVpYdz/RTqdB92Mmud5Hj5zkuEE4CHBh8L8AJC5kZu/YUXXDtuECSMVhg5O84h
+QsdcuygyVASmw2aliMAFXfIBDYelduG0XwjdOREN3q4SDTKP+pfBxx6OdD1RfsYF
+/9HhtVbKLq34iQftF4oIH66bYDEyG5y4CLKQ8Nq0WDWq50OcaP9KpDiS21BC43SW
+t+NX7PDOWx4k
 -----END CERTIFICATE-----

data/checksum/nerd_dice-0.4.0.gem.sha256

@@ -0,0 +1 @@
+a74239be73e7c9926d6aec4afd8ef2e5e516f536fcf0d66d7471e9f374644df5

data/checksum/nerd_dice-0.4.0.gem.sha512

@@ -0,0 +1 @@
+c43b3cf00e6ca319f7a522d9a84c71c793b645a97130544ea1f0dcb149863b9ba9d25065dd813f496d2f6d53ad6c169b6129997ffe05c52504ae4df3af351880

data/lib/nerd_dice/convenience_methods.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+# rubocop:disable Metrics/ModuleLength
 module NerdDice
   # The NerdDice::ConvenienceMethods module overrides the default behavior of method_missing to
   # provide the ability to dynamically roll dice with methods names that match specific patterns.
@@ -244,9 +245,27 @@ module NerdDice
         specified_number = method_name.to_s.match(/(#{ADV}|#{DIS})\d+/o)
 
         # set the default to 1 if only one die or number minus 1 if multiple
-        default = number_of_dice == 1 ? 1 : number_of_dice - 1
+        default = get_default_from_number_of_dice(number_of_dice)
 
         # return pattern match if one exists or number of dice -1 if no pattern match
+        get_pattern_match_or_default(specified_number, default)
+      end
+
+      # Determines what the default number_to_keep should be based on the number of dice being rolled
+      # using the advantage/disadvantage mechanics if you don't specify a number to keep
+      #
+      # If the number of dice being rolled is 1, you have to keep the one die. Otherwise
+      # you take the number of dice - 1. So if you do roll_4d6_with_advantage, you will get
+      # the highest three dice kept by default
+      def get_default_from_number_of_dice(number_of_dice)
+        number_of_dice == 1 ? 1 : number_of_dice - 1
+      end
+
+      # Takes the specified number match from the method name and determines
+      # whether it is only digits. If this matches and only contains digits
+      # the method returns the integer value of the specified digits. Otherwise
+      # it will return the default that was passed in the second parameter
+      def get_pattern_match_or_default(specified_number, default)
         specified_number ? specified_number.to_s.match(/\d+/).to_s.to_i : default
       end
 
@@ -277,3 +296,4 @@ module NerdDice
       end
   end
 end
+# rubocop:enable Metrics/ModuleLength

data/lib/nerd_dice/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NerdDice
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/nerd_dice.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.metadata["bug_tracker_uri"] = "https://github.com/statelesscode/nerd_dice/issues"
   spec.metadata["documentation_uri"] = "https://github.com/statelesscode/nerd_dice/README.md"
   spec.metadata["github_repo"] = "https://github.com/statelesscode/nerd_dice"
+  spec.metadata["rubygems_mfa_required"] = "true"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -43,13 +44,13 @@ Gem::Specification.new do |spec|
   spec.signing_key = File.expand_path("~/.ssh/gem-private_key.pem") if $PROGRAM_NAME.end_with?("gem")
 
   # Dependencies
-  spec.add_dependency "securerandom", "~> 0.1", ">= 0.1.1"
+  spec.add_dependency "securerandom", "~> 0.2", ">= 0.2.2"
 
   # Development Dependencies
-  spec.add_development_dependency "coveralls_reborn", "~> 0.23.0"
-  spec.add_development_dependency "rubocop", "~> 1.22", ">= 1.22.2"
-  spec.add_development_dependency "rubocop-performance", "~> 1.11", ">= 1.11.5"
+  spec.add_development_dependency "coveralls_reborn", "~> 0.27.0"
+  spec.add_development_dependency "rubocop", "~> 1.46", ">= 1.46.0"
+  spec.add_development_dependency "rubocop-performance", "~> 1.16", ">= 1.16.0"
   spec.add_development_dependency "rubocop-rake", "~> 0.6", ">= 0.6.0"
-  spec.add_development_dependency "rubocop-rspec", "~> 2.5", ">= 2.5.0"
+  spec.add_development_dependency "rubocop-rspec", "~> 2.18", ">= 2.18.1"
   spec.add_development_dependency "simplecov-lcov", "~> 0.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nerd_dice
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Michael Duchemin
@@ -10,32 +10,33 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIETTCCArWgAwIBAgIBATANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDDB1zdGF0
-  ZWxlc3Njb2RlL0RDPWdtYWlsL0RDPWNvbTAeFw0yMDEyMDYyMzQ1NTZaFw0yMTEy
-  MDYyMzQ1NTZaMCgxJjAkBgNVBAMMHXN0YXRlbGVzc2NvZGUvREM9Z21haWwvREM9
-  Y29tMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAyHIMJi0o3bwBZsx5
-  TQ35XByFsdDRsro3T+0NY7EAILtOiU04o9C2NPOp/RQE7BXQgMjGebwp6bT6QvzN
-  6noV4jPL7Fi5pWw08QygG7f+73YUBb+8d8o+3xGrC+UO5h1PZEtVcZwUWUG18QBE
-  fbDinQT6P4IDQoZwhfrPCB+aBfUyQp4Ok7oD7MEWqsq9SjrSxqxfk4+oZdXUySe7
-  Vi5vnzVQ5uFf56NHwWnNKCzJzmH84mBO5MzHaQpHNzKGJPoUmzLU5RBlCH6YXqBG
-  KhXTMUDBWKJmJ3RDry/FpGgJLKu4wzFRYjXla6IjeKozWGuPNNJ+2mesXKhsX7bo
-  vVCzRxPEupbEg/0FkJiWpiGlSPOdd6oJiwX8E6rlEeV605xrbOQewkbovHkYTMtG
-  +NH+u08x0z4Oj71kmDLwuj812uS0mtrCg2VhiYO0ZCQ4XrwBsBfK+/MtMlR+o6sG
-  /zvz/vHVJKaLTQxRp5oGo4QH6HfbOnwzTkXdZnt5AlN31ErJAgMBAAGjgYEwfzAJ
-  BgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUC7seYydsGO6O1qT4nVVD
-  G/LkiHYwIgYDVR0RBBswGYEXc3RhdGVsZXNzY29kZUBnbWFpbC5jb20wIgYDVR0S
-  BBswGYEXc3RhdGVsZXNzY29kZUBnbWFpbC5jb20wDQYJKoZIhvcNAQELBQADggGB
-  ADPRFRB1cjqdcE2O0jtqiDRmrR62uEYBiUbkRPVhyoEp/cK0TVhAs9mGWAyCWu0M
-  LewUeqNTUvQ9MgvagcKcnxa2RTjdrP3nGnwpStMr9bm3ArNJEzvWEs0Eusk9y73x
-  fjy0qH2pw5WPfWcKYlDehMXqOP+a4udYsz0YSNiI8qEfkDCSqTJN11d5kSjVjwGB
-  xkauxDT68j1JZRjPmQl3dl+DCgxkoziWX2mFTPLfGg5vZ0t6gmhdUtLvJtNIo0IX
-  477E5UjmE1+rULQp/fsH6n5+H+t2eCED41ST+gkKbaQBUfIuUaCmdHz9sJaIIBw2
-  6ordFa1nrLV4w5Uf6qYFnWVhIWX4GToyZSPO2s0DPYp3PWFJ4VtzKa2vp1TR5ZEA
-  dkij2eQ9M8bzWWmW+A7RNaI0CzLl967bKGBSaMVCsZGBarggWD8UwJnBhTuOPZGR
-  WQ4faXJSevxT+x9TgyUNJINPkz/KqreClzdL83cwxPzFFQto7zF6zMCsj0slqJjW
-  EQ==
+  MIIEhTCCAu2gAwIBAgIBATANBgkqhkiG9w0BAQsFADBEMRYwFAYDVQQDDA1zdGF0
+  ZWxlc3Njb2RlMRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJk/IsZAEZ
+  FgNjb20wHhcNMjMwMjIzMjMyMTQwWhcNMjQwMjIzMjMyMTQwWjBEMRYwFAYDVQQD
+  DA1zdGF0ZWxlc3Njb2RlMRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJ
+  k/IsZAEZFgNjb20wggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCxVzHS
+  gYszan//tjTSO0z59UO1rUiT5G0//iyhiaYIiuwxhYFbfD+wOCou4M18pQtEb4qx
+  o67tPfGimBAVak6fGfo8fo1ByHiKCvx3jgOjxNifT9pRFlBSr6ZvyXeu7zA0ddLr
+  slw92DNqeRlZXqB0mxDtpKWONGc1XhAqEjEP3VL7g7x0xPQShcpXg/OyRPR5vyv8
+  66pXdFrXYZGrySfIB6ZOWFV6wGBj603rPdXOeYVeks6hKvw3wb4G1s7tvwTA5MWI
+  otw6Mp9TaMdms9zTc5A3N58pueKfBJfwkICkdAGJDWC6sIXECoaTDRqVK96RSH/1
+  8tEPDoFYpJDOa5byX1j7srwO0B6WOtPxix7gW1wBbEp7eWSQf1k3k9XEh32SRsPq
+  NJObRfhkzoa9p1tPkVP3nasDTK5gtisolwhb7Vimeup54yKfT/THv2iNEnGTvK1P
+  sV4vC8nch88lBI1mIecmSh/mwED4Mb1dNtcyuB/+XnSI8vIzXJKAAKaT0eMCAwEA
+  AaOBgTB/MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBRP42hSa0JV
+  QGDSobiGTYyfM570hjAiBgNVHREEGzAZgRdzdGF0ZWxlc3Njb2RlQGdtYWlsLmNv
+  bTAiBgNVHRIEGzAZgRdzdGF0ZWxlc3Njb2RlQGdtYWlsLmNvbTANBgkqhkiG9w0B
+  AQsFAAOCAYEANtaR6OV7p1IJOsvVgGQzVg88NIOeXrfOaEDUPb6eg4JMOSL0Cvvl
+  2F7lB/ykbQcO4Oe7NucuavC7ClyG3c/V5eQ5TtPNWkMbVN9ESVR8wk5SjhiI8L35
+  MBxJ6YU27eyDmazQJ7eCYcRJkuyWt3KcqgsEh7JyNnKcJ/3rgf1QW0IyJiGsXM1I
+  SssQ/t7Ia2tVMrVMsvs834v9FRpVbO3dHdCO4t7zQBIADVcj4NqCDV10D6aji/Aa
+  35YJHwlkhuZH6AYC45QHt9dW0/OLmbFwoJqW7syrso2PParyMr4YcJwucXViRiL7
+  l5aVpYdz/RTqdB92Mmud5Hj5zkuEE4CHBh8L8AJC5kZu/YUXXDtuECSMVhg5O84h
+  QsdcuygyVASmw2aliMAFXfIBDYelduG0XwjdOREN3q4SDTKP+pfBxx6OdD1RfsYF
+  /9HhtVbKLq34iQftF4oIH66bYDEyG5y4CLKQ8Nq0WDWq50OcaP9KpDiS21BC43SW
+  t+NX7PDOWx4k
   -----END CERTIFICATE-----
-date: 2021-10-23 00:00:00.000000000 Z
+date: 2023-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: securerandom
@@ -43,74 +44,74 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: coveralls_reborn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.27.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.27.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: '1.46'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.22.2
+        version: 1.46.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: '1.46'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.22.2
+        version: 1.46.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.16'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.5
+        version: 1.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.16'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.5
+        version: 1.16.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -137,20 +138,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.18'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.18.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.18'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.18.1
 - !ruby/object:Gem::Dependency
   name: simplecov-lcov
   requirement: !ruby/object:Gem::Requirement
@@ -206,6 +207,8 @@ files:
 - checksum/nerd_dice-0.2.0.gem.sha512
 - checksum/nerd_dice-0.3.0.gem.sha256
 - checksum/nerd_dice-0.3.0.gem.sha512
+- checksum/nerd_dice-0.4.0.gem.sha256
+- checksum/nerd_dice-0.4.0.gem.sha512
 - lib/nerd_dice.rb
 - lib/nerd_dice/class_methods.rb
 - lib/nerd_dice/class_methods/configure.rb
@@ -235,6 +238,7 @@ metadata:
   bug_tracker_uri: https://github.com/statelesscode/nerd_dice/issues
   documentation_uri: https://github.com/statelesscode/nerd_dice/README.md
   github_repo: https://github.com/statelesscode/nerd_dice
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -250,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.7
 signing_key: 
 specification_version: 4
 summary: A Ruby Gem for rolling polyhedral dice.