rbs-src 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49a3f8cd78e54658b9eb73372f426f9b349153199145620d371a0820e2dcfee2
-  data.tar.gz: 21a2d80857939a03e9f3e1de3f0e789d8532d52060e809715ebdf8dc8e890dfb
+  metadata.gz: 02f00b3f9d5db76fd52097440453dc502f298da9a4f9bd2b3c852786064c3cb4
+  data.tar.gz: 6094fd8f39dc65932db88c76046d934c6b30a65620d3a27033bbf879f629d084
 SHA512:
-  metadata.gz: c180657f37217b65bcadce2744d8b3a272382cbf03a8226cd319d409fd546040d11b288ba11d6d4c555598506aad0a0f732b9240b449fd9dcc36729f3aa1e0f5
-  data.tar.gz: bb162c3e2dacc635c6116ced85e16608429ef2fb2dac8106a09e248aa99346e24578b4c453498ba61852c5f0fa21e180380550881cf83551ca1e5fbb1f1fbce8
+  metadata.gz: 8cb34af3adfb39bb9772da48d6730dda31922a67fec6197ec630aad849b1f6c7e8b1f90f29ddd0805d83bdbd0a2304ccc3ce69118a4a4552b90d8199f4c3f270
+  data.tar.gz: 925593e54d59dd10de6c2275348b8bb98aa454548405a9b372fcd6b11886b530850954674718acdbac843438a63f63d90571ff4bfa8ca8c02ed0b8b4c1f363dd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbs-src (0.1.0)
+    rbs-src (0.3.0)
 
 GEM
   remote: https://rubygems.org/
@@ -60,6 +60,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-22
+  x86_64-linux
 
 DEPENDENCIES
   minitest (~> 5.0)

data/README.md

@@ -54,7 +54,8 @@ 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"
+  signature "sig/rbs-src/*/[^_]*/**/*.rbs"
 
   # Stop loading libraries through rbs-collection
   disable_collection()

data/Rakefile

@@ -6,7 +6,7 @@ require "rake/testtask"
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
-  t.test_files = FileList["test/**/test_*.rb"]
+  t.test_files = FileList["test/**/*_test.rb"]
 end
 
 task default: :test

data/Steepfile

@@ -2,11 +2,9 @@ D = Steep::Diagnostic
 
 target :lib do
   signature "sig"
-  signature "sig/rbs-src/*/**/*.rbs"
 
   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
@@ -14,25 +12,4 @@ target :lib do
   # configure_code_diagnostics do |hash|             # You can setup everything yourself
   #   hash[D::Ruby::NoMethod] = :information
   # end
-
-  library('abbrev')
-  library('date')
-  library('dbm')
-  library('json')
-  library('logger')
-  library('minitest')
-  library('monitor')
-  library('mutex_m')
-  library('optparse')
-  library('pathname')
-  library('pstore')
-  library('rbs:3.1.2')
-  library('rdoc')
-  library('securerandom')
-  library('singleton')
-  library('time')
-  library('tsort')
-  library('yaml')
-
-  disable_collection
 end

data/lib/rbs/src/cli.rb

@@ -3,7 +3,7 @@ require "optparse"
 module Rbs
   module Src
     class CLI
-      def self.start(argv)
+      def self.start(argv, stdout: STDOUT)
         command = argv.shift
 
         case command
@@ -45,7 +45,7 @@ module Rbs
             rbs_prefix: rbs_prefix
           )
 
-          runner = CommandRunner.new(stdout: STDOUT)
+          runner = CommandRunner.new(stdout: stdout)
 
           runner.push "Setting up #{gem.name}-#{gem.version}" do
             runner.push "Cloning git repository into #{gem.repository_root}" do
@@ -57,7 +57,7 @@ module Rbs
             end
 
             runner.push "Linking to #{gem.rbs_path}" do
-              unless gem.repository_path.exist?
+              unless gem.rbs_path.exist?
                 runner.puts "File.symlink..."
                 gem.link()
               else
@@ -104,7 +104,7 @@ module Rbs
             rbs_prefix: rbs_prefix
           )
 
-          runner = CommandRunner.new(stdout: STDOUT)
+          runner = CommandRunner.new(stdout: stdout)
 
           loader.each_gem do |gem, repo, commit|
             runner.push "Setting up #{gem.name}-#{gem.version}" do
@@ -117,7 +117,7 @@ module Rbs
               end
 
               runner.push "Linking to #{gem.rbs_path}" do
-                unless gem.repository_path.exist?
+                unless gem.rbs_path.exist?
                   runner.puts "File.symlink..."
                   gem.link()
                 else
@@ -140,9 +140,9 @@ module Rbs
           other_libs.sort_by! { _1[0] }
 
           unless other_libs.empty?
-            runner.push "Load other libraries yourself:" do
+            runner.push "You have to load other libraries without rbs-collection:" do
               if has_gem?("steep")
-                runner.puts "Put the following lines in your Steepfile:"
+                runner.puts "Add the following lines in your Steepfile:"
 
                 other_libs.each do |name, version|
                   runner.puts "  library('#{name}')"

data/lib/rbs/src/command_runner.rb

@@ -37,6 +37,23 @@ module Rbs
           raise status.inspect
         end
       end
+
+      def query!(*command, chdir: Pathname.pwd)
+        # @type var out: String
+        # @type var status: Process::Status
+
+        out, status = Open3.capture2e(*command, chdir: chdir)
+
+        unless status.success?
+          puts "🚨 Command failed: #{command.inspect} in #{chdir}..."
+          out.each_line do |line|
+            puts "| #{line}"
+          end
+          raise status.inspect
+        end
+
+        out
+      end
     end
   end
 end

data/lib/rbs/src/gem.rb

@@ -25,7 +25,10 @@ module Rbs
 
       def clone(runner, repository_url:, commit:)
         runner.puts "git clone..."
-        runner.execute!("git", "clone", "--filter=blob:none", repository_url, repository_root.to_s)
+        runner.execute!("git", "clone", "--filter=blob:none", "--sparse", repository_url, repository_root.to_s)
+        dirs = runner.query!("git", "ls-tree", "-d", "--name-only", "-z", "HEAD", chdir: repository_root).split("\0")
+        dirs.delete(repository_dir.to_s)
+        runner.execute!("git", "sparse-checkout", "set", *dirs, repository_dir.join(name, version).to_s, chdir: repository_root)
         if commit
           runner.puts "git checkout..."
           runner.execute!("git", "checkout", commit, chdir: repository_root)

data/lib/rbs/src/version.rb

@@ -2,6 +2,6 @@
 
 module Rbs
   module Src
-    VERSION = "0.1.0"
+    VERSION = "0.3.0"
   end
 end

data/rbs_collection.lock.yaml

@@ -2,7 +2,7 @@
 sources:
 - type: git
   name: ruby/gem_rbs_collection
-  revision: aeede7258d020bfd509541e0c8075ce833292409
+  revision: 9330d49993d18362cce9190b9596f03d1f4915f8
   remote: https://github.com/ruby/gem_rbs_collection.git
   repo_dir: gems
 path: ".gem_rbs_collection"
@@ -11,38 +11,10 @@ gems:
   version: '0'
   source:
     type: stdlib
-- name: activesupport
-  version: '6.0'
-  source:
-    type: git
-    name: ruby/gem_rbs_collection
-    revision: aeede7258d020bfd509541e0c8075ce833292409
-    remote: https://github.com/ruby/gem_rbs_collection.git
-    repo_dir: gems
-- name: concurrent-ruby
-  version: '1.1'
-  source:
-    type: git
-    name: ruby/gem_rbs_collection
-    revision: aeede7258d020bfd509541e0c8075ce833292409
-    remote: https://github.com/ruby/gem_rbs_collection.git
-    repo_dir: gems
-- name: date
-  version: '0'
-  source:
-    type: stdlib
 - name: dbm
   version: '0'
   source:
     type: stdlib
-- name: i18n
-  version: '1.10'
-  source:
-    type: git
-    name: ruby/gem_rbs_collection
-    revision: aeede7258d020bfd509541e0c8075ce833292409
-    remote: https://github.com/ruby/gem_rbs_collection.git
-    repo_dir: gems
 - name: json
   version: '0'
   source:
@@ -83,18 +55,6 @@ gems:
   version: '0'
   source:
     type: stdlib
-- name: securerandom
-  version: '0'
-  source:
-    type: stdlib
-- name: singleton
-  version: '0'
-  source:
-    type: stdlib
-- name: time
-  version: '0'
-  source:
-    type: stdlib
 - name: tsort
   version: '0'
   source:

data/rbs_collection.yaml

@@ -16,5 +16,3 @@ path: .gem_rbs_collection
 gems:
   - name: pathname
   - name: yaml
-  - name: activesupport
-    version: 6.0

data/sig/rbs/command_runner.rbs

@@ -12,6 +12,8 @@ module Rbs
       def puts: (String) -> void
 
       def execute!: (*String, ?chdir: Pathname) -> void
+
+      def query!: (*String, ?chdir: Pathname) -> String
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs-src
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-28 00:00:00.000000000 Z
+date: 2023-08-01 00:00:00.000000000 Z
 dependencies: []
 description: rbs-src
 email: