autoproj 1.13.5 → 1.13.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f64596563a0e120b680f113398de4b459b0d1b61
-  data.tar.gz: 34e5fb1b97d0a40e333a18dbf180cca211dc4f5f
+  metadata.gz: 91f2f8f2ee8e760db9598f7b8d12c6d47c5efebb
+  data.tar.gz: c3f5a5a811b784361f2b01e856162b777d821b3c
 SHA512:
-  metadata.gz: 210404bc22acc099d6d9898987a437f9c621899e049a584b1784ec52e6efe82022083a3f02a7351a6cf216f39738b9e5677cc8f7451319cc34db96e5123747bd
-  data.tar.gz: 820b985f771c8d8b68ede2fac87ef0a84544f6c2a8e913e4f4d5324030e1746a834350af3bf66aa8ff673e3d8d5b7832d805e02fc692d28d7f30b8074a062ea3
+  metadata.gz: 553c69b190843df01046b667ccbeff230492cbfe879442042400a226d84c92768ddc0333a14edf06168f347fc4d25593157c8a22c1895d6a1619cfaa3150db65
+  data.tar.gz: b88ca4d0120dee5659b54b4c8ae259b3a063c1570bc66f5265669de0f593d5b68fa35a77cff67cf89914842bb705604d7aab3ed71e6c6b86b3e3448d3c0b817e

data/bin/autoproj_bootstrap

@@ -2542,19 +2542,17 @@ module Autobuild
             programs[name.to_sym] || programs[name.to_s] || name.to_s
         end
 
-        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
+        # Find a file in a given path-like variable
+        def find_in_path(file, envvar = 'PATH')
+            env.find_in_path(file, envvar)
         end
 
         # Resolves the absolute path to a given tool
-        def tool_in_path(name)
+        def tool_in_path(name, env: self.env)
             path, path_name, path_env = programs_in_path[name]
             current = tool(name)
-            if path_env != ENV['PATH'] || path_name != current
+            env_PATH = env.resolved_env['PATH']
+            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] == "/"
@@ -2574,7 +2572,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/manifest.rb

@@ -403,6 +403,10 @@ module Autoproj
             end
         end
 
+        def find_package_definition(name)
+            packages[name]
+        end
+
         def find_package(name)
             packages[name]
         end

data/lib/autoproj/metapackage.rb

@@ -38,6 +38,14 @@ module Autoproj
             @packages.each(&block)
         end
 
+        # Filter this metapackage by removing some packages
+        def remove(pkg)
+            if !pkg.respond_to?(:to_str)
+                pkg = pkg.name
+            end
+            @packages.delete_if { |p| p.name == pkg }
+        end
+
         # Tests if the given package is included in this metapackage
         #
         # @param [String,#name] pkg the package or package name

data/lib/autoproj/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.13.5
+  version: 1.13.6
 platform: ruby
 authors:
 - Rock Core Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild