sorbet 0.4.5109 → 0.4.5129

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ef693ca3caa35b14b4f9f33cc5d52ba2aec16a9
-  data.tar.gz: 28a22a9948f48962219855d39a0e02a022dc19eb
+  metadata.gz: 151546f4aafacfd98cd6fb512a6b40276e3a4003
+  data.tar.gz: 924d9d6696c3f40c7afd085674972c2a7c3850e7
 SHA512:
-  metadata.gz: 03db6317bd23df81a5ba1be4d1ac09d27806139c83ec7a5a0b849922f1304b1df3e69bd19482158c0cab5a1dc83c1ec210725a4803f08d9fad124a4ae844f03a
-  data.tar.gz: 7334e5cc457f89ea206d2941dd769245c87b187720ffcf8877bec43a2d2fbac70bc24326fcb5a76e212f32981cc736cf5cf16fde18bf0082cd1aed6166191805
+  metadata.gz: 649c1d6224da092a9eb6d286ba4fdf6871252cd08fcc1aa3d7b98d41ce0c6ca1c1679680ed0bdf54a33e176a135a46857a13ec396652ca6a0af7a77fe50a8b7e
+  data.tar.gz: e8660ee3741a4eb94597d4896f42923b53b90bbdb49c9f8da0d0ce6c7f8867873a2f27b0555fc40e47003dff458eca7668512d62d3266356754fb35e586df34e

data/bin/srb

@@ -70,6 +70,7 @@ typecheck() {
     version_suffix="${without_bin_srb##*/sorbet}"
     # /path/to/gems
     gems_path="${without_bin_srb%/sorbet*}"
+
     # /path/to/gems/sorbet-static-0.0.1-darwin-17/libexec/sorbet
     # (assumes people only have one platform-depdendent gem installed per version)
     guess_sorbet=("$gems_path/sorbet-static$version_suffix"*/libexec/sorbet)
@@ -83,6 +84,27 @@ typecheck() {
       sorbet="$(VISUAL=echo gem open sorbet-static -v "${version}")/libexec/sorbet"
     fi
 
+    # if we still don't know the sorbet binary
+    # perhaps this is the java platform
+    if ! [[ -f "${sorbet}" ]]; then
+      if gem env platform | grep -q "java"; then
+        # certain platforms (i.e. java) include multiple binaries 
+        # mac.sorbet & linux.sorbet -- since they can't use the host platform (i.e. darwin or linux)
+        # to collect the correct sorbet binary
+        case "$(uname -s)" in
+        Linux*)     prefix="linux.";;
+        Darwin*)    prefix="mac.";;
+        *)          prefix=""
+        esac
+        
+        guess_sorbet=("$gems_path/sorbet-static$version_suffix"*/libexec/"${prefix}sorbet")
+        if [[ -f "${guess_sorbet[0]}" ]]; then
+          sorbet="${guess_sorbet[0]}"
+        fi
+
+      fi
+    fi
+
     # shellcheck disable=SC2086
     "${sorbet}" "${args[@]}"
   fi

data/lib/gem-generator-tracepoint/tracepoint_serializer.rb

@@ -215,8 +215,9 @@ module Sorbet::Private
       def gem_from_location(location)
         match =
           location&.match(/^.*\/(ruby)\/([\d.]+)\//) || # ruby stdlib
+          location&.match(/^.*\/(j?ruby)-([\d.]+)\//) || # jvm ruby stdlib
           location&.match(/^.*\/(site_ruby)\/([\d.]+)\//) || # rubygems
-          location&.match(/^.*\/gems\/(?:ruby-)?[\d.]+(?:@[^\/]+)?(?:\/bundler)?\/gems\/([^\/]+)-([^-\/]+)\//i) # gem
+          location&.match(/^.*\/gems\/(?:j?ruby-)?[\d.]+(?:@[^\/]+)?(?:\/bundler)?\/gems\/([^\/]+)-([^-\/]+)\//i) # gem
         if match.nil?
           # uncomment to generate files for methods outside of gems
           # {

data/lib/gem-generator-tracepoint/tracer.rb

@@ -118,13 +118,18 @@ module Sorbet::Private
           on_module_created(tp.self)
         end
         @c_call_tracepoint = TracePoint.new(:c_call) do |tp|
-          case tp.method_id
+
+          # older version of JRuby unfortunately returned a String
+          case tp.method_id.to_sym
           when :require, :require_relative
             @context_stack << []
           end
         end
         @c_return_tracepoint = TracePoint.new(:c_return) do |tp|
-          case tp.method_id
+
+          # older version of JRuby unfortunately returned a String
+          method_id_sym = tp.method_id.to_sym
+          case method_id_sym
           when :require, :require_relative
             popped = @context_stack.pop
 
@@ -147,8 +152,13 @@ module Sorbet::Private
             begin
               tp.disable
 
-              singleton = tp.method_id == :singleton_method_added
+              singleton = method_id_sym == :singleton_method_added
               receiver = singleton ? Sorbet::Private::RealStdlib.real_singleton_class(tp.self) : tp.self
+
+              # JRuby the main Object is not a module
+              # so lets skip it, otherwise RealStdlib#real_instance_methods raises an exception since it expects one.
+              next unless receiver.is_a?(Module)
+
               methods = Sorbet::Private::RealStdlib.real_instance_methods(receiver, false) + Sorbet::Private::RealStdlib.real_private_instance_methods(receiver, false)
               set = @modules[Sorbet::Private::RealStdlib.real_object_id(receiver)] ||= Set.new
               added = methods.find { |m| !set.include?(m) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorbet
 version: !ruby/object:Gem::Version
-  version: 0.4.5109
+  version: 0.4.5129
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-05 00:00:00.000000000 Z
+date: 2019-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sorbet-static
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.5109
+        version: 0.4.5129
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.5109
+        version: 0.4.5129
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement