rbs-src 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49e3f5f4a8aee7ee558855e658b47e01e4f17d3a24eaf0c167c26812e7fa4195
-  data.tar.gz: 062ac2a5b37770592afa3c07c23c32b18259c679c6eae8de8b0f58dff4140928
+  metadata.gz: 8228a38c388aa1705ca70c266e411b621b45a7d86f296117bdfcb376befab15c
+  data.tar.gz: 1b0f0daf59afe755d0fada717eb9573fead9936a3e1c5f9728b5ad72a9ca7496
 SHA512:
-  metadata.gz: cc36bedb368b369bc005a879486d1c70f684fb7bba77bcd6825324240a4b343441aacf6649cd1832cd50868b369dc6c9421c2080534bb4d9cbcd2dffd8a0b0c1
-  data.tar.gz: 1bf8e0cd1e0c87a5b595e478fe18a7e99f9bc3a3336bfb62baa6bdf0347b2f29cf2718d8c36ffbd581e0e6a4e4d57bcd19a4220d681f42ceb3bbd00603704496
+  metadata.gz: 6c255dec49483e1822ff3c21ccd3078023a898aa11a4701e0be60b876d3f18558087fc1bdd2a2a44825fb125d07785af5e355e55347115fbff5c898e736725f5
+  data.tar.gz: acfebcd0ae86f99e212c83c0df51f7b05466e149748c4edd6c8604b6b197c620ec69222186a1d5b6c1f1b0e620f9f220aebb3bbee49c96099623adacee62e89c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbs-src (0.5.0)
+    rbs-src (0.7.0)
       rainbow (~> 3.1.1)
 
 GEM

data/README.md

@@ -45,9 +45,15 @@ Load gem dependencies from `rbs_collection.lock.yaml` and set up all repositorie
 
 If the git repository content is edited, it runs `git stash` and `git reset --hard`.
 
+It accepts `--output` option to write the dependencies to a file.
+
+    $ rbs-src setup --output
+
+You can load the dependencies to your type checkers from the file.
+
 #### For Steep users
 
-You need to edit your Steepfile to let the type checker stop using rbs-collection.
+The recommended setup for Steep is the following:
 
 ```ruby
 # Steepfile
@@ -55,20 +61,33 @@ You need to edit your Steepfile to let the type checker stop using rbs-collectio
 target ... do
   # Existing config...
 
-  # Add `#signature` call to support loading RBS files from symlinked directory
-  signature "sig/rbs-src/*/*.rbs"
-  signature "sig/rbs-src/*/[^_]*/**/*.rbs"
+  # Assume we use `rbs-src setup --output` to generate `rbs_src.dep` file
+  if (dep_path = Pathname("rbs_src.dep")).file?
+    # Stop loading libraries through rbs-collection
+    disable_collection()
 
-  # Stop loading libraries through rbs-collection
-  disable_collection()
+    signature "sig/rbs-src/*/*.rbs"
+    signature "sig/rbs-src/*/[^_]*/**/*.rbs"
 
-  # Load standard libraries and gems manually
-  library('abbrev')
-  library('date')
-  # ...
+    dep_path.readlines().each {|lib| library(lib.chomp) }
+  end
 end
 ```
 
+In this setup, you can use Steep without using `rbs-src` until you run `rbs-src setup --output`.
+Once you run `rbs-src setup --output`, it generates `rbs_src.dep` file and `Steepfile` loads the dependencies from the file.
+
+```sh
+# When you install your rbs_collection dependencies
+$ rbs collection install && rbs-src setup --output
+
+# When you update your rbs_collection dependencies
+$ rbs collection update && rbs-src setup --output
+
+# When you stop using rbs-src
+$ rm -rf rbs_src.dep tmp/rbs-src sig/rbs-src
+```
+
 ### rbs-src link
 
 The command clones and set up a symlink of a ruby gem, not loaded from `rbs_collection.lock.yaml`.

data/Steepfile

@@ -6,10 +6,22 @@ target :lib do
   check "lib"                       # Directory name
 
   configure_code_diagnostics(D::Ruby.default)      # `default` diagnostics setting (applies by default)
+
   # configure_code_diagnostics(D::Ruby.strict)       # `strict` diagnostics setting
   # configure_code_diagnostics(D::Ruby.lenient)      # `lenient` diagnostics setting
   # configure_code_diagnostics(D::Ruby.silent)       # `silent` diagnostics setting
   # configure_code_diagnostics do |hash|             # You can setup everything yourself
   #   hash[D::Ruby::NoMethod] = :information
   # end
+
+  # `rbs-src setup -o` generates `rbs_src.dep` file
+  if (dep_path = Pathname("rbs_src.dep")).file?
+    # Stop loading libraries through rbs-collection
+    disable_collection()
+
+    signature "sig/rbs-src/*/*.rbs"
+    signature "sig/rbs-src/*/[^_]*/**/*.rbs"
+
+    dep_path.readlines().each {|lib| library(lib.chomp) }
+  end
 end

data/lib/rbs/src/cli.rb

@@ -132,11 +132,13 @@ module Rbs
           rbs_collection_lock_path = RBS::Collection::Config.to_lockfile_path(RBS::Collection::Config::PATH)
           repository_prefix = Pathname("tmp/rbs-src")
           rbs_prefix = Pathname("sig/rbs-src")
+          output_path= nil #: Pathname?
 
           OptionParser.new do |opts|
             opts.on("--rbs-collection-lock=PATH", "The path to rbs_collection.lock.yaml (default: #{rbs_collection_lock_path})") { rbs_collection_lock_path = Pathname(_1) }
             opts.on("--repo-prefix=PREFIX", "The location to put repository in (default: #{repository_prefix})") { repository_prefix = Pathname(_1) }
             opts.on("--rbs-prefix=PREFIX", "The location to put symlinks in (default: #{rbs_prefix})") { rbs_prefix = Pathname(_1) }
+            opts.on("--output[=PATH]", "-o[PATH]", "The path to write the list of stdlib dependencies (default: rbs_src.dep)") {|path| output_path = Pathname(path || "rbs_src.dep") }
 
             opts.banner = <<~BANNER
               Usage: rbs-src setup [options]
@@ -201,17 +203,27 @@ module Rbs
 
           other_libs.sort_by! { _1[0] }
 
-          unless other_libs.empty?
-            runner.push "You have to load other libraries without rbs-collection:" do
-              if has_gem?("steep")
-                runner.puts "Add the following lines in your Steepfile:"
-
-                other_libs.each do |name, version|
-                  runner.puts "  library('#{name}')"
+          if output_path
+            runner.push "Writing dependencies to #{output_path}:" do
+              output_path.open("w") do |io|
+                other_libs.each do |name, _|
+                  io.puts name
                 end
-              else
-                other_libs.each do |name, version|
-                  runner.puts "-r #{name} \\"
+              end
+            end
+          else
+            unless other_libs.empty?
+              runner.push "You have to load other libraries without rbs-collection:" do
+                if has_gem?("steep")
+                  runner.puts "Add the following lines in your Steepfile:"
+
+                  other_libs.each do |name, version|
+                    runner.puts "  library('#{name}')"
+                  end
+                else
+                  other_libs.each do |name, version|
+                    runner.puts "-r #{name} \\"
+                  end
                 end
               end
             end

data/lib/rbs/src/gem.rb

@@ -19,8 +19,8 @@ module Rbs
         repository_root.join(repository_dir, name, version)
       end
 
-      def rbs_path
-        rbs_prefix + "#{name}-#{version}"
+      def rbs_path(suffix = version)
+        rbs_prefix + "#{name}-#{suffix}"
       end
 
       def status(runner, commit:)
@@ -50,7 +50,7 @@ module Rbs
         end
 
         runner.puts "💪 Checking out the commit #{commit}..."
-        runner.execute!("git", "reset", "--hard", commit, chdir: repository_root)
+        runner.execute!("git", "checkout", commit, chdir: repository_root)
       end
 
       def clone(runner, repository_url:, commit:)
@@ -66,6 +66,9 @@ module Rbs
       end
 
       def link
+        Pathname.glob(rbs_path("*").to_s).each do |path|
+          File.unlink(path.to_s)
+        end
         File.symlink(repository_path.relative_path_from(rbs_path.parent), rbs_path)
       end
     end

data/lib/rbs/src/version.rb

@@ -2,6 +2,6 @@
 
 module Rbs
   module Src
-    VERSION = "0.5.0"
+    VERSION = "0.7.0"
   end
 end

data/sig/rbs/gem.rbs

@@ -19,7 +19,7 @@ module Rbs
       def repository_path: () -> Pathname
 
       # The path of the directory in the `#rbs_prefix` that contains the RBS files of the gem
-      def rbs_path: () -> Pathname
+      def rbs_path: (?String suffix) -> Pathname
 
       def clone: (CommandRunner, repository_url: String, commit: String?) -> void
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs-src
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-29 00:00:00.000000000 Z
+date: 2023-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: rbs-src