autoproj 1.8.2.b9 → 1.8.2.b10

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
@@ -1741,86 +1746,86 @@ module Autoproj
 end
 
 DEFS = <<EODEFS
----
+--- 
+autobuild: gem
 none: ignore
-ruby18:
-  debian,ubuntu:
-  - ruby1.8-dev
-  - ruby1.8
-  - rubygems1.8
-  - ri1.8
-  - libopenssl-ruby1.8
-  - rake
-  gentoo:
-  - dev-lang/ruby:1.8
+cmake: 
+  arch: cmake
+  debian,ubuntu: cmake
+  gentoo: dev-util/cmake
+lsb_release: 
+  arch: ignore
+  debian,ubuntu: lsb-release
+  gentoo: sys-apps/lsb-release
+autotools: 
+  arch: automake autoconf
+  debian,ubuntu: 
+  - automake1.9
+  - autoconf
+  gentoo: 
+  - sys-devel/automake:1.9
+  - sys-devel/autoconf
+zlib: 
+  debian,ubuntu: zlib1g-dev
+cvs: 
+  debian,ubuntu: cvs
+git: 
+  arch: git
+  ubuntu: git-core
+  gentoo: dev-vcs/git
+  debian: 
+    default: git-core
+    lenny: git
+ruby19: 
+  arch: 
+  - ruby
   - rake
-ruby19:
-  debian:
+  ubuntu: 
   - ruby1.9.1
   - ruby1.9.1-dev
   - rubygems1.9.1
+  - ri1.9.1
+  - libopenssl-ruby1.9.1
   - rake
-  - rubygems-integration
-  ubuntu:
+  gentoo: 
+  - dev-lang/ruby:1.9
+  - rake
+  debian: 
   - ruby1.9.1
   - ruby1.9.1-dev
   - rubygems1.9.1
-  - ri1.9.1
-  - libopenssl-ruby1.9.1
   - rake
-  gentoo:
-  - dev-lang/ruby:1.9
+  - rubygems-integration
+ruby18: 
+  debian,ubuntu: 
+  - ruby1.8-dev
+  - ruby1.8
+  - rubygems1.8
+  - ri1.8
+  - libopenssl-ruby1.8
   - rake
-  arch:
-  - ruby
+  gentoo: 
+  - dev-lang/ruby:1.8
   - rake
-build-essential:
-  debian,ubuntu: build-essential
-  gentoo: ignore
-  arch: ignore
-zlib:
-  debian,ubuntu: zlib1g-dev
-autobuild: gem
-autoproj: gem
-git:
-  debian:
-    lenny: git
-    default: git-core
-  ubuntu: git-core
-  gentoo: dev-vcs/git
-  arch: git
-svn:
+svn: 
+  arch: subversion
   debian,ubuntu: subversion
   gentoo: dev-util/subversion
-  arch: subversion
-cmake:
-  debian,ubuntu: cmake
-  gentoo: dev-util/cmake
-  arch: cmake
-autotools:
-  debian,ubuntu:
-  - automake1.9
-  - autoconf
-  gentoo:
-  - sys-devel/automake:1.9
-  - sys-devel/autoconf
-  arch: automake autoconf
-lsb_release:
-  debian,ubuntu: lsb-release
-  gentoo: sys-apps/lsb-release
-  arch: ignore
-archive:
-  debian,ubuntu:
+archive: 
+  arch: 
   - tar
   - unzip
-  gentoo:
-  - app-arch/tar
-  - app-arch/unzip
-  arch:
+  debian,ubuntu: 
   - tar
   - unzip
-cvs:
-  debian,ubuntu: cvs
+  gentoo: 
+  - app-arch/tar
+  - app-arch/unzip
+autoproj: gem
+build-essential: 
+  arch: ignore
+  debian,ubuntu: build-essential
+  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.b9"
+    VERSION = "1.8.2.b10"
 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,76 +1,107 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: autoproj
-version: !ruby/object:Gem::Version
-  version: 1.8.2.b9
+version: !ruby/object:Gem::Version 
+  hash: 540536345
   prerelease: 6
+  segments: 
+  - 1
+  - 8
+  - 2
+  - b
+  - 10
+  version: 1.8.2.b10
 platform: ruby
-authors:
+authors: 
 - Rock Core Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-10-04 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: autobuild
-  requirement: &7511060 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3998849465
+        segments: 
+        - 1
+        - 6
+        - 0
+        - rc
+        - 1
         version: 1.6.0.rc1
   type: :runtime
-  prerelease: false
-  version_requirements: *7511060
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: utilrb
-  requirement: &7510160 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 6
+        - 0
         version: 1.6.0
   type: :runtime
-  prerelease: false
-  version_requirements: *7510160
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: highline
-  requirement: &7509460 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 5
+        - 0
         version: 1.5.0
   type: :runtime
-  prerelease: false
-  version_requirements: *7509460
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: &7508660 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 3
+        - 10
+        version: "3.10"
   type: :development
-  prerelease: false
-  version_requirements: *7508660
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: hoe
-  requirement: &7507380 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
   type: :development
-  prerelease: false
-  version_requirements: *7507380
-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.
+  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.
 email: rock-dev@dfki.de
-executables:
+executables: 
 - amake
 - aup
 - autolocate
@@ -81,12 +112,13 @@ executables:
 - autoproj_bootstrap
 - autoproj_stress_test
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - History.txt
 - Manifest.txt
 - README.txt
 - samples/autoproj/README.txt
-files:
+files: 
 - History.txt
 - Manifest.txt
 - README.txt
@@ -125,39 +157,49 @@ files:
 - test/data/test_manifest/autoproj/manifest
 - test/test_debian.rb
 - test/test_manifest.rb
-- test/test_package_manifest.rb
 - test/test_os_dependencies.rb
 - test/package_managers/test_gem.rb
+- test/test_package_manifest.rb
 - .gemtest
 homepage: http://rock-robotics.org/documentation/autoproj
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
 - README.txt
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
+
 rubyforge_project: autobuild
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 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_files: 
 - test/test_os_dependencies.rb
-- test/test_debian.rb
 - test/package_managers/test_gem.rb
+- test/test_manifest.rb
+- test/test_debian.rb
+- test/test_package_manifest.rb