autoproj 1.9.7.rc15 → 1.9.7.rc16

data/Manifest.txt

@@ -30,7 +30,6 @@ lib/autoproj/default.osdeps
 lib/autoproj/environment.rb
 lib/autoproj/gitorious.rb
 lib/autoproj/installation_manifest.rb
-lib/autoproj/loader.rb
 lib/autoproj/manifest.rb
 lib/autoproj/metapackage.rb
 lib/autoproj/options.rb

data/bin/autoproj_bootstrap

@@ -620,7 +620,14 @@ fi
                         dep = Gem::Dependency.new(name, version_requirements)
                         available =
                             if gem_fetcher.respond_to?(:find_matching)
-                                gem_fetcher.find_matching(dep, true, true, GemManager.with_prerelease).map(&:first)
+                                non_prerelease, _ = gem_fetcher.find_matching(dep, false, true).first
+                                if GemManager.with_prerelease
+                                    prerelease, _ = gem_fetcher.find_matching(dep, false, true, true).last
+                                end
+                                [non_prerelease, prerelease].
+                                    compact.
+                                    map { |name, version, _| [name, version] }
+
                             else # Post RubyGems-2.0
                                 type = if GemManager.with_prerelease then :complete
                                        else :released
@@ -2519,7 +2526,7 @@ end
 # run autoproj bootstrap manually.
 if ARGV.first != "localdev"
     if ARGV.first == "dev"
-        ENV['AUTOPROJ_USE_PRERELEASE'] = 1
+        ENV['AUTOPROJ_USE_PRERELEASE'] = '1'
         Autoproj::PackageManagers::GemManager.with_prerelease = true
         ARGV.shift
     end

data/bin/autoproj_bootstrap.in

@@ -198,7 +198,7 @@ end
 # run autoproj bootstrap manually.
 if ARGV.first != "localdev"
     if ARGV.first == "dev"
-        ENV['AUTOPROJ_USE_PRERELEASE'] = 1
+        ENV['AUTOPROJ_USE_PRERELEASE'] = '1'
         Autoproj::PackageManagers::GemManager.with_prerelease = true
         ARGV.shift
     end

data/lib/autoproj/cmdline.rb

@@ -231,7 +231,7 @@ module Autoproj
                 begin
                     saved_flag = PackageManagers::GemManager.with_prerelease
                     PackageManagers::GemManager.with_prerelease = use_prerelease
-                    Autoproj.osdeps.install(%w{autobuild autoproj})
+                    OSDependencies.load_default.install(%w{autobuild autoproj})
                 ensure
                     PackageManagers::GemManager.with_prerelease = saved_flag
                 end

data/lib/autoproj/osdeps.rb

@@ -493,7 +493,14 @@ fi
                         dep = Gem::Dependency.new(name, version_requirements)
                         available =
                             if gem_fetcher.respond_to?(:find_matching)
-                                gem_fetcher.find_matching(dep, true, true, GemManager.with_prerelease).map(&:first)
+                                non_prerelease, _ = gem_fetcher.find_matching(dep, false, true).first
+                                if GemManager.with_prerelease
+                                    prerelease, _ = gem_fetcher.find_matching(dep, false, true, true).last
+                                end
+                                [non_prerelease, prerelease].
+                                    compact.
+                                    map { |name, version, _| [name, version] }
+
                             else # Post RubyGems-2.0
                                 type = if GemManager.with_prerelease then :complete
                                        else :released

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.9.7.rc15"
+    VERSION = "1.9.7.rc16"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.9.7.rc15
+  version: 1.9.7.rc16
   prerelease: 6
 platform: ruby
 authors:
@@ -155,7 +155,6 @@ files:
 - lib/autoproj/environment.rb
 - lib/autoproj/gitorious.rb
 - lib/autoproj/installation_manifest.rb
-- lib/autoproj/loader.rb
 - lib/autoproj/manifest.rb
 - lib/autoproj/metapackage.rb
 - lib/autoproj/options.rb