kar 6 → 8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 370a71b352efdc345562491f694552d0450a7eb7bb3b73f4e2f70d89f8ead35d
-  data.tar.gz: 04d19c674fdd8afc2d7c588429642c641ec2ea0c431855d1ebc877d7f06f80b4
+  metadata.gz: f4c0a1aedbbe17daa95271d652ed514cc3dbd612a6e8ffae1245e66d55267614
+  data.tar.gz: 7d05b2efc9519d39dcfe3a063a99d1a9d63cc327b452c76bb5f43cea2233ea40
 SHA512:
-  metadata.gz: ccc1f62a586e54a7d3c4b65181cbee1dac9752c6a59e47379e552da7230913db46f3ff9f6090e16004850898adf0efc1b37f6c06d26cbc37044b84462f8eef1a
-  data.tar.gz: f21722ed42367ddb8be79c63bf1b528f1c80fd9cf84fe2e763dc2f7f9df18efffa153afe9d6dfb9adcec80119ad92f53f5609826784b26c610f0427e9492de22
+  metadata.gz: c949744f08208072d0171ee87002e65a9d2ab025790d4acb27637c32afb3f92d46ea0e3979f7cfd7ab091e740ce40d922e28753983342044d2f78f6f1bb3ed50
+  data.tar.gz: 146fbd5c31d7f79be868c7c97e248d5ab82d6e7bb5e74e05e78b6cee8ae5972f66d021911bce79b752a140b33ed5e0e1f8d3bccfaafde4a2adc2af18ffeab5de

data/CHANGELOG.md

@@ -1,10 +1,14 @@
 ## [Unreleased]
 
-# [6] - 2025-11-16
+## [7] - 2026-08-11
+
+* Fix installation path of Cargo built file of CargoTask
+
+## [6] - 2025-11-16
 
 * Don't remove compiled files in CargoTask
 
-# [5] - 2025-11-14
+## [5] - 2025-11-14
 
 * Use open-uri for URITask
 * Add Cargo.lock generate task in CargoTask

data/kar.gemspec

@@ -1,11 +1,11 @@
 Gem::Specification.new do |spec|
   spec.name = "kar"
-  spec.version = "6"
+  spec.version = "8"
   spec.authors = ["Kitaiti Makoto"]
   spec.email = ["KitaitiMakoto@gmail.com"]
 
   spec.summary = "Rake utilities"
-  spec.description = "Rake utilities such as task to download, DSL to define multiple tasks at onece, etc."
+  spec.description = "Rake utilities such as task to download, DSL to define multiple tasks at once, etc."
   spec.homepage = "https://gitlab.com/KitaitiMakoto/kar"
   spec.required_ruby_version = ">= 2.6.0"
   spec.license = "AGPL-3.0-or-later"

data/lib/kar/cargotask/cargo_builder.rb

@@ -0,0 +1,67 @@
+class Kar::CargoTask::CargoBuilder < Gem::Ext::CargoBuilder
+  # Original Gem::Ext::CargoBuilder removes compiled files after installation.
+  # It is ideal for installation, but not for development.
+  # We override the behavior to keep the compiled files.
+  def build(extension, dest_path, results, args = [], lib_dir = nil, cargo_dir = Dir.pwd,
+    target_rbconfig = Gem.target_rbconfig, n_jobs: nil)
+    require "tempfile"
+    require "fileutils"
+
+    if target_rbconfig.path
+      warn "--target-rbconfig is not yet supported for Rust extensions. Ignoring"
+    end
+
+    # Where's the Cargo.toml of the crate we're building
+    cargo_toml = File.join(cargo_dir, "Cargo.toml")
+    # What's the crate's name
+    crate_name = cargo_crate_name(cargo_dir, cargo_toml, results)
+
+    begin
+      # Mimic tmp_dest to make diff with superclass's #build clean
+      tmp_dest = cargo_dir
+
+      # Run the build
+      cmd = cargo_command(cargo_toml, tmp_dest, args, crate_name)
+      runner.call(cmd, results, "cargo", cargo_dir, build_env)
+
+      # Where do we expect Cargo to write the compiled library
+      dylib_path = cargo_dylib_path(tmp_dest, crate_name)
+
+      # Helpful error if we didn't find the compiled library
+      raise DylibNotFoundError, tmp_dest unless File.exist?(dylib_path)
+
+      # Cargo and Ruby differ on how the library should be named, rename from
+      # what Cargo outputs to what Ruby expects
+      dlext_name = "#{crate_name}.#{makefile_config("DLEXT")}"
+      dlext_path = File.join(File.dirname(dylib_path), dlext_name)
+      FileUtils.cp(dylib_path, dlext_path)
+
+      nesting = extension_nesting(extension)
+
+      if Gem.install_extension_in_lib && lib_dir
+        nested_lib_dir = File.join(lib_dir, nesting)
+        FileUtils.mkdir_p nested_lib_dir
+        FileUtils.cp_r dlext_path, nested_lib_dir, remove_destination: true
+      end
+
+      # move to final destination
+      nested_dest_path = File.join(dest_path, nesting)
+      FileUtils.mkdir_p nested_dest_path
+      FileUtils.cp_r dlext_path, nested_dest_path, remove_destination: true
+    ensure
+      #noop
+    end
+
+    results
+  end
+
+  # This intentionally duplicates part of #build to keep that method close to
+  # the upstream CargoBuilder implementation and make updates easy to review with diff.
+  def dl_path(extension, dest_path, cargo_dir)
+    cargo_toml = File.join(cargo_dir, "Cargo.toml")
+    crate_name = cargo_crate_name(cargo_dir, cargo_toml, [])
+    dlext_name = "#{crate_name}.#{makefile_config("DLEXT")}"
+    nesting = extension_nesting(extension)
+    File.join(dest_path, nesting, dlext_name)
+  end
+end

data/lib/kar/cargotask.rb

@@ -23,16 +23,16 @@ module Kar
       file dl_path => [lock_file] + src do |t|
         results = Results.new
         begin
-          CargoBuilder.new.build t.source, ext_dir, results, [], lib_dir, File.expand_path(ext_dir)
+          builder.build manifest, lib_dir, results, [], nil, cargo_dir
         rescue => error
           $stderr.puts results unless verbose?
           fail
         end
       end
-      CLEAN.include dl_name, dl_path
+      CLEAN.include dl_path
 
       file lock_file => manifest do |t|
-        sh "cargo", "generate-lockfile", "--manifest-path", t.source
+        sh "cargo", "generate-lockfile", "--manifest-path", t.source, "--offline"
       end
 
       namespace :cargo do
@@ -47,12 +47,25 @@ module Kar
 
         desc "Check Rust sources and manifests"
         task check: "cargo:check:#{@target}"
+
+        namespace :fmt do
+          task @target => manifest do |t|
+            sh "cargo", "fmt", "--manifest-path", manifest, "--quiet"
+          end
+        end
+
+        desc "Format Rust sources"
+        task fmt: "cargo:fmt:#{@target}"
       end
 
       desc "Build all extensions in Rust"
       task cargo: "cargo:#{@target}"
     end
 
+    def builder
+      @builder ||= CargoBuilder.new
+    end
+
     def gemspec
       @gemspec ||= Gem::Specification.load("#{@target}.gemspec")
     end
@@ -65,6 +78,10 @@ module Kar
       @lock_file ||= manifest.ext(".lock")
     end
 
+    def cargo_dir
+      @cargo_dir ||= File.expand_path(ext_dir)
+    end
+
     def ext_dir
       @ext_dir ||= File.dirname(manifest)
     end
@@ -74,16 +91,12 @@ module Kar
       @lib_dir ||= gemspec.require_paths[1]
     end
 
-    def dl_name
-      @dl_name ||= "#{gemspec.name}.#{RbConfig::CONFIG["DLEXT"]}"
-    end
-
     def dl_path
-      @dl_path ||= File.join(lib_dir, dl_name)
+      @dl_path ||= builder.dl_path(manifest, lib_dir, cargo_dir)
     end
 
     def src
-      @src ||= FileList["#{ext_dir}/src/**/*.rs"]
+      @src ||= FileList["#{ext_dir}/src/**/*.rs", "#{ext_dir}/build.rs"]
     end
 
     class Results
@@ -111,56 +124,7 @@ module Kar
         Rake.verbose == true
       end
     end
-
-    class CargoBuilder < Gem::Ext::CargoBuilder
-      # Original Gem::Ext::CargoBuilder removes compiled files after installation.
-      # It is ideal for installation, but not for development.
-      # We override the behavior to keep the compiled files.
-      def build(extension, dest_path, results, args = [], lib_dir = nil, cargo_dir = Dir.pwd,
-                target_rbconfig=Gem.target_rbconfig)
-        require "tempfile"
-        require "fileutils"
-
-        if target_rbconfig.path
-          warn "--target-rbconfig is not yet supported for Rust extensions. Ignoring"
-        end
-
-        # Where's the Cargo.toml of the crate we're building
-        cargo_toml = File.join(cargo_dir, "Cargo.toml")
-        # What's the crate's name
-        crate_name = cargo_crate_name(cargo_dir, cargo_toml, results)
-
-        # Run the build
-        cmd = cargo_command(cargo_toml, cargo_dir, args, crate_name)
-        runner.call(cmd, results, "cargo", cargo_dir, build_env)
-
-        # Where do we expect Cargo to write the compiled library
-        dylib_path = cargo_dylib_path(cargo_dir, crate_name)
-
-        # Helpful error if we didn't find the compiled library
-        raise DylibNotFoundError, cargo_dir unless File.exist?(dylib_path)
-
-        # Cargo and Ruby differ on how the library should be named, rename from
-        # what Cargo outputs to what Ruby expects
-        dlext_name = "#{crate_name}.#{makefile_config("DLEXT")}"
-        dlext_path = File.join(File.dirname(dylib_path), dlext_name)
-        FileUtils.cp(dylib_path, dlext_path)
-
-        nesting = extension_nesting(extension)
-
-        if Gem.install_extension_in_lib && lib_dir
-          nested_lib_dir = File.join(lib_dir, nesting)
-          FileUtils.mkdir_p nested_lib_dir
-          FileUtils.cp_r dlext_path, nested_lib_dir, remove_destination: true
-        end
-
-        # move to final destination
-        nested_dest_path = File.join(dest_path, nesting)
-        FileUtils.mkdir_p nested_dest_path
-        FileUtils.cp_r dlext_path, nested_dest_path, remove_destination: true
-
-        results
-      end
-    end
   end
 end
+
+require_relative "cargotask/cargo_builder"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kar
 version: !ruby/object:Gem::Version
-  version: '6'
+  version: '8'
 platform: ruby
 authors:
 - Kitaiti Makoto
@@ -66,7 +66,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Rake utilities such as task to download, DSL to define multiple tasks
-  at onece, etc.
+  at once, etc.
 email:
 - KitaitiMakoto@gmail.com
 executables: []
@@ -80,6 +80,7 @@ files:
 - kar.gemspec
 - lib/kar.rb
 - lib/kar/cargotask.rb
+- lib/kar/cargotask/cargo_builder.rb
 - lib/kar/dsl.rb
 - lib/kar/uritask.rb
 - sig/kar.rbs
@@ -104,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Rake utilities
 test_files: []