dry-monads-sorbet 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c166f0c33bed0bf911ff8e70324f05f6c06b4b6bc1e58dc3f0f2a572ed8444b
-  data.tar.gz: 3caf9e75a4de9ae4f85ab73280520bb3f77a3a0a80bf67a2c0499286236de8f4
+  metadata.gz: 9cf3f9a8c8d624101fc2ae7b06e4cab59b1cd956f10c2bee945dbb4937062a0b
+  data.tar.gz: 88bc955e267eb1a2822953ef49d9a6ae93f2f6d11dc5db929e946eafcac6cd8a
 SHA512:
-  metadata.gz: 6abba0a4195a1adbb8823a0a8ee56f128cdca6dc1cf3a87c48100b285215426d2b45b463e32269ece03d68f785ca6e7ff656f38ea5bcd5ce1af85bbc91a38d1a
-  data.tar.gz: 06a475b9ecba2f93b8eac52124eb89bd7d46a841c4bb19e33bc39b7cbbfad3948a83a6b8872738a3f0bf6e68350372cd01b072bfc3ce933d20a6077411c4bb18
+  metadata.gz: 87f58bb422e18f2822cc0db272c019035c4f07644915edd486b848061ac733367f93a464225da76cad51d026e5e0cd4b1ca6a3312b69c7357dc1d3f6baa6e6a0
+  data.tar.gz: ce3873adea336fb69e309224e6d506b46c59518f0c25c6bc6b2a09d42054e524547372934d0179add97b4067562881655c67ce85db8e1feb0739e04476010a18

data/.github/workflows/ci.yml

@@ -15,36 +15,28 @@ jobs:
       shell: bash
       run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
       id: extract_branch
-    - name: Install Linux dependencies
-      run: sudo apt-get update -qq && sudo apt-get install -y libsqlite3-dev
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 2.6.6
     - name: Cache gems
       uses: actions/cache@v2
       with:
         path: vendor/bundle
-        key: "${{ runner.OS }}-gem-cache-${{ hashFiles('**/dry-monads-sorbet.gemspec')
+        key: "${{ runner.OS }}-gem-cache-${{ hashFiles('**/*.gemspec')
           }}"
         restore-keys: "${{ runner.OS }}-gem-cache-\n"
-    - name: Install bundler
-      run: (bundler -v | grep "2.1.4") || gem install bundler:2.1.4
-    - name: Remove metrics from bundled gems
-      run: bundle config set without 'metrics'
-    - name: Install gems
-      run: bundle install --jobs $(nproc) --retry 3 --path vendor/bundle
-    - name: Create cache directory
-      run: mkdir -p tmp/cache
-    - name: Typecheck with Sorbet
-      run: bundle exec srb tc . --ignore=/vendor
-    - name: Run RSpec test suite
-      run: bundle exec rspec spec
+    - 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:
-        METRICS: '1'
+        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/stable')
-      uses: pullreminders/slack-action@master
+      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.SLACK_BOT_TOKEN }}"
       with:

data/.gitignore

@@ -12,9 +12,11 @@
 # rspec failure tracking
 .rspec_status
 
-/shell.nix
+
 /tags
 
 *.log
 
 .ruby-gemset
+.direnv
+.envrc

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+1.1.7
+
+* Update to method signatures
+
 1.1.6
 
 * Fix bundled RBI being incompatible with recent Sorbet releases due to `params()` and invalid use of `sealed!`.

data/Gemfile

@@ -4,19 +4,14 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
-  gem 'guard-livereload', require: false
-  gem 'guard-rspec'
   gem 'pry-byebug'
   gem 'rb-fsevent', require: false
   gem 'rb-readline'
-  gem 'reek'
   gem 'rspec'
   gem 'rubocop-rspec'
   gem 'rubocop'
-  gem 'shoulda-matchers', require: false
-  gem 'sqlite3'
   gem 'stackprof'
-  gem 'timecop'
+  gem 'tapioca'
 end
 
 group :test do

data/bin/tapioca

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'tapioca' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+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("tapioca", "tapioca")

data/dry-monads-sorbet.gemspec

@@ -28,9 +28,10 @@ Gem::Specification.new do |spec|
     You can use the included "dry_monads_sorbet:update_rbi" Rake task to do this.
   TEXT
 
-  spec.add_dependency 'sorbet'
-  spec.add_dependency 'sorbet-runtime'
+  spec.add_dependency 'dry-equalizer'
   spec.add_dependency 'dry-monads'
+  spec.add_dependency 'sorbet-runtime'
+  spec.add_dependency 'sorbet'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'pry'

data/lib/bundled_rbi/dry-monads.rbi

@@ -132,8 +132,8 @@ class Dry::Monads::Maybe::None < Dry::Monads::Maybe
   def deconstruct; end
   def eql?(other); end
   def hash; end
-  sig {void}
-  def initialize(); end
+  sig {params(trace: T.untyped).void}
+  def initialize(trace = T.unsafe(nil)); end
   def inspect; end
   def maybe(*arg0); end
   def or(*args); end
@@ -551,7 +551,7 @@ module Dry::Monads::Do
   def self.for(*methods); end
   def self.halt(result); end
   def self.included(base); end
-  def self.wrap_method(target, method_name); end
+  def self.wrap_method(target, method, visibility); end
   extend Dry::Monads::Do::Mixin
 end
 module Dry::Monads::Do::Mixin

data/lib/dry/monads/sorbet/version.rb

@@ -4,7 +4,7 @@
 module Dry
   module Monads
     module Sorbet
-      VERSION = '1.1.6'
+      VERSION = '1.1.7'
     end
   end
 end

data/nix/sources.json

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

data/nix/sources.nix

@@ -0,0 +1,174 @@
+# 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`!";
+    in
+      builtins.fetchGit { url = spec.repo; inherit (spec) rev; inherit ref; };
+
+  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

@@ -0,0 +1,7 @@
+#!/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

@@ -0,0 +1,20 @@
+{ 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"
+  '';
+}

data/sorbet/config

@@ -2,3 +2,9 @@
 .
 --ignore
 /lib/dry/monads/sorbet.rb
+--ignore
+/lib/dry-monads-sorbet/railtie.rb
+--ignore
+vendor
+--ignore
+/sorbet/rbi/gems/rb-readline@0.5.5.rbi

data/sorbet/rbi/gems/{ast.rbi → ast@2.4.2.rbi}

@@ -1,48 +1,54 @@
-# This file is autogenerated. Do not edit it by hand. Regenerate it with:
-#   srb rbi gems
-
-# typed: strict
-#
-# If you would like to make changes to this file, great! Please create the gem's shim here:
-#
-#   https://github.com/sorbet/sorbet-typed/new/master?filename=lib/ast/all/ast.rbi
-#
-# ast-2.4.1
-
-module AST
-end
+# DO NOT EDIT MANUALLY
+# This is an autogenerated file for types exported from the `ast` gem.
+# Please instead update this file by running `bin/tapioca gem ast`.
+
+# typed: true
+
+module AST; end
+
 class AST::Node
+  def initialize(type, children = T.unsafe(nil), properties = T.unsafe(nil)); end
+
   def +(array); end
   def <<(element); end
   def ==(other); end
   def append(element); end
-  def assign_properties(properties); end
   def children; end
   def clone; end
   def concat(array); end
+  def deconstruct; end
   def dup; end
   def eql?(other); end
-  def fancy_type; end
   def hash; end
-  def initialize(type, children = nil, properties = nil); end
-  def inspect(indent = nil); end
-  def original_dup; end
+  def inspect(indent = T.unsafe(nil)); end
   def to_a; end
   def to_ast; end
-  def to_s(indent = nil); end
-  def to_sexp(indent = nil); end
+  def to_s(indent = T.unsafe(nil)); end
+  def to_sexp(indent = T.unsafe(nil)); end
   def to_sexp_array; end
   def type; end
-  def updated(type = nil, children = nil, properties = nil); end
+  def updated(type = T.unsafe(nil), children = T.unsafe(nil), properties = T.unsafe(nil)); end
+
+  protected
+
+  def assign_properties(properties); end
+  def fancy_type; end
+
+  private
+
+  def original_dup; end
 end
+
 class AST::Processor
-  include AST::Processor::Mixin
+  include ::AST::Processor::Mixin
 end
+
 module AST::Processor::Mixin
   def handler_missing(node); end
   def process(node); end
   def process_all(nodes); end
 end
+
 module AST::Sexp
   def s(type, *children); end
 end