sorbet-struct-comparable 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cdc3f402081351e1da4c84bc5dc767f59d288b781763ba64be2b1f4e6d77768
-  data.tar.gz: c336b74f657fb64e7b29e024ceb10c02e555a82f89283f758e9984aeb6c65b5e
+  metadata.gz: b2bcc9eb5d155248ce5512138442ea6807a1fde32e845d3cf9a8d51dccb08fac
+  data.tar.gz: 91a9e9ec13ee37d53415238dc191d45916dae5936d20de368a6392e4444a7956
 SHA512:
-  metadata.gz: a505ab5eed81e5f80280e6c7f2ae68c619d561c2c4ef13ec0866249083e7092ada08d961502d4d7fdb7f289a07849fdf044eb58121e2bd8c2a802c12c8f14121
-  data.tar.gz: f3958b00820ff24401823af78c8b91d789fd2da090e117c15699a0a1bbb125f1770c1b1eaa32111650a8fae319ee1e3232052da12cbebf89c3cd136c754ae670
+  metadata.gz: 8093306de472f2b197c4655159a1870ec0001a14d6f2e2efb8324190c27f483dadfa85e886c5477645baa36f5b7bbc91e5fe008777c17cd8c43e7c5690fde573
+  data.tar.gz: b8bc445ee4bb5d2195dd1aa5976058138cc80d7026671da8387ced8a5058576febe348989f4bdaa68c5e7f4f4ca04afd2bfa8f01eadd23111ef5e094fc1e314f

data/.github/workflows/ci.yml

@@ -16,9 +16,10 @@
           run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
           id: extract_branch
         - name: Set up Ruby
-          uses: actions/setup-ruby@v1.1.1
+          uses: ruby/setup-ruby@v1
           with:
-            ruby-version: 2.7.1
+            ruby-version: 2.6.6
+            bundler-cache: false
         - name: Cache gems
           uses: actions/cache@v1
           with:

data/.ruby-version

@@ -1 +1 @@
-2.7.1
+2.6.6

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Releases
 
+1.1.0
+
+* Fixed `T::Struct`'s of different classes returning `-1`; now returning `nil` as is expected of incomparable objects
+* Fixed incomparable attributes of different returning `-1` instead of `nil`
+
 1.0.0
 
 * Initial release: Extracted from [https://bellroy.com/](Bellroy) projects.

data/README.md

@@ -1,6 +1,6 @@
 ![Sorbet](https://user-images.githubusercontent.com/2643026/84757714-60be0600-afbc-11ea-8c0e-7da839ea1712.png)
 
-![Continuous Integration](https://github.com/tricycle/sorbet-struct-comparable/workflows/Continuous%20Integration/badge.svg)
+[![Gem Version](https://badge.fury.io/rb/sorbet-struct-comparable.svg)](https://badge.fury.io/rb/sorbet-struct-comparable) ![Continuous Integration](https://github.com/bellroy/sorbet-struct-comparable/workflows/Continuous%20Integration/badge.svg)
 # Making T::Struct's comparable since 2020
 
 If you just want some simple equality checking on your `T::Struct`'s then you've come to the right place.
@@ -67,4 +67,4 @@ 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/tricycle/sorbet-struct-comparable.
+Bug reports and pull requests are welcome on GitHub at https://github.com/bellroy/sorbet-struct-comparable.

data/lib/sorbet-struct-comparable/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module SorbetStructComparable
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/lib/t/struct/acts_as_comparable.rb

@@ -7,24 +7,19 @@ module T
       extend T::Sig
       include ::Comparable
 
-      LESS_THAN_OTHER = -1
       EQUAL = 0
+      NOT_COMPARABLE = nil
 
-      sig { params(other: Object).returns(Integer) }
+      sig { params(other: Object).returns(T.nilable(Integer)) }
       def <=>(other)
-        result = EQUAL
-        return LESS_THAN_OTHER if other.class != T.unsafe(self).class
+        return NOT_COMPARABLE if other.class != T.unsafe(self).class
 
-        T.unsafe(self).class.decorator.props.keys.map do |attribute_key|
+        T.unsafe(self).class.decorator.props.keys.each do |attribute_key|
           compare_result = T.unsafe(self).send(attribute_key) <=> other.send(attribute_key)
-          result = if compare_result.nil?
-                    LESS_THAN_OTHER
-                   else
-                     T.cast(compare_result, Integer)
-                   end
-          break if result != EQUAL
+          return T.cast(compare_result, T.nilable(Integer)) if compare_result != EQUAL
         end
-        result
+
+        return EQUAL
       end
     end
   end

data/sorbet-struct-comparable.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['michael.webb@bellroy.com', 'sam@samuelgil.es']
 
   spec.summary       = "Comparable T::Struct's for the equality focused typed Ruby developer."
-  spec.homepage      = 'https://github.com/tricycle/sorbet-struct-comparable'
+  spec.homepage      = 'https://github.com/bellroy/sorbet-struct-comparable'
   spec.required_ruby_version = Gem::Requirement.new('>= 2.0.0')
 
   spec.metadata['homepage_uri'] = spec.homepage

data/sorbet/rbi/gems/docile.rbi

@@ -7,7 +7,7 @@
 #
 #   https://github.com/sorbet/sorbet-typed/new/master?filename=lib/docile/all/docile.rbi
 #
-# docile-1.3.2
+# docile-1.3.5
 
 module Docile
   def dsl_eval(dsl, *args, &block); end
@@ -30,3 +30,7 @@ end
 class Docile::ChainingFallbackContextProxy < Docile::FallbackContextProxy
   def method_missing(method, *args, &block); end
 end
+module Docile::BacktraceFilter
+  def backtrace; end
+  def backtrace_locations; end
+end

data/sorbet/rbi/gems/listen.rbi

@@ -7,25 +7,19 @@
 #
 #   https://github.com/sorbet/sorbet-typed/new/master?filename=lib/listen/all/listen.rbi
 #
-# listen-3.2.1
+# listen-3.5.1
 
 module Listen
+  def self.default_logger; end
   def self.logger; end
-  def self.logger=(logger); end
-  def self.setup_default_logger_if_unset; end
+  def self.logger=(arg0); end
   def self.stop; end
   def self.to(*args, &block); end
 end
-class Listen::Logger
-  def self.debug(*args, &block); end
-  def self.error(*args, &block); end
-  def self.fatal(*args, &block); end
-  def self.info(*args, &block); end
-  def self.warn(*args, &block); end
-end
 class Listen::Options
   def initialize(opts, defaults); end
   def method_missing(name, *_); end
+  def respond_to_missing?(name, *_); end
 end
 class Listen::Record
   def _auto_hash; end
@@ -39,7 +33,6 @@ class Listen::Record
   def file_data(rel_path); end
   def initialize(directory); end
   def root; end
-  def tree; end
   def unset_path(rel_path); end
   def update_file(rel_path, data); end
 end
@@ -56,13 +49,17 @@ class Listen::Record::Entry
   def root; end
   def sys_path; end
 end
+class Listen::Error < RuntimeError
+end
+class Listen::Error::NotStarted < Listen::Error
+end
+class Listen::Error::SymlinkLoop < Listen::Error
+end
 class Listen::Record::SymlinkDetector
   def _fail(symlinked, real_path); end
   def initialize; end
   def verify_unwatched!(entry); end
 end
-class Listen::Record::SymlinkDetector::Error < RuntimeError
-end
 class Listen::File
   def self.change(record, rel_path); end
   def self.inaccurate_mac_time?(stat); end
@@ -75,7 +72,6 @@ class Listen::Directory
   def self.scan(snapshot, rel_path, options); end
 end
 class Listen::Change
-  def config; end
   def initialize(config, record); end
   def invalidate(type, rel_path, options); end
   def record; end
@@ -85,14 +81,18 @@ class Listen::Change::Config
   def queue(*args); end
   def silenced?(path, type); end
 end
+module Listen::Thread
+  def self._exception_with_causes(exception); end
+  def self._log_exception(exception, thread_name, caller_stack: nil); end
+  def self.new(name, &block); end
+  def self.rescue_and_log(method_name, *args, caller_stack: nil); end
+end
 module Listen::Adapter
-  def self._log(type, message); end
   def self._usable_adapter_class; end
   def self._warn_polling_fallback(options); end
   def self.select(options = nil); end
 end
 class Listen::Adapter::Base
-  def _log(*args, &block); end
   def _log_exception(msg, caller_stack); end
   def _queue_change(type, dir, rel_path, options); end
   def _stop; end
@@ -101,7 +101,6 @@ class Listen::Adapter::Base
   def configure; end
   def initialize(config); end
   def options; end
-  def self._log(*args, &block); end
   def self.usable?; end
   def start; end
   def started?; end
@@ -118,18 +117,12 @@ class Listen::Adapter::BSD < Listen::Adapter::Base
   def _watch_for_new_file(event); end
   def self.usable?; end
 end
-module Listen::Internals
-end
-module Listen::Internals::ThreadPool
-  def self.add(&block); end
-  def self.stop; end
-end
 class Listen::Adapter::Darwin < Listen::Adapter::Base
   def _configure(dir, &callback); end
   def _process_changes(dirs); end
   def _process_event(dir, path); end
   def _run; end
-  def _run_worker(worker); end
+  def _stop; end
   def self.usable?; end
 end
 class Listen::Adapter::Linux < Listen::Adapter::Base
@@ -169,14 +162,15 @@ class Listen::Backend
   extend Forwardable
 end
 class Listen::Silencer
+  def _ignore?(path); end
   def _init_ignores(ignores, overrides); end
+  def _only?(path); end
   def configure(options); end
   def ignore_patterns; end
   def ignore_patterns=(arg0); end
   def initialize; end
   def only_patterns; end
   def only_patterns=(arg0); end
-  def options; end
   def silenced?(relative_path, type); end
 end
 class Listen::Silencer::Controller
@@ -188,11 +182,11 @@ class Listen::Silencer::Controller
 end
 class Listen::QueueOptimizer
   def _calculate_add_remove_difference(actions, path, default_if_exists); end
-  def _detect_possible_editor_save(changes); end
   def _logical_action_for(path, actions); end
   def _reinterpret_related_changes(cookies); end
   def _squash_changes(changes); end
   def config; end
+  def editor_modified?(changes); end
   def initialize(config); end
   def smoosh_changes(changes); end
 end
@@ -204,40 +198,40 @@ class Listen::QueueOptimizer::Config
 end
 module Listen::FSM
   def current_state; end
-  def current_state_name; end
-  def default_state; end
-  def initialize; end
+  def initialize_fsm; end
   def self.included(klass); end
   def state; end
-  def states; end
-  def transition!(state_name); end
-  def transition(state_name); end
-  def transition_with_callbacks!(state_name); end
-  def validate_and_sanitize_new_state(state_name); end
+  def transition!(new_state_name); end
+  def transition(new_state_name); end
+  def transition_with_callbacks!(new_state); end
+  def validate_and_sanitize_new_state(new_state_name); end
+  def wait_for_state(*wait_for_states, timeout: nil); end
 end
 module Listen::FSM::ClassMethods
-  def default_state(new_default = nil); end
-  def state(*args, &block); end
+  def start_state(new_start_state = nil); end
+  def state(state_name, to: nil, &block); end
   def states; end
 end
 class Listen::FSM::State
   def call(obj); end
-  def initialize(name, transitions = nil, &block); end
+  def initialize(name, transitions, &block); end
   def name; end
   def transitions; end
   def valid_transition?(new_state); end
 end
+module Listen::MonotonicTime
+  def self.now; end
+end
 module Listen::Event
 end
 class Listen::Event::Processor
   def _check_stopped; end
   def _deadline; end
   def _flush_wakeup_reasons; end
-  def _process_changes; end
+  def _process_changes(event); end
   def _remember_time_of_first_unprocessed_event; end
   def _reset_no_unprocessed_events; end
-  def _sleep(_local_reason, *args); end
-  def _timestamp; end
+  def _sleep(seconds); end
   def _wait_until_events; end
   def _wait_until_events_calm_down; end
   def _wait_until_no_longer_paused; end
@@ -248,37 +242,24 @@ end
 class Listen::Event::Processor::Stopped < RuntimeError
 end
 class Listen::Event::Loop
-  def _nice_error(ex); end
-  def _sleep(*args); end
-  def _wait_for_changes(ready_queue, config); end
-  def _wait_until_resumed(ready_queue); end
+  def _process_changes; end
   def _wakeup(reason); end
-  def config; end
   def initialize(config); end
   def pause; end
-  def paused?; end
-  def processing?; end
-  def resume; end
-  def setup; end
-  def state; end
-  def state=(arg0); end
+  def start; end
+  def started?; end
+  def stop; end
   def stopped?; end
-  def teardown; end
-  def wait_thread; end
   def wakeup_on_event; end
-end
-class Listen::Event::Loop::Error < RuntimeError
-end
-class Listen::Event::Loop::Error::NotStarted < Listen::Event::Loop::Error
+  extend Listen::FSM::ClassMethods
+  include Listen::FSM
 end
 class Listen::Event::Queue
   def <<(args); end
   def _safe_relative_from_cwd(dir); end
-  def block; end
-  def config; end
+  def close(*args, &block); end
   def empty?(*args, &block); end
-  def event_queue; end
-  def initialize(config, &block); end
+  def initialize(config); end
   def pop(*args, &block); end
   extend Forwardable
 end
@@ -294,13 +275,9 @@ class Listen::Event::Config
   def listener; end
   def min_delay_between_events; end
   def optimize_changes(changes); end
-  def paused?; end
-  def sleep(*args); end
-  def stopped?; end
-  def timestamp; end
+  def sleep(seconds); end
 end
 class Listen::Listener
-  def backend; end
   def ignore!(regexps); end
   def ignore(regexps); end
   def initialize(*dirs, &block); end
@@ -308,9 +285,9 @@ class Listen::Listener
   def pause; end
   def paused?; end
   def processing?; end
-  def processor; end
   def start; end
   def stop; end
+  def stopped?; end
   extend Listen::FSM::ClassMethods
   include Listen::FSM
 end

data/sorbet/rbi/gems/rake.rbi

@@ -203,7 +203,6 @@ class Rake::FileList
   def concat(*args, &block); end
   def count(*args, &block); end
   def cycle(*args, &block); end
-  def deconstruct(*args, &block); end
   def delete(*args, &block); end
   def delete_at(*args, &block); end
   def delete_if(*args, &block); end
@@ -231,7 +230,6 @@ class Rake::FileList
   def fill(*args, &block); end
   def filter!(*args, &block); end
   def filter(*args, &block); end
-  def filter_map(*args, &block); end
   def find(*args, &block); end
   def find_all(*args, &block); end
   def find_index(*args, &block); end
@@ -252,7 +250,6 @@ class Rake::FileList
   def inject(*args, &block); end
   def insert(*args, &block); end
   def inspect(*args, &block); end
-  def intersection(*args, &block); end
   def is_a?(klass); end
   def join(*args, &block); end
   def keep_if(*args, &block); end
@@ -319,7 +316,6 @@ class Rake::FileList
   def sum(*args, &block); end
   def take(*args, &block); end
   def take_while(*args, &block); end
-  def tally(*args, &block); end
   def to_a; end
   def to_ary; end
   def to_h(*args, &block); end
@@ -549,6 +545,7 @@ end
 class Rake::EarlyTime
   def <=>(other); end
   def self.allocate; end
+  def self.instance; end
   def self.new(*arg0); end
   def to_s; end
   extend Singleton::SingletonClassMethods
@@ -627,6 +624,7 @@ end
 class Rake::LateTime
   def <=>(other); end
   def self.allocate; end
+  def self.instance; end
   def self.new(*arg0); end
   def to_s; end
   extend Singleton::SingletonClassMethods

data/sorbet/rbi/gems/rspec-core.rbi

@@ -7,7 +7,7 @@
 #
 #   https://github.com/sorbet/sorbet-typed/new/master?filename=lib/rspec-core/all/rspec-core.rbi
 #
-# rspec-core-3.9.2
+# rspec-core-3.10.1
 
 module RSpec
   def self.clear_examples; end
@@ -176,6 +176,7 @@ class RSpec::Core::Formatters::ExceptionPresenter
   def exception_backtrace; end
   def exception_class_name(exception = nil); end
   def exception_lines; end
+  def exception_message_string(exception); end
   def extra_detail_formatter; end
   def extra_failure_lines; end
   def failure_lines; end
@@ -577,7 +578,6 @@ module RSpec::Core::HashImitatable
   def compare_by_identity?(*args, &block); end
   def count(*args, &block); end
   def cycle(*args, &block); end
-  def deconstruct_keys(*args, &block); end
   def default(*args, &block); end
   def default=(*args, &block); end
   def default_proc(*args, &block); end
@@ -605,7 +605,6 @@ module RSpec::Core::HashImitatable
   def fetch_values(*args, &block); end
   def filter!(*args, &block); end
   def filter(*args, &block); end
-  def filter_map(*args, &block); end
   def find(*args, &block); end
   def find_all(*args, &block); end
   def find_index(*args, &block); end
@@ -666,7 +665,6 @@ module RSpec::Core::HashImitatable
   def sum(*args, &block); end
   def take(*args, &block); end
   def take_while(*args, &block); end
-  def tally(*args, &block); end
   def to_a(*args, &block); end
   def to_h; end
   def to_hash(*args, &block); end
@@ -935,13 +933,10 @@ class RSpec::Core::OutputWrapper
   def advise(*args, &block); end
   def autoclose=(*args, &block); end
   def autoclose?(*args, &block); end
-  def beep(*args, &block); end
   def binmode(*args, &block); end
   def binmode?(*args, &block); end
   def bytes(*args, &block); end
   def chars(*args, &block); end
-  def check_winsize_changed(*args, &block); end
-  def clear_screen(*args, &block); end
   def close(*args, &block); end
   def close_on_exec=(*args, &block); end
   def close_on_exec?(*args, &block); end
@@ -949,27 +944,13 @@ class RSpec::Core::OutputWrapper
   def close_write(*args, &block); end
   def closed?(*args, &block); end
   def codepoints(*args, &block); end
-  def console_mode(*args, &block); end
-  def console_mode=(*args, &block); end
-  def cooked!(*args, &block); end
-  def cooked(*args, &block); end
-  def cursor(*args, &block); end
-  def cursor=(*args, &block); end
-  def cursor_down(*args, &block); end
-  def cursor_left(*args, &block); end
-  def cursor_right(*args, &block); end
-  def cursor_up(*args, &block); end
   def each(*args, &block); end
   def each_byte(*args, &block); end
   def each_char(*args, &block); end
   def each_codepoint(*args, &block); end
   def each_line(*args, &block); end
-  def echo=(*args, &block); end
-  def echo?(*args, &block); end
   def eof(*args, &block); end
   def eof?(*args, &block); end
-  def erase_line(*args, &block); end
-  def erase_screen(*args, &block); end
   def external_encoding(*args, &block); end
   def fcntl(*args, &block); end
   def fdatasync(*args, &block); end
@@ -978,25 +959,17 @@ class RSpec::Core::OutputWrapper
   def fsync(*args, &block); end
   def getbyte(*args, &block); end
   def getc(*args, &block); end
-  def getch(*args, &block); end
-  def getpass(*args, &block); end
   def gets(*args, &block); end
-  def goto(*args, &block); end
-  def goto_column(*args, &block); end
-  def iflush(*args, &block); end
   def initialize(output); end
   def inspect(*args, &block); end
   def internal_encoding(*args, &block); end
   def ioctl(*args, &block); end
-  def ioflush(*args, &block); end
   def isatty(*args, &block); end
   def lineno(*args, &block); end
   def lineno=(*args, &block); end
   def lines(*args, &block); end
   def method_missing(name, *args, &block); end
-  def noecho(*args, &block); end
   def nread(*args, &block); end
-  def oflush(*args, &block); end
   def output; end
   def output=(arg0); end
   def pathconf(*args, &block); end
@@ -1004,14 +977,11 @@ class RSpec::Core::OutputWrapper
   def pos(*args, &block); end
   def pos=(*args, &block); end
   def pread(*args, &block); end
-  def pressed?(*args, &block); end
   def print(*args, &block); end
   def printf(*args, &block); end
   def putc(*args, &block); end
   def puts(*args, &block); end
   def pwrite(*args, &block); end
-  def raw!(*args, &block); end
-  def raw(*args, &block); end
   def read(*args, &block); end
   def read_nonblock(*args, &block); end
   def readbyte(*args, &block); end
@@ -1023,11 +993,8 @@ class RSpec::Core::OutputWrapper
   def reopen(*args, &block); end
   def respond_to?(name, priv = nil); end
   def rewind(*args, &block); end
-  def scroll_backward(*args, &block); end
-  def scroll_forward(*args, &block); end
   def seek(*args, &block); end
   def set_encoding(*args, &block); end
-  def set_encoding_by_bom(*args, &block); end
   def stat(*args, &block); end
   def sync(*args, &block); end
   def sync=(*args, &block); end
@@ -1043,8 +1010,6 @@ class RSpec::Core::OutputWrapper
   def wait(*args, &block); end
   def wait_readable(*args, &block); end
   def wait_writable(*args, &block); end
-  def winsize(*args, &block); end
-  def winsize=(*args, &block); end
   def write(*args, &block); end
   def write_nonblock(*args, &block); end
 end
@@ -1114,6 +1079,9 @@ class RSpec::Core::Configuration
   def dry_run; end
   def dry_run=(arg0); end
   def dry_run?; end
+  def error_exit_code; end
+  def error_exit_code=(arg0); end
+  def error_exit_code?; end
   def error_stream; end
   def error_stream=(arg0); end
   def error_stream?; end
@@ -1244,8 +1212,8 @@ class RSpec::Core::Configuration
   def seed_used?(*args, &block); end
   def self.add_read_only_setting(name, opts = nil); end
   def self.add_setting(name, opts = nil); end
-  def self.define_aliases(name, alias_name); end
-  def self.define_predicate_for(*names); end
+  def self.define_alias(name, alias_name); end
+  def self.define_predicate(name); end
   def self.define_reader(name); end
   def self.delegate_to_ordering_manager(*methods); end
   def shared_context_metadata_behavior; end
@@ -1288,6 +1256,7 @@ module RSpec::Core::Configuration::Readers
   def drb; end
   def drb_port; end
   def dry_run; end
+  def error_exit_code; end
   def error_stream; end
   def example_status_persistence_file_path; end
   def exclude_pattern; end
@@ -1302,7 +1271,6 @@ module RSpec::Core::Configuration::Readers
   def output_stream; end
   def pattern; end
   def pending_color; end
-  def profile_examples; end
   def project_source_dirs; end
   def requires; end
   def run_all_when_everything_filtered; end
@@ -1366,6 +1334,7 @@ end
 class RSpec::Core::Runner
   def configuration; end
   def configure(err, out); end
+  def exit_code(examples_passed = nil); end
   def initialize(options, configuration = nil, world = nil); end
   def options; end
   def persist_example_statuses; end
@@ -1497,7 +1466,6 @@ class RSpec::Core::Example::Procsy
   def pending?(*a, &b); end
   def reporter(*a, &b); end
   def rerun_argument(*a, &b); end
-  def ruby2_keywords(*a, &b); end
   def run(*args, &block); end
   def skip(*a, &b); end
   def skipped?(*a, &b); end
@@ -1675,7 +1643,7 @@ module RSpec::Support
   def self.require_rspec_core(f); end
 end
 class RSpec::Core::Time
-  def self.now(*arg0); end
+  def self.now; end
 end
 class Module
   def context(*a, &b); end
@@ -1917,14 +1885,3 @@ class RSpec::Core::Formatters::FailureListFormatter < RSpec::Core::Formatters::B
   def example_failed(failure); end
   def message(_message); end
 end
-module RSpec::Core::MockingAdapters
-end
-module RSpec::Core::MockingAdapters::RSpec
-  def self.configuration; end
-  def self.framework_name; end
-  def setup_mocks_for_rspec; end
-  def teardown_mocks_for_rspec; end
-  def verify_mocks_for_rspec; end
-  include RSpec::Mocks::ExampleMethods
-  include RSpec::Mocks::ExampleMethods::ExpectHost
-end