go_gem 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf04032b5fd467ed3123d922c9ad7978e577601552bf46a2fe4bde8b0b464caf
-  data.tar.gz: dd5a7b4c2742f4d3a8b19871729c89ae59ceb4035d7a573476f34a9178406b4d
+  metadata.gz: de781c3ea978d43846ab114c957f973d1273a385b4a2cda8b4ab8bcae31e7b61
+  data.tar.gz: ff9e4ec5ee199bcc5aeabeec13426caa2db9cf2d593bb5fdca44f164daed6f2f
 SHA512:
-  metadata.gz: 66a47a395e84b2b241974b77da353834f8f344982b2f85ab9ec2a7c2ddb67b29242b3ecc9235f36188be82a575733b3d608b16e367adb74e03476c77d929f27c
-  data.tar.gz: 3db32329bcbba23583fca335ae00b0fa78b4dcbab64262afba18e09fd495af47e0eda7c5c16cf3abc7cdd2fca67441fbebb777003ab3c116d83541a96203c481
+  metadata.gz: 55fe501bd31919fe173a8ed9dbb7998a51da0098679e15f3d1ad2da120c62b78d80dc91139feb9056f949d08e49ed0bcd5ef1e217dd6d7e52297baa9039b9871
+  data.tar.gz: 82d8f84fb59e73fd7e555446fc02121e516fb5a376478a2484174bff7f2e3cdb60e7d5f461432783126fef30130c7b7e6e9081cbe6460957e87de0b1bf8b8cdd

data/lib/go_gem/mkmf.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "util"
+
 module GoGem
   # Helper module for creating Go Makefiles
   module Mkmf
@@ -35,11 +37,13 @@ module GoGem
 
       current_dir = File.expand_path(".")
 
+      goflags = "-tags=#{GoGem::Util.ruby_minor_version_build_tag}"
+
       File.open("Makefile", "a") do |f|
         f.write <<~MAKEFILE.gsub(/^ {8}/, "\t")
           $(DLLIB): Makefile $(srcdir)/*.go
                   cd $(srcdir); \
-                  CGO_CFLAGS='$(INCFLAGS)' CGO_LDFLAGS='#{ldflags}' \
+                  CGO_CFLAGS='$(INCFLAGS)' CGO_LDFLAGS='#{ldflags}' GOFLAGS='#{goflags}' \
                     go build -p 4 -buildmode=c-shared -o #{current_dir}/$(DLLIB)
         MAKEFILE
       end

data/lib/go_gem/rake_task.rb

@@ -3,6 +3,8 @@
 require "rake"
 require "rake/tasklib"
 
+require_relative "util"
+
 module GoGem
   # Provides rake tasks for `go test` with CRuby
   #
@@ -40,7 +42,7 @@ module GoGem
   #       end
   #     end
   #   end
-  class RakeTask < ::Rake::TaskLib
+  class RakeTask < ::Rake::TaskLib # rubocop:disable Metrics/ClassLength
     DEFAULT_TASK_NAMESPACE = :go
 
     DEFAULT_GO_BIN_PATH = "go"
@@ -87,6 +89,7 @@ module GoGem
         define_go_testrace_task
         define_go_fmt_task
         define_go_build_envs_task
+        define_go_build_tag_task
       end
     end
 
@@ -94,20 +97,8 @@ module GoGem
     #
     # @return [Hash<String, String>]
     def self.build_env_vars
-      ldflags = "-L#{RbConfig::CONFIG["libdir"]} -l#{RbConfig::CONFIG["RUBY_SO_NAME"]}"
-
-      case `#{RbConfig::CONFIG["CC"]} --version` # rubocop:disable Lint/LiteralAsCondition
-      when /Free Software Foundation/
-        ldflags << " -Wl,--unresolved-symbols=ignore-all"
-      when /clang/
-        ldflags << " -undefined dynamic_lookup"
-      end
-
-      cflags = [
-        RbConfig::CONFIG["CFLAGS"],
-        "-I#{RbConfig::CONFIG["rubyarchhdrdir"]}",
-        "-I#{RbConfig::CONFIG["rubyhdrdir"]}",
-      ].join(" ")
+      ldflags = generate_ldflags
+      cflags = generate_cflags
 
       # FIXME: Workaround for Ubuntu (GitHub Actions)
       if RUBY_PLATFORM =~ /linux/i
@@ -123,12 +114,44 @@ module GoGem
       ld_library_path = RbConfig::CONFIG["libdir"].to_s
 
       {
+        "GOFLAGS"         => generate_goflags,
         "CGO_CFLAGS"      => cflags,
         "CGO_LDFLAGS"     => ldflags,
         "LD_LIBRARY_PATH" => ld_library_path,
       }
     end
 
+    # @return [String]
+    def self.generate_goflags
+      "-tags=#{GoGem::Util.ruby_minor_version_build_tag}"
+    end
+    private_class_method :generate_goflags
+
+    # @return [String]
+    def self.generate_ldflags
+      ldflags = "-L#{RbConfig::CONFIG["libdir"]} -l#{RbConfig::CONFIG["RUBY_SO_NAME"]}"
+
+      case `#{RbConfig::CONFIG["CC"]} --version` # rubocop:disable Lint/LiteralAsCondition
+      when /Free Software Foundation/
+        ldflags << " -Wl,--unresolved-symbols=ignore-all"
+      when /clang/
+        ldflags << " -undefined dynamic_lookup"
+      end
+
+      ldflags
+    end
+    private_class_method :generate_ldflags
+
+    # @return [String]
+    def self.generate_cflags
+      [
+        RbConfig::CONFIG["CFLAGS"],
+        "-I#{RbConfig::CONFIG["rubyarchhdrdir"]}",
+        "-I#{RbConfig::CONFIG["rubyhdrdir"]}",
+      ].join(" ")
+    end
+    private_class_method :generate_cflags
+
     # @yield
     def within_target_dir
       Dir.chdir(target_dir) do # rubocop:disable Style/ExplicitBlockArgument
@@ -183,5 +206,12 @@ module GoGem
         end
       end
     end
+
+    def define_go_build_tag_task
+      desc "Print build tag"
+      task(:build_tag) do
+        puts GoGem::Util.ruby_minor_version_build_tag
+      end
+    end
   end
 end

data/lib/go_gem/util.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module GoGem
+  # Common utility methods for {GoGem::Mkmf} and {GoGem::RakeTask}
+  module Util
+    # Return ruby version build tag for `go build` and `go test`
+    #
+    # @param ruby_version [String]
+    # @return [String]
+    #
+    # @example
+    #   GoGem::Util.ruby_minor_version_build_tag("3.4.1")
+    #   #=> "ruby_3_4"
+    def self.ruby_minor_version_build_tag(ruby_version = RUBY_VERSION)
+      "ruby_#{ruby_version.to_f.to_s.gsub(".", "_")}"
+    end
+  end
+end

data/lib/go_gem/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GoGem
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

data/sig/go_gem/rake_task.rbs

@@ -28,7 +28,13 @@ module GoGem
 
     def initialize: (String gem_name) ?{ (RakeTask) -> void } -> void
 
-    def self.build_env_vars: () -> { "CGO_CFLAGS" => String, "CGO_LDFLAGS" => String, "LD_LIBRARY_PATH" => String }
+    def self.build_env_vars: () -> { "GOFLAGS" => String, "CGO_CFLAGS" => String, "CGO_LDFLAGS" => String, "LD_LIBRARY_PATH" => String }
+
+    def self.generate_goflags: () -> String
+
+    def self.generate_ldflags: () -> String
+
+    def self.generate_cflags: () -> String
 
     private
 
@@ -40,6 +46,8 @@ module GoGem
 
     def define_go_build_envs_task: () -> void
 
+    def define_go_build_tag_task: () -> void
+
     def within_target_dir: () { () -> void } -> void
 
     def ext_dir: () -> String

data/sig/go_gem/util.rbs

@@ -0,0 +1,5 @@
+module GoGem
+  module Util
+    def self.ruby_minor_version_build_tag: (?String ruby_version) -> String
+  end
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: go_gem
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - sue445
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-15 00:00:00.000000000 Z
+date: 2025-01-06 00:00:00.000000000 Z
 dependencies: []
 description: Helpers for compiling Go extensions for ruby
 email:
@@ -24,10 +23,12 @@ files:
 - lib/go_gem.rb
 - lib/go_gem/mkmf.rb
 - lib/go_gem/rake_task.rb
+- lib/go_gem/util.rb
 - lib/go_gem/version.rb
 - sig/go_gem.rbs
 - sig/go_gem/mkmf.rbs
 - sig/go_gem/rake_task.rbs
+- sig/go_gem/util.rbs
 homepage: https://github.com/ruby-go-gem/go-gem-wrapper
 licenses:
 - MIT
@@ -37,7 +38,6 @@ metadata:
   changelog_uri: https://github.com/ruby-go-gem/go-gem-wrapper/blob/main/CHANGELOG.md
   documentation_uri: https://ruby-go-gem.github.io/go-gem-wrapper/
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -46,14 +46,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: 3.3.0
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: 3.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Helpers for compiling Go extensions for ruby
 test_files: []