bin/autoproj_bootstrap in autoproj-2.0.0.b6 vs bin/autoproj_bootstrap in autoproj-2.0.0.b7

@@ -383,10 +383,19 @@
 
         def import_log_enabled=(value)
             set('import_log_enabled', !!value)
         end
 
+        def parallel_build_level
+            get('parallel_build_level', nil) || Autobuild.parallel_build_level
+        end
+
+        def parallel_build_level=(level)
+            set('parallel_build_level', level)
+            Autobuild.parallel_build_level = level
+        end
+
         def parallel_import_level
             get('parallel_import_level', 10)
         end
 
         def parallel_import_level=(level)
@@ -1251,14 +1260,24 @@
                 if Autobuild.programs['gem']
                     return Autobuild.programs['gem']
                 end
 
                 ruby_bin = RbConfig::CONFIG['RUBY_INSTALL_NAME']
+                ruby_bindir = RbConfig::CONFIG['bindir']
+
+                candidates = ['gem']
                 if ruby_bin =~ /^ruby(.+)$/
-                    Autobuild.programs['gem'] = "gem#{$1}"
-                else
-                    Autobuild.programs['gem'] = "gem"
+                    candidates << "gem#{$1}" 
                 end
+
+                candidates.each do |gem_name|
+                    if File.file?(gem_full_path = File.join(ruby_bindir, gem_name))
+                        Autobuild.programs['gem'] = gem_full_path
+                        return
+                    end
+                end
+
+                raise ArgumentError, "cannot find a gem program (tried #{candidates.sort.join(", ")} in #{ruby_bindir})"
             end
 
             def build_gem_cmdlines(gems)
                 with_version, without_version = gems.partition { |name, v| v }