autoproj 1.7.21.b2 → 1.7.21.b3

data/Rakefile

@@ -7,7 +7,7 @@ Utilrb::Rake.hoe do
         Hoe.spec 'autoproj' do
             self.developer "Sylvain Joyeux", "sylvain.joyeux@dfki.de"
 
-            self.url = ["http://rock-robotics.org/autoproj",
+            self.url = ["http://rock-robotics.org/documentation/autoproj",
                 "git://github.com/doudou/autoproj.git"]
             self.rubyforge_name = 'autobuild'
             self.summary = 'Easy installation and management of software packages'

data/bin/autoproj

@@ -93,7 +93,7 @@ EOTEXT
     root_dir = Autoproj.root_dir
     selected_packages.map! do |name|
         if File.directory?(name)
-            File.expand_path(name)
+            File.expand_path(name) + File::SEPARATOR
         else
             name
         end

data/bin/autoproj_bootstrap

@@ -188,6 +188,9 @@ fi
             attr_writer :needs_locking
             def needs_locking?; !!@needs_locking end
 
+            attr_reader :auto_install_cmd
+            attr_reader :user_install_cmd
+
             def initialize(names, needs_locking, user_install_cmd, auto_install_cmd)
                 super(names)
                 @needs_locking, @user_install_cmd, @auto_install_cmd =
@@ -205,7 +208,7 @@ fi
                 (auto_install_cmd % [os_packages.join("' '")])
             end
 
-            def osdeps_interaction(osdeps, os_packages, shell_script)
+            def osdeps_interaction(os_packages, shell_script)
                 if OSDependencies.force_osdeps
                     return true
                 elsif enabled?
@@ -242,11 +245,11 @@ fi
             def install(packages)
                 handled_os = OSDependencies.supported_operating_system?
                 if handled_os
-                    shell_script = generate_auto_os_script(os_packages)
-                    user_shell_script = generate_user_os_script(os_packages)
+                    shell_script = generate_auto_os_script(packages)
+                    user_shell_script = generate_user_os_script(packages)
                 end
-                if osdeps_interaction(osdeps, os_packages, user_shell_script)
-                    Autoproj.message "  installing OS packages: #{os_packages.sort.join(", ")}"
+                if osdeps_interaction(packages, user_shell_script)
+                    Autoproj.message "  installing OS packages: #{packages.sort.join(", ")}"
 
                     if Autoproj.verbose
                         Autoproj.message "Generating installation script for non-ruby OS dependencies"
@@ -331,7 +334,7 @@ fi
 
             def gem_fetcher
                 if !@gem_fetcher
-                    Autoproj.message "looking for RubyGems updates"
+                    Autoproj.message "  looking for RubyGems updates"
                     @gem_fetcher = Gem::SpecFetcher.fetcher
                 end
                 @gem_fetcher
@@ -372,7 +375,7 @@ fi
                 end
 
                 if gems_interaction(gems, cmdlines)
-                    Autoproj.message "installing/updating RubyGems dependencies: #{gems.map { |g| g.join(" ") }.sort.join(", ")}"
+                    Autoproj.message "  installing/updating RubyGems dependencies: #{gems.map { |g| g.join(" ") }.sort.join(", ")}"
 
                     cmdlines.each do |c|
                         Autobuild::Subprocess.run 'autoproj', 'osdeps', *c
@@ -528,6 +531,7 @@ fi
             self.alias(ruby_version_keyword, "ruby")
         end
 	self.suffixes << ruby_version_keyword
+        autodetect_ruby
 
         AUTOPROJ_OSDEPS = File.join(File.expand_path(File.dirname(__FILE__)), 'default.osdeps')
         def self.load_default
@@ -639,17 +643,20 @@ fi
         end
 
         # Perform some sanity checks on the given osdeps definitions
-        def self.verify_definitions(hash)
+        def self.verify_definitions(hash, path = [])
             hash.each do |key, value|
-                if !key.kind_of?(String)
-                    raise ArgumentError, "invalid osdeps definition: found an #{key.class}. Don't forget to put quotes around numbers"
+                if value && !key.kind_of?(String)
+                    raise ArgumentError, "invalid osdeps definition: found an #{key.class} as a key in #{path.join("/")}. Don't forget to put quotes around numbers"
+                elsif !value && (key.kind_of?(Hash) || key.kind_of?(Array))
+                    verify_definitions(key)
                 end
                 next if !value
+
                 if value.kind_of?(Array) || value.kind_of?(Hash)
-                    verify_definitions(value)
+                    verify_definitions(value, (path + [key]))
                 else
                     if !value.kind_of?(String)
-                        raise ArgumentError, "invalid osdeps definition: found an #{value.class}. Don't forget to put quotes around numbers"
+                        raise ArgumentError, "invalid osdeps definition: found an #{value.class} as a value in #{path.join("/")}. Don't forget to put quotes around numbers"
                     end
                 end
             end
@@ -799,6 +806,10 @@ fi
         # name and version. The package list might be empty even if status ==
         # FOUND_PACKAGES, for instance if the ignore keyword is used.
         def resolve_package(name)
+            while OSDependencies.aliases.has_key?(name)
+                name = OSDependencies.aliases[name]
+            end
+
             os_names, os_versions = OSDependencies.operating_system
 
             dep_def = definitions[name]
@@ -1724,7 +1735,7 @@ archive:
   - tar
   - unzip
 lsb_release: 
-  arch: 
+  arch: ignore
   gentoo: sys-apps/lsb-release
   debian,ubuntu: lsb-release
 ruby18: 
@@ -1769,8 +1780,8 @@ cmake:
   gentoo: dev-util/cmake
   debian,ubuntu: cmake
 build-essential: 
-  arch: 
-  gentoo: 
+  arch: ignore
+  gentoo: ignore
   debian,ubuntu: build-essential
 libxslt: 
   arch: libxslt
@@ -1834,7 +1845,7 @@ end
 # run autoproj bootstrap manually.
 if ARGV.first != "localdev"
     if ARGV.first == "dev"
-        Autoproj::OSDependencies.gem_with_prerelease = true
+        Autoproj::PackageManagers::GemManager.with_prerelease = true
         ARGV.shift
     end
     begin
@@ -1844,7 +1855,7 @@ if ARGV.first != "localdev"
         STDERR.puts "failed: #{e.message}"
         exit(1)
     end
-    Autoproj::OSDependencies.gem_with_prerelease = false
+    Autoproj::PackageManagers::GemManager.with_prerelease = false
 
     if !system('autoproj', 'bootstrap', *ARGV)
         STDERR.puts "ERROR: failed to run autoproj bootstrap #{ARGV.join(", ")}"

data/lib/autoproj/cmdline.rb

@@ -1,10 +1,13 @@
 require 'highline'
-require 'utilrb/module/attr_predicate'
 module Autoproj
     class << self
         attr_accessor :verbose
         attr_reader :console
-        attr_predicate :silent?, true
+
+        def silent?
+            !!@silent
+        end
+        attr_writer :silent=
     end
     @silent  = false
     @verbose = false

data/lib/autoproj/default.osdeps

@@ -36,8 +36,8 @@ ruby19:
 
 build-essential:
     debian,ubuntu: build-essential
-    gentoo:
-    arch:
+    gentoo: ignore
+    arch: ignore
 
 libxml2:
     debian,ubuntu: libxml2-dev
@@ -82,7 +82,7 @@ autotools:
 lsb_release:
     debian,ubuntu: lsb-release
     gentoo: sys-apps/lsb-release
-    arch:
+    arch: ignore
     
 archive:
     debian,ubuntu: [tar, unzip]

data/lib/autoproj/manifest.rb

@@ -2098,7 +2098,7 @@ module Autoproj
                 match_pkg_name = Regexp.new(Regexp.quote(sel))
                 all_packages.each do |pkg_name|
                     pkg = Autobuild::Package[pkg_name]
-                    if pkg_name =~ match_pkg_name || sel =~ Regexp.new("^#{Regexp.quote(pkg.srcdir)}") || pkg.srcdir =~ Regexp.new("^#{Regexp.quote(sel)}")
+                    if pkg_name =~ match_pkg_name || "#{sel}/" =~ Regexp.new("^#{Regexp.quote(pkg.srcdir)}/") || pkg.srcdir =~ Regexp.new("^#{Regexp.quote(sel)}")
                         # Check-out packages that are not in the manifest only
                         # if they are explicitely selected
                         if !all_layout_packages.include?(pkg.name)

data/lib/autoproj/osdeps.rb

@@ -89,6 +89,9 @@ fi
             attr_writer :needs_locking
             def needs_locking?; !!@needs_locking end
 
+            attr_reader :auto_install_cmd
+            attr_reader :user_install_cmd
+
             def initialize(names, needs_locking, user_install_cmd, auto_install_cmd)
                 super(names)
                 @needs_locking, @user_install_cmd, @auto_install_cmd =
@@ -106,7 +109,7 @@ fi
                 (auto_install_cmd % [os_packages.join("' '")])
             end
 
-            def osdeps_interaction(osdeps, os_packages, shell_script)
+            def osdeps_interaction(os_packages, shell_script)
                 if OSDependencies.force_osdeps
                     return true
                 elsif enabled?
@@ -143,11 +146,11 @@ fi
             def install(packages)
                 handled_os = OSDependencies.supported_operating_system?
                 if handled_os
-                    shell_script = generate_auto_os_script(os_packages)
-                    user_shell_script = generate_user_os_script(os_packages)
+                    shell_script = generate_auto_os_script(packages)
+                    user_shell_script = generate_user_os_script(packages)
                 end
-                if osdeps_interaction(osdeps, os_packages, user_shell_script)
-                    Autoproj.message "  installing OS packages: #{os_packages.sort.join(", ")}"
+                if osdeps_interaction(packages, user_shell_script)
+                    Autoproj.message "  installing OS packages: #{packages.sort.join(", ")}"
 
                     if Autoproj.verbose
                         Autoproj.message "Generating installation script for non-ruby OS dependencies"
@@ -232,7 +235,7 @@ fi
 
             def gem_fetcher
                 if !@gem_fetcher
-                    Autoproj.message "looking for RubyGems updates"
+                    Autoproj.message "  looking for RubyGems updates"
                     @gem_fetcher = Gem::SpecFetcher.fetcher
                 end
                 @gem_fetcher
@@ -273,7 +276,7 @@ fi
                 end
 
                 if gems_interaction(gems, cmdlines)
-                    Autoproj.message "installing/updating RubyGems dependencies: #{gems.map { |g| g.join(" ") }.sort.join(", ")}"
+                    Autoproj.message "  installing/updating RubyGems dependencies: #{gems.map { |g| g.join(" ") }.sort.join(", ")}"
 
                     cmdlines.each do |c|
                         Autobuild::Subprocess.run 'autoproj', 'osdeps', *c
@@ -429,6 +432,7 @@ fi
             self.alias(ruby_version_keyword, "ruby")
         end
 	self.suffixes << ruby_version_keyword
+        autodetect_ruby
 
         AUTOPROJ_OSDEPS = File.join(File.expand_path(File.dirname(__FILE__)), 'default.osdeps')
         def self.load_default
@@ -540,17 +544,20 @@ fi
         end
 
         # Perform some sanity checks on the given osdeps definitions
-        def self.verify_definitions(hash)
+        def self.verify_definitions(hash, path = [])
             hash.each do |key, value|
-                if !key.kind_of?(String)
-                    raise ArgumentError, "invalid osdeps definition: found an #{key.class}. Don't forget to put quotes around numbers"
+                if value && !key.kind_of?(String)
+                    raise ArgumentError, "invalid osdeps definition: found an #{key.class} as a key in #{path.join("/")}. Don't forget to put quotes around numbers"
+                elsif !value && (key.kind_of?(Hash) || key.kind_of?(Array))
+                    verify_definitions(key)
                 end
                 next if !value
+
                 if value.kind_of?(Array) || value.kind_of?(Hash)
-                    verify_definitions(value)
+                    verify_definitions(value, (path + [key]))
                 else
                     if !value.kind_of?(String)
-                        raise ArgumentError, "invalid osdeps definition: found an #{value.class}. Don't forget to put quotes around numbers"
+                        raise ArgumentError, "invalid osdeps definition: found an #{value.class} as a value in #{path.join("/")}. Don't forget to put quotes around numbers"
                     end
                 end
             end
@@ -700,6 +707,10 @@ fi
         # name and version. The package list might be empty even if status ==
         # FOUND_PACKAGES, for instance if the ignore keyword is used.
         def resolve_package(name)
+            while OSDependencies.aliases.has_key?(name)
+                name = OSDependencies.aliases[name]
+            end
+
             os_names, os_versions = OSDependencies.operating_system
 
             dep_def = definitions[name]

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.7.21.b2"
+    VERSION = "1.7.21.b3"
 end

data/test/test_os_dependencies.rb

@@ -50,6 +50,20 @@ class TC_OSDependencies < Test::Unit::TestCase
         assert_equal expected, osdeps.resolve_package('pkg')
     end
 
+    def test_resolve_package_applies_aliases
+        data = { 'pkg' => {
+                'test' => {
+                    'v1.0' => 'pkg1.0',
+                    'v1.1' => 'pkg1.1',
+                    'default' => 'pkgdef'
+                 }
+        } }
+        Autoproj::OSDependencies.alias('pkg', 'bla')
+        osdeps = create_osdep(data)
+        expected = [[osdeps.os_package_handler, FOUND_PACKAGES, ['pkg1.0']]]
+        assert_equal expected, osdeps.resolve_package('bla')
+    end
+
     def test_resolve_specific_os_name_and_version_single_package
         data = { 'pkg' => {
                 'test' => {

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: 139
+  hash: 137
   prerelease: 7
   segments: 
   - 1
   - 7
   - 21
   - b
-  - 2
-  version: 1.7.21.b2
+  - 3
+  version: 1.7.21.b3
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-11 00:00:00 Z
+date: 2012-03-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: autobuild
@@ -169,7 +169,7 @@ files:
 - test/package_managers/test_gem.rb
 - test/test_package_manifest.rb
 - .gemtest
-homepage: http://rock-robotics.org/autoproj
+homepage: http://rock-robotics.org/documentation/autoproj
 licenses: []
 
 post_install_message: