rbs 0.11.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe2c03d38ca9869e7c7bdf283f56e61e5ccbad3831b524ba14c6fd31941985e2
-  data.tar.gz: d9cc6563f7eb3173410209daeda05a8216d2ade261a3f05d3f258d0782a08e64
+  metadata.gz: 74ff49fc40275647a8d06dcda0f3a210454b5e1d73a4a08a65e3b6c9147cceb5
+  data.tar.gz: fe69119582d76d69cfe3bcf91bf902bdb5c329b32787adfccb473da93ed99a71
 SHA512:
-  metadata.gz: fb4391906260a8414e2c2ef44ded8fda974c495830fb6c2335204052cba67260f1f0d0fd44dd560c3c05b7cdcaffa20ee24d7d16a529c37f900689bb084ce198
-  data.tar.gz: 68cb88ea29edbce815a6887b716f20c640b651628b55b9b3e660e6bc93c218081464888632f9df7bc42da49700c253bc74fb9d01970f7bf13a2425742890431e
+  metadata.gz: b35ce98a3183f6c2ef53e9fafb52620d837fb2d2300a27bedf4d81a45b245769c42770ae9b6b07a2ad873bcf6dd191f7faf3986cc895646f515f395fc5003bc8
+  data.tar.gz: 479296ba1c726b424d86817b0b33956b270a6f7df56ff40f41122f600e49ab3858a3f438ce4277bc0bbff6be32b74d41b470c956c0a7977d5d067ab016d4e3df

data/.github/workflows/ruby.yml

@@ -15,20 +15,20 @@ jobs:
         - master-nightly-bionic 
         - 2.6.5-bionic
         - 2.7.0-bionic
+        job:
+        - test
+        - stdlib_test
+        - rubocop validate test_doc build test_generate_stdlib
     container:
       image: rubylang/ruby:${{ matrix.container_tag }}
     steps:
     - uses: actions/checkout@v1
-    - name: Run test
+    - name: Install
       run: |
         ruby -v
         gem install bundler
         bin/setup
-        bundle exec rake test
-        bundle exec rake stdlib_test
-        bundle exec rake rubocop
-        bundle exec rake validate
-        bundle exec rake test_doc
-        bundle exec rake build
-        RBS_GENERATE_TEST_PATH=/tmp/Array_test.rb bundle exec rake 'generate:stdlib_test[Array]'
-        ruby -c /tmp/Array_test.rb
+    - name: Run test
+      run: |
+        bundle exec rake ${{ matrix.job }}
+      if: "!(matrix.job == 'stdlib_test' && contains(matrix.container_tag, '2.6.5'))"

data/CHANGELOG.md

@@ -2,6 +2,30 @@
 
 ## master
 
+## 0.13.1 (2020-09-09)
+
+* Fix test for CI of ruby/ruby ([#412](https://github.com/ruby/rbs/pull/412))
+
+## 0.13.0 (2020-09-09)
+
+* Signature updates for `URI` classes.
+* Fix tests ([#410](https://github.com/ruby/rbs/pull/410))
+* Add `--silent` option for `rbs validate` ([#411](https://github.com/ruby/rbs/pull/411))
+
+## 0.12.2 (2020-09-17)
+
+* Minor signature update for `pty`
+* Fix `PTY` stdlib test
+
+## 0.12.1 (2020-09-16)
+
+This version is to improve Ruby 3 testing compatibility. Nothing changed for users.
+
+## 0.12.0 (2020-09-15)
+
+* Signature updates for `forwardable`, `struct`, `set`, `URI::Generic`, `URI::File`, and `BigDecimal`.
+* Define `.new` methods from `initialize` included from modules [#390](https://github.com/ruby/rbs/pull/390)
+
 ## 0.11.0 (2020-08-31)
 
 * Signature update for `date/datetime` [#367](https://github.com/ruby/rbs/pull/367)

data/Rakefile

@@ -1,5 +1,10 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
+require "rbconfig"
+
+ruby = ENV["RUBY"] || RbConfig.ruby
+rbs = File.join(__dir__, "exe/rbs")
+bin = File.join(__dir__, "bin")
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
@@ -16,23 +21,23 @@ task :test_doc => :parser do
     `git ls-files -z`.split("\x0").select do |file| Pathname(file).extname == ".md" end
   end
 
-  sh "ruby bin/run_in_md.rb #{files.join(" ")}"
+  sh "#{ruby} #{__dir__}/bin/run_in_md.rb #{files.join(" ")}"
 end
 
 task :validate => :parser do
-  sh "rbs validate"
+  sh "#{ruby} #{rbs} validate --silent"
 
   FileList["stdlib/*"].each do |path|
     next if path =~ %r{stdlib/builtin}
-    sh "rbs -r#{File.basename(path)} validate"
+    sh "#{ruby} #{rbs} -r#{File.basename(path)} validate --silent"
   end
 end
 
 FileList["test/stdlib/**/*_test.rb"].each do |test|
-  multitask test => :parser do
-    sh "ruby bin/test_runner.rb #{test}"
+  task test => :parser do
+    sh "#{ruby} -Ilib #{bin}/test_runner.rb #{test}"
   end
-  multitask stdlib_test: test
+  task stdlib_test: test
 end
 
 task :rubocop do
@@ -171,4 +176,9 @@ namespace :generate do
   end
 end
 
+task :test_generate_stdlib do
+  sh "RBS_GENERATE_TEST_PATH=/tmp/Array_test.rb rake 'generate:stdlib_test[Array]'"
+  sh "ruby -c /tmp/Array_test.rb"
+end
+
 CLEAN.include("lib/rbs/parser.rb")

data/Steepfile

@@ -0,0 +1,28 @@
+target :lib do
+  signature "sig"
+  check "lib"
+
+  vendor stdlib: "stdlib"
+  library "set", "pathname", "json", "logger"
+end
+
+# target :lib do
+#   signature "sig"
+#
+#   check "lib"                       # Directory name
+#   check "Gemfile"                   # File name
+#   check "app/models/**/*.rb"        # Glob
+#   # ignore "lib/templates/*.rb"
+#
+#   # library "pathname", "set"       # Standard libraries
+#   # library "strong_json"           # Gems
+# end
+
+# target :spec do
+#   signature "sig", "sig-private"
+#
+#   check "spec"
+#
+#   # library "pathname", "set"       # Standard libraries
+#   # library "rspec"
+# end

data/bin/steep

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+GEMFILE=$(cd $(dirname $0); pwd)/../steep/Gemfile
+bundle exec --gemfile=${GEMFILE} steep $*

data/bin/test_runner.rb

@@ -1,12 +1,14 @@
 #!/usr/bin/env ruby
 
-RUBY_27 = Gem::Version.new(RUBY_VERSION).yield_self do |ruby_version|
-  Gem::Version.new('2.7.0') <= ruby_version && ruby_version < Gem::Version.new("2.8.0")
+$LOAD_PATH << File.join(__dir__, "../lib")
+
+IS_RUBY_27 = Gem::Version.new(RUBY_VERSION).yield_self do |ruby_version|
+  Gem::Version.new('2.7.0') <= ruby_version &&
+    ruby_version <= Gem::Version.new('2.8.0')
 end
 
-unless RUBY_27
-  STDERR.puts "🚨🚨🚨 stdlib test requires Ruby 2.7 but RUBY_VERSION==#{RUBY_VERSION}, exiting... 🚨🚨🚨"
-  exit
+unless IS_RUBY_27
+  STDERR.puts "⚠️⚠️⚠️⚠️ stdlib test assumes Ruby 2.7 but RUBY_VERSION==#{RUBY_VERSION} ⚠️⚠️⚠️⚠️"
 end
 
 ARGV.each do |arg|

data/lib/rbs/ast/comment.rb

@@ -25,7 +25,13 @@ module RBS
 
       def concat(string:, location:)  
         @string.concat string
-        @location.concat location
+
+        if loc = @location
+          loc.concat location
+        else
+          @location = location
+        end
+
         self
       end
     end

data/lib/rbs/ast/declarations.rb

@@ -7,7 +7,7 @@ module RBS
       class ModuleTypeParams
         attr_reader :params
 
-        TypeParam = Struct.new(:name, :variance, :skip_validation, keyword_init: true) do
+        TypeParam = _ = Struct.new(:name, :variance, :skip_validation, keyword_init: true) do
           def to_json(*a)
             {
               name: name,
@@ -47,7 +47,11 @@ module RBS
         end
 
         def each(&block)
-          params.each(&block)
+          if block
+            params.each(&block)
+          else
+            params.each
+          end
         end
 
         def self.empty
@@ -55,11 +59,13 @@ module RBS
         end
 
         def variance(name)
-          self[name].variance
+          var = self[name] or raise
+          var.variance
         end
 
         def skip_validation?(name)
-          self[name].skip_validation
+          var = self[name] or raise
+          var.skip_validation
         end
 
         def empty?
@@ -85,7 +91,7 @@ module RBS
           if block_given?
             members.each do |member|
               if member.is_a?(Members::Base)
-                yield member
+                yield(_ = member)
               end
             end
           else
@@ -96,8 +102,8 @@ module RBS
         def each_decl
           if block_given?
             members.each do |member|
-              if member.is_a?(Declarations::Base)
-                yield member
+              if member.is_a?(Base)
+                yield(_ = member)
               end
             end
           else
@@ -108,9 +114,9 @@ module RBS
 
       module MixinHelper
         def each_mixin(&block)
-          if block_given?
+          if block
             @mixins ||= begin
-                          members.select do |member|
+                          _ = members.select do |member|
                             case member
                             when Members::Include, Members::Extend, Members::Prepend
                               true

data/lib/rbs/buffer.rb

@@ -23,7 +23,7 @@ module RBS
 
     def pos_to_loc(pos)
       index = ranges.bsearch_index do |range|
-        pos < range.end
+        pos < range.end ? true : false
       end
 
       if index

data/lib/rbs/cli.rb

@@ -1,3 +1,4 @@
+require "open3"
 require "optparse"
 require "shellwords"
 
@@ -383,6 +384,11 @@ Examples:
 
   $ rbs validate
 EOU
+
+        opts.on("--silent") do
+          require "stringio"
+          @stdout = StringIO.new
+        end
       end.parse!(args)
 
       loader = EnvironmentLoader.new()
@@ -488,7 +494,7 @@ Show paths to directories where the RBS files are loaded from.
 Examples:
 
   $ rbs paths
-  $ tbs -r set paths
+  $ rbs -r set paths
 EOU
       end.parse!(args)
 
@@ -543,7 +549,7 @@ EOU
 Usage: rbs prototype runtime [options...] [pattern...]
 
 Generate RBS prototype based on runtime introspection.
-It loads Ruby code specified in [options] and generates RBS prototypes for classes matches to [pattern]. 
+It loads Ruby code specified in [options] and generates RBS prototypes for classes matches to [pattern].
 
 Examples:
 
@@ -808,8 +814,10 @@ EOB
         'RBS_TEST_TARGET' => (targets.join(',') unless targets.empty?)
       }
 
-      system(env_hash, *args)
-      $?
+      out, err, status = Open3.capture3(env_hash, *args)
+      stdout.print(out)
+      stderr.print(err)
+      status
     end
   end
 end

data/lib/rbs/constant.rb

@@ -2,7 +2,7 @@ module RBS
   class Constant
     attr_reader :name
     attr_reader :type
-    attr_reader :declaration
+    attr_reader :entry
 
     def initialize(name:, type:, entry:)
       @name = name

data/lib/rbs/constant_table.rb

@@ -47,6 +47,8 @@ module RBS
 
       head, *tail = split_name(name)
 
+      raise unless head
+
       head_constant = case
                       when name.absolute?
                         name_to_constant(TypeName.new(name: head, namespace: Namespace.root))
@@ -57,11 +59,13 @@ module RBS
                           resolve_constant_reference_inherit(head, scopes: constant_scopes(context.first.to_type_name))
                       end
 
-      if head_constant
-        tail.inject(head_constant) do |constant, name|
-          resolve_constant_reference_inherit name,
-                                             scopes: constant_scopes(constant.name),
-                                             no_object: constant.name != BuiltinNames::Object.name
+      tail.inject(head_constant) do |constant, name|
+        if constant
+          resolve_constant_reference_inherit(
+            name,
+            scopes: constant_scopes(constant.name),
+            no_object: constant.name != BuiltinNames::Object.name
+          )
         end
       end
     end
@@ -150,9 +154,6 @@ module RBS
       when Environment::ModuleEntry
         constant_scopes0 BuiltinNames::Module.name, scopes: scopes
         constant_scopes_module name, scopes: scopes
-
-      else
-        raise "Unexpected declaration: #{name} (#{entry.class})"
       end
 
       scopes

data/lib/rbs/definition.rb

@@ -47,9 +47,9 @@ module RBS
         end
 
         def overload?
-          case member
+          case mem = member
           when AST::Members::MethodDefinition
-            member.overload?
+            mem.overload?
           else
             false
           end
@@ -69,11 +69,17 @@ module RBS
       end
 
       def defined_in
-        @defined_in ||= defs.last.defined_in
+        @defined_in ||= begin
+          last_def = defs.last or raise
+          last_def.defined_in
+        end
       end
 
       def implemented_in
-        @implemented_in ||= defs.last.implemented_in
+        @implemented_in ||= begin
+          last_def = defs.last or raise
+          last_def.implemented_in
+        end
       end
 
       def method_types
@@ -81,7 +87,7 @@ module RBS
       end
 
       def comments
-        @comments ||= defs.map(&:comment).compact
+        @comments ||= _ = defs.map(&:comment).compact
       end
 
       def annotations
@@ -126,8 +132,8 @@ module RBS
     end
 
     module Ancestor
-      Instance = Struct.new(:name, :args, keyword_init: true)
-      Singleton = Struct.new(:name, keyword_init: true)
+      Instance = _ = Struct.new(:name, :args, keyword_init: true)
+      Singleton = _ = Struct.new(:name, keyword_init: true)
     end
 
     class InstanceAncestors
@@ -219,7 +225,10 @@ module RBS
     end
 
     def interface?
-      entry.is_a?(Environment::SingleEntry) && entry.decl.is_a?(AST::Declarations::Interface)
+      case en = entry
+      when Environment::SingleEntry
+        en.decl.is_a?(AST::Declarations::Interface)
+      end
     end
 
     def class_type?
@@ -239,16 +248,16 @@ module RBS
     end
 
     def type_params_decl
-      case entry
+      case en = entry
       when Environment::ClassEntry, Environment::ModuleEntry
-        entry.type_params
+        en.type_params
       when Environment::SingleEntry
-        entry.decl.type_params
+        en.decl.type_params
       end
     end
 
     def sub(s)
-      definition = self.class.new(type_name: type_name, self_type: self_type.sub(s), ancestors: ancestors, entry: entry)
+      definition = self.class.new(type_name: type_name, self_type: _ = self_type.sub(s), ancestors: ancestors, entry: entry)
 
       definition.methods.merge!(methods.transform_values {|method| method.sub(s) })
       definition.instance_variables.merge!(instance_variables.transform_values {|v| v.sub(s) })
@@ -268,7 +277,7 @@ module RBS
     end
 
     def each_type(&block)
-      if block_given?
+      if block
         methods.each_value do |method|
           if method.defined_in == type_name
             method.method_types.each do |method_type|