autoproj 2.8.7 → 2.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '06899cc513fc1e9db2ad848a7fbb41072c7e98da4edfcee416945795bf6b8073'
-  data.tar.gz: 529ed7ee3173ba42d7ba283c20aa22ae1dd4dd8fdb86e98372766f2f78236c14
+  metadata.gz: 52887a2af332210cca2a14090350718f88ca070be1a5ab7493cc82af38f7ba59
+  data.tar.gz: b3d84d28e9a283f0cd9efd2cf0cd254382caffabbd7144aff55633e917466c9e
 SHA512:
-  metadata.gz: 1fff56785550539d5f0192e648dd7e04714d123eb12c91517066e78f24ee31d11f1a294bed999ade50c76b8126cfefb3e1918588ecc0736c90b6091cd681fb7a
-  data.tar.gz: 9ad7d2cf7f0101009276449bd8c33d274e29e6ee537455864cc2b369b621df7c0343b4a8dc9a2dabd92344c32286b852284a18475afc52d84534e5afcc90270e
+  metadata.gz: 03c32ce93aed3de8fad8bf3dfcbfe5529703315b83e0a8afe70bd1b54c3f0c91257a42f838e67866aca8beff348f4766b37eec82e70dfa04b243bc6d41df2747
+  data.tar.gz: 8fe58af39dd943a8841eadce3222cf32124d3befe1e909e683b34481d5211da660c1ba8d1ab25ee8fad6fbe5aca209cfe1d9927a1248fa8cf74bab99cd2e0198

data/bin/autoproj_bootstrap

@@ -291,16 +291,18 @@ module Autoproj
             end
 
             def find_bundler(gem_program)
-                setup_path =
-                    IO.popen([env_for_child, Gem.ruby, gem_program, 'which', 'bundler/setup']) do |io|
+                setup_paths =
+                    IO.popen([env_for_child, Gem.ruby, gem_program, 'which','-a', 'bundler/setup']) do |io|
                         io.read
                     end
                 return unless $?.success?
-
                 bundler_path = File.join(gems_gem_home, 'bin', 'bundle')
-                if File.exist?(bundler_path) && setup_path.start_with?(gems_gem_home)
-                    bundler_path
+                setup_paths.each_line do |setup_path|
+                    if File.exist?(bundler_path) && setup_path.start_with?(gems_gem_home)
+                        return bundler_path
+                    end
                 end
+                return
             end
 
             def install_bundler(gem_program, silent: false)

data/bin/autoproj_install

@@ -291,16 +291,18 @@ module Autoproj
             end
 
             def find_bundler(gem_program)
-                setup_path =
-                    IO.popen([env_for_child, Gem.ruby, gem_program, 'which', 'bundler/setup']) do |io|
+                setup_paths =
+                    IO.popen([env_for_child, Gem.ruby, gem_program, 'which','-a', 'bundler/setup']) do |io|
                         io.read
                     end
                 return unless $?.success?
-
                 bundler_path = File.join(gems_gem_home, 'bin', 'bundle')
-                if File.exist?(bundler_path) && setup_path.start_with?(gems_gem_home)
-                    bundler_path
+                setup_paths.each_line do |setup_path|
+                    if File.exist?(bundler_path) && setup_path.start_with?(gems_gem_home)
+                        return bundler_path
+                    end
                 end
+                return
             end
 
             def install_bundler(gem_program, silent: false)

data/lib/autoproj/cli/test.rb

@@ -3,67 +3,69 @@
 module Autoproj
     module CLI
         class Test < InspectionTool
-            def enable(user_selection, options = Hash.new)
+            def enable(user_selection, options = {})
                 if user_selection.empty?
                     ws.load_config
                     ws.config.utility_enable_all('test')
                 else
                     initialize_and_load
-                    selection, _ = finalize_setup(
+                    selection, = finalize_setup(
                         user_selection,
                         recursive: options[:deps],
-                        non_imported_packages: :return)
+                        non_imported_packages: :return
+                    )
                     ws.config.utility_enable('test', *selection)
                 end
                 ws.config.save
             end
 
-            def disable(user_selection, options = Hash.new)
+            def disable(user_selection, options = {})
                 if user_selection.empty?
                     ws.load_config
                     ws.config.utility_disable_all('test')
                 else
                     initialize_and_load
-                    selection, _ = finalize_setup(
+                    selection, = finalize_setup(
                         user_selection,
                         recursive: options[:deps],
-                        non_imported_packages: :return)
+                        non_imported_packages: :return
+                    )
                     ws.config.utility_disable('test', *selection)
                 end
                 ws.config.save
             end
 
-            def list(user_selection, options = Hash.new)
+            def list(user_selection, options = {})
                 initialize_and_load
-                resolved_selection, _ = finalize_setup(
+                resolved_selection, = finalize_setup(
                     user_selection,
                     recursive: options[:deps],
-                    non_imported_packages: :return)
+                    non_imported_packages: :return
+                )
 
-                lines = Array.new
+                lines = []
                 resolved_selection.each do |pkg_name|
                     pkg = ws.manifest.find_package_definition(pkg_name).autobuild
                     lines << [pkg.name, pkg.test_utility.enabled?, pkg.test_utility.available?]
                 end
                 lines = lines.sort_by { |name, _| name }
                 w     = lines.map { |name, _| name.length }.max
-                format = "%-#{w}s %-7s %-9s"
-                puts format % ["Package Name", "Enabled", "Available"]
+                out_format = "%-#{w}s %-7s %-9s"
+                puts format(out_format, 'Package Name', 'Enabled', 'Available')
                 lines.each do |name, enabled, available|
-                    puts(format % [name, (!!enabled).to_s, (!!available).to_s])
+                    puts(format(out_format, name, (!!enabled).to_s, (!!available).to_s))
                 end
             end
 
             def run(user_selection, deps: true)
                 initialize_and_load
-                packages, _ =
-                    finalize_setup(user_selection, recursive: deps)
+                packages, =
+                    finalize_setup(user_selection, recursive: user_selection.empty? || deps)
                 packages.each do |pkg|
                     ws.manifest.find_autobuild_package(pkg).disable_phases('import', 'prepare', 'install')
                 end
-                Autobuild.apply(packages, "autoproj-test", ['test'])
+                Autobuild.apply(packages, 'autoproj-test', ['test'])
             end
         end
     end
 end
-

data/lib/autoproj/ops/install.rb

@@ -281,16 +281,18 @@ def parse_options(args = ARGV)
             end
 
             def find_bundler(gem_program)
-                setup_path =
-                    IO.popen([env_for_child, Gem.ruby, gem_program, 'which', 'bundler/setup']) do |io|
+                setup_paths =
+                    IO.popen([env_for_child, Gem.ruby, gem_program, 'which','-a', 'bundler/setup']) do |io|
                         io.read
                     end
                 return unless $?.success?
-
                 bundler_path = File.join(gems_gem_home, 'bin', 'bundle')
-                if File.exist?(bundler_path) && setup_path.start_with?(gems_gem_home)
-                    bundler_path
+                setup_paths.each_line do |setup_path|
+                    if File.exist?(bundler_path) && setup_path.start_with?(gems_gem_home)
+                        return bundler_path
+                    end
                 end
+                return
             end
 
             def install_bundler(gem_program, silent: false)

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.8.7"
+    VERSION = "2.8.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.8.7
+  version: 2.8.8
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-04 00:00:00.000000000 Z
+date: 2018-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler