autoproj 1.8.2.b11 → 1.8.2.b12

data/bin/autoproj_bootstrap

@@ -948,6 +948,7 @@ fi
         #
         def partition_osdep_entry(osdep_name, dep_def, handler_names, excluded, *keys)
             keys, *additional_keys = *keys
+            keys ||= []
             found = false
             nonexistent = false
             result = []
@@ -979,7 +980,7 @@ fi
                         end
                         result.concat(rec_result)
                     end
-                elsif keys
+                else
                     if names.respond_to?(:to_str) # names could be an array already
                         names = names.split(',')
                     end
@@ -1747,12 +1748,58 @@ end
 
 DEFS = <<EODEFS
 --- 
+zlib: 
+  debian,ubuntu: zlib1g-dev
+git: 
+  arch: git
+  ubuntu: git-core
+  debian: 
+    default: git-core
+    lenny: git
+  gentoo: dev-vcs/git
 cvs: 
   debian,ubuntu: cvs
+cmake: 
+  arch: cmake
+  gentoo: dev-util/cmake
+  debian,ubuntu: cmake
+build-essential: 
+  arch: ignore
+  gentoo: ignore
+  debian,ubuntu: build-essential
 autoproj: gem
-zlib: 
-  debian,ubuntu: zlib1g-dev
+autobuild: gem
+lsb_release: 
+  arch: ignore
+  gentoo: sys-apps/lsb-release
+  debian,ubuntu: lsb-release
+none: ignore
+svn: 
+  arch: subversion
+  gentoo: dev-util/subversion
+  debian,ubuntu: subversion
+archive: 
+  arch: 
+  - tar
+  - unzip
+  gentoo: 
+  - app-arch/tar
+  - app-arch/unzip
+  debian,ubuntu: 
+  - tar
+  - unzip
+autotools: 
+  arch: automake autoconf
+  gentoo: 
+  - sys-devel/automake:1.9
+  - sys-devel/autoconf
+  debian,ubuntu: 
+  - automake1.9
+  - autoconf
 ruby19: 
+  arch: 
+  - ruby
+  - rake
   ubuntu: 
   - ruby1.9.1
   - ruby1.9.1-dev
@@ -1760,19 +1807,19 @@ ruby19:
   - ri1.9.1
   - libopenssl-ruby1.9.1
   - rake
-  arch: 
-  - ruby
-  - rake
-  gentoo: 
-  - dev-lang/ruby:1.9
-  - rake
   debian: 
   - ruby1.9.1
   - ruby1.9.1-dev
   - rubygems1.9.1
   - rake
   - rubygems-integration
+  gentoo: 
+  - dev-lang/ruby:1.9
+  - rake
 ruby18: 
+  gentoo: 
+  - dev-lang/ruby:1.8
+  - rake
   debian,ubuntu: 
   - ruby1.8-dev
   - ruby1.8
@@ -1780,52 +1827,6 @@ ruby18:
   - ri1.8
   - libopenssl-ruby1.8
   - rake
-  gentoo: 
-  - dev-lang/ruby:1.8
-  - rake
-archive: 
-  debian,ubuntu: 
-  - tar
-  - unzip
-  arch: 
-  - tar
-  - unzip
-  gentoo: 
-  - app-arch/tar
-  - app-arch/unzip
-cmake: 
-  debian,ubuntu: cmake
-  arch: cmake
-  gentoo: dev-util/cmake
-build-essential: 
-  debian,ubuntu: build-essential
-  arch: ignore
-  gentoo: ignore
-svn: 
-  debian,ubuntu: subversion
-  arch: subversion
-  gentoo: dev-util/subversion
-none: ignore
-lsb_release: 
-  debian,ubuntu: lsb-release
-  arch: ignore
-  gentoo: sys-apps/lsb-release
-autotools: 
-  debian,ubuntu: 
-  - automake1.9
-  - autoconf
-  arch: automake autoconf
-  gentoo: 
-  - sys-devel/automake:1.9
-  - sys-devel/autoconf
-git: 
-  ubuntu: git-core
-  arch: git
-  gentoo: dev-vcs/git
-  debian: 
-    default: git-core
-    lenny: git
-autobuild: gem
 
 EODEFS
 

data/lib/autoproj/osdeps.rb

@@ -849,6 +849,7 @@ fi
         #
         def partition_osdep_entry(osdep_name, dep_def, handler_names, excluded, *keys)
             keys, *additional_keys = *keys
+            keys ||= []
             found = false
             nonexistent = false
             result = []
@@ -880,7 +881,7 @@ fi
                         end
                         result.concat(rec_result)
                     end
-                elsif keys
+                else
                     if names.respond_to?(:to_str) # names could be an array already
                         names = names.split(',')
                     end

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.8.2.b11"
+    VERSION = "1.8.2.b12"
 end

data/test/test_os_dependencies.rb

@@ -342,6 +342,20 @@ class TC_OSDependencies < Test::Unit::TestCase
         assert_equal expected, osdeps.resolve_package('pkg')
     end
 
+    def test_resolve_mixed_os_and_osindep_dependencies
+        data = { 'pkg' =>
+                 { 'test' => { 'default' => ['ospkg', 'gem' => 'gempkg'] }
+                 }
+               }
+
+        osdeps = create_osdep(data)
+        expected = [
+            [osdeps.os_package_handler, FOUND_PACKAGES, ['ospkg']],
+            [osdeps.package_handlers['gem'], FOUND_PACKAGES, ['gempkg']]
+        ].to_set
+        assert_equal expected, osdeps.resolve_package('pkg').to_set
+    end
+
     def test_availability_of
         osdeps = flexmock(OSDependencies.new)
         osdeps.should_receive(:resolve_package).with('pkg0').once.and_return(
@@ -426,7 +440,7 @@ class TC_OSDependencies < Test::Unit::TestCase
         osdeps.should_receive(:resolve_package).with('pkg0').once.and_return(nil)
         osdeps.should_receive(:resolve_package).with('pkg1').never
         osdeps.should_receive(:resolve_package).with('pkg2').never
-        assert_raises(ConfigError) { osdeps.resolve_os_dependencies(['pkg0', 'pkg1', 'pkg2']) }
+        assert_raises(Autoproj::OSDependencies::MissingOSDep) { osdeps.resolve_os_dependencies(['pkg0', 'pkg1', 'pkg2']) }
 
         osdeps.should_receive(:resolve_package).with('pkg0').once.and_return(
             [[osdeps.os_package_handler, FOUND_PACKAGES, ['pkg0']]])
@@ -437,13 +451,13 @@ class TC_OSDependencies < Test::Unit::TestCase
         expected =
             [[osdeps.os_package_handler, ['pkg0']],
              [osdeps.package_handlers['gem'], ['gempkg1', 'gempkg2']]]
-        assert_raises(ConfigError) { osdeps.resolve_os_dependencies(['pkg0', 'pkg1', 'pkg2']) }
+        assert_raises(Autoproj::OSDependencies::MissingOSDep) { osdeps.resolve_os_dependencies(['pkg0', 'pkg1', 'pkg2']) }
 
         osdeps.should_receive(:resolve_package).with('pkg0').once.and_return(
             [[osdeps.os_package_handler, FOUND_NONEXISTENT, ['pkg0']]])
         osdeps.should_receive(:resolve_package).with('pkg1').never
         osdeps.should_receive(:resolve_package).with('pkg2').never
-        assert_raises(ConfigError) { osdeps.resolve_os_dependencies(['pkg0', 'pkg1', 'pkg2']) }
+        assert_raises(Autoproj::OSDependencies::MissingOSDep) { osdeps.resolve_os_dependencies(['pkg0', 'pkg1', 'pkg2']) }
 
         osdeps.should_receive(:resolve_package).with('pkg0').once.and_return(
             [[osdeps.os_package_handler, FOUND_PACKAGES, ['pkg0']]])
@@ -451,7 +465,7 @@ class TC_OSDependencies < Test::Unit::TestCase
             [[osdeps.os_package_handler, FOUND_PACKAGES, ['pkg1']],
              [osdeps.package_handlers['gem'], FOUND_NONEXISTENT, ['gempkg1']]])
         osdeps.should_receive(:resolve_package).with('pkg2').never
-        assert_raises(ConfigError) { osdeps.resolve_os_dependencies(['pkg0', 'pkg1', 'pkg2']) }
+        assert_raises(Autoproj::OSDependencies::MissingOSDep) { osdeps.resolve_os_dependencies(['pkg0', 'pkg1', 'pkg2']) }
     end
 
     def test_install

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: 1097016347
+  hash: 126413845
   prerelease: 6
   segments: 
   - 1
   - 8
   - 2
   - b
-  - 11
-  version: 1.8.2.b11
+  - 12
+  version: 1.8.2.b12
 platform: ruby
 authors: 
 - Rock Core Developers
@@ -27,7 +27,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -3362145234
+        hash: 3197745649
         segments: 
         - 1
         - 6