utilrb 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: becf09fee88559811629a72aee4fe627a86f2231
-  data.tar.gz: 1f690f7883cf11362a8f1656a3e04cdfc6f98da1
+  metadata.gz: 30f3b27613076cc9f327bccee358f2bc55bcd826
+  data.tar.gz: ef980585fef480c37de10056afec1bd714df4683
 SHA512:
-  metadata.gz: 2aeaf57d6ab7deeab1027b82e796127e23adc2acf2291df450f1b4b76f466ef12acc9f74a2e9cc1c2727c6732c50b7e5d2d9ad553f277c70cd583c971bfc3c62
-  data.tar.gz: 52766e2bc24e6c27c27af4d5410da75e86077bc7c476240ab0f82116ac6b9847c92ecf8cb38e7e88d6913932eb786db60968cc2cac011a9920900650a267a802
+  metadata.gz: df1fab4bfabbe73e7d657a7564022042d3f16c84293474ed441c1c9b1452481c2393aa76d38b820a398731fc605aa5d0a8ea6e30c089b7ef3b2ca2279145bbd2
+  data.tar.gz: 1efd86909aff5ea2802c1ff9a04db0e5eb052cbed3412858d1d051245b47baf82d329a200102318e8067396f1175f319247062942bd4bab4d22a72818ac06408

data/lib/utilrb/array/to_s.rb

@@ -1,12 +0,0 @@
-require 'utilrb/enumerable/to_s_helper'
-class Array
-    # Displays arrays as [ a, b, [c, d], ... ] instead of the standard #join
-    # Unlike #inspect, it calls #to_s on the elements too
-    undef_method :to_s
-    def to_s
-	EnumerableToString.to_s_helper(self, '[', ']') do |obj|
-	    obj.to_s
-	end
-    end
-end
-

data/lib/utilrb/hash/to_s.rb

@@ -1,12 +0,0 @@
-require 'utilrb/enumerable/to_s_helper'
-class Hash
-    # Displays hashes as { a => A, b => B, ... } instead of the standard #join
-    # Unlike #inspect, it calls #to_s on the elements too
-    undef_method :to_s
-    def to_s
-	EnumerableToString.to_s_helper(self, '{', '}') do |k, v| 
-	    "#{k} => #{v}" 
-	end
-    end
-end
-

data/lib/utilrb/pkgconfig.rb

@@ -66,14 +66,19 @@ module Utilrb
                     raise NotFound.new(name), "cannot find the pkg-config specification for #{name}"
                 end
 
-                candidates = loaded_packages[name] = Array.new
+                candidates = Array.new
                 paths.each do |p|
                     candidates << PkgConfig.load(p, preset_variables)
                 end
+                loaded_packages[name] = candidates
             end
 
             # Now try to find a matching spec
-            find_matching_version(candidates, version_spec)
+            if version_match = find_matching_version(candidates, version_spec)
+                version_match
+            else
+                raise NotFound, "found #{candidates.size} packages for #{name}, but none match the version specification #{version_spec}"
+            end
         end
 
         # Finds the provided package and optional version and returns its
@@ -461,8 +466,8 @@ module Utilrb
         end
 
 
-        FOUND_PATH_RX = /Scanning directory '(.*\/)((?:lib|lib64|share)\/.*)'$/
-        NONEXISTENT_PATH_RX = /Cannot open directory '.*\/((?:lib|lib64|share)\/.*)' in package search path:.*/
+        FOUND_PATH_RX = /Scanning directory (?:#\d+ )?'(.*\/)((?:lib|lib64|share)\/.*)'$/
+        NONEXISTENT_PATH_RX = /Cannot open directory (?:#\d+ )?'.*\/((?:lib|lib64|share)\/.*)' in package search path:.*/
 
         # Returns the system-wide search path that is embedded in pkg-config
         def self.default_search_path

data/lib/utilrb/set/to_s.rb

@@ -1,11 +0,0 @@
-require 'utilrb/enumerable/to_s_helper'
-require 'set'
-class Set
-    # Displays the set as {a, b, c, d}
-    def to_s
-	EnumerableToString.to_s_helper(self, '{', '}') do |obj|
-	    obj.to_s
-	end
-    end
-end
-

data/lib/utilrb/version.rb

@@ -1,4 +1,4 @@
 module Utilrb
-    VERSION = "3.0.0"
+    VERSION = "3.0.1"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utilrb
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-11 00:00:00.000000000 Z
+date: 2016-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets
@@ -216,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Utilrb is yet another Ruby toolkit, in the spirit of facets