autoproj 1.8.2.b12 → 1.8.2.b13

data/Manifest.txt

@@ -7,6 +7,7 @@ bin/aup
 bin/autolocate
 bin/autoproj
 bin/autoproj-clean
+bin/autoproj-inspect
 bin/autoproj-locate
 bin/autoproj-query
 bin/autoproj_bootstrap

data/bin/autoproj-inspect

@@ -0,0 +1,29 @@
+#! /usr/bin/env ruby
+
+require 'autoproj'
+require 'autoproj/cmdline'
+require 'pp'
+
+Autoproj.silent = true
+root_dir  = Autoproj::CmdLine.initialize_root_directory
+selection = Autoproj::CmdLine.initialize_and_load(ARGV)
+
+selection.each do |name|
+    puts "resolved '#{name}' with"
+    resolved = Autoproj.manifest.resolve_package_name(name)
+
+    packages, osdeps = resolved.partition { |type, name| type == :package }
+    packages = packages.map(&:last)
+    osdeps   = osdeps.map(&:last)
+
+    puts "#{packages.size} source packages"
+    puts "  " + packages.sort.join("\n  ")
+    puts "#{osdeps.size} OS dependencies"
+    osdeps.each do |pkg_name|
+        puts "  the osdep '#{pkg_name}'"
+        Autoproj.osdeps.resolve_os_dependencies(pkg_name).each do |manager, packages|
+            puts "    #{manager.names.first}: #{packages.map { |*subnames| subnames.join(" ") }.join(", ")}"
+        end
+    end
+end
+

data/bin/autoproj_bootstrap

@@ -948,7 +948,6 @@ fi
         #
         def partition_osdep_entry(osdep_name, dep_def, handler_names, excluded, *keys)
             keys, *additional_keys = *keys
-            keys ||= []
             found = false
             nonexistent = false
             result = []
@@ -980,7 +979,7 @@ fi
                         end
                         result.concat(rec_result)
                     end
-                else
+                elsif keys
                     if names.respond_to?(:to_str) # names could be an array already
                         names = names.split(',')
                     end
@@ -1747,86 +1746,86 @@ module Autoproj
 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
-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
+ruby18:
+  debian,ubuntu:
+  - ruby1.8-dev
+  - ruby1.8
+  - rubygems1.8
+  - ri1.8
+  - libopenssl-ruby1.8
   - rake
-  ubuntu: 
+  gentoo:
+  - dev-lang/ruby:1.8
+  - rake
+ruby19:
+  debian:
   - ruby1.9.1
   - ruby1.9.1-dev
   - rubygems1.9.1
-  - ri1.9.1
-  - libopenssl-ruby1.9.1
   - rake
-  debian: 
+  - rubygems-integration
+  ubuntu:
   - ruby1.9.1
   - ruby1.9.1-dev
   - rubygems1.9.1
+  - ri1.9.1
+  - libopenssl-ruby1.9.1
   - rake
-  - rubygems-integration
-  gentoo: 
+  gentoo:
   - dev-lang/ruby:1.9
   - rake
-ruby18: 
-  gentoo: 
-  - dev-lang/ruby:1.8
-  - rake
-  debian,ubuntu: 
-  - ruby1.8-dev
-  - ruby1.8
-  - rubygems1.8
-  - ri1.8
-  - libopenssl-ruby1.8
+  arch:
+  - ruby
   - 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:
+  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:
+  - tar
+  - unzip
+  gentoo:
+  - app-arch/tar
+  - app-arch/unzip
+  arch:
+  - tar
+  - unzip
+cvs:
+  debian,ubuntu: cvs
 
 EODEFS
 

data/lib/autoproj/autobuild.rb

@@ -684,3 +684,17 @@ def default_packages(*names)
     metapackage(pkg_set.name, *names)
 end
 
+# This can be used only during the load of a package set
+#
+# It removes the given packages from the set of packages that will be built if
+# 'package_set_name' is used. By default, all of the package set's packages are
+# included. After a call to default_packages, only the packages listed (and
+# their dependencies) are.
+def remove_from_default(*names)
+    pkg_set = Autoproj.current_package_set
+    Autoproj.manifest.metapackage(pkg_set.name).packages.delete_if do |pkg|
+        names.include?(pkg.name)
+    end
+    puts Autoproj.manifest.metapackage(pkg_set.name).packages.map(&:name).sort.join(", ")
+end
+

data/lib/autoproj/osdeps.rb

@@ -849,7 +849,6 @@ fi
         #
         def partition_osdep_entry(osdep_name, dep_def, handler_names, excluded, *keys)
             keys, *additional_keys = *keys
-            keys ||= []
             found = false
             nonexistent = false
             result = []
@@ -881,7 +880,7 @@ fi
                         end
                         result.concat(rec_result)
                     end
-                else
+                elsif keys
                     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.b12"
+    VERSION = "1.8.2.b13"
 end

data/test/test_os_dependencies.rb

@@ -342,20 +342,6 @@ 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(
@@ -440,7 +426,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(Autoproj::OSDependencies::MissingOSDep) { osdeps.resolve_os_dependencies(['pkg0', 'pkg1', 'pkg2']) }
+        assert_raises(ConfigError) { 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,13 +437,13 @@ class TC_OSDependencies < Test::Unit::TestCase
         expected =
             [[osdeps.os_package_handler, ['pkg0']],
              [osdeps.package_handlers['gem'], ['gempkg1', 'gempkg2']]]
-        assert_raises(Autoproj::OSDependencies::MissingOSDep) { osdeps.resolve_os_dependencies(['pkg0', 'pkg1', 'pkg2']) }
+        assert_raises(ConfigError) { 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(Autoproj::OSDependencies::MissingOSDep) { osdeps.resolve_os_dependencies(['pkg0', 'pkg1', 'pkg2']) }
+        assert_raises(ConfigError) { osdeps.resolve_os_dependencies(['pkg0', 'pkg1', 'pkg2']) }
 
         osdeps.should_receive(:resolve_package).with('pkg0').once.and_return(
             [[osdeps.os_package_handler, FOUND_PACKAGES, ['pkg0']]])
@@ -465,7 +451,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(Autoproj::OSDependencies::MissingOSDep) { osdeps.resolve_os_dependencies(['pkg0', 'pkg1', 'pkg2']) }
+        assert_raises(ConfigError) { osdeps.resolve_os_dependencies(['pkg0', 'pkg1', 'pkg2']) }
     end
 
     def test_install

metadata

@@ -1,124 +1,93 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: autoproj
-version: !ruby/object:Gem::Version 
-  hash: 126413845
+version: !ruby/object:Gem::Version
+  version: 1.8.2.b13
   prerelease: 6
-  segments: 
-  - 1
-  - 8
-  - 2
-  - b
-  - 12
-  version: 1.8.2.b12
 platform: ruby
-authors: 
+authors:
 - Rock Core Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-10-04 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: autobuild
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &18481040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3197745649
-        segments: 
-        - 1
-        - 6
-        - 0
-        - rc
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.0.rc1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: utilrb
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *18481040
+- !ruby/object:Gem::Dependency
+  name: utilrb
+  requirement: &18480280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 6
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: highline
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *18480280
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: &18479460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 5
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *18479460
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &18478320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 10
-        version: "3.10"
+      - !ruby/object:Gem::Version
+        version: '3.10'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *18478320
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &18477520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        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.
+  prerelease: false
+  version_requirements: *18477520
+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
 - autoproj
 - autoproj-clean
+- autoproj-inspect
 - autoproj-locate
 - autoproj-query
 - 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
@@ -128,6 +97,7 @@ files:
 - bin/autolocate
 - bin/autoproj
 - bin/autoproj-clean
+- bin/autoproj-inspect
 - bin/autoproj-locate
 - bin/autoproj-query
 - bin/autoproj_bootstrap
@@ -157,49 +127,39 @@ 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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: autobuild
-rubygems_version: 1.8.24
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Easy installation and management of sets of software packages
-test_files: 
-- test/test_os_dependencies.rb
-- test/package_managers/test_gem.rb
+test_files:
 - test/test_manifest.rb
-- test/test_debian.rb
 - test/test_package_manifest.rb
+- test/test_os_dependencies.rb
+- test/test_debian.rb
+- test/package_managers/test_gem.rb