Move to GoGem::Util

Author: sue445

_gem/lib/go_gem/rake_task.rb

@@ -100,50 +100,18 @@ def initialize(gem_name)
     # @return [Hash<String, String>]
     def self.build_env_vars
       ldflags = GoGem::Util.generate_ldflags
-      cflags = generate_cflags
+      cflags = GoGem::Util.generate_cflags
 
       ld_library_path = RbConfig::CONFIG["libdir"].to_s
 
       {
-        "GOFLAGS"         => generate_goflags,
+        "GOFLAGS"         => GoGem::Util.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_cflags
-      cflags =
-        [
-          RbConfig::CONFIG["CFLAGS"],
-          "-I#{RbConfig::CONFIG["rubyarchhdrdir"]}",
-          "-I#{RbConfig::CONFIG["rubyhdrdir"]}",
-        ].join(" ")
-
-      # FIXME: Workaround for Ubuntu (GitHub Actions)
-      if RUBY_PLATFORM =~ /linux/i
-        cflags.gsub!("-Wno-self-assign", "")
-        cflags.gsub!("-Wno-parentheses-equality", "")
-        cflags.gsub!("-Wno-constant-logical-operand", "")
-        cflags.gsub!("-Wsuggest-attribute=format", "")
-        cflags.gsub!("-Wold-style-definition", "")
-        cflags.gsub!("-Wsuggest-attribute=noreturn", "")
-      end
-
-      # FIXME: Workaround for Alpine
-      cflags.gsub!("-Wpointer-arith", "") if RUBY_PLATFORM =~ /linux-musl/i
-
-      cflags.strip
-    end
-    private_class_method :generate_cflags
-
     # @yield
     def within_target_dir
       Dir.chdir(target_dir) do # rubocop:disable Style/ExplicitBlockArgument

_gem/lib/go_gem/util.rb

@@ -31,5 +31,35 @@ def self.generate_ldflags
 
       ldflags.strip
     end
+
+    # @return [String]
+    def self.generate_cflags
+      cflags =
+        [
+          RbConfig::CONFIG["CFLAGS"],
+          "-I#{RbConfig::CONFIG["rubyarchhdrdir"]}",
+          "-I#{RbConfig::CONFIG["rubyhdrdir"]}",
+        ].join(" ")
+
+      # FIXME: Workaround for Ubuntu (GitHub Actions)
+      if RUBY_PLATFORM =~ /linux/i
+        cflags.gsub!("-Wno-self-assign", "")
+        cflags.gsub!("-Wno-parentheses-equality", "")
+        cflags.gsub!("-Wno-constant-logical-operand", "")
+        cflags.gsub!("-Wsuggest-attribute=format", "")
+        cflags.gsub!("-Wold-style-definition", "")
+        cflags.gsub!("-Wsuggest-attribute=noreturn", "")
+      end
+
+      # FIXME: Workaround for Alpine
+      cflags.gsub!("-Wpointer-arith", "") if RUBY_PLATFORM =~ /linux-musl/i
+
+      cflags.strip
+    end
+
+    # @return [String]
+    def self.generate_goflags
+      "-tags=#{ruby_minor_version_build_tag}"
+    end
   end
 end

_gem/sig/go_gem/rake_task.rbs

@@ -30,10 +30,6 @@ module GoGem
 
     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_cflags: () -> String
-
     private
 
     def define_go_test_task: () -> void

_gem/sig/go_gem/util.rbs

@@ -3,5 +3,9 @@ module GoGem
     def self.ruby_minor_version_build_tag: (?String ruby_version) -> String
 
     def self.generate_ldflags: () -> String
+
+    def self.generate_cflags: () -> String
+
+    def self.generate_goflags: () -> String
   end
 end