autoproj 1.9.7.rc17 → 1.9.7.rc18

data/bin/autoproj_bootstrap

@@ -620,13 +620,13 @@ fi
                         dep = Gem::Dependency.new(name, version_requirements)
                         available =
                             if gem_fetcher.respond_to?(:find_matching)
-                                non_prerelease, _ = gem_fetcher.find_matching(dep, false, true).first
+                                non_prerelease, _ = gem_fetcher.find_matching(dep, true, true).map(&:first)
                                 if GemManager.with_prerelease
-                                    prerelease, _ = gem_fetcher.find_matching(dep, false, true, true).last
+                                    prerelease, _ = gem_fetcher.find_matching(dep, false, true, true).map(&:first)
+                                else prerelease = Array.new
                                 end
-                                [non_prerelease, prerelease].
-                                    compact.
-                                    map { |name, version, _| [name, version] }
+                                (non_prerelease + prerelease).
+                                    map { |(n, v, _), _| [n, v] }
 
                             else # Post RubyGems-2.0
                                 type = if GemManager.with_prerelease then :complete
@@ -638,7 +638,7 @@ fi
                                 end.map { |tuple, _| [tuple.name, tuple.version] }
                             end
                         installed_version = installed.map(&:version).max
-                        available_version = available.map { |name, v| v }.max
+                        available_version = available.map { |_, v| v }.max
                         if !available_version
                             if version
                                 raise ConfigError.new, "cannot find any gem with the name '#{name}' and version #{version}"

data/lib/autoproj/osdeps.rb

@@ -493,13 +493,13 @@ fi
                         dep = Gem::Dependency.new(name, version_requirements)
                         available =
                             if gem_fetcher.respond_to?(:find_matching)
-                                non_prerelease, _ = gem_fetcher.find_matching(dep, false, true).first
+                                non_prerelease, _ = gem_fetcher.find_matching(dep, true, true).map(&:first)
                                 if GemManager.with_prerelease
-                                    prerelease, _ = gem_fetcher.find_matching(dep, false, true, true).last
+                                    prerelease, _ = gem_fetcher.find_matching(dep, false, true, true).map(&:first)
+                                else prerelease = Array.new
                                 end
-                                [non_prerelease, prerelease].
-                                    compact.
-                                    map { |name, version, _| [name, version] }
+                                (non_prerelease + prerelease).
+                                    map { |(n, v, _), _| [n, v] }
 
                             else # Post RubyGems-2.0
                                 type = if GemManager.with_prerelease then :complete
@@ -511,7 +511,7 @@ fi
                                 end.map { |tuple, _| [tuple.name, tuple.version] }
                             end
                         installed_version = installed.map(&:version).max
-                        available_version = available.map { |name, v| v }.max
+                        available_version = available.map { |_, v| v }.max
                         if !available_version
                             if version
                                 raise ConfigError.new, "cannot find any gem with the name '#{name}' and version #{version}"

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.9.7.rc17"
+    VERSION = "1.9.7.rc18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.9.7.rc17
+  version: 1.9.7.rc18
   prerelease: 6
 platform: ruby
 authors: