rspec-sorbet 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c919fffe36f51d10375e595ccb204bc198e25cf8315e266b58ac003e5a3044e3
-  data.tar.gz: e9f7fd2ebc16cbfb02a35386e6e18167e4c2d7135d892818cfef0828bbac3d29
+  metadata.gz: 1e49df5d697e2d441b06483b44261e8edb5ac59b7003c5356d88d6be106db79e
+  data.tar.gz: 17aebafd7cd92d511915bced0d87279e8a0a271ba4ed593a7cdd465c5514c31c
 SHA512:
-  metadata.gz: 036dc3f8f4fe03014d3fd841c3db206cb3f4d044238f995f204ea66379763e1dd4f66882fd87571eaf1fa5a473af3b4dd28cdd943d7ff1dfb902b03ef1849b86
-  data.tar.gz: bfaa969a76685774eedbceb4842b977a3bdb39dc48055035a93c85b53cf9a7029b9f6592722307a96d0b03ac2ff51ed0d5b406012469334eaf92c11f3bfd855c
+  metadata.gz: 0d37e33a3218ebde8de313aa0707c690f1d06c28b04f552dcc6611d09334d52b73a4aeafc50b132fdc7c1266f1a430a2affffc17928857ecebdefa788e081fa6
+  data.tar.gz: 777a239771115649469b1eff69936a5bd64c1815915ee322300028864d44092481d94b637c0b778b85020a965b900af7d3414ab903dc0ee703cd4dfabc18c47d

data/.devcontainer/devcontainer.json

@@ -0,0 +1,5 @@
+{
+	"name": "Ruby",
+	"image": "mcr.microsoft.com/devcontainers/ruby:0-3.1",
+	"postCreateCommand": "bin/setup"
+}

data/.github/workflows/ci.yml

@@ -1,50 +1,24 @@
----
 name: Continuous Integration
-env:
-  SLACK_CHANNEL_ID: C0317P7C9C2
-on:
-  push:
-    branches-ignore:
-    - refs/tags/*_staging
-    - refs/tags/*_production
+
+on: push
+
+permissions:
+  contents: read
+
 jobs:
-  build:
-    runs-on: ubuntu-18.04
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['3.1']
     steps:
-    - name: Checkout branch
-      uses: actions/checkout@v2
-    - name: Extract branch name
-      shell: bash
-      run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
-      id: extract_branch
-    - name: Cache gems
-      uses: actions/cache@v2
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
       with:
-        path: vendor/bundle
-        key: "${{ runner.OS }}-gem-cache-${{ hashFiles('**/*.gemspec')
-          }}"
-        restore-keys: "${{ runner.OS }}-gem-cache-\n"
-    - uses: "cachix/install-nix-action@8d6d5e949675fbadb765c6b1a975047fa5f09b27"
-      with:
-        extra_nix_config: |
-          post-build-hook = /etc/nix/upload-to-cache.sh
-          substituters = https://cache.nixos.org/
-          trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
-        nix_path: nixpkgs=channel:nixos-21.05
-    - name: Run CI through nix-shell
-      env:
-        GEMFURY_DEPLOY_TOKEN: ${{ secrets.GEMFURY_DEPLOY_TOKEN }}
-      run: nix-shell --run "chmod 755 ./run_ci.sh && ./run_ci.sh"
-    - name: Post to Slack if build fails
-      if: failure() && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
-        || github.ref == 'refs/heads/stable')
-      uses: pullreminders/slack-action@a5a262c896a1cc80dcbae59ba95513e2dfb21439
-      env:
-        SLACK_BOT_TOKEN: "${{ secrets.BELLROY_SLACK_TOKEN }}"
-      with:
-        args: '{\"channel\":\"${{ env.SLACK_CHANNEL_ID }}\",\"text\":\"* ${{ github.repository }} BUILD
-          FAILURE*\", \"attachments\": [{ \"fallback\": \"Failure summary\", \"color\":
-          \"#ff0000\", \"fields\": [{\"title\": \"Branch\", \"value\":\"${{ steps.extract_branch.outputs.branch
-          }}\"}, {\"title\": \"Who broke it\", \"value\":\"${{ github.actor }}\"},
-          { \"title\": \"Build output\", \"value\": \"https://github.com/${{ github.repository
-          }}/commit/${{ github.sha }}/checks\", \"short\": false }]}]}'
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Run RSpec tests
+      run: bin/rspec
+    - name: Check for Rubocop offenses
+      run: bin/rubocop --format github

data/.rubocop.yml

@@ -1,66 +1,22 @@
----
-Documentation:
-  Enabled: false
-Rails:
-  Enabled: true
+inherit_gem:
+  rubocop-shopify: rubocop.yml
+require: rubocop-rspec
+
 AllCops:
-  Include:
-  - app/**/*.rb
-  - lib/**/*.rb
-  - spec/**/*.rb
-  Exclude:
-  - app/assets/**/*
-  - bin/**/*
-  - client/node_modules/**/*
-  - config/**/*
-  - coverage/**/*
-  - data/**/*
-  - db/**/*
-  - db_*/**/*
-  - dw/**/*
-  - log/**/*
-  - phrase/**/*
-  - public/**/*
-  - tmp/**/*
-  - vendor/**/*
-  TargetRubyVersion: 2.5
-Metrics/LineLength:
-  Max: 100
-Layout/MultilineMethodCallIndentation:
-  EnforcedStyle: indented
-Style/PercentLiteralDelimiters:
-  PreferredDelimiters:
-    "%w": "[]"
-RSpec/ExampleLength:
-  Enabled: false
-  Max: 10
-RSpec/MultipleExpectations:
-  Enabled: false
-  Max: 10
-RSpec/NestedGroups:
-  Enabled: false
-  Max: 10
-RSpec/MessageExpectation:
+  NewCops: disable
+  SuggestExtensions: false
+
+RSpec/LeakyConstantDeclaration:
   Enabled: false
-RSpec/MissingExampleGroupArgument:
-  Enabled: false
-require:
-- rubocop-performance
-- rubocop-rspec
-- test_prof/rubocop
-Metrics/BlockLength:
-  Enabled: false
-RSpec/MessageSpies:
-  Enabled: false
-RSpec/ExpectInHook:
+
+RSpec/ExampleLength:
   Enabled: false
-RSpec/AggregateFailures:
-  Enabled: true
-  Include:
-  - spec/**/*.rb
-Rails/InverseOf:
+
+RSpec/NamedSubject:
   Enabled: false
-Rails/Present:
+
+RSpec/MultipleExpectations:
   Enabled: false
-Rails/TimeZone:
+
+RSpec/VerifiedDoubles:
   Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 1.9.2
+
+- Rubocop offenses resolved
+- Sorbet signatures added to `RSpec::Sorbet::Doubles`
+- Added `RSpec::Sorbet.reset!` to restore handlers to previous state
+- Added fix to prevent `SystemStackError` by keeping track of when handlers have been configured. (thanks [@alex-tan](https://github.com/alex-tan))
+- Added logic to pass type error onwards to existing inline type error handler.
+- Slimmed down Gem RBIs to minimum needed for `srb tc` to pass in development.
+
 ## 1.9.1
 
 - Support `T.nilable(T.class_of(...))` among others (thanks [@deecewan](https://github.com/deecewan))

data/Gemfile

@@ -1,21 +1,24 @@
-source 'https://rubygems.org'
+# frozen_string_literal: true
+
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in rspec-sorbet.gemspec
 gemspec
 
 group :development, :test do
-  gem 'guard-livereload', require: false
-  gem 'guard-rspec'
-  gem 'pry-byebug'
-  gem 'rb-fsevent', require: false
-  gem 'rspec'
-  gem 'rubocop-rspec'
-  gem 'rubocop'
-  gem 'stackprof'
-  gem 'tapioca'
+  gem "guard-livereload", require: false
+  gem "guard-rspec"
+  gem "pry-byebug"
+  gem "rb-fsevent", require: false
+  gem "rspec"
+  gem "rubocop-rspec"
+  gem "rubocop-shopify"
+  gem "rubocop"
+  gem "stackprof"
+  gem "tapioca"
 end
 
 group :test do
-  gem 'ffaker'
-  gem 'simplecov'
+  gem "ffaker"
+  gem "rspec-github", require: false
 end

data/README.md

@@ -1,6 +1,6 @@
 ![rspec-sorbet](https://user-images.githubusercontent.com/2643026/63100456-02c12c00-bf6f-11e9-8430-630a27bc6e42.png)
 
-# RSpec Sorbet [![Gem Version](https://badge.fury.io/rb/rspec-sorbet.svg)](https://badge.fury.io/rb/rspec-sorbet) ![CI Badge](https://github.com/tricycle/rspec-sorbet/workflows/Continuous%20Integration/badge.svg)
+# RSpec Sorbet [![Gem Version](https://badge.fury.io/rb/rspec-sorbet.svg)](https://badge.fury.io/rb/rspec-sorbet) ![CI Badge](https://github.com/samuelgiles/rspec-sorbet/workflows/Continuous%20Integration/badge.svg)
 
 A small gem consisting of helpers for using Sorbet & RSpec together.
 
@@ -19,7 +19,7 @@ require 'rspec/sorbet'
 
 Out of the box if you're using `instance_double`, `class_double` or `object_double` in your specs you'll encounter errors such as the following:
 
-```
+```ruby
  TypeError:
        Parameter 'my_parameter': Expected type MyObject, got type RSpec::Mocks::InstanceVerifyingDouble with value #<InstanceDouble(MyObject) (anonymous)>
        Caller: /Users/samuelgiles/Documents/Projects/Clients/Bellroy/bellroy/spec/lib/checkout/use_cases/my_use_case.rb:9
@@ -33,7 +33,7 @@ RSpec::Sorbet.allow_doubles!
 
 ### `eq` matcher usage with `T::Struct`'s
 
-Using the [`eq` matcher](https://www.rubydoc.info/github/rspec/rspec-expectations/RSpec%2FMatchers:eq) to compare [`T::Struct`'s](https://sorbet.org/docs/tstruct) might not behave as you'd expect whereby two separate instances of the same struct class with identical attributes are not `==` out of the box. The standalone [sorbet-struct-comparable](https://github.com/tricycle/sorbet-struct-comparable) gem may be of interest if you are looking for a simple attribute based comparison that will help make the `eq` matcher behave as you expect.
+Using the [`eq` matcher](https://www.rubydoc.info/github/rspec/rspec-expectations/RSpec%2FMatchers:eq) to compare [`T::Struct`'s](https://sorbet.org/docs/tstruct) might not behave as you'd expect whereby two separate instances of the same struct class with identical attributes are not `==` out of the box. The standalone [sorbet-struct-comparable](https://github.com/samuelgiles/sorbet-struct-comparable) gem may be of interest if you are looking for a simple attribute based comparison that will help make the `eq` matcher behave as you expect.
 
 ### Specifying a custom validation handler
 

data/Rakefile

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require 'bundler/setup'
-require 'rspec/sorbet'
+require "bundler/setup"
+require "rspec/sorbet"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +11,5 @@ require 'rspec/sorbet'
 # require "pry"
 # Pry.start
 
-require 'irb'
+require "irb"
 IRB.start(__FILE__)

data/bin/rbi

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bin/tapioca gems rspec-core rspec-expectations rspec-github rspec-support rspec

data/bin/rspec

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    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("rspec-core", "rspec")

data/bin/rubocop

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rubocop' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    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("rubocop", "rubocop")

data/bin/setup

@@ -4,5 +4,3 @@ IFS=$'\n\t'
 set -vx
 
 bundle install
-
-# Do any other automated setup that you need to do here

data/bin/tapioca

@@ -9,8 +9,10 @@
 #
 
 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", __FILE__)
 

data/generate_require_files.rb

@@ -1,35 +1,35 @@
 # typed: true
 # frozen_string_literal: true
 
-BASE_FOLDER_PATH = 'rspec'
+BASE_FOLDER_PATH = "rspec"
 
 def directories_in(root)
   Dir.entries(root).sort.select do |entry|
     fully_qualified_entry = File.join(root, entry)
-    File.directory?(fully_qualified_entry) && !['.', '..'].include?(entry.to_s)
+    File.directory?(fully_qualified_entry) && ![".", ".."].include?(entry.to_s)
   end
 end
 
 def files_in(root)
   Dir.entries(root).sort.reject do |entry|
     fully_qualified_entry = File.join(root, entry)
-    File.directory?(fully_qualified_entry) || entry.to_s == 'all.rb' || entry[-3..-1] != '.rb'
+    File.directory?(fully_qualified_entry) || entry.to_s == "all.rb" || entry[-3..-1] != ".rb"
   end
 end
 
 def recursive_files_in(root)
-  full_paths = Dir.glob(File.join(root, '**', '*')).sort.reject do |entry|
+  full_paths = Dir.glob(File.join(root, "**", "*")).sort.reject do |entry|
     fully_qualified_entry = File.join(root, entry)
-    File.directory?(fully_qualified_entry) || entry[-7..-1] == '/all.rb' || entry[-3..-1] != '.rb'
+    File.directory?(fully_qualified_entry) || entry[-7..-1] == "/all.rb" || entry[-3..-1] != ".rb"
   end
 
-  remove_path = root.split('/')[0..-2].join('/') + '/'
-  full_paths.map { |full_path| full_path.gsub(remove_path, '') }
+  remove_path = root.split("/")[0..-2].join("/") + "/"
+  full_paths.map { |full_path| full_path.gsub(remove_path, "") }
 end
 
 def write_require_file(root, require_directories, require_files)
-  require_file_path = File.join(root, 'all.rb')
-  File.open(require_file_path, 'w') do |file|
+  require_file_path = File.join(root, "all.rb")
+  File.open(require_file_path, "w") do |file|
     file.write("# frozen_string_literal: true\n\n")
     file.write("# THIS FILE IS AUTOGENERATED AND SHOULD NOT BE MANUALLY MODIFIED\n\n")
     require_directories.each do |require_directory|
@@ -40,7 +40,7 @@ def write_require_file(root, require_directories, require_files)
   end
 end
 
-root = File.join(__dir__, 'lib', BASE_FOLDER_PATH)
+root = File.join(__dir__, "lib", BASE_FOLDER_PATH)
 directories = directories_in(root)
 write_require_file(root, directories, files_in(root))
 directories.each do |directory|

data/lib/rspec/all.rb

@@ -3,6 +3,6 @@
 
 # THIS FILE IS AUTOGENERATED AND SHOULD NOT BE MANUALLY MODIFIED
 
-require 'rspec/sorbet/all'
+require "rspec/sorbet/all"
 
-require 'rspec/sorbet'
+require "rspec/sorbet"

data/lib/rspec/sorbet/all.rb

@@ -3,5 +3,5 @@
 
 # THIS FILE IS AUTOGENERATED AND SHOULD NOT BE MANUALLY MODIFIED
 
-require 'rspec/sorbet/doubles'
-require 'rspec/sorbet/version'
+require "rspec/sorbet/doubles"
+require "rspec/sorbet/version"

data/lib/rspec/sorbet/doubles.rb

@@ -1,37 +1,82 @@
-# typed: false
+# typed: strict
 # frozen_string_literal: true
 
-require 'sorbet-runtime'
+require "sorbet-runtime"
 
 module RSpec
   module Sorbet
     module Doubles
+      extend T::Sig
+      extend T::Helpers
+
+      requires_ancestor { Kernel }
+
+      sig { void }
       def allow_doubles!
+        reset! if configured
+
+        self.existing_inline_type_error_handler = T::Configuration.instance_variable_get(
+          :@inline_type_error_handler,
+        )
         T::Configuration.inline_type_error_handler = proc do |error|
           inline_type_error_handler(error)
         end
 
-        @existing_handler = T::Configuration.instance_variable_get(:@call_validation_error_handler)
-
+        self.existing_call_validation_error_handler = T::Configuration.instance_variable_get(
+          :@call_validation_error_handler,
+        )
         T::Configuration.call_validation_error_handler = proc do |signature, opts|
           call_validation_error_handler(signature, opts)
         end
+
+        self.configured = true
+      end
+
+      sig { params(clear_existing: T::Boolean).void }
+      def reset!(clear_existing: false)
+        if clear_existing
+          self.existing_inline_type_error_handler = nil
+          self.existing_call_validation_error_handler = nil
+        end
+
+        T::Configuration.instance_variable_set(
+          :@inline_type_error_handler,
+          existing_inline_type_error_handler,
+        )
+        T::Configuration.instance_variable_set(
+          :@call_validation_error_handler,
+          existing_call_validation_error_handler,
+        )
+
+        self.configured = false
       end
 
       alias_method :allow_instance_doubles!, :allow_doubles!
 
       private
 
-      INLINE_DOUBLE_REGEX =
-        /T.(?:let|cast): Expected type (?:T.(?<t_method>any|nilable|class_of)\()*(?<expected_types>[a-zA-Z0-9:: ,]*)(\))*, got (?:type .* with value )?#<(?<double_type>Instance|Class|Object)?Double([\(]|[ ])(?<doubled_type>[a-zA-Z0-9:: ,]*)(\))?/.freeze
+      sig { returns(T.nilable(T.proc.params(signature: Exception).void)) }
+      attr_accessor :existing_inline_type_error_handler
+
+      sig { returns(T.nilable(T.proc.params(signature: T.untyped, opts: T::Hash[T.untyped, T.untyped]).void)) }
+      attr_accessor :existing_call_validation_error_handler
 
+      sig { returns(T.nilable(T::Boolean)) }
+      attr_accessor :configured
 
+      # rubocop:disable Layout/LineLength
+      INLINE_DOUBLE_REGEX =
+        T.let(/T.(?:let|cast): Expected type (?:T.(?<t_method>any|nilable|class_of)\()*(?<expected_types>[a-zA-Z0-9:: ,]*)(\))*, got (?:type .* with value )?#<(?<double_type>Instance|Class|Object)?Double([\(]|[ ])(?<doubled_type>[a-zA-Z0-9:: ,]*)(\))?/.freeze, Regexp)
+      # rubocop:enable Layout/LineLength
+
+      sig { params(signature: T.untyped, opts: T.untyped).void }
       def handle_call_validation_error(signature, opts)
-        raise TypeError, opts[:pretty_message] unless @existing_handler 
+        raise TypeError, opts[:pretty_message] unless @existing_call_validation_error_handler
 
-        @existing_handler.call(signature, opts)
+        @existing_call_validation_error_handler.call(signature, opts)
       end
 
+      sig { params(error: Exception).void }
       def inline_type_error_handler(error)
         case error
         when TypeError
@@ -41,15 +86,16 @@ module RSpec
           raise error unless (match = message.match(INLINE_DOUBLE_REGEX))
 
           t_method = match[:t_method]
-          expected_types = match[:expected_types].split(',').map do |expected_type|
+          expected_types = T.must(match[:expected_types]).split(",").map do |expected_type|
             Object.const_get(expected_type.strip)
           end
           double_type = match[:double_type]
           return if double_type.nil?
-          doubled_type = Object.const_get(match[:doubled_type])
 
-          if double_type == 'Class'
-            raise error if t_method != 'class_of'
+          doubled_type = Object.const_get(T.must(match[:doubled_type]))
+
+          if double_type == "Class"
+            raise error if t_method != "class_of"
 
             valid = expected_types.any? do |expected_type|
               doubled_type <= expected_type
@@ -64,30 +110,36 @@ module RSpec
         else
           raise error
         end
+
+        existing_inline_type_error_handler&.call(error)
       end
 
+      sig { params(message: String).returns(T::Boolean) }
       def unable_to_check_type_for_message?(message)
         double_message_with_ellipsis?(message) ||
           typed_array_message?(message)
       end
 
       VERIFYING_DOUBLE_OR_DOUBLE =
-        /(RSpec::Mocks::(Instance|Class|Object)VerifyingDouble|(Instance|Class|Object)?Double)/.freeze
+        T.let(/(RSpec::Mocks::(Instance|Class|Object)VerifyingDouble|(Instance|Class|Object)?Double)/.freeze, Regexp)
 
+      sig { params(message: String).returns(T::Boolean) }
       def double_message_with_ellipsis?(message)
-        message.include?('...') && message.match?(VERIFYING_DOUBLE_OR_DOUBLE)
+        message.include?("...") && message.match?(VERIFYING_DOUBLE_OR_DOUBLE)
       end
 
-      TYPED_ARRAY_MESSAGE = /got T::Array/.freeze
+      TYPED_ARRAY_MESSAGE = T.let(/got T::Array/.freeze, Regexp)
 
+      sig { params(message: String).returns(T::Boolean) }
       def typed_array_message?(message)
         message.match?(TYPED_ARRAY_MESSAGE)
       end
 
+      sig { params(signature: T.untyped, opts: T::Hash[T.untyped, T.untyped]).void }
       def call_validation_error_handler(signature, opts)
         should_raise = true
 
-        message = opts.fetch(:pretty_message, opts.fetch(:message, ''))
+        message = opts.fetch(:pretty_message, opts.fetch(:message, ""))
         if message.match?(VERIFYING_DOUBLE_OR_DOUBLE)
           typing = opts[:type]
           value = opts[:value].is_a?(Array) ? opts[:value].first : opts[:value]

data/lib/rspec/sorbet/version.rb

@@ -3,6 +3,6 @@
 
 module RSpec
   module Sorbet
-    VERSION = '1.9.1'
+    VERSION = "1.9.2"
   end
 end

data/lib/rspec/sorbet.rb

@@ -1,7 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
-require 'rspec/sorbet/doubles'
+require "rspec/sorbet/doubles"
 
 module RSpec
   module Sorbet

data/rspec-sorbet.gemspec

@@ -1,32 +1,34 @@
-lib = File.expand_path('lib', __dir__)
+# frozen_string_literal: true
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-require 'rspec/sorbet/version'
+require "rspec/sorbet/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'rspec-sorbet'
+  spec.name          = "rspec-sorbet"
   spec.version       = RSpec::Sorbet::VERSION
-  spec.authors       = ['Samuel Giles']
-  spec.email         = ['samuel.giles@bellroy.com']
+  spec.authors       = ["Samuel Giles"]
+  spec.email         = ["sam@samuelgil.es"]
 
-  spec.summary       = 'A small gem consisting of helpers for using Sorbet & RSpec together.'
-  spec.homepage      = 'https://github.com/tricycle/rspec-sorbet'
-  spec.license       = 'MIT'
+  spec.summary       = "A small gem consisting of helpers for using Sorbet & RSpec together."
+  spec.homepage      = "https://github.com/samuelgiles/rspec-sorbet"
+  spec.license       = "MIT"
 
   # 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 = `git ls-files -z`.split("\x0").reject do |f|
+  spec.files = %x(git ls-files -z).split("\x0").reject do |f|
     f.match(%r{^(sorbet|spec)/}) && !f.match(%r{^spec/support/factories/})
   end
-  spec.bindir        = 'exe'
+  spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
 
-  spec.add_dependency 'sorbet-runtime'
+  spec.add_dependency("sorbet-runtime")
 
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rake', '>= 13.0'
-  spec.add_development_dependency 'rspec', '>= 3.0'
-  spec.add_development_dependency 'sorbet'
+  spec.add_development_dependency("bundler")
+  spec.add_development_dependency("pry")
+  spec.add_development_dependency("rake", ">= 13.0")
+  spec.add_development_dependency("rspec", ">= 3.0")
+  spec.add_development_dependency("sorbet")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-sorbet
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
 platform: ruby
 authors:
 - Samuel Giles
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 1980-01-01 00:00:00.000000000 Z
+date: 2023-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sorbet-runtime
@@ -94,13 +94,14 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description: 
 email:
-- samuel.giles@bellroy.com
+- sam@samuelgil.es
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".devcontainer/devcontainer.json"
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
@@ -111,6 +112,9 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/rbi
+- bin/rspec
+- bin/rubocop
 - bin/setup
 - bin/tapioca
 - generate_require_files.rb
@@ -119,16 +123,12 @@ files:
 - lib/rspec/sorbet/all.rb
 - lib/rspec/sorbet/doubles.rb
 - lib/rspec/sorbet/version.rb
-- nix/sources.json
-- nix/sources.nix
 - rspec-sorbet.gemspec
-- run_ci.sh
-- shell.nix
-homepage: https://github.com/tricycle/rspec-sorbet
+homepage: https://github.com/samuelgiles/rspec-sorbet
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -143,8 +143,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.26
-signing_key:
+rubygems_version: 3.3.26
+signing_key: 
 specification_version: 4
 summary: A small gem consisting of helpers for using Sorbet & RSpec together.
 test_files: []

data/nix/sources.json

@@ -1,14 +0,0 @@
-{
-    "nixpkgs": {
-        "branch": "nixos-22.05",
-        "description": "Nix packages collection",
-        "homepage": "https://github.com/NixOS/nixpkgs",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "1935dd8fdab8e022a9d958419663162fd840014c",
-        "sha256": "1z0nkqpwahlaz362lcdx5qcdvwdzr5a3bdfirjgbf9jg37rsbwl2",
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/1935dd8fdab8e022a9d958419663162fd840014c.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    }
-}

data/nix/sources.nix

@@ -1,194 +0,0 @@
-# This file has been generated by Niv.
-
-let
-
-  #
-  # The fetchers. fetch_<type> fetches specs of type <type>.
-  #
-
-  fetch_file = pkgs: name: spec:
-    let
-      name' = sanitizeName name + "-src";
-    in
-      if spec.builtin or true then
-        builtins_fetchurl { inherit (spec) url sha256; name = name'; }
-      else
-        pkgs.fetchurl { inherit (spec) url sha256; name = name'; };
-
-  fetch_tarball = pkgs: name: spec:
-    let
-      name' = sanitizeName name + "-src";
-    in
-      if spec.builtin or true then
-        builtins_fetchTarball { name = name'; inherit (spec) url sha256; }
-      else
-        pkgs.fetchzip { name = name'; inherit (spec) url sha256; };
-
-  fetch_git = name: spec:
-    let
-      ref =
-        if spec ? ref then spec.ref else
-          if spec ? branch then "refs/heads/${spec.branch}" else
-            if spec ? tag then "refs/tags/${spec.tag}" else
-              abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!";
-      submodules = if spec ? submodules then spec.submodules else false;
-      submoduleArg =
-        let
-          nixSupportsSubmodules = builtins.compareVersions builtins.nixVersion "2.4" >= 0;
-          emptyArgWithWarning =
-            if submodules == true
-            then
-              builtins.trace
-                (
-                  "The niv input \"${name}\" uses submodules "
-                  + "but your nix's (${builtins.nixVersion}) builtins.fetchGit "
-                  + "does not support them"
-                )
-                {}
-            else {};
-        in
-          if nixSupportsSubmodules
-          then { inherit submodules; }
-          else emptyArgWithWarning;
-    in
-      builtins.fetchGit
-        ({ url = spec.repo; inherit (spec) rev; inherit ref; } // submoduleArg);
-
-  fetch_local = spec: spec.path;
-
-  fetch_builtin-tarball = name: throw
-    ''[${name}] The niv type "builtin-tarball" is deprecated. You should instead use `builtin = true`.
-        $ niv modify ${name} -a type=tarball -a builtin=true'';
-
-  fetch_builtin-url = name: throw
-    ''[${name}] The niv type "builtin-url" will soon be deprecated. You should instead use `builtin = true`.
-        $ niv modify ${name} -a type=file -a builtin=true'';
-
-  #
-  # Various helpers
-  #
-
-  # https://github.com/NixOS/nixpkgs/pull/83241/files#diff-c6f540a4f3bfa4b0e8b6bafd4cd54e8bR695
-  sanitizeName = name:
-    (
-      concatMapStrings (s: if builtins.isList s then "-" else s)
-        (
-          builtins.split "[^[:alnum:]+._?=-]+"
-            ((x: builtins.elemAt (builtins.match "\\.*(.*)" x) 0) name)
-        )
-    );
-
-  # The set of packages used when specs are fetched using non-builtins.
-  mkPkgs = sources: system:
-    let
-      sourcesNixpkgs =
-        import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) { inherit system; };
-      hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath;
-      hasThisAsNixpkgsPath = <nixpkgs> == ./.;
-    in
-      if builtins.hasAttr "nixpkgs" sources
-      then sourcesNixpkgs
-      else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
-        import <nixpkgs> {}
-      else
-        abort
-          ''
-            Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
-            add a package called "nixpkgs" to your sources.json.
-          '';
-
-  # The actual fetching function.
-  fetch = pkgs: name: spec:
-
-    if ! builtins.hasAttr "type" spec then
-      abort "ERROR: niv spec ${name} does not have a 'type' attribute"
-    else if spec.type == "file" then fetch_file pkgs name spec
-    else if spec.type == "tarball" then fetch_tarball pkgs name spec
-    else if spec.type == "git" then fetch_git name spec
-    else if spec.type == "local" then fetch_local spec
-    else if spec.type == "builtin-tarball" then fetch_builtin-tarball name
-    else if spec.type == "builtin-url" then fetch_builtin-url name
-    else
-      abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}";
-
-  # If the environment variable NIV_OVERRIDE_${name} is set, then use
-  # the path directly as opposed to the fetched source.
-  replace = name: drv:
-    let
-      saneName = stringAsChars (c: if isNull (builtins.match "[a-zA-Z0-9]" c) then "_" else c) name;
-      ersatz = builtins.getEnv "NIV_OVERRIDE_${saneName}";
-    in
-      if ersatz == "" then drv else
-        # this turns the string into an actual Nix path (for both absolute and
-        # relative paths)
-        if builtins.substring 0 1 ersatz == "/" then /. + ersatz else /. + builtins.getEnv "PWD" + "/${ersatz}";
-
-  # Ports of functions for older nix versions
-
-  # a Nix version of mapAttrs if the built-in doesn't exist
-  mapAttrs = builtins.mapAttrs or (
-    f: set: with builtins;
-    listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set))
-  );
-
-  # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295
-  range = first: last: if first > last then [] else builtins.genList (n: first + n) (last - first + 1);
-
-  # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257
-  stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1));
-
-  # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L269
-  stringAsChars = f: s: concatStrings (map f (stringToCharacters s));
-  concatMapStrings = f: list: concatStrings (map f list);
-  concatStrings = builtins.concatStringsSep "";
-
-  # https://github.com/NixOS/nixpkgs/blob/8a9f58a375c401b96da862d969f66429def1d118/lib/attrsets.nix#L331
-  optionalAttrs = cond: as: if cond then as else {};
-
-  # fetchTarball version that is compatible between all the versions of Nix
-  builtins_fetchTarball = { url, name ? null, sha256 }@attrs:
-    let
-      inherit (builtins) lessThan nixVersion fetchTarball;
-    in
-      if lessThan nixVersion "1.12" then
-        fetchTarball ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
-      else
-        fetchTarball attrs;
-
-  # fetchurl version that is compatible between all the versions of Nix
-  builtins_fetchurl = { url, name ? null, sha256 }@attrs:
-    let
-      inherit (builtins) lessThan nixVersion fetchurl;
-    in
-      if lessThan nixVersion "1.12" then
-        fetchurl ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
-      else
-        fetchurl attrs;
-
-  # Create the final "sources" from the config
-  mkSources = config:
-    mapAttrs (
-      name: spec:
-        if builtins.hasAttr "outPath" spec
-        then abort
-          "The values in sources.json should not have an 'outPath' attribute"
-        else
-          spec // { outPath = replace name (fetch config.pkgs name spec); }
-    ) config.sources;
-
-  # The "config" used by the fetchers
-  mkConfig =
-    { sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null
-    , sources ? if isNull sourcesFile then {} else builtins.fromJSON (builtins.readFile sourcesFile)
-    , system ? builtins.currentSystem
-    , pkgs ? mkPkgs sources system
-    }: rec {
-      # The sources, i.e. the attribute set of spec name to spec
-      inherit sources;
-
-      # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers
-      inherit pkgs;
-    };
-
-in
-mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); }

data/run_ci.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-set -e
-rm -f Gemfile.lock
-bundle config gem.fury.io $GEMFURY_DEPLOY_TOKEN
-bundle install
-bundle exec srb tc
-METRICS=1 bundle exec rspec spec

data/shell.nix

@@ -1,20 +0,0 @@
-{ sources ? import ./nix/sources.nix }:
-let
-  nixpkgs = import sources.nixpkgs { };
-in
-nixpkgs.mkShell {
-  name = "bellroy-gem-env";
-  buildInputs = with nixpkgs; [
-    bundler
-    libnotify
-    niv
-    pkg-config
-    readline
-    ruby_2_7
-    zlib
-  ]
-  ++ (if stdenv.hostPlatform.isDarwin then [ libiconv darwin.apple_sdk.frameworks.CoreServices ] else [ ]);
-  shellHook = ''
-    bundle config --local path "$PWD/vendor/bundle"
-  '';
-}