sorbet 0.4.5095 → 0.4.5135

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9254db3554e9b57faa24c192c0a6c12b53f468f
-  data.tar.gz: be79bc2c1fe8ee69adb787bdabc11ba2a09982a0
+  metadata.gz: bf19f8280cee10aa9738268727afab501e1bf751
+  data.tar.gz: 2dccb9e6292953ae9cbfd59ba736d63fc4264bb6
 SHA512:
-  metadata.gz: 65e7e6988b02f44089c6afdc27223088fa0b0457d3acec8af88f4f6829129a0b23cf6b79c8e370d9cb1562ced791fc0eaf4167f3027e87c6c62f7789fdbdfaca
-  data.tar.gz: 578886ef6d7e9169288210457107658be66fad7cdea9cb0176eaebda61e4b76213f7234c6e793768bf152d53d76fe09ad6e21d019ecc444775387613fd8defee
+  metadata.gz: 8091b4d40e61d0cac2e8237367a4ba6ebb7c68a6a56304aa01ea49cfc1d8c40d921d9beef74a3a85fd08a018bbfbcabb8e6ae5e36ddc79adad92773906638bce
+  data.tar.gz: e701d09faacf3041fd94a76bdf6800f2c07c3032d86e302b1a4331c4d1b8c364fa73ab0aff6a4f2c3b7e21422d4bd4f7725897f34c2c2ff39de751862cdc751b

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) }

data/lib/gem_loader.rb

@@ -559,7 +559,11 @@ class Sorbet::Private::GemLoader
         puts "NameError: #{e}"
       end
     else
-      require gem # rubocop:disable PrisonGuard/NoDynamicRequire
+      begin
+        require gem # rubocop:disable PrisonGuard/NoDynamicRequire
+      rescue NameError => e
+        puts "NameError: #{e}"
+      end
     end
   end
 
@@ -579,10 +583,17 @@ class Sorbet::Private::GemLoader
     specs.sort_by(&:name).each do |gemspec|
       begin
         require_gem(gemspec.name)
-      rescue LoadError
+      rescue LoadError => e
+        puts "LoadError: #{e}"
+      rescue NameError => e
+        puts "NameError: #{e}"
       end
     end
-    Bundler.require
+    begin
+      Bundler.require
+    rescue NameError => e
+      puts "NameError: #{e}"
+    end
   end
 end
 # rubocop:enable PrisonGuard/AutogenLoaderPreamble

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorbet
 version: !ruby/object:Gem::Version
-  version: 0.4.5095
+  version: 0.4.5135
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-03 00:00:00.000000000 Z
+date: 2019-12-10 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.5095
+        version: 0.4.5135
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.5095
+        version: 0.4.5135
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement