rbs 0.12.2 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1738d77c19c9d170537831e8a3d7bb5cdaa7dfa0baf37a16d8b8c0589ce3636d
-  data.tar.gz: 8a7dbb478d8817b5c5eb860507a3a0dabec2a5c340e4e09a311350f20a764a43
+  metadata.gz: b9e733e8a7ed63c585d2a2253728700a7cdca633fd6a7953fb95cda24f423604
+  data.tar.gz: e690e3412cc614e0ce7d8c379e78f2d39d5a2def56f2e7165322db7c421cffd2
 SHA512:
-  metadata.gz: 17f8b1e8e0ddbd584d7f325201de367dd52884c8bca168dd8b14c9464017bcd6db0f4959f72d5d1eebee2235b5fd97f9d46f5dbb87f696b2aeeb6e7a46cb051a
-  data.tar.gz: f250146315eb49e81c92407b52f62d9d3d1b2a05904c1bf7552f1523eb0a8c52108a2f74184d1e85b6d86948d485c47dc1a695536ac5f0534db5870bd488fb69
+  metadata.gz: 87bcb3459cb7ef4ac2e56f1047064e0d2b7412d19023ae63b1329e8e40a1dcff3ce3766cfc1086c8447aa2b2e4aea5207e1bf901b25c3f3d49072d90f5a6c694
+  data.tar.gz: 916e9bb2f678fa321862700f386b09b7de88a127e7d4ba92d9b6139f030a865db18a976e51a5820b84caa4c6598aafda876c5e7183a3ed3ff19b8054cfa16842

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## master
 
+## 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`

data/Rakefile

@@ -25,11 +25,11 @@ task :test_doc => :parser do
 end
 
 task :validate => :parser do
-  sh "#{ruby} #{rbs} validate"
+  sh "#{ruby} #{rbs} validate --silent"
 
   FileList["stdlib/*"].each do |path|
     next if path =~ %r{stdlib/builtin}
-    sh "#{ruby} #{rbs} -r#{File.basename(path)} validate"
+    sh "#{ruby} #{rbs} -r#{File.basename(path)} validate --silent"
   end
 end
 

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/environment.rb

@@ -258,6 +258,8 @@ module RBS
                 outer: outer_,
                 prefix: prefix_
               )
+            else
+              raise
             end
           end,
           location: decl.location,
@@ -288,6 +290,8 @@ module RBS
                 outer: outer_,
                 prefix: prefix_
               )
+            else
+              raise
             end
           end,
           location: decl.location,

data/lib/rbs/environment_loader.rb

@@ -9,14 +9,14 @@ module RBS
       end
     end
 
-    LibraryPath = Struct.new(:name, :path, keyword_init: true)
-    GemPath = Struct.new(:name, :version, :path, keyword_init: true)
+    LibraryPath = _ = Struct.new(:name, :path, keyword_init: true)
+    GemPath = _ = Struct.new(:name, :version, :path, keyword_init: true)
 
     attr_reader :paths
     attr_reader :stdlib_root
     attr_reader :gem_vendor_path
 
-    STDLIB_ROOT = Pathname(__dir__) + "../../stdlib"
+    STDLIB_ROOT = Pathname(_ = __dir__) + "../../stdlib"
 
     def self.gem_sig_path(name, version)
       Pathname(Gem::Specification.find_by_name(name, version).gem_dir) + "sig"
@@ -50,22 +50,20 @@ module RBS
     end
 
     def self.parse_library(lib)
-      lib.split(/:/)
+      _ = lib.split(/:/)
     end
 
     def stdlib?(name)
-      if stdlib_root
-        path = stdlib_root + name
-        if path.directory?
-          path
-        end
+      path = stdlib_root + name
+      if path.directory?
+        path
       end
     end
 
     def gem?(name, version)
-      if gem_vendor_path
+      if path = gem_vendor_path
         # Try vendored RBS first
-        gem_dir = gem_vendor_path + name
+        gem_dir = path + name
         if gem_dir.directory?
           return gem_dir
         end
@@ -76,7 +74,7 @@ module RBS
     end
 
     def each_signature(path, immediate: true, &block)
-      if block_given?
+      if block
         case
         when path.file?
           if path.extname == ".rbs" || immediate
@@ -116,6 +114,7 @@ module RBS
 
     def each_decl
       if block_given?
+        # @type var signature_files: Array[[path | :stdlib, Pathname]]
         signature_files = []
 
         unless no_builtin?
@@ -142,6 +141,7 @@ module RBS
     end
 
     def load(env:)
+      # @type var loadeds: Array[[AST::Declarations::t, Pathname, path | :stdlib]]
       loadeds = []
 
       each_decl do |decl, buffer, file_path, lib_path|

data/lib/rbs/variance_calculator.rb

@@ -120,7 +120,7 @@ module RBS
 
         type.args.each.with_index do |ty, i|
           var = type_params.params[i]
-          case var.variance
+          case var&.variance
           when :invariant
             type(ty, result: result, context: :invariant)
           when :covariant

data/lib/rbs/version.rb

@@ -1,3 +1,3 @@
 module RBS
-  VERSION = "0.12.2"
+  VERSION = "0.13.0"
 end

data/lib/rbs/writer.rb

@@ -60,6 +60,8 @@ module RBS
 
     def write(decls)
       [nil, *decls].each_cons(2) do |prev, decl|
+        raise unless decl
+
         preserve_empty_line(prev, decl)
         write_decl decl
       end
@@ -68,8 +70,8 @@ module RBS
     def write_decl(decl)
       case decl
       when AST::Declarations::Class
-        super_class = if decl.super_class
-                        " < #{name_and_args(decl.super_class.name, decl.super_class.args)}"
+        super_class = if super_class = decl.super_class
+                        " < #{name_and_args(super_class.name, super_class.args)}"
                       end
         write_comment decl.comment
         write_annotation decl.annotations
@@ -77,6 +79,8 @@ module RBS
 
         indent do
           [nil, *decl.members].each_cons(2) do |prev, member|
+            raise unless member
+
             preserve_empty_line prev, member
             write_member member
           end
@@ -134,9 +138,6 @@ module RBS
 
         puts "end"
 
-      when AST::Declarations::Extension
-        RBS.logger.warn "Extension is ignored: #{decl.name}"
-
       end
     end
 
@@ -288,20 +289,29 @@ module RBS
     end
 
     def preserve_empty_line(prev, decl)
-      return unless prev
+      # @type var decl: _Located
 
-      decl = decl.comment if decl.respond_to?(:comment) && decl.comment
+      return unless prev
 
-      # When the signature is not constructed by the parser,
-      # it always inserts an empty line.
-      if !prev.location || !decl.location
-        puts
-        return
+      if (_ = decl).respond_to?(:comment)
+        if comment = (_ = decl).comment
+          decl = comment
+        end
       end
 
-      prev_end_line = prev.location.end_line
-      start_line = decl.location.start_line
-      if start_line - prev_end_line > 1
+      prev_loc = prev.location
+      decl_loc = decl.location
+
+      if prev_loc && decl_loc
+        prev_end_line = prev_loc.end_line
+        start_line = decl_loc.start_line
+  
+        if start_line - prev_end_line > 1
+          puts
+        end
+      else
+        # When the signature is not constructed by the parser,
+        # it always inserts an empty line.
         puts
       end
     end

data/sig/constant.rbs

@@ -0,0 +1,21 @@
+module RBS
+  class Constant
+    type constant_entry = Environment::ClassEntry
+                        | Environment::ModuleEntry
+                        | Environment::SingleEntry[TypeName, AST::Declarations::Constant]
+
+    attr_reader name: TypeName
+
+    attr_reader type: Types::t
+
+    attr_reader entry: constant_entry
+
+    def initialize: (name: TypeName, type: Types::t, entry: constant_entry) -> void
+                  
+    def ==: (untyped other) -> bool
+          
+    alias eql? ==
+
+    def hash: () -> Integer
+  end
+end

data/sig/constant_table.rbs

@@ -0,0 +1,30 @@
+module RBS
+  class ConstantTable
+    attr_reader definition_builder: DefinitionBuilder
+    attr_reader constant_scopes_cache: Hash[TypeName, Array[Namespace]]
+    attr_reader resolver: TypeNameResolver
+    attr_reader env(): Environment
+
+    def initialize: (builder: DefinitionBuilder) -> void
+                  
+    def absolute_type: (Types::t, context: Array[Namespace]) -> Types::t
+                     
+    def absolute_type_name: (TypeName, context: Array[Namespace], location: Location?) -> TypeName
+                          
+    def name_to_constant: (TypeName) -> Constant?
+                        
+    def split_name: (TypeName) -> Array[Symbol]
+                  
+    def resolve_constant_reference: (TypeName name, context: Array[Namespace]) -> Constant?
+                                  
+    def resolve_constant_reference_context: (Symbol, context: Array[Namespace]) -> Constant?
+                                          
+    def resolve_constant_reference_inherit: (Symbol, scopes: Array[Namespace], ?no_object: bool) -> Constant?
+                                          
+    def constant_scopes: (TypeName) -> Array[Namespace]
+                       
+    def constant_scopes_module: (TypeName, scopes: Array[Namespace]) -> Array[Namespace]
+                       
+    def constant_scopes0: (TypeName, ?scopes: Array[Namespace]) -> Array[Namespace]
+  end
+end

data/sig/definition_builder.rbs

@@ -29,14 +29,14 @@ module RBS
 
     attr_reader env: Environment
     attr_reader type_name_resolver: TypeNameResolver
-    
+
     attr_reader instance_cache: Hash[TypeName, Definition | false | nil]
     attr_reader singleton_cache: Hash[TypeName, Definition | false | nil]
     attr_reader interface_cache: Hash[TypeName, Definition | false | nil]
 
     attr_reader one_instance_cache: Hash[TypeName, Definition]
     attr_reader one_singleton_cache: Hash[TypeName, Definition]
-    
+
     attr_reader instance_ancestors_cache: Hash[TypeName, Definition::InstanceAncestors]
     attr_reader singleton_ancestor_cache: Hash[TypeName, Definition::SingletonAncestors]
 
@@ -48,7 +48,7 @@ module RBS
     def validate_super_class!: (TypeName, Environment::ClassEntry) -> void
 
     def one_instance_ancestors: (TypeName) -> OneAncestors
-                                
+
     def one_singleton_ancestors: (TypeName) -> OneAncestors
 
     def instance_ancestors: (TypeName, ?building_ancestors: Array[Definition::Ancestor::t]) -> Definition::InstanceAncestors
@@ -69,7 +69,7 @@ module RBS
 
     def build_one_singleton: (TypeName) -> Definition
 
-    def merge_definitions: (TypeName, 
+    def merge_definitions: (TypeName,
                             Array[[Definition::Ancestor::t, Definition]],
                             entry: Environment::ModuleEntry | Environment::ClassEntry,
                             self_type: Definition::self_type,
@@ -92,4 +92,3 @@ module RBS
     def expand_alias: (TypeName) -> Types::t
   end
 end
-

data/sig/environment_loader.rbs

@@ -1,4 +1,58 @@
 module RBS
   class EnvironmentLoader
+    class UnknownLibraryNameError < StandardError
+      attr_reader name: String
+
+      def initialize: (name: String) -> void
+    end
+
+    class LibraryPath
+      attr_reader name: String
+      attr_reader path: Pathname
+
+      def initialize: (name: String, path: Pathname) -> void
+    end
+
+    class GemPath
+      attr_reader name: String
+      attr_reader version: String?
+      attr_reader path: Pathname
+
+      def initialize: (name: String, version: String?, path: Pathname) -> void
+    end
+
+    STDLIB_ROOT: Pathname
+
+    type path = Pathname | LibraryPath | GemPath
+
+    attr_reader paths: Array[path]
+    attr_reader stdlib_root: Pathname
+    attr_reader gem_vendor_path: Pathname?
+
+    def self.gem_sig_path: (String, String?) -> Pathname?
+
+    def initialize: (?stdlib_root: Pathname, ?gem_vendor_path: Pathname?) -> void
+
+    def add: (path: Pathname?) -> void
+           | (library: String?) -> void
+
+    def self.parse_library: (String) -> [String, String?]
+
+    def stdlib?: (String) -> Pathname?
+
+    def gem?: (String, String?) -> Pathname?
+
+    def each_signature: (Pathname, ?immediate: bool) { (Pathname) -> void } -> void
+                      | (Pathname, ?immediate: bool) -> Enumerator[Pathname, void]
+
+    def each_library_path: { (path, Pathname) -> void } -> void
+
+    def no_builtin!: (?bool) -> self
+
+    def no_builtin?: () -> bool
+
+    def each_decl: () { (AST::Declarations::t, Buffer, Pathname, path | :stdlib) -> void } -> void
+
+    def load: (env: Environment) -> Array[[AST::Declarations::t, Pathname, path | :stdlib]]
   end
 end

data/sig/version.rbs

@@ -0,0 +1,3 @@
+module RBS
+  VERSION: String
+end

data/sig/writer.rbs

@@ -0,0 +1,40 @@
+module RBS
+  class Writer
+    attr_reader out: IO
+    attr_reader indentation: Array[String]
+
+    def initialize: (out: IO) -> void
+                  
+    def indent: (?Integer size) { () -> void } -> void
+              
+    def prefix: () -> String
+              
+    def puts: (?String) -> void
+            
+    def write_annotation: (Array[AST::Annotation]) -> void
+                        
+    def write_comment: (AST::Comment?) -> void
+                     
+    def write: (Array[AST::Declarations::t]) -> void
+             
+    def write_decl: (AST::Declarations::t) -> void
+                  
+    def write_member: (AST::Declarations::Module::member) -> void
+                  
+    def name_and_params: (TypeName, AST::Declarations::ModuleTypeParams) -> String?
+                       
+    def name_and_args: (TypeName, Array[Types::t]) -> String?
+                     
+    def method_name: (Symbol) -> String
+                   
+    def write_def: (AST::Members::MethodDefinition) -> void
+                 
+    def attribute: (:reader | :writer | :accessor, AST::Members::Attribute) -> void
+                 
+    interface _Located
+      def location: () -> Location?
+    end
+                 
+    def preserve_empty_line: (_Located?, _Located) -> void
+  end
+end

data/stdlib/builtin/kernel.rbs

@@ -11,6 +11,8 @@
 # sprintf "%.1f", 1.234 #=> "1.2"
 # ```
 module Kernel
+  private
+  
   def caller: (?Integer start_or_range, ?Integer length) -> ::Array[String]?
             | (?::Range[Integer] start_or_range) -> ::Array[String]?
             | () -> ::Array[String]

data/stdlib/pathname/pathname.rbs

@@ -1077,6 +1077,8 @@ class Pathname
 end
 
 module Kernel
+  private
+  
   # Creates a new Pathname object from the given string, `path`, and returns
   # pathname object.
   #

data/stdlib/uri/generic.rbs

@@ -851,7 +851,7 @@ module URI
     #   uri.coerce("http://foo.com")
     #   #=> [#<URI::HTTP http://foo.com>, #<URI::HTTP http://my.example.com>]
     #
-    def coerce: ((URI::Generic | String) oth) -> Array[URI::Generic]
+    def coerce: (URI::Generic | String oth) -> Array[URI::Generic]
 
     # Returns a proxy URI.
     # The proxy URI is obtained from environment variables such as http_proxy,

data/stdlib/uri/http.rbs

@@ -0,0 +1,158 @@
+# URI is a module providing classes to handle Uniform Resource Identifiers
+# ([RFC2396](http://tools.ietf.org/html/rfc2396)).
+#
+# ## Features
+#
+# *   Uniform way of handling URIs.
+# *   Flexibility to introduce custom URI schemes.
+# *   Flexibility to have an alternate URI::Parser (or just different patterns
+#     and regexp's).
+#
+#
+# ## Basic example
+#
+#     require 'uri'
+#
+#     uri = URI("http://foo.com/posts?id=30&limit=5#time=1305298413")
+#     #=> #<URI::HTTP http://foo.com/posts?id=30&limit=5#time=1305298413>
+#
+#     uri.scheme    #=> "http"
+#     uri.host      #=> "foo.com"
+#     uri.path      #=> "/posts"
+#     uri.query     #=> "id=30&limit=5"
+#     uri.fragment  #=> "time=1305298413"
+#
+#     uri.to_s      #=> "http://foo.com/posts?id=30&limit=5#time=1305298413"
+#
+# ## Adding custom URIs
+#
+#     module URI
+#       class RSYNC < Generic
+#         DEFAULT_PORT = 873
+#       end
+#       @@schemes['RSYNC'] = RSYNC
+#     end
+#     #=> URI::RSYNC
+#
+#     URI.scheme_list
+#     #=> {"FILE"=>URI::File, "FTP"=>URI::FTP, "HTTP"=>URI::HTTP,
+#     #    "HTTPS"=>URI::HTTPS, "LDAP"=>URI::LDAP, "LDAPS"=>URI::LDAPS,
+#     #    "MAILTO"=>URI::MailTo, "RSYNC"=>URI::RSYNC}
+#
+#     uri = URI("rsync://rsync.foo.com")
+#     #=> #<URI::RSYNC rsync://rsync.foo.com>
+#
+# ## RFC References
+#
+# A good place to view an RFC spec is http://www.ietf.org/rfc.html.
+#
+# Here is a list of all related RFC's:
+# *   [RFC822](http://tools.ietf.org/html/rfc822)
+# *   [RFC1738](http://tools.ietf.org/html/rfc1738)
+# *   [RFC2255](http://tools.ietf.org/html/rfc2255)
+# *   [RFC2368](http://tools.ietf.org/html/rfc2368)
+# *   [RFC2373](http://tools.ietf.org/html/rfc2373)
+# *   [RFC2396](http://tools.ietf.org/html/rfc2396)
+# *   [RFC2732](http://tools.ietf.org/html/rfc2732)
+# *   [RFC3986](http://tools.ietf.org/html/rfc3986)
+#
+#
+# ## Class tree
+#
+# *   URI::Generic (in uri/generic.rb)
+#     *   URI::File - (in uri/file.rb)
+#     *   URI::FTP - (in uri/ftp.rb)
+#     *   URI::HTTP - (in uri/http.rb)
+#         *   URI::HTTPS - (in uri/https.rb)
+#
+#     *   URI::LDAP - (in uri/ldap.rb)
+#         *   URI::LDAPS - (in uri/ldaps.rb)
+#
+#     *   URI::MailTo - (in uri/mailto.rb)
+#
+# *   URI::Parser - (in uri/common.rb)
+# *   URI::REGEXP - (in uri/common.rb)
+#     *   URI::REGEXP::PATTERN - (in uri/common.rb)
+#
+# *   URI::Util - (in uri/common.rb)
+# *   URI::Escape - (in uri/common.rb)
+# *   URI::Error - (in uri/common.rb)
+#     *   URI::InvalidURIError - (in uri/common.rb)
+#     *   URI::InvalidComponentError - (in uri/common.rb)
+#     *   URI::BadURIError - (in uri/common.rb)
+#
+#
+#
+# ## Copyright Info
+#
+# Author
+# :   Akira Yamada <akira@ruby-lang.org>
+# Documentation
+# :   Akira Yamada <akira@ruby-lang.org> Dmitry V. Sabanin <sdmitry@lrn.ru>
+#     Vincent Batts <vbatts@hashbangbash.com>
+# License
+# :   Copyright (c) 2001 akira yamada <akira@ruby-lang.org> You can redistribute
+#     it and/or modify it under the same term as Ruby.
+# Revision
+# :   $Id$
+#
+#
+module URI
+  #
+  # The syntax of HTTP URIs is defined in RFC1738 section 3.3.
+  #
+  # Note that the Ruby URI library allows HTTP URLs containing usernames and
+  # passwords. This is not legal as per the RFC, but used to be
+  # supported in Internet Explorer 5 and 6, before the MS04-004 security
+  # update. See <URL:http://support.microsoft.com/kb/834489>.
+  #
+  class HTTP < Generic
+    # A Default port of 80 for URI::HTTP.
+    DEFAULT_PORT: Integer
+
+    # An Array of the available components for URI::HTTP.
+    COMPONENT: Array[Symbol]
+
+    #
+    # == Description
+    #
+    # Creates a new URI::HTTP object from components, with syntax checking.
+    #
+    # The components accepted are userinfo, host, port, path, query, and
+    # fragment.
+    #
+    # The components should be provided either as an Array, or as a Hash
+    # with keys formed by preceding the component names with a colon.
+    #
+    # If an Array is used, the components must be passed in the
+    # order <code>[userinfo, host, port, path, query, fragment]</code>.
+    #
+    # Example:
+    #
+    #     uri = URI::HTTP.build(host: 'www.example.com', path: '/foo/bar')
+    #
+    #     uri = URI::HTTP.build([nil, "www.example.com", nil, "/path",
+    #       "query", 'fragment'])
+    #
+    # Currently, if passed userinfo components this method generates
+    # invalid HTTP URIs as per RFC 1738.
+    #
+    def self.build: (Array[String | Integer] args) -> URI::HTTP
+                  | ({ userinfo: String, host: String, port: Integer, path: String, query: String, fragment: String }) -> URI::HTTP
+
+    #
+    # == Description
+    #
+    # Returns the full path for an HTTP request, as required by Net::HTTP::Get.
+    #
+    # If the URI contains a query, the full path is URI#path + '?' + URI#query.
+    # Otherwise, the path is simply URI#path.
+    #
+    # Example:
+    #
+    #     uri = URI::HTTP.build(path: '/foo/bar', query: 'test=true')
+    #     uri.request_uri #  => "/foo/bar?test=true"
+    #
+    def request_uri: () -> String
+  end
+end

data/stdlib/uri/https.rbs

@@ -0,0 +1,108 @@
+# URI is a module providing classes to handle Uniform Resource Identifiers
+# ([RFC2396](http://tools.ietf.org/html/rfc2396)).
+#
+# ## Features
+#
+# *   Uniform way of handling URIs.
+# *   Flexibility to introduce custom URI schemes.
+# *   Flexibility to have an alternate URI::Parser (or just different patterns
+#     and regexp's).
+#
+#
+# ## Basic example
+#
+#     require 'uri'
+#
+#     uri = URI("http://foo.com/posts?id=30&limit=5#time=1305298413")
+#     #=> #<URI::HTTP http://foo.com/posts?id=30&limit=5#time=1305298413>
+#
+#     uri.scheme    #=> "http"
+#     uri.host      #=> "foo.com"
+#     uri.path      #=> "/posts"
+#     uri.query     #=> "id=30&limit=5"
+#     uri.fragment  #=> "time=1305298413"
+#
+#     uri.to_s      #=> "http://foo.com/posts?id=30&limit=5#time=1305298413"
+#
+# ## Adding custom URIs
+#
+#     module URI
+#       class RSYNC < Generic
+#         DEFAULT_PORT = 873
+#       end
+#       @@schemes['RSYNC'] = RSYNC
+#     end
+#     #=> URI::RSYNC
+#
+#     URI.scheme_list
+#     #=> {"FILE"=>URI::File, "FTP"=>URI::FTP, "HTTP"=>URI::HTTP,
+#     #    "HTTPS"=>URI::HTTPS, "LDAP"=>URI::LDAP, "LDAPS"=>URI::LDAPS,
+#     #    "MAILTO"=>URI::MailTo, "RSYNC"=>URI::RSYNC}
+#
+#     uri = URI("rsync://rsync.foo.com")
+#     #=> #<URI::RSYNC rsync://rsync.foo.com>
+#
+# ## RFC References
+#
+# A good place to view an RFC spec is http://www.ietf.org/rfc.html.
+#
+# Here is a list of all related RFC's:
+# *   [RFC822](http://tools.ietf.org/html/rfc822)
+# *   [RFC1738](http://tools.ietf.org/html/rfc1738)
+# *   [RFC2255](http://tools.ietf.org/html/rfc2255)
+# *   [RFC2368](http://tools.ietf.org/html/rfc2368)
+# *   [RFC2373](http://tools.ietf.org/html/rfc2373)
+# *   [RFC2396](http://tools.ietf.org/html/rfc2396)
+# *   [RFC2732](http://tools.ietf.org/html/rfc2732)
+# *   [RFC3986](http://tools.ietf.org/html/rfc3986)
+#
+#
+# ## Class tree
+#
+# *   URI::Generic (in uri/generic.rb)
+#     *   URI::File - (in uri/file.rb)
+#     *   URI::FTP - (in uri/ftp.rb)
+#     *   URI::HTTP - (in uri/http.rb)
+#         *   URI::HTTPS - (in uri/https.rb)
+#
+#     *   URI::LDAP - (in uri/ldap.rb)
+#         *   URI::LDAPS - (in uri/ldaps.rb)
+#
+#     *   URI::MailTo - (in uri/mailto.rb)
+#
+# *   URI::Parser - (in uri/common.rb)
+# *   URI::REGEXP - (in uri/common.rb)
+#     *   URI::REGEXP::PATTERN - (in uri/common.rb)
+#
+# *   URI::Util - (in uri/common.rb)
+# *   URI::Escape - (in uri/common.rb)
+# *   URI::Error - (in uri/common.rb)
+#     *   URI::InvalidURIError - (in uri/common.rb)
+#     *   URI::InvalidComponentError - (in uri/common.rb)
+#     *   URI::BadURIError - (in uri/common.rb)
+#
+#
+#
+# ## Copyright Info
+#
+# Author
+# :   Akira Yamada <akira@ruby-lang.org>
+# Documentation
+# :   Akira Yamada <akira@ruby-lang.org> Dmitry V. Sabanin <sdmitry@lrn.ru>
+#     Vincent Batts <vbatts@hashbangbash.com>
+# License
+# :   Copyright (c) 2001 akira yamada <akira@ruby-lang.org> You can redistribute
+#     it and/or modify it under the same term as Ruby.
+# Revision
+# :   $Id$
+#
+#
+module URI
+  # The default port for HTTPS URIs is 443, and the scheme is 'https:' rather
+  # than 'http:'. Other than that, HTTPS URIs are identical to HTTP URIs;
+  # see URI::HTTP.
+  class HTTPS < HTTP
+    # A Default port of 443 for URI::HTTPS
+    DEFAULT_PORT: Integer
+  end
+end

data/stdlib/uri/ldap.rbs

@@ -0,0 +1,224 @@
+# URI is a module providing classes to handle Uniform Resource Identifiers
+# ([RFC2396](http://tools.ietf.org/html/rfc2396)).
+#
+# ## Features
+#
+# *   Uniform way of handling URIs.
+# *   Flexibility to introduce custom URI schemes.
+# *   Flexibility to have an alternate URI::Parser (or just different patterns
+#     and regexp's).
+#
+#
+# ## Basic example
+#
+#     require 'uri'
+#
+#     uri = URI("http://foo.com/posts?id=30&limit=5#time=1305298413")
+#     #=> #<URI::HTTP http://foo.com/posts?id=30&limit=5#time=1305298413>
+#
+#     uri.scheme    #=> "http"
+#     uri.host      #=> "foo.com"
+#     uri.path      #=> "/posts"
+#     uri.query     #=> "id=30&limit=5"
+#     uri.fragment  #=> "time=1305298413"
+#
+#     uri.to_s      #=> "http://foo.com/posts?id=30&limit=5#time=1305298413"
+#
+# ## Adding custom URIs
+#
+#     module URI
+#       class RSYNC < Generic
+#         DEFAULT_PORT = 873
+#       end
+#       @@schemes['RSYNC'] = RSYNC
+#     end
+#     #=> URI::RSYNC
+#
+#     URI.scheme_list
+#     #=> {"FILE"=>URI::File, "FTP"=>URI::FTP, "HTTP"=>URI::HTTP,
+#     #    "HTTPS"=>URI::HTTPS, "LDAP"=>URI::LDAP, "LDAPS"=>URI::LDAPS,
+#     #    "MAILTO"=>URI::MailTo, "RSYNC"=>URI::RSYNC}
+#
+#     uri = URI("rsync://rsync.foo.com")
+#     #=> #<URI::RSYNC rsync://rsync.foo.com>
+#
+# ## RFC References
+#
+# A good place to view an RFC spec is http://www.ietf.org/rfc.html.
+#
+# Here is a list of all related RFC's:
+# *   [RFC822](http://tools.ietf.org/html/rfc822)
+# *   [RFC1738](http://tools.ietf.org/html/rfc1738)
+# *   [RFC2255](http://tools.ietf.org/html/rfc2255)
+# *   [RFC2368](http://tools.ietf.org/html/rfc2368)
+# *   [RFC2373](http://tools.ietf.org/html/rfc2373)
+# *   [RFC2396](http://tools.ietf.org/html/rfc2396)
+# *   [RFC2732](http://tools.ietf.org/html/rfc2732)
+# *   [RFC3986](http://tools.ietf.org/html/rfc3986)
+#
+#
+# ## Class tree
+#
+# *   URI::Generic (in uri/generic.rb)
+#     *   URI::File - (in uri/file.rb)
+#     *   URI::FTP - (in uri/ftp.rb)
+#     *   URI::HTTP - (in uri/http.rb)
+#         *   URI::HTTPS - (in uri/https.rb)
+#
+#     *   URI::LDAP - (in uri/ldap.rb)
+#         *   URI::LDAPS - (in uri/ldaps.rb)
+#
+#     *   URI::MailTo - (in uri/mailto.rb)
+#
+# *   URI::Parser - (in uri/common.rb)
+# *   URI::REGEXP - (in uri/common.rb)
+#     *   URI::REGEXP::PATTERN - (in uri/common.rb)
+#
+# *   URI::Util - (in uri/common.rb)
+# *   URI::Escape - (in uri/common.rb)
+# *   URI::Error - (in uri/common.rb)
+#     *   URI::InvalidURIError - (in uri/common.rb)
+#     *   URI::InvalidComponentError - (in uri/common.rb)
+#     *   URI::BadURIError - (in uri/common.rb)
+#
+#
+#
+# ## Copyright Info
+#
+# Author
+# :   Akira Yamada <akira@ruby-lang.org>
+# Documentation
+# :   Akira Yamada <akira@ruby-lang.org> Dmitry V. Sabanin <sdmitry@lrn.ru>
+#     Vincent Batts <vbatts@hashbangbash.com>
+# License
+# :   Copyright (c) 2001 akira yamada <akira@ruby-lang.org> You can redistribute
+#     it and/or modify it under the same term as Ruby.
+# Revision
+# :   $Id$
+#
+#
+module URI
+  #
+  # LDAP URI SCHEMA (described in RFC2255).
+  # -
+  # ldap://<host>/<dn>[?<attrs>[?<scope>[?<filter>[?<extensions>]]]]
+  # +
+  class LDAP < Generic
+    # A Default port of 389 for URI::LDAP.
+    DEFAULT_PORT: Integer
+
+    # An Array of the available components for URI::LDAP.
+    COMPONENT: Array[Symbol]
+
+    # Scopes available for the starting point.
+    #
+    # * SCOPE_BASE - the Base DN
+    # * SCOPE_ONE  - one level under the Base DN, not including the base DN and
+    #   not including any entries under this
+    # * SCOPE_SUB  - subtrees, all entries at all levels
+    #
+    SCOPE: Array[String]
+
+    #
+    # == Description
+    #
+    # Creates a new URI::LDAP object from components, with syntax checking.
+    #
+    # The components accepted are host, port, dn, attributes,
+    # scope, filter, and extensions.
+    #
+    # The components should be provided either as an Array, or as a Hash
+    # with keys formed by preceding the component names with a colon.
+    #
+    # If an Array is used, the components must be passed in the
+    # order <code>[host, port, dn, attributes, scope, filter, extensions]</code>.
+    #
+    # Example:
+    #
+    #     uri = URI::LDAP.build({:host => 'ldap.example.com',
+    #       :dn => '/dc=example'})
+    #
+    #     uri = URI::LDAP.build(["ldap.example.com", nil,
+    #       "/dc=example;dc=com", "query", nil, nil, nil])
+    #
+    def self.build: (Array[nil | String | Integer] args) -> URI::LDAP
+                  | ({ host: String, port: Integer?, dn: String, attributes: String?, scope: String?, filter: String?, extensions: String? }) -> URI::LDAP
+
+    #
+    # == Description
+    #
+    # Creates a new URI::LDAP object from generic URI components as per
+    # RFC 2396. No LDAP-specific syntax checking is performed.
+    #
+    # Arguments are +scheme+, +userinfo+, +host+, +port+, +registry+, +path+,
+    # +opaque+, +query+, and +fragment+, in that order.
+    #
+    # Example:
+    #
+    #     uri = URI::LDAP.new("ldap", nil, "ldap.example.com", nil, nil,
+    #       "/dc=example;dc=com", nil, "query", nil)
+    #
+    # See also URI::Generic.new.
+    #
+    def initialize: (String schema, String? userinfo, String host, Integer? port, String? registry, String? path, String? opaque, String query, String? fragment) -> URI::LDAP
+
+    # Private method to cleanup +dn+ from using the +path+ component attribute.
+    def parse_dn: () -> nil
+
+    # Private method to cleanup +attributes+, +scope+, +filter+, and +extensions+
+    # from using the +query+ component attribute.
+    def parse_query: () -> nil
+
+    # Private method to assemble +query+ from +attributes+, +scope+, +filter+, and +extensions+.
+    def build_path_query: () -> String
+
+    # Returns dn.
+    def dn: () -> String
+
+    # Private setter for dn +val+.
+    def set_dn: (String val) -> String
+
+    # Setter for dn +val+.
+    def dn=: (String val) -> String
+
+    # Returns attributes.
+    def attributes: () -> String
+
+    # Private setter for attributes +val+.
+    def set_attributes: (String val) -> String
+
+    # Setter for attributes +val+.
+    def attributes=: (String val) -> String
+
+    # Returns scope.
+    def scope: () -> String
+
+    # Private setter for scope +val+.
+    def set_scope: (String val) -> String
+
+    # Setter for scope +val+.
+    def scope=: (String val) -> String
+
+    # Returns filter.
+    def filter: () -> String
+
+    # Private setter for filter +val+.
+    def set_filter: (String val) -> String
+
+    # Setter for filter +val+.
+    def filter=: (String val) -> String
+
+    # Returns extensions.
+    def extensions: () -> untyped
+
+    # Private setter for extensions +val+.
+    def set_extensions: (String val) -> String
+
+    # Setter for extensions +val+.
+    def extensions=: (String val) -> String
+
+    # Checks if URI has a path.
+    # For URI::LDAP this will return +false+.
+    def hierarchical?: () -> ::FalseClass
+  end
+end

data/stdlib/uri/ldaps.rbs

@@ -0,0 +1,108 @@
+# URI is a module providing classes to handle Uniform Resource Identifiers
+# ([RFC2396](http://tools.ietf.org/html/rfc2396)).
+#
+# ## Features
+#
+# *   Uniform way of handling URIs.
+# *   Flexibility to introduce custom URI schemes.
+# *   Flexibility to have an alternate URI::Parser (or just different patterns
+#     and regexp's).
+#
+#
+# ## Basic example
+#
+#     require 'uri'
+#
+#     uri = URI("http://foo.com/posts?id=30&limit=5#time=1305298413")
+#     #=> #<URI::HTTP http://foo.com/posts?id=30&limit=5#time=1305298413>
+#
+#     uri.scheme    #=> "http"
+#     uri.host      #=> "foo.com"
+#     uri.path      #=> "/posts"
+#     uri.query     #=> "id=30&limit=5"
+#     uri.fragment  #=> "time=1305298413"
+#
+#     uri.to_s      #=> "http://foo.com/posts?id=30&limit=5#time=1305298413"
+#
+# ## Adding custom URIs
+#
+#     module URI
+#       class RSYNC < Generic
+#         DEFAULT_PORT = 873
+#       end
+#       @@schemes['RSYNC'] = RSYNC
+#     end
+#     #=> URI::RSYNC
+#
+#     URI.scheme_list
+#     #=> {"FILE"=>URI::File, "FTP"=>URI::FTP, "HTTP"=>URI::HTTP,
+#     #    "HTTPS"=>URI::HTTPS, "LDAP"=>URI::LDAP, "LDAPS"=>URI::LDAPS,
+#     #    "MAILTO"=>URI::MailTo, "RSYNC"=>URI::RSYNC}
+#
+#     uri = URI("rsync://rsync.foo.com")
+#     #=> #<URI::RSYNC rsync://rsync.foo.com>
+#
+# ## RFC References
+#
+# A good place to view an RFC spec is http://www.ietf.org/rfc.html.
+#
+# Here is a list of all related RFC's:
+# *   [RFC822](http://tools.ietf.org/html/rfc822)
+# *   [RFC1738](http://tools.ietf.org/html/rfc1738)
+# *   [RFC2255](http://tools.ietf.org/html/rfc2255)
+# *   [RFC2368](http://tools.ietf.org/html/rfc2368)
+# *   [RFC2373](http://tools.ietf.org/html/rfc2373)
+# *   [RFC2396](http://tools.ietf.org/html/rfc2396)
+# *   [RFC2732](http://tools.ietf.org/html/rfc2732)
+# *   [RFC3986](http://tools.ietf.org/html/rfc3986)
+#
+#
+# ## Class tree
+#
+# *   URI::Generic (in uri/generic.rb)
+#     *   URI::File - (in uri/file.rb)
+#     *   URI::FTP - (in uri/ftp.rb)
+#     *   URI::HTTP - (in uri/http.rb)
+#         *   URI::HTTPS - (in uri/https.rb)
+#
+#     *   URI::LDAP - (in uri/ldap.rb)
+#         *   URI::LDAPS - (in uri/ldaps.rb)
+#
+#     *   URI::MailTo - (in uri/mailto.rb)
+#
+# *   URI::Parser - (in uri/common.rb)
+# *   URI::REGEXP - (in uri/common.rb)
+#     *   URI::REGEXP::PATTERN - (in uri/common.rb)
+#
+# *   URI::Util - (in uri/common.rb)
+# *   URI::Escape - (in uri/common.rb)
+# *   URI::Error - (in uri/common.rb)
+#     *   URI::InvalidURIError - (in uri/common.rb)
+#     *   URI::InvalidComponentError - (in uri/common.rb)
+#     *   URI::BadURIError - (in uri/common.rb)
+#
+#
+#
+# ## Copyright Info
+#
+# Author
+# :   Akira Yamada <akira@ruby-lang.org>
+# Documentation
+# :   Akira Yamada <akira@ruby-lang.org> Dmitry V. Sabanin <sdmitry@lrn.ru>
+#     Vincent Batts <vbatts@hashbangbash.com>
+# License
+# :   Copyright (c) 2001 akira yamada <akira@ruby-lang.org> You can redistribute
+#     it and/or modify it under the same term as Ruby.
+# Revision
+# :   $Id$
+#
+#
+module URI
+  # The default port for LDAPS URIs is 636, and the scheme is 'ldaps:' rather
+  # than 'ldap:'. Other than that, LDAPS URIs are identical to LDAP URIs;
+  # see URI::LDAP.
+  class LDAPS < LDAP
+    # A Default port of 636 for URI::LDAPS
+    DEFAULT_PORT: Integer
+  end
+end

data/steep/Gemfile.lock

@@ -1,19 +1,7 @@
-PATH
-  remote: ../../steep
-  specs:
-    steep (0.27.0)
-      activesupport (>= 5.1)
-      ast_utils (~> 0.3.0)
-      language_server-protocol (~> 3.14.0.2)
-      listen (~> 3.1)
-      parser (~> 2.7.0)
-      rainbow (>= 2.2.2, < 4.0)
-      rbs (~> 0.11.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.2)
+    activesupport (6.0.3.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -32,13 +20,21 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     minitest (5.14.2)
-    parser (2.7.1.4)
+    parser (2.7.1.5)
       ast (~> 2.4.1)
     rainbow (3.0.0)
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbs (0.11.0)
+    rbs (0.12.2)
+    steep (0.28.0)
+      activesupport (>= 5.1)
+      ast_utils (~> 0.3.0)
+      language_server-protocol (~> 3.14.0.2)
+      listen (~> 3.1)
+      parser (~> 2.7.0)
+      rainbow (>= 2.2.2, < 4.0)
+      rbs (~> 0.12.0)
     thor (1.0.1)
     thread_safe (0.3.6)
     tzinfo (1.2.7)
@@ -49,7 +45,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  steep!
+  steep
 
 BUNDLED WITH
-   2.1.3
+   2.1.4

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.13.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-17 00:00:00.000000000 Z
+date: 2020-10-09 00:00:00.000000000 Z
 dependencies: []
 description: RBS is the language for type signatures for Ruby and standard library
   definitions.
@@ -101,6 +101,8 @@ files:
 - sig/buffer.rbs
 - sig/builtin_names.rbs
 - sig/comment.rbs
+- sig/constant.rbs
+- sig/constant_table.rbs
 - sig/declarations.rbs
 - sig/definition.rbs
 - sig/definition_builder.rbs
@@ -118,6 +120,8 @@ files:
 - sig/types.rbs
 - sig/util.rbs
 - sig/variance_calculator.rbs
+- sig/version.rbs
+- sig/writer.rbs
 - stdlib/abbrev/abbrev.rbs
 - stdlib/base64/base64.rbs
 - stdlib/benchmark/benchmark.rbs
@@ -204,6 +208,10 @@ files:
 - stdlib/tmpdir/tmpdir.rbs
 - stdlib/uri/file.rbs
 - stdlib/uri/generic.rbs
+- stdlib/uri/http.rbs
+- stdlib/uri/https.rbs
+- stdlib/uri/ldap.rbs
+- stdlib/uri/ldaps.rbs
 - stdlib/zlib/zlib.rbs
 - steep/Gemfile
 - steep/Gemfile.lock