rubygems-requirements-system 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90a61d5a90ce6c2152e1bad4a5f7824ab91e0bc89edacff1bb5fac9999b13803
-  data.tar.gz: d32a941aeb55702028cf1ec11f95b4d0182e0c8b56935bb28552854217b19ded
+  metadata.gz: a5df5e519aeace78d1dd3458027a2ac8f035b01b603a1e802c24d95397b59a09
+  data.tar.gz: 4abb564599ef2b88a7a4de12650abfd440f7151b314f8613de9159fc64d8d297
 SHA512:
-  metadata.gz: 213e567eeef057abf6bd2beac626e066a5722ddcff48e95e4aae1ed59e56d75870382518fc724e77e1efa10ef23ad983e29f814b566b625b8fe7f8412919c585
-  data.tar.gz: 4e4b37b4ef3f9bc62dbae0d206c3cfd25be43e64dd6a5ccfb5429409e53b84a9ec0d45d20e583e0e57ed72d4e2ab16f32c884982a3904b1fa3af99adbc897f3e
+  metadata.gz: fa69897a8464203ea3171e68d34ab2bda417262941e53d7fdf4110f04196041fb92f6bcb313f944e9b6adc0af72807255da8576cf59e4c53d74d49654fc4b600
+  data.tar.gz: 9e589167215ee1d51f773fa4130e11b59624d76a643b4e87a3f380524004cd1092f9b4d0c2dabe390e76bb57d1f97146f16efb3ce84b4e90e7faa77eea31d9a5

data/doc/text/news.md

@@ -1,5 +1,17 @@
 # News
 
+## 0.1.3 - 2025-09-03
+
+### Improvements
+
+  * Updated bundled `pkg-config` gem to 1.6.4.
+
+## 0.1.2 - 2025-08-27
+
+### Improvements
+
+  * Updated bundled `pkg-config` gem to 1.6.3.
+
 ## 0.1.1 - 2025-06-11
 
 ### Fixes

data/lib/rubygems-requirements-system/pkg-config.rb

@@ -19,7 +19,7 @@ require "rbconfig"
 require "shellwords"
 
 module PKGConfig
-  VERSION = "1.6.0"
+  VERSION = "1.6.4"
 
   @@paths = []
   @@override_variables = {}
@@ -340,21 +340,34 @@ class PackageConfig
         if brew
           homebrew_repository = run_command("brew", "--repository")
           if homebrew_repository
-          homebrew_repository_candidates <<
-            Pathname(homebrew_repository.to_s)
+            homebrew_repository_candidates <<
+              Pathname(homebrew_repository.strip)
+          end
+          homebrew_prefix = run_command("brew", "--prefix")
+          if homebrew_prefix
+            homebrew_repository_candidates <<
+              Pathname(homebrew_prefix.strip)
           end
         end
         homebrew_repository_candidates.uniq.each do |candidate|
-          pkgconfig_base_path = candidate + "Library/Homebrew/os/mac/pkgconfig"
-          path = pkgconfig_base_path + mac_os_version
-          unless path.exist?
-            path = pkgconfig_base_path + mac_os_version.gsub(/\.\d+\z/, "")
+          mac_pkgconfig_base_path =
+            candidate + "Library/Homebrew/os/mac/pkgconfig"
+          mac_pkgconfig_path = mac_pkgconfig_base_path + mac_os_version
+          unless mac_pkgconfig_path.exist?
+            mac_pkgconfig_path =
+              mac_pkgconfig_base_path + mac_os_version.gsub(/\.\d+\z/, "")
           end
-          paths << path.to_s if path.exist?
+          paths << mac_pkgconfig_path.to_s if mac_pkgconfig_path.exist?
+
+          pkgconfig_path = candidate + "lib/pkgconfig"
+          paths << pkgconfig_path.to_s if pkgconfig_path.exist?
         end
       end
       paths.concat(default_paths)
-      paths.join(SEPARATOR)
+      [
+        with_config("pkg-config-path") || ENV["PKG_CONFIG_PATH"],
+        *paths,
+      ].compact.join(SEPARATOR)
     end
 
     def run_command(*command_line)
@@ -388,8 +401,10 @@ class PackageConfig
       @name = name
     end
     @options = options
-    path = @options[:path] || ENV["PKG_CONFIG_PATH"]
-    @paths = [path, self.class.default_path].compact.join(SEPARATOR).split(SEPARATOR)
+    @paths = [
+      @options[:path],
+      self.class.default_path,
+    ].compact.join(SEPARATOR).split(SEPARATOR)
     @paths.unshift(*(@options[:paths] || []))
     @paths = normalize_paths(@paths)
     @msvc_syntax = @options[:msvc_syntax]
@@ -622,13 +637,18 @@ class PackageConfig
     @variables = {}
     @declarations = {}
     File.open(pc_path) do |input|
+      current_line = +""
       input.each_line do |line|
         if line.dup.force_encoding("UTF-8").valid_encoding?
           line.force_encoding("UTF-8")
         end
         line = line.gsub(/#.*/, "").strip
-        next if line.empty?
-        case line
+        if line.end_with?("\\")
+          current_line += line[0..-2]
+          next
+        end
+        current_line += line
+        case current_line
         when /^(#{IDENTIFIER_RE})\s*=\s*/
           match = Regexp.last_match
           @variables[match[1]] = match.post_match.strip
@@ -636,6 +656,7 @@ class PackageConfig
           match = Regexp.last_match
           @declarations[match[1]] = match.post_match.strip
         end
+        current_line = +""
       end
     end
   end

data/lib/rubygems-requirements-system/version.rb

@@ -14,5 +14,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module RubyGemsRequirementsSystem
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-requirements-system
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Sutou Kouhei
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Users can install system packages automatically on "gem install"
 test_files: []