merginator 0.2.2 → 0.2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cec09691fc1e5abd0eb16409a89002e835b565c1f030235d58e01143a090419a
-  data.tar.gz: 84dc992b1e3567c82ef5d53d280d8708105a81186d71b4adc592d1284d75fec4
+  metadata.gz: 321415b27631c9ff9994aab44bb722b36f958968987955da56239570f891f574
+  data.tar.gz: e2d178068865787f7bb9f9591a96849dcb50b1e94a9ce6536e2aef613008b819
 SHA512:
-  metadata.gz: 4238899209c3d5fbf18a3f4d72ff0167ac0d4218f338f9ae09ef78cc798e9798456729d41ebcadd3fa01df75b0758fcf5096af3e3b4ba3eb1db024f2a0b06eb0
-  data.tar.gz: e1b1b285d7dee050ab08a2100794f82a0a993ac40f26dc12af30c98f04ab5cd2c1d4e1e6edf56ff595844490d44fda3d648edb7db2bab19dad761247729086b6
+  metadata.gz: 69217b847c087900d958850dca6a47c75b39eb77cd2d88c0469a0e5529b6d6b38008465a33a09e21413f760146345c40d8a99f2a297472b714ef683c6c7cc858
+  data.tar.gz: 6cc3e942612bce94f9e58893b68a975c3ff180e50916293ee5ab4dafd9bc79719686c490fc520eaa5ac3273dcc5cd16d008b4a0ef55427fdd4e5d6d55cd75767

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## [0.2.3.1] - 2024-03-12
+
+- Dependency updates
+- GitHub actions updates
+- Testing on more Ruby versions
+- Development (RBS, Steep) configuration
+
+## [0.2.3] - 2023-06-30
+
+- Fixing issue where array of arrays would be flattened completely unexpectedly
+
 ## [0.2.2] - 2023-06-30
 
 - Updating ignore total behavior to actually ignore total when validating

data/Gemfile

@@ -7,9 +7,19 @@ gemspec
 
 gem 'rake'
 
-gem 'minitest'
-gem 'rubocop', require: false
-gem 'rubocop-minitest', require: false
-gem 'rubocop-rake', require: false
-gem 'simplecov', require: false
-gem 'steep', require: false
+group :development do
+  gem 'bundler-audit', require: false
+  gem 'rubocop', require: false
+  gem 'rubocop-minitest', require: false
+  gem 'rubocop-rake', require: false
+end
+
+group :test do
+  gem 'minitest', require: false
+  gem 'simplecov', require: false
+end
+
+group :development, :test do
+  gem 'rbs', '~> 3.1', '>= 3.1.3', require: false
+  gem 'steep', '~> 1.5', '>= 1.5.3', require: false
+end

data/Gemfile.lock

@@ -1,45 +1,59 @@
 PATH
   remote: .
   specs:
-    merginator (0.2.2)
+    merginator (0.2.3.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.5.1)
+    activesupport (7.1.3.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
     ast (2.4.2)
-    concurrent-ruby (1.2.2)
-    csv (3.2.7)
-    docile (1.3.5)
-    ffi (1.15.5)
-    fileutils (1.7.1)
-    i18n (1.14.1)
+    base64 (0.1.1)
+    bigdecimal (3.1.6)
+    bundler-audit (0.9.1)
+      bundler (>= 1.2.0, < 3)
+      thor (~> 1.0)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
+    csv (3.2.8)
+    docile (1.4.0)
+    drb (2.2.1)
+    ffi (1.16.3)
+    fileutils (1.7.2)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
-    json (2.6.3)
+    json (2.7.1)
     language_server-protocol (3.17.0.3)
-    listen (3.8.0)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.5.3)
-    minitest (5.18.1)
+    logger (1.6.0)
+    minitest (5.22.2)
+    mutex_m (0.2.0)
     parallel (1.23.0)
-    parser (3.2.2.3)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
-    racc (1.7.1)
+    racc (1.7.3)
     rainbow (3.1.1)
     rake (13.0.6)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbs (3.1.0)
+    rbs (3.1.3)
     regexp_parser (2.8.1)
-    rexml (3.2.5)
-    rubocop (1.53.1)
+    rexml (3.2.6)
+    rubocop (1.56.3)
+      base64 (~> 0.1.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -47,7 +61,7 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.0, < 2.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.29.0)
@@ -57,16 +71,16 @@ GEM
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
     ruby-progressbar (1.13.0)
-    securerandom (0.2.2)
-    simplecov (0.21.2)
+    securerandom (0.3.1)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.2)
-    steep (1.4.0)
+    simplecov_json_formatter (0.1.4)
+    steep (1.5.3)
       activesupport (>= 5.1)
-      concurrent-ruby (>= 1.2.2)
+      concurrent-ruby (>= 1.1.10)
       csv (>= 3.0.9)
       fileutils (>= 1.1.0)
       json (>= 2.1.0)
@@ -75,29 +89,32 @@ GEM
       logger (>= 1.3.0)
       parser (>= 3.1)
       rainbow (>= 2.2.2, < 4.0)
-      rbs (>= 2.8.0)
+      rbs (>= 3.1.0)
       securerandom (>= 0.1)
       strscan (>= 1.0.0)
       terminal-table (>= 2, < 4)
-    strscan (3.0.6)
+    strscan (3.1.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
+    thor (1.3.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  bundler-audit
   merginator!
   minitest
   rake
+  rbs (~> 3.1, >= 3.1.3)
   rubocop
   rubocop-minitest
   rubocop-rake
   simplecov
-  steep
+  steep (~> 1.5, >= 1.5.3)
 
 BUNDLED WITH
-   2.1.4
+   2.4.22

data/lib/merginator/pattern_merge.rb

@@ -67,7 +67,7 @@ module Merginator
 
     def merge_collections_into_wrapper(slices_for_collections, wrapper:, total:)
       slices_for_collections.map(&:size).max.to_i.times.each_with_object(wrapper) do |index, wrapper_obj|
-        wrapper_obj.concat slices_for_collections.map { |slices| slices[index] || [] }.flatten
+        wrapper_obj.concat(slices_for_collections.map { |slices| slices[index] || [] }.flatten(1))
         break(wrapper_obj) if wrapper_obj.size >= total
       end
 

data/lib/merginator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Merginator
-  VERSION = '0.2.2'
+  VERSION = '0.2.3.1'
 end

data/rbs_collection.lock.yaml

@@ -1,18 +1,16 @@
 ---
-sources:
-- type: git
-  name: ruby/gem_rbs_collection
-  revision: 87fba082504c606c03edf724cdf2e119bcd46c8c
-  remote: https://github.com/ruby/gem_rbs_collection.git
-  repo_dir: gems
 path: ".gem_rbs_collection"
 gems:
-- name: minitest
+- name: fileutils
   version: '0'
   source:
     type: stdlib
-- name: mutex_m
-  version: '0'
+- name: rake
+  version: '13.0'
   source:
-    type: stdlib
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 372c833bb52be1bc34aef5e2793ab47c35c0dba9
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
 gemfile_lock_path: Gemfile.lock

data/rbs_collection.yaml

@@ -18,3 +18,5 @@ gems:
   # It's unnecessary if you don't use rbs as a library.
   - name: rbs
     ignore: true
+  - name: steep
+    ignore: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: merginator
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3.1
 platform: ruby
 authors:
 - Ryan Verhey
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-30 00:00:00.000000000 Z
+date: 2024-03-12 00:00:00.000000000 Z
 dependencies: []
 description: Merge 2 or more collections based on a repeating pattern.
 email:
@@ -30,7 +30,6 @@ files:
 - lib/merginator.rb
 - lib/merginator/pattern_merge.rb
 - lib/merginator/version.rb
-- merginator.gemspec
 - rbs_collection.lock.yaml
 - rbs_collection.yaml
 - sig/merginator.rbs

data/merginator.gemspec

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'lib/merginator/version'
-
-Gem::Specification.new do |spec|
-  spec.name = 'merginator'
-  spec.version = Merginator::VERSION
-  spec.authors = ['Ryan Verhey']
-  spec.email = ['ryan@ryanverhey.com']
-
-  spec.summary = 'Merging collections based on a pattern.'
-  spec.description = 'Merge 2 or more collections based on a repeating pattern.'
-  spec.homepage = 'https://github.com/RyanVerhey/merginator'
-  spec.license = 'MIT'
-  spec.required_ruby_version = '>= 2.7.8'
-
-  spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = 'https://github.com/RyanVerhey/merginator'
-  spec.metadata['changelog_uri'] = 'https://github.com/RyanVerhey/merginator/blob/main/CHANGELOG.md'
-
-  # 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.
-  spec.files = Dir.chdir(__dir__) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|circleci)|appveyor)})
-    end
-  end
-  spec.bindir = 'exe'
-  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
-
-  # Uncomment to register a new dependency of your gem
-  # spec.add_dependency "example-gem", "~> 1.0"
-
-  # For more information and examples about making a new gem, check out our
-  # guide at: https://bundler.io/guides/creating_gem.html
-  spec.metadata['rubygems_mfa_required'] = 'true'
-end