autoproj 1.8.2.b5 → 1.8.2.b6

data/bin/autoproj_bootstrap

@@ -951,7 +951,7 @@ fi
             found = false
             nonexistent = false
             result = []
-            found_keys = []
+            found_keys = Hash.new
             Array(dep_def).each do |names, values|
                 if !values
                     # Raw array of packages. Possible only if we are not at toplevel
@@ -997,20 +997,25 @@ fi
                     matching_name = keys.find { |k| names.any? { |name_tag| k == name_tag.downcase } }
                     if matching_name
                         rec_found, rec_result = partition_osdep_entry(osdep_name, values, handler_names, excluded, *additional_keys)
-
-                        if rec_found
-                            idx = keys.index(matching_name)
+                        # We only consider the first highest-priority entry,
+                        # regardless of whether it has some packages for us or
+                        # not
+                        idx = keys.index(matching_name)
+                        if !rec_found
+                            if !found_keys.has_key?(idx)
+                                found_keys[idx] = nil
+                            end
+                        else
                             found_keys[idx] ||= [0, []]
                             found_keys[idx][0] += rec_found
                             found_keys[idx][1].concat(rec_result)
                         end
-
-                        # We only consider the first matching entry
-                        keys = nil
                     end
                 end
             end
-            if found_keys = found_keys.compact.first
+            first_entry = found_keys.keys.sort.first
+            found_keys = found_keys[first_entry]
+            if found_keys
                 if found_keys[0] > 0
                     nonexistent = true
                 else
@@ -1740,34 +1745,56 @@ end
 
 DEFS = <<EODEFS
 --- 
-build-essential: 
+git: 
+  debian: 
+    default: git-core
+    lenny: git
+  arch: git
+  gentoo: dev-vcs/git
+  ubuntu: git-core
+autotools: 
+  debian,ubuntu: 
+  - automake1.9
+  - autoconf
+  arch: automake autoconf
+  gentoo: 
+  - sys-devel/automake:1.9
+  - sys-devel/autoconf
+none: ignore
+cvs: 
+  debian,ubuntu: cvs
+cmake: 
+  debian,ubuntu: cmake
+  arch: cmake
+  gentoo: dev-util/cmake
+lsb_release: 
+  debian,ubuntu: lsb-release
   arch: ignore
-  gentoo: ignore
-  debian,ubuntu: build-essential
+  gentoo: sys-apps/lsb-release
+zlib: 
+  debian,ubuntu: zlib1g-dev
+autoproj: gem
 ruby19: 
-  ubuntu: 
+  debian: 
   - ruby1.9.1
   - ruby1.9.1-dev
   - rubygems1.9.1
-  - ri1.9.1
-  - libopenssl-ruby1.9.1
   - rake
+  - rubygems-integration
   arch: 
   - ruby
   - rake
   gentoo: 
   - dev-lang/ruby:1.9
   - rake
-  debian: 
+  ubuntu: 
   - ruby1.9.1
   - ruby1.9.1-dev
   - rubygems1.9.1
+  - ri1.9.1
+  - libopenssl-ruby1.9.1
   - rake
-  - rubygems-integration
 ruby18: 
-  gentoo: 
-  - dev-lang/ruby:1.8
-  - rake
   debian,ubuntu: 
   - ruby1.8-dev
   - ruby1.8
@@ -1775,50 +1802,28 @@ ruby18:
   - ri1.8
   - libopenssl-ruby1.8
   - rake
+  gentoo: 
+  - dev-lang/ruby:1.8
+  - rake
+svn: 
+  debian,ubuntu: subversion
+  arch: subversion
+  gentoo: dev-util/subversion
 archive: 
+  debian,ubuntu: 
+  - tar
+  - unzip
   arch: 
   - tar
   - unzip
   gentoo: 
   - app-arch/tar
   - app-arch/unzip
-  debian,ubuntu: 
-  - tar
-  - unzip
-cmake: 
-  arch: cmake
-  gentoo: dev-util/cmake
-  debian,ubuntu: cmake
-svn: 
-  arch: subversion
-  gentoo: dev-util/subversion
-  debian,ubuntu: subversion
 autobuild: gem
-autotools: 
-  arch: automake autoconf
-  gentoo: 
-  - sys-devel/automake:1.9
-  - sys-devel/autoconf
-  debian,ubuntu: 
-  - automake1.9
-  - autoconf
-git: 
-  ubuntu: git-core
-  arch: git
-  gentoo: dev-vcs/git
-  debian: 
-    lenny: git
-    default: git-core
-none: ignore
-cvs: 
-  debian,ubuntu: cvs
-lsb_release: 
+build-essential: 
+  debian,ubuntu: build-essential
   arch: ignore
-  gentoo: sys-apps/lsb-release
-  debian,ubuntu: lsb-release
-autoproj: gem
-zlib: 
-  debian,ubuntu: zlib1g-dev
+  gentoo: ignore
 
 EODEFS
 

data/lib/autoproj/osdeps.rb

@@ -852,7 +852,7 @@ fi
             found = false
             nonexistent = false
             result = []
-            found_keys = []
+            found_keys = Hash.new
             Array(dep_def).each do |names, values|
                 if !values
                     # Raw array of packages. Possible only if we are not at toplevel
@@ -898,20 +898,25 @@ fi
                     matching_name = keys.find { |k| names.any? { |name_tag| k == name_tag.downcase } }
                     if matching_name
                         rec_found, rec_result = partition_osdep_entry(osdep_name, values, handler_names, excluded, *additional_keys)
-
-                        if rec_found
-                            idx = keys.index(matching_name)
+                        # We only consider the first highest-priority entry,
+                        # regardless of whether it has some packages for us or
+                        # not
+                        idx = keys.index(matching_name)
+                        if !rec_found
+                            if !found_keys.has_key?(idx)
+                                found_keys[idx] = nil
+                            end
+                        else
                             found_keys[idx] ||= [0, []]
                             found_keys[idx][0] += rec_found
                             found_keys[idx][1].concat(rec_result)
                         end
-
-                        # We only consider the first matching entry
-                        keys = nil
                     end
                 end
             end
-            if found_keys = found_keys.compact.first
+            first_entry = found_keys.keys.sort.first
+            found_keys = found_keys[first_entry]
+            if found_keys
                 if found_keys[0] > 0
                     nonexistent = true
                 else

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.8.2.b5"
+    VERSION = "1.8.2.b6"
 end

data/test/test_os_dependencies.rb

@@ -25,12 +25,10 @@ class TC_OSDependencies < Test::Unit::TestCase
     def create_osdep(data)
         osdeps = OSDependencies.new(data)
         # Mock the package handlers
-        osdeps.os_package_handler = flexmock(PackageManagers::Manager.new)
-        osdeps.os_package_handler.should_receive('names').and_return(['apt-dpkg'])
+        osdeps.os_package_handler = flexmock(PackageManagers::Manager.new(['apt-dpkg']))
         osdeps.package_handlers.clear
         osdeps.package_handlers['apt-dpkg'] = osdeps.os_package_handler
-        osdeps.package_handlers['gem'] = flexmock(PackageManagers::Manager.new)
-        osdeps.package_handlers['gem'].should_receive('names').and_return(['gem'])
+        osdeps.package_handlers['gem'] = flexmock(PackageManagers::Manager.new(['gem']))
         flexmock(osdeps)
     end
 
@@ -324,8 +322,9 @@ class TC_OSDependencies < Test::Unit::TestCase
 
     def test_specific_os_version_supersedes_nonspecific_one
         data = { 'pkg' =>
-                 { 'test' => { 'gem' => 'gempkg' },
-                   'debian' => 'binary_package'
+                 {
+                   'debian' => 'binary_package',
+                   'test' => { 'gem' => 'gempkg' }
                  }
                }
         osdeps = create_osdep(data)
@@ -333,8 +332,9 @@ class TC_OSDependencies < Test::Unit::TestCase
         assert_equal expected, osdeps.resolve_package('pkg')
 
         data = { 'pkg' =>
-                 { 'test' => 'binary_package',
-                   'default' => { 'gem' => 'gem_package' }
+                 {
+                   'default' => { 'gem' => 'gem_package' },
+                   'test' => 'binary_package'
                  }
                }
         osdeps = create_osdep(data)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: 1750541319
+  hash: 2914478081
   prerelease: 6
   segments: 
   - 1
   - 8
   - 2
   - b
-  - 5
-  version: 1.8.2.b5
+  - 6
+  version: 1.8.2.b6
 platform: ruby
 authors: 
 - Rock Core Developers
@@ -27,7 +27,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3080299933
+        hash: 3474568203
         segments: 
         - 1
         - 6
@@ -92,11 +92,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 7
         segments: 
         - 3
-        - 1
-        version: "3.1"
+        - 0
+        version: "3.0"
   type: :development
   version_requirements: *id005
 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.