autoproj 1.9.3.rc2 → 1.9.3.rc3

data/bin/autoproj

@@ -130,20 +130,12 @@ EOTEXT
     #
     # First do the resolution to get auto-add, finalize the package
     # configuration, and then re-resolve
-    begin
-        Autoproj::CmdLine.resolve_user_selection(selected_packages)
-    rescue Autoproj::Manifest::ExcludedSelection => e
-        raise e, "#{e.selection}, which is selected on the command line, cannot be built: #{e.message}"
-    end
+    Autoproj::CmdLine.resolve_user_selection(selected_packages)
     # Now load the rest of the configuration
     Autoproj::CmdLine.finalize_package_setup
     # Finally, filter out exclusions
     resolved_selected_packages =
-        begin
-            Autoproj::CmdLine.resolve_user_selection(selected_packages)
-        rescue Autoproj::Manifest::ExcludedSelection => e
-            raise e, "#{e.selection}, which is selected on the command line, cannot be built: #{e.message}"
-        end
+        Autoproj::CmdLine.resolve_user_selection(selected_packages)
     Autoproj::CmdLine.validate_user_selection(selected_packages, resolved_selected_packages)
 
     if !selected_packages.empty?

data/bin/autoproj_bootstrap

@@ -521,9 +521,20 @@ fi
                     if !installed.empty? && Autobuild.do_update
                         # Look if we can update the package ...
                         dep = Gem::Dependency.new(name, version_requirements)
-                        available = gem_fetcher.find_matching(dep, true, true, GemManager.with_prerelease)
+                        available =
+                            if gem_fetcher.respond_to?(:find_matching)
+                                gem_fetcher.find_matching(dep).map(&:first)
+                            else # Post RubyGems-2.0
+                                type = if GemManager.with_prerelease then :prerelease
+                                       else :complete
+                                       end
+
+                                gem_fetcher.detect(type) do |tuple|
+                                    tuple.name == name && dep.match?(tuple)
+                                end.map { |tuple, _| [tuple.name, tuple.version] }
+                            end
                         installed_version = installed.map(&:version).max
-                        available_version = available.map { |(name, v), source| v }.max
+                        available_version = available.map { |name, v| v }.max
                         if !available_version
                             if version
                                 raise ConfigError.new, "cannot find any gem with the name '#{name}' and version #{version}"
@@ -642,9 +653,7 @@ fi
         end
 
 	def self.ruby_version_keyword
-            if RUBY_VERSION < "1.9.0" then "ruby18"
-            else "ruby19"
-            end
+            "ruby#{RUBY_VERSION.split('.')[0, 2].join("")}"
         end
 
         def self.autodetect_ruby
@@ -961,6 +970,8 @@ fi
             end
 
             os_names, os_versions = OSDependencies.operating_system
+            os_names = os_names.dup
+            os_names << 'default'
 
             dep_def = definitions[name]
             if !dep_def
@@ -1972,6 +1983,7 @@ ruby19:
   - ruby19
   - rake
   default: nonexistent
+ruby20: ignore
 build-essential:
   debian,ubuntu: build-essential
   gentoo: ignore

data/lib/autoproj/cmdline.rb

@@ -74,7 +74,7 @@ module Autoproj
             end
             FileUtils.chmod 0755, File.join(bindir, 'ruby')
 
-            subprograms = ['gem', 'irb'].each do |name|
+            subprograms = ['gem', 'irb', 'testrb'].each do |name|
                 # Look for the corresponding gem program
                 prg_name = "#{name}#{install_suffix}"
                 if File.file?(prg_path = File.join(ruby_bindir, prg_name))
@@ -82,6 +82,7 @@ module Autoproj
                         io.puts "#! /bin/sh"
                         io.puts "exec #{prg_path} \"$@\""
                     end
+                    FileUtils.chmod 0755, File.join(bindir, name)
                 end
             end
         end
@@ -650,7 +651,7 @@ module Autoproj
                 if chain.size == 1
                     Autoproj.manifest.add_exclusion(pkg_name, "its dependency #{reason}")
                 else
-                    Autoproj.manifest.add_exclusion(pkg_name, "#{reason} (dependency chain: #{chain.join(">")}")
+                    Autoproj.manifest.add_exclusion(pkg_name, "#{reason} (dependency chain: #{chain.join(">")})")
                 end
             end
 

data/lib/autoproj/default.osdeps

@@ -51,6 +51,8 @@ ruby19:
         - rake
     default: nonexistent
 
+ruby20: ignore
+
 build-essential:
   debian,ubuntu: build-essential
   gentoo: ignore

data/lib/autoproj/manifest.rb

@@ -2222,19 +2222,20 @@ module Autoproj
                         exclusions = excluded.map do |pkg_name|
                             [pkg_name, manifest.exclusion_reason(pkg_name)]
                         end
+                        base_msg = "#{sel} is selected in the manifest or on the command line"
                         if exclusions.size == 1
                             reason = exclusions[0][1]
                             if sel == exclusions[0][0]
-                                raise ExcludedSelection.new(sel), "it is excluded from the build: #{reason}"
+                                raise ExcludedSelection.new(sel), "#{base_msg}, but it is excluded from the build: #{reason}"
                             elsif weak_dependencies[sel]
-                                raise ExcludedSelection.new(sel), "it expands to #{exclusions.map(&:first).join(", ")}, which is excluded from the build: #{reason}"
+                                raise ExcludedSelection.new(sel), "#{base_msg}, but it expands to #{exclusions.map(&:first).join(", ")}, which is excluded from the build: #{reason}"
                             else
-                                raise ExcludedSelection.new(sel), "it requires #{exclusions.map(&:first).join(", ")}, which is excluded from the build: #{reason}"
+                                raise ExcludedSelection.new(sel), "#{base_msg}, but its dependency #{exclusions.map(&:first).join(", ")} is excluded from the build: #{reason}"
                             end
                         elsif weak_dependencies[sel]
-                            raise ExcludedSelection.new(sel), "it expands to #{exclusions.map(&:first).join(", ")}, and all these packages are excluded from the build:\n  #{exclusions.map { |name, reason| "#{name}: #{reason}" }.join("\n  ")}"
+                            raise ExcludedSelection.new(sel), "#{base_msg}, but expands to #{exclusions.map(&:first).join(", ")}, and all these packages are excluded from the build:\n  #{exclusions.map { |name, reason| "#{name}: #{reason}" }.join("\n  ")}"
                         else
-                            raise ExcludedSelection.new(sel), "it requires #{exclusions.map(&:first).join(", ")}, and all these packages are excluded from the build:\n  #{exclusions.map { |name, reason| "#{name}: #{reason}" }.join("\n  ")}"
+                            raise ExcludedSelection.new(sel), "#{base_msg}, but it requires #{exclusions.map(&:first).join(", ")}, and all these packages are excluded from the build:\n  #{exclusions.map { |name, reason| "#{name}: #{reason}" }.join("\n  ")}"
                         end
                     else
                         self.exclusions[sel] |= excluded.to_set.dup

data/lib/autoproj/osdeps.rb

@@ -404,9 +404,20 @@ fi
                     if !installed.empty? && Autobuild.do_update
                         # Look if we can update the package ...
                         dep = Gem::Dependency.new(name, version_requirements)
-                        available = gem_fetcher.find_matching(dep, true, true, GemManager.with_prerelease)
+                        available =
+                            if gem_fetcher.respond_to?(:find_matching)
+                                gem_fetcher.find_matching(dep).map(&:first)
+                            else # Post RubyGems-2.0
+                                type = if GemManager.with_prerelease then :prerelease
+                                       else :complete
+                                       end
+
+                                gem_fetcher.detect(type) do |tuple|
+                                    tuple.name == name && dep.match?(tuple)
+                                end.map { |tuple, _| [tuple.name, tuple.version] }
+                            end
                         installed_version = installed.map(&:version).max
-                        available_version = available.map { |(name, v), source| v }.max
+                        available_version = available.map { |name, v| v }.max
                         if !available_version
                             if version
                                 raise ConfigError.new, "cannot find any gem with the name '#{name}' and version #{version}"
@@ -525,9 +536,7 @@ fi
         end
 
 	def self.ruby_version_keyword
-            if RUBY_VERSION < "1.9.0" then "ruby18"
-            else "ruby19"
-            end
+            "ruby#{RUBY_VERSION.split('.')[0, 2].join("")}"
         end
 
         def self.autodetect_ruby
@@ -844,6 +853,8 @@ fi
             end
 
             os_names, os_versions = OSDependencies.operating_system
+            os_names = os_names.dup
+            os_names << 'default'
 
             dep_def = definitions[name]
             if !dep_def

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.9.3.rc2"
+    VERSION = "1.9.3.rc3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.9.3.rc2
+  version: 1.9.3.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-28 00:00:00.000000000 Z
+date: 2013-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &4807160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: 1.7.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.7.0
+  version_requirements: *4807160
 - !ruby/object:Gem::Dependency
   name: utilrb
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &4805920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.6.0
+  version_requirements: *4805920
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &4804340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +43,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.0
+  version_requirements: *4804340
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &4803240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,28 +54,18 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
+  version_requirements: *4803240
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &4820260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.4'
+  version_requirements: *4820260
 description: autoproj is a manager for sets of software packages. It allows the user
   to import and build packages from source, still using the underlying distribution's
   native package manager for software that is available on it.
@@ -197,14 +172,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: autobuild
-rubygems_version: 1.8.23
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Easy installation and management of sets of software packages
 test_files:
+- test/test_manifest.rb
+- test/test_package_manifest.rb
 - test/test_os_dependencies.rb
 - test/test_debian.rb
-- test/test_manifest.rb
 - test/package_managers/test_apt_dpkg_manager.rb
 - test/package_managers/test_gem.rb
-- test/test_package_manifest.rb