autoproj 1.13.6 → 1.13.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91f2f8f2ee8e760db9598f7b8d12c6d47c5efebb
-  data.tar.gz: c3f5a5a811b784361f2b01e856162b777d821b3c
+  metadata.gz: 5d9ce5749393ef4ef70b623d58c40081a5627c45
+  data.tar.gz: 531e965538bdfd19e8ae40290d2e53bcfd5031a6
 SHA512:
-  metadata.gz: 553c69b190843df01046b667ccbeff230492cbfe879442042400a226d84c92768ddc0333a14edf06168f347fc4d25593157c8a22c1895d6a1619cfaa3150db65
-  data.tar.gz: b88ca4d0120dee5659b54b4c8ae259b3a063c1570bc66f5265669de0f593d5b68fa35a77cff67cf89914842bb705604d7aab3ed71e6c6b86b3e3448d3c0b817e
+  metadata.gz: 0a834c5d645039281a09328febb4cf736d4b5a5151813752467195b36c6a15ba383352693a0df4a1443296d7e67574e2c396ceeee2f4a8697bdce8a037143d8b
+  data.tar.gz: 7f0359dbee5d7c6674e36af22d1096592aaec38640eeecc8ec6f075db14eee8482037bd5437b6370f920e30db4e5247d7a1b9831cccdaf4c0b7e1561b9edeed3

data/bin/autoproj_bootstrap

@@ -565,6 +565,10 @@ module Autoproj
                 @silent = true
             end
 
+            def parse_package_entry(entry)
+                entry
+            end
+
             # The primary name for this package manager
             def name
                 names.first
@@ -1974,11 +1978,15 @@ fi
             end
 
             result.map do |handler, status, entries|
-                if handler.respond_to?(:parse_package_entry)
-                    [handler, status, entries.map { |s| handler.parse_package_entry(s) }]
-                else
-                    [handler, status, entries]
+                entries = entries.map do |e|
+                    if e.respond_to?(:to_str)
+                        handler.parse_package_entry(e)
+                    else
+                        e
+                    end
                 end
+
+                [handler, status, entries]
             end
         end
 
@@ -2542,17 +2550,19 @@ module Autobuild
             programs[name.to_sym] || programs[name.to_s] || name.to_s
         end
 
-        # Find a file in a given path-like variable
-        def find_in_path(file, envvar = 'PATH')
-            env.find_in_path(file, envvar)
+        def find_in_path(file)
+            path = ENV['PATH'].split(File::PATH_SEPARATOR).
+                find { |dir| File.exist?(File.join(dir, file)) }
+            if path
+                return File.join(path, file)
+            end
         end
 
         # Resolves the absolute path to a given tool
-        def tool_in_path(name, env: self.env)
+        def tool_in_path(name)
             path, path_name, path_env = programs_in_path[name]
             current = tool(name)
-            env_PATH = env.resolved_env['PATH']
-            if (path_env != env_PATH) || (path_name != current)
+            if path_env != ENV['PATH'] || path_name != current
                 # Delete the current entry given that it is invalid
                 programs_in_path.delete(name)
                 if current[0, 1] == "/"
@@ -2572,7 +2582,7 @@ module Autobuild
                 elsif !File.executable?(path)
                     raise ArgumentError, "tool #{name} is set to #{current}, but this resolves to #{path} which is not executable"
                 end
-                programs_in_path[name] = [path, current, env_PATH]
+                programs_in_path[name] = [path, current, ENV['PATH']]
             end
 
             return path

data/lib/autoproj/osdeps.rb

@@ -32,6 +32,10 @@ module Autoproj
                 @silent = true
             end
 
+            def parse_package_entry(entry)
+                entry
+            end
+
             # The primary name for this package manager
             def name
                 names.first
@@ -1441,11 +1445,15 @@ fi
             end
 
             result.map do |handler, status, entries|
-                if handler.respond_to?(:parse_package_entry)
-                    [handler, status, entries.map { |s| handler.parse_package_entry(s) }]
-                else
-                    [handler, status, entries]
+                entries = entries.map do |e|
+                    if e.respond_to?(:to_str)
+                        handler.parse_package_entry(e)
+                    else
+                        e
+                    end
                 end
+
+                [handler, status, entries]
             end
         end
 

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.13.6"
+    VERSION = "1.13.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.13.6
+  version: 1.13.7
 platform: ruby
 authors:
 - Rock Core Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-31 00:00:00.000000000 Z
+date: 2016-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.14'
 description: autoproj is a manager for sets of software packages. It allows the user
   to import and build packages from source, still using the underlying distribution's
   native package manager for software that is available on it.