shaped 0.7.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcb21038c53b353208f02bd64475365067297f3a491645dec0b81cec74bbc151
-  data.tar.gz: 899d747be3d03b69796bfe0fa2fad813f2281397107b86973ff7195233c2b6f7
+  metadata.gz: 1a4a0b7d86c8417b8e9308fa91798a2a92ab697160e2fcfc457d8e29b6e905df
+  data.tar.gz: fa5ac8fdb7155d47076ddd60dbc0b81eb0c4626d2e2ee2f5b09a16f7a35cd629
 SHA512:
-  metadata.gz: f0dbbce2637e41389801a48f197f3fccf220c5665ca84d3f2938c73de7854110fc27b972c08cdcd1e64e18c96873543a111454134462feaa41af72e0abebbe25
-  data.tar.gz: d5d2b4e12cf31d8c29226a512138def5cc5543ef06bc1778cf587a84a20ccb2cd6c7a0bc1dd86d68edeb980934c4c7a0fe5e1b1bbbae6ea0dc6ea941a97d3f28
+  metadata.gz: 2150e55d70f8732d833f4fa709159c7eb62ca8d06b10e4f8f1fb8c1461ee809c8c3f9aff95e04fc99ff1650d58b72531dc9e27d206f19a4e9d929c03e04e20b6
+  data.tar.gz: 13cbe12cc05f9fabff0738416b8bdf1981f8449e2c8bdf33be86814c070a09d07302daf830cf21d7e7ecdae0e529eb7fb2aaf0db4318cd22f870801805b9782d

data/.github/dependabot.yml

@@ -0,0 +1,16 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: weekly
+    time: "03:52"
+    timezone: America/Chicago
+  open-pull-requests-limit: 20
+  ignore:
+  - dependency-name: activesupport
+    versions:
+    - 6.1.3
+  - dependency-name: activemodel
+    versions:
+    - 6.1.2.1

data/.github/workflows/ruby.yml

@@ -0,0 +1,21 @@
+name: Run Tests, Linters, Etc.
+
+on:
+  pull_request:
+    branches:
+    - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        bundler-cache: true
+    - name: Run Rubocop
+      run: bin/rubocop --format clang
+    - name: Run RSpec tests
+      run: bin/rspec --format progress
+    - name: Ensure no git diff
+      run: git diff --exit-code && git diff-index --quiet --cached HEAD

data/.release_assistant.yml

@@ -0,0 +1,3 @@
+---
+git: true
+rubygems: true

data/.ruby-version

@@ -1 +1 @@
-2.7.0
+3.0.2

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## v0.9.0 (2022-06-13)
+[no unreleased changes yet]
+
+## v0.8.2 (2021-02-01)
+### Internal
+- Update release_assistant
+
+## v0.8.1 (2021-02-01)
+### Internal
+- Use `release_assistant` gem to manage the release process
+
+## v0.8.0 (2021-01-31)
+### Added
+- Accept `Method` as a `Callable` shape definition
+
+### Internal
+- Bump Ruby version from 2.7.0 to 2.7.2
+- Move from Travis to GitHub Actions
+
 ## v0.7.3 (2021-01-07)
 ### Removed
 - Removed `::name` method for anonymous validator class in `Shaped::Shapes::Class`

data/Gemfile

@@ -15,6 +15,10 @@ group :development, :test do
   gem 'runger_style', github: 'davidrunger/runger_style', require: false
 end
 
+group :development do
+  gem 'release_assistant', require: false, github: 'davidrunger/release_assistant'
+end
+
 group :test do
   gem 'codecov', require: false
   gem 'guard-espect', require: false, github: 'davidrunger/guard-espect'

data/Gemfile.lock

@@ -7,65 +7,76 @@ GIT
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
 
+GIT
+  remote: https://github.com/davidrunger/release_assistant.git
+  revision: 862f2590257e1533f27772920bbe6205726fe534
+  specs:
+    release_assistant (0.3.3.alpha)
+      activesupport (>= 6, < 8)
+      colorize (~> 0.8)
+      memoist (~> 0.16)
+      slop (~> 4.8)
+
 GIT
   remote: https://github.com/davidrunger/runger_style.git
-  revision: f7c19c578016914b58a216a71bc4193d276b1048
+  revision: a88256aa4bd96db0ab8248ffa6a456fd1e28f664
   specs:
-    runger_style (0.2.5)
+    runger_style (0.2.22.alpha)
 
 PATH
   remote: .
   specs:
-    shaped (0.7.3)
-      activemodel (~> 6.0)
-      activesupport (~> 6.0)
+    shaped (0.9.0)
+      activemodel (>= 6, < 8)
+      activesupport (>= 6, < 8)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.1)
-      activesupport (= 6.1.1)
-    activesupport (6.1.1)
+    activemodel (7.0.3)
+      activesupport (= 7.0.3)
+    activesupport (7.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    amazing_print (1.2.2)
-    ast (2.4.1)
+    amazing_print (1.4.0)
+    ast (2.4.2)
     byebug (11.1.3)
-    codecov (0.2.15)
-      simplecov (>= 0.15, < 0.21)
+    codecov (0.6.0)
+      simplecov (>= 0.15, < 0.22)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
-    diff-lcs (1.4.4)
-    docile (1.3.4)
-    ffi (1.13.1)
-    formatador (0.2.5)
-    guard (2.16.2)
+    colorize (0.8.1)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    ffi (1.15.4)
+    formatador (0.3.0)
+    guard (2.18.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
-      pry (>= 0.9.12)
+      pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
-    i18n (1.8.7)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    listen (3.2.1)
+    listen (3.7.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    lumberjack (1.2.5)
+    lumberjack (1.2.8)
+    memoist (0.16.2)
     method_source (1.0.0)
-    minitest (5.14.3)
+    minitest (5.15.0)
     nenv (0.3.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.20.1)
-    parser (3.0.0.0)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -73,56 +84,55 @@ GEM
     pry-byebug (3.9.0)
       byebug (~> 11.0)
       pry (~> 0.13.0)
-    rainbow (3.0.0)
-    rake (13.0.3)
-    rb-fsevent (0.10.4)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    regexp_parser (2.0.3)
-    rexml (3.2.4)
-    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)
+    regexp_parser (2.5.0)
+    rexml (3.2.5)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.1)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.1)
-    rubocop (0.93.1)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.30.1)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8)
-      rexml
-      rubocop-ast (>= 0.6.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.18.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.4.0)
-      parser (>= 2.7.1.5)
-    rubocop-performance (1.9.2)
-      rubocop (>= 0.90.0, < 2.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.18.0)
+      parser (>= 3.1.1.0)
+    rubocop-performance (1.14.2)
+      rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rspec (1.44.1)
-      rubocop (~> 0.87)
-      rubocop-ast (>= 0.7.1)
+    rubocop-rspec (2.11.1)
+      rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
     shellany (0.0.1)
-    simplecov (0.20.0)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.2)
-    thor (1.0.1)
+    simplecov_json_formatter (0.1.3)
+    slop (4.9.2)
+    thor (1.1.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (1.7.0)
-    zeitwerk (2.4.2)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
   ruby
@@ -133,6 +143,7 @@ DEPENDENCIES
   guard-espect!
   pry-byebug
   rake
+  release_assistant!
   rspec
   rubocop
   rubocop-performance
@@ -141,4 +152,4 @@ DEPENDENCIES
   shaped!
 
 BUNDLED WITH
-   2.1.2
+   2.2.22

data/README.md

@@ -1,5 +1,4 @@
 [![codecov](https://codecov.io/gh/davidrunger/shaped/branch/master/graph/badge.svg)](https://codecov.io/gh/davidrunger/shaped)
-[![Build Status](https://travis-ci.com/davidrunger/shaped.svg?branch=master)](https://travis-ci.com/davidrunger/shaped)
 [![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=davidrunger/shaped)](https://dependabot.com)
 [![Gem Version](https://badge.fury.io/rb/shaped.svg)](https://badge.fury.io/rb/shaped)
 
@@ -240,6 +239,23 @@ shape.matched_by?(5) # fails the `#even?` check
 shape.matched_by?(10) # fails the `#cover?` check (10 is too high)
 # => false
 ```
+
+If you'd like to provide a named method rather than an anonymous proc/lambda, you can do that, too:
+
+```rb
+def number_is_greater_than_thirty?(number)
+  number > 30
+end
+
+shape = Shaped::Shape(method(:number_is_greater_than_thirty?))
+
+shape.matched_by?(31)
+# => true
+
+shape.matched_by?(29)
+# => false
+```
+
 You can also provide an instance of a custom class that implements a `#call` instance method:
 
 ```rb
@@ -386,14 +402,15 @@ rake install`.
 
 # For maintainers
 
-To release a new version:
-1. check out the `master` branch
-2. update `CHANGELOG.md`
-3. update the version number in `version.rb`
-4. `bundle install` (which will update `Gemfile.lock`)
-5. commit the changes with a message like `Prepare to release v0.1.1`
-6. run `bin/release` (which will create a git tag for the version, push git commits and
-   tags to GitHub, and push the gem to RubyGems)
+To release a new version, run `bin/release` with an appropriate `--type` option, e.g.:
+
+```
+bin/release --type minor
+```
+
+(This uses the [`release_assistant` gem][release_assistant].)
+
+[release_assistant]: https://github.com/davidrunger/release_assistant/
 
 # License
 

data/bin/_guard-core

@@ -9,10 +9,7 @@
 #
 
 require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path(
-  '../../Gemfile',
-  Pathname.new(__FILE__).realpath,
-)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', Pathname.new(__FILE__).realpath)
 
 bundle_binstub = File.expand_path('bundle', __dir__)
 

data/bin/guard

@@ -9,10 +9,7 @@
 #
 
 require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path(
-  '../../Gemfile',
-  Pathname.new(__FILE__).realpath,
-)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', Pathname.new(__FILE__).realpath)
 
 bundle_binstub = File.expand_path('bundle', __dir__)
 

data/bin/release

@@ -1,16 +1,28 @@
-#!/usr/bin/env bash
-set -euo pipefail
+#!/usr/bin/env ruby
+# frozen_string_literal: true
 
-BRANCH=$(git rev-parse --abbrev-ref HEAD)
-if [[ "$BRANCH" != "master" ]]; then
-  echo "Aborting release! Not on master. Current branch is '$BRANCH'.";
-  exit 1;
-fi
+#
+# This file was generated by Bundler.
+#
+# The application 'release' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
 
-COMMIT_MESSAGE=$(git log --format=%B -n 1)
-if ! [[ $COMMIT_MESSAGE =~ ^Prepare[[:space:]]to[[:space:]]release[[:space:]]v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-  echo "Aborting release! Commit message is improperly formatted. Commit message is '$COMMIT_MESSAGE'.";
-  exit 1;
-fi
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', Pathname.new(__FILE__).realpath)
 
-bundle exec rake release
+bundle_binstub = File.expand_path('bundle', __dir__)
+
+if File.file?(bundle_binstub)
+  if /This file was generated by Bundler/.match?(File.read(bundle_binstub, 300))
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('release_assistant', 'release')

data/bin/rspec

@@ -9,11 +9,7 @@
 #
 
 require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||=
-  File.expand_path(
-    '../../Gemfile',
-    Pathname.new(__FILE__).realpath,
-  )
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', Pathname.new(__FILE__).realpath)
 
 bundle_binstub = File.expand_path('bundle', __dir__)
 

data/lib/shaped/shapes/callable.rb

@@ -11,6 +11,7 @@ class Shaped::Shapes::Callable < Shaped::Shape
 
   def to_s
     case @callable
+    when Method then "Method defined at #{@callable.source_location.map(&:to_s).join(':')}"
     when Proc then "Proc test defined at #{@callable.source_location.map(&:to_s).join(':')}"
     else "#call test defined at #{@callable.method(:call).source_location.map(&:to_s).join(':')}"
     end

data/lib/shaped/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Shaped
-  VERSION = '0.7.3'
+  VERSION = '0.9.0'
 end

data/shaped.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
   spec.required_ruby_version = Gem::Requirement.new('>= 2.7.0')
 
+  spec.metadata['rubygems_mfa_required'] = 'true'
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = 'https://github.com/davidrunger/shaped'
   spec.metadata['changelog_uri'] = 'https://github.com/davidrunger/shaped/blob/master/CHANGELOG.md'
@@ -26,6 +27,6 @@ Gem::Specification.new do |spec|
     end
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency('activemodel', '~> 6.0')
-  spec.add_runtime_dependency('activesupport', '~> 6.0')
+  spec.add_runtime_dependency('activemodel', '>= 6', '< 8')
+  spec.add_runtime_dependency('activesupport', '>= 6', '< 8')
 end

metadata

@@ -1,43 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: shaped
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.9.0
 platform: ruby
 authors:
 - David Runger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-08 00:00:00.000000000 Z
+date: 2022-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8'
 description: Validate the "shape" of Ruby objects.
 email:
 - davidjrunger@gmail.com
@@ -45,11 +57,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
+- ".release_assistant.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -79,6 +93,7 @@ homepage: https://github.com/davidrunger/shaped
 licenses:
 - MIT
 metadata:
+  rubygems_mfa_required: 'true'
   homepage_uri: https://github.com/davidrunger/shaped
   source_code_uri: https://github.com/davidrunger/shaped
   changelog_uri: https://github.com/davidrunger/shaped/blob/master/CHANGELOG.md
@@ -97,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Validate the "shape" of Ruby objects.

data/.travis.yml

@@ -1,14 +0,0 @@
----
-language: ruby
-os: linux
-dist: bionic
-cache: bundler
-rvm:
-  - 2.7.0
-notifications:
-  email:
-    on_success: never
-    on_failure: always
-script:
-  - bin/rubocop --format clang
-  - bin/rspec