pkg-config 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '09358e3bde84ec7d5a2a90f63c7645fb157826c1'
-  data.tar.gz: e51b468a0e04475368df7a1812dc8261fb1bd2e2
+  metadata.gz: 4853ef3274189b7494ef228d87db6c067576f7d8
+  data.tar.gz: b9d10332ab8bf6e2d9f2e03df87d3507704be760
 SHA512:
-  metadata.gz: 35f46161d07e06730e9411e4a0c5fee1a75e60c186af40dbcde8200f2a4093f3d4c35ed2f8ed8d4ff0ae4860144a8fb2c06b86e962ebf231bfc462fb44f136ec
-  data.tar.gz: 88a56de322a6d128145b5a07835a37a786b98bece0a90968badfdbd4c1a17a4c49b5f2482e91fd878b0c5300959f26bfb42f0cecc411a9667ff44b4e4ab1d46a
+  metadata.gz: 0f24dac3a3f4efda1a9332f25262bcd991bd048c57e6f308ed5221d94e87d16c8ce41303dae5d011f937262a36df2d8b5cbfb4a0a958ef192782c28bf3030064
+  data.tar.gz: 0b29180c716c7a27987c30ea544f897d90b043bbd0ba1c0051f1262077847ef2a4de27426d6f32c5e7585a4fc835a13cde48d35dc59c16f80fb8248d41e296ab

data/NEWS

@@ -1,5 +1,11 @@
 = NEWS
 
+== 1.2.6 - 2017-08-13
+
+=== Improvements
+
+  * Improved Homebrew repository detection.
+
 == 1.2.5 - 2017-08-10
 
 === Improvements

data/lib/pkg-config/version.rb

@@ -15,5 +15,5 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module PKGConfig
-  VERSION = "1.2.5"
+  VERSION = "1.2.6"
 end

data/lib/pkg-config.rb

@@ -376,9 +376,20 @@ class PackageConfig
     if /-darwin\d+\z/ =~ RUBY_PLATFORM and
         /\A(\d+\.\d+)\./ =~ `sw_vers -productVersion`
       mac_os_version = $1
-      path = pkg_config_prefix +
-        "Library/Homebrew/os/mac/pkgconfig/#{mac_os_version}"
-      paths << path.to_s if path.exist?
+      homebrew_repository_candidates = []
+      brew_path = pkg_config_prefix + "bin" + "brew"
+      if brew_path.exist?
+        escaped_brew_path = Shellwords.escape(brew_path.to_s)
+        homebrew_repository = `#{escaped_brew_path} --repository`.chomp
+        homebrew_repository_candidates << Pathname.new(homebrew_repository)
+      else
+        homebrew_repository_candidates << pkg_config_prefix + "Homebrew"
+        homebrew_repository_candidates << pkg_config_prefix
+      end
+      homebrew_repository_candidates.each do |candidate|
+        path = candidate + "Library/Homebrew/os/mac/pkgconfig/#{mac_os_version}"
+        paths << path.to_s if path.exist?
+      end
     end
     paths.concat(default_paths)
     paths.join(SEPARATOR)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkg-config
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-10 00:00:00.000000000 Z
+date: 2017-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit