autoproj 1.9.5.rc3 → 1.9.5.rc4

data/bin/autoproj_bootstrap

@@ -12,12 +12,12 @@ end
 
 require 'rbconfig'
 module Autobuild
-    @windows = RbConfig::CONFIG["host_os"] =~%r!(msdos|mswin|djgpp|mingw|[Ww]indows)!
+    @windows = RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw|[Ww]indows)!
     def self.windows?
         @windows
     end
 
-    @macos =  RbConfig::CONFIG["host_os"] = ~%r!([Dd]arwin)!
+    @macos =  RbConfig::CONFIG["host_os"] =~ %r!([Dd]arwin)!
     def self.macos?
         @macos
     end
@@ -450,11 +450,8 @@ fi
                 Autobuild.env_init_from_env 'GEM_PATH'
 
                 orig_gem_path = Autobuild::ORIGINAL_ENV['GEM_PATH'].split(':')
-                Gem.default_path.each do |p|
-                    if !orig_gem_path.include?(p)
-                        orig_gem_path << ":#{p}"
-                    end
-                end
+                Autobuild::SYSTEM_ENV['GEM_PATH'] = Gem.default_path
+                Autobuild::ORIGINAL_ENV['GEM_PATH'] = orig_gem_path.join(":")
 
                 Autoproj.manifest.each_reused_autoproj_installation do |p|
                     p_gems = File.join(Autoproj.root_dir, '.gems')
@@ -571,8 +568,8 @@ fi
                             if gem_fetcher.respond_to?(:find_matching)
                                 gem_fetcher.find_matching(dep, true, true, GemManager.with_prerelease).map(&:first)
                             else # Post RubyGems-2.0
-                                type = if GemManager.with_prerelease then :prerelease
-                                       else :complete
+                                type = if GemManager.with_prerelease then :complete
+                                       else :released
                                        end
 
                                 gem_fetcher.detect(type) do |tuple|
@@ -808,6 +805,7 @@ fi
             PackageManagers::GemManager,
             PackageManagers::EmergeManager,
             PackageManagers::PacmanManager,
+            PackageManagers::PacmanManager,
             PackageManagers::YumManager,
             PackageManagers::PortManager,
             PackageManagers::PipManager]
@@ -815,6 +813,7 @@ fi
             'debian' => 'apt-dpkg',
             'gentoo' => 'emerge',
             'arch' => 'pacman',
+            'manjarolinux' => 'pacman',
             'fedora' => 'yum',
             'darwin' => 'port'
         }
@@ -1003,12 +1002,14 @@ fi
                 Autoproj.message "  autodetecting the operating system"
                 lsb_name, lsb_versions = os_from_lsb
                 if lsb_name
-                    if lsb_name != "debian"
-                        if File.exists?("/etc/debian_version")
-                            @operating_system = [[lsb_name, "debian"], lsb_versions]
-                        else
-                            @operating_system = [[lsb_name], lsb_versions]
-                        end
+                    if lsb_name != 'debian' && File.exists?("/etc/debian_version")
+                        @operating_system = [[lsb_name, "debian"], lsb_versions]
+                    elsif lsb_name != 'arch' && File.exists?("/etc/arch-release")
+                        @operating_system = [[lsb_name, "arch"], lsb_versions]
+                    elsif lsb_name != 'debian'
+                        # Debian unstable cannot be detected with lsb_release,
+                        # so debian has its own detection logic
+                        @operating_system = [[lsb_name], lsb_versions]
                     end
                 end
             end
@@ -1424,25 +1425,27 @@ usually able to install those automatically, but unfortunately your operating
 system is not (yet) supported by autoproj's osdeps mechanism, it can only offer
 you some limited support.
 
-RubyGem packages are a cross-platform mechanism, and are therefore supported.
-However, you will have to install the kind of OS dependencies (so-called OS
-packages)
+Some package handlers are cross-platform, and are therefore supported.  However,
+you will have to install the kind of OS dependencies (so-called OS packages)
 
 This option is meant to allow you to control autoproj's behaviour while handling
 OS dependencies.
 
+* if you say "all", all OS-independent packages are going to be installed.
 * if you say "gem", the RubyGem packages will be installed.
+* if you say "pip", the Pythin PIP packages will be installed.
 * if you say "none", autoproj will not do anything related to the OS
   dependencies.
 
 As any configuration value, the mode can be changed anytime by calling
   autoproj reconfigure
 
-Finally, the "autoproj osdeps" command will give you the necessary information about the OS packages that you will need to install manually.
+Finally, the "autoproj osdeps" command will give you the necessary information
+about the OS packages that you will need to install manually.
 
-So, what do you want ? (either 'all', 'none', or a comma-separated list of 'gem' and 'pip' -- without the quotes)
+So, what do you want ? (all, none or a comma-separated list of: gem pip)
             EOT
-            message = [ "Which prepackaged software (a.k.a. 'osdeps') should autoproj install automatically ('all', 'none', or a comma-separated list of 'gem' and 'pip' -- without the quotes) ?", long_doc.strip ]
+            message = [ "Which prepackaged software (a.k.a. 'osdeps') should autoproj install automatically (all, none or a comma-separated list of: gem pip) ?", long_doc.strip ]
 
 	    Autoproj.configuration_option 'osdeps_mode', 'string',
 		:default => 'ruby',
@@ -1473,14 +1476,17 @@ while handling OS dependencies.
 * if you say "none", autoproj will not do anything related to the
   OS dependencies.
 
+Finally, you can provide a comma-separated list of pip gem and os.
+
 As any configuration value, the mode can be changed anytime by calling
   autoproj reconfigure
 
-Finally, the "autoproj osdeps" command 
+Finally, the "autoproj osdeps" command will give you the necessary information
+about the OS packages that you will need to install manually.
 
-So, what do you want ? (either 'all', 'none', or a comma-separated list of 'os', 'gem' and 'pip' -- without the quotes)
+So, what do you want ? (all, none or a comma-separated list of: os gem pip)
             EOT
-            message = [ "Which prepackaged software (a.k.a. 'osdeps') should autoproj install automatically ('all', 'none', or a comma-separated list of 'os', 'gem' and 'pip' -- without the quotes) ?", long_doc.strip ]
+            message = [ "Which prepackaged software (a.k.a. 'osdeps') should autoproj install automatically (all, none or a comma-separated list of: os gem pip) ?", long_doc.strip ]
 
 	    Autoproj.configuration_option 'osdeps_mode', 'string',
 		:default => 'all',
@@ -1497,14 +1503,20 @@ So, what do you want ? (either 'all', 'none', or a comma-separated list of 'os',
         end
 
         def self.osdeps_mode_string_to_value(string)
-            string = string.to_s.downcase
-            case string
-            when 'all'  then ['os', 'gem', 'pip']
-            when 'ruby' then ['gem']
-            when 'os'   then ['os']
-            when 'none' then ['none']
-            else string.split(',')
+            string = string.to_s.downcase.split(',')
+            modes = []
+            string.map do |str|
+                case str
+                when 'all'  then modes.concat(['os', 'gem', 'pip'])
+                when 'ruby' then modes << 'gem'
+                when 'gem'  then modes << 'gem'
+                when 'pip'  then modes << 'pip'
+                when 'os'   then modes << 'os'
+                when 'none' then modes << 'none'
+                else raise ArgumentError, "#{str} is not a known package handler"
+                end
             end
+            modes
         end
 
         # If set to true (the default), #install will try to remove the list of
@@ -1584,7 +1596,7 @@ So, what do you want ? (either 'all', 'none', or a comma-separated list of 'os',
             package_handlers.each_value do |handler|
                 handler.enabled = false
             end
-            osdeps_mode.each do |m|
+            options[:osdeps_mode].each do |m|
                 if m == 'os'
                     os_package_handler.enabled = true
                 else
@@ -2081,127 +2093,130 @@ module Autoproj
 end
 
 DEFS = <<EODEFS
---- 
-ruby20: ignore
-archive: 
-  darwin: 
-  - gnutar
-  - unzip
-  debian,ubuntu: 
-  - tar
-  - unzip
-  fedora: 
-  - tar
-  - unzip
-  arch: 
-  - tar
-  - unzip
-  gentoo: 
-  - app-arch/tar
-  - app-arch/unzip
-autoproj: gem
-lsb_release: 
-  darwin: ignore
-  debian,ubuntu: lsb-release
-  fedora: redhat-lsb
-  arch: ignore
-  gentoo: sys-apps/lsb-release
-svn: 
-  darwin: subversion
-  debian,ubuntu: subversion
-  fedora: subversion
-  arch: subversion
-  gentoo: dev-util/subversion
-autobuild: gem
-build-essential: 
-  darwin: ignore
-  debian,ubuntu: build-essential
-  fedora: ignore
-  arch: ignore
-  gentoo: ignore
-ruby19: 
-  darwin: 
-  - ruby19
+---
+none: ignore
+ruby18:
+  debian,ubuntu:
+  - ruby1.8-dev
+  - ruby1.8
+  - rubygems1.8
+  - ri1.8
+  - libopenssl-ruby1.8
   - rake
+  gentoo:
+  - dev-lang/ruby:1.8
+  - rake
+  fedora:
+    '15,16':
+    - ruby
+    - rubygems
+  darwin:
+  - ruby
+  - rb-rake
   default: nonexistent
-  debian: 
+ruby19:
+  debian:
   - ruby1.9.1
   - ruby1.9.1-dev
   - rubygems1.9.1
   - rake
   - rubygems-integration
-  ubuntu: 
+  ubuntu:
   - ruby1.9.1
   - ruby1.9.1-dev
   - rubygems1.9.1
   - ri1.9.1
   - libopenssl-ruby1.9.1
   - rake
-  fedora: 
-    "17": 
-    - ruby
-    - rubygems
-  arch: 
-  - ruby
-  - rake
-  gentoo: 
+  gentoo:
   - dev-lang/ruby:1.9
   - rake
-ruby18: 
-  darwin: 
+  arch,manjarolinux:
   - ruby
-  - rb-rake
-  default: nonexistent
-  debian,ubuntu: 
-  - ruby1.8-dev
-  - ruby1.8
-  - rubygems1.8
-  - ri1.8
-  - libopenssl-ruby1.8
-  - rake
-  fedora: 
-    "15,16": 
+  fedora:
+    '17':
     - ruby
     - rubygems
-  gentoo: 
-  - dev-lang/ruby:1.8
+  darwin:
+  - ruby19
   - rake
-git: 
-  darwin: git-core
-  debian: 
-    default: git-core
+  default: nonexistent
+ruby20: ignore
+build-essential:
+  debian,ubuntu: build-essential
+  gentoo: ignore
+  arch,manjarolinux: base-dev
+  fedora: ignore
+  darwin: ignore
+autobuild: gem
+autoproj: gem
+git:
+  debian:
     lenny: git
+    default: git-core
   ubuntu: git-core
-  fedora: git
-  arch: git
   gentoo: dev-vcs/git
-autotools: 
-  darwin: 
+  arch,manjarolinux: git
+  fedora: git
+  darwin: git-core
+svn:
+  debian,ubuntu: subversion
+  gentoo: dev-util/subversion
+  arch,manjarolinux: subversion
+  fedora: subversion
+  darwin: subversion
+cmake:
+  debian,ubuntu: cmake
+  gentoo: dev-util/cmake
+  arch,manjarolinux: cmake
+  fedora: cmake
+  darwin: cmake
+autotools:
+  debian,ubuntu:
+  - automake1.9
+  - autoconf
+  gentoo:
+  - sys-devel/automake:1.9
+  - sys-devel/autoconf
+  arch,manjarolinux:
   - automake
   - autoconf
-  debian,ubuntu: 
-  - automake1.9
+  fedora:
+  - automake
   - autoconf
-  fedora: 
+  darwin:
   - automake
   - autoconf
-  arch: automake autoconf
-  gentoo: 
-  - sys-devel/automake:1.9
-  - sys-devel/autoconf
-cmake: 
-  darwin: cmake
-  debian,ubuntu: cmake
-  fedora: cmake
-  arch: cmake
-  gentoo: dev-util/cmake
-none: ignore
-pip: 
-  debian,ubuntu: python-pip
-cvs: 
-  darwin: cvs
+lsb_release:
+  debian,ubuntu: lsb-release
+  gentoo: sys-apps/lsb-release
+  arch,manjarolinux: lsb-release
+  fedora: redhat-lsb
+  darwin: ignore
+archive:
+  debian,ubuntu:
+  - tar
+  - unzip
+  gentoo:
+  - app-arch/tar
+  - app-arch/unzip
+  arch,manjarolinux:
+  - tar
+  - unzip
+  fedora:
+  - tar
+  - unzip
+  darwin:
+  - gnutar
+  - unzip
+cvs:
   debian,ubuntu: cvs
   fedora: cvs
+  darwin: cvs
+  arch,manjarolinux: cvs
+pip:
+  debian,ubuntu: python-pip
+  arch,manjarolinux: python2-pip
 
 EODEFS
 

data/bin/autoproj_bootstrap.in

@@ -12,12 +12,12 @@ end
 
 require 'rbconfig'
 module Autobuild
-    @windows = RbConfig::CONFIG["host_os"] =~%r!(msdos|mswin|djgpp|mingw|[Ww]indows)!
+    @windows = RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw|[Ww]indows)!
     def self.windows?
         @windows
     end
 
-    @macos =  RbConfig::CONFIG["host_os"] = ~%r!([Dd]arwin)!
+    @macos =  RbConfig::CONFIG["host_os"] =~ %r!([Dd]arwin)!
     def self.macos?
         @macos
     end

data/lib/autoproj/autobuild.rb

@@ -366,7 +366,7 @@ def setup_package(package_name, &block)
 end
 
 # Common setup for packages
-def package_common(package_type, spec, &block) # :nodoc:
+def package_common(package_type, spec, &block)
     package_name = Autoproj.package_name_from_options(spec)
 
     if Autobuild::Package[package_name]
@@ -507,6 +507,7 @@ def ruby_package(options)
         pkg.exclude << /Makefile$/
         pkg.exclude << /mkmf.log$/
         pkg.exclude << /\.o$/
+        pkg.exclude << /doc$/
 
         pkg.extend Autoproj::RubyPackage
         pkg.rake_setup_task = "default"
@@ -658,7 +659,7 @@ class Autobuild::ArchiveImporter
         FileUtils.mkdir_p archive_dir
         FileUtils.cp @cachefile, archive_dir
 
-        { 'url' =>  File.join('$AUTOPROJ_SOURCE_DIR', File.basename(@cachefile)) }
+        { 'url' =>  "file://$AUTOPROJ_SOURCE_DIR/archives/#{File.basename(@cachefile)}" }
     end
 end
 

data/lib/autoproj/cmdline.rb

@@ -124,8 +124,8 @@ module Autoproj
             end
 
             # Make sure that the currently loaded env.sh is actually us
-            if ENV['AUTOPROJ_CURRENT_ROOT'] && (ENV['AUTOPROJ_CURRENT_ROOT'] != Autoproj.root_dir)
-                raise ConfigError.new, "the current environment is for #{ENV['AUTOPROJ_ROOT_DIR']}, but you are in #{Autoproj.root_dir}, make sure you are loading the right #{ENV_FILENAME} script !"
+            if ENV['AUTOPROJ_CURRENT_ROOT'] && !ENV['AUTOPROJ_CURRENT_ROOT'].empty? && (ENV['AUTOPROJ_CURRENT_ROOT'] != Autoproj.root_dir)
+                raise ConfigError.new, "the current environment is for #{ENV['AUTOPROJ_CURRENT_ROOT']}, but you are in #{Autoproj.root_dir}, make sure you are loading the right #{ENV_FILENAME} script !"
             end
 
             Autoproj.manifest = Manifest.new
@@ -404,7 +404,12 @@ module Autoproj
 
             # And, finally, disable all ignored packages on the autobuild side
             manifest.each_ignored_package do |pkg_name|
-                Autobuild::Package[pkg_name].disable
+                pkg = Autobuild::Package[pkg_name]
+                if !pkg
+                    Autoproj.warn "ignore line #{pkg_name} does not match anything"
+                else
+                    pkg.disable
+                end
             end
 
             update_environment

data/lib/autoproj/default.osdeps

@@ -39,9 +39,8 @@ ruby19:
     gentoo:
         - dev-lang/ruby:1.9
         - rake
-    arch:
+    arch,manjarolinux:
         - ruby
-        - rake
     fedora:
       "17":
       - ruby
@@ -56,7 +55,7 @@ ruby20: ignore
 build-essential:
   debian,ubuntu: build-essential
   gentoo: ignore
-  arch: ignore
+  arch,manjarolinux: base-dev
   fedora: ignore
   darwin: ignore
 
@@ -70,21 +69,21 @@ git:
     default: git-core
   ubuntu: git-core
   gentoo: dev-vcs/git
-  arch: git
+  arch,manjarolinux: git
   fedora: git
   darwin: git-core
 
 svn:
   debian,ubuntu: subversion
   gentoo: dev-util/subversion
-  arch: subversion
+  arch,manjarolinux: subversion
   fedora: subversion
   darwin: subversion
 
 cmake:
   debian,ubuntu: cmake
   gentoo: dev-util/cmake
-  arch: cmake
+  arch,manjarolinux: cmake
   fedora: cmake
   darwin: cmake
 
@@ -95,7 +94,9 @@ autotools:
   gentoo:
   - "sys-devel/automake:1.9"
   - sys-devel/autoconf
-  arch: automake autoconf
+  arch,manjarolinux: 
+  - automake 
+  - autoconf
   fedora:
   - automake
   - autoconf
@@ -106,7 +107,7 @@ autotools:
 lsb_release:
   debian,ubuntu: lsb-release
   gentoo: sys-apps/lsb-release
-  arch: ignore
+  arch,manjarolinux: lsb-release
   fedora: redhat-lsb
   darwin: ignore
     
@@ -117,7 +118,7 @@ archive:
   gentoo:
   - app-arch/tar
   - app-arch/unzip
-  arch:
+  arch,manjarolinux:
   - tar
   - unzip
   fedora:
@@ -131,9 +132,11 @@ cvs:
   debian,ubuntu: cvs
   fedora: cvs
   darwin: cvs
+  arch,manjarolinux: cvs
 
 pip:
   debian,ubuntu: python-pip
+  arch,manjarolinux: python2-pip
 
 # vim: expandtab
 

data/lib/autoproj/gitorious.rb

@@ -42,7 +42,7 @@ module Autoproj
         if access_mode == "git"
             Autoproj.change_option("#{name}_ROOT", "git://#{base_url}")
         elsif access_mode == "http"
-            Autoproj.change_option("#{name}_ROOT", "http://git.#{base_url}")
+            Autoproj.change_option("#{name}_ROOT", "https://git.#{base_url}")
         elsif access_mode == "ssh"
             Autoproj.change_option("#{name}_ROOT", "git@#{base_url}:")
         end

data/lib/autoproj/manifest.rb

@@ -1787,7 +1787,7 @@ module Autoproj
                     begin
                         Autoproj.osdeps.resolve_os_dependencies([name].to_set)
                     rescue Autoproj::ConfigError => e
-                        if osdeps_availability != Autoproj::OSDependencies::NO_PACKAGE && !Autoproj.osdeps.installs_os_packages?
+                        if osdeps_availability != Autoproj::OSDependencies::NO_PACKAGE && !Autoproj.osdeps.os_package_handler.enabled?
                             if !@ignored_os_dependencies.include?(name)
                                 Autoproj.warn "some package depends on the #{name} osdep: #{e.message}"
                                 Autoproj.warn "this osdeps dependency is simply ignored as you asked autoproj to not install osdeps packages"
@@ -2118,7 +2118,7 @@ module Autoproj
                     true
                 end
             end
-            Autoproj.osdeps.install(required_os_packages, package_os_deps)
+            Autoproj.osdeps.install(required_os_packages)
         end
 
         # The set of overrides added with #add_osdeps_overrides

data/lib/autoproj/osdeps.rb

@@ -332,11 +332,8 @@ fi
                 Autobuild.env_init_from_env 'GEM_PATH'
 
                 orig_gem_path = Autobuild::ORIGINAL_ENV['GEM_PATH'].split(':')
-                Gem.default_path.each do |p|
-                    if !orig_gem_path.include?(p)
-                        orig_gem_path << ":#{p}"
-                    end
-                end
+                Autobuild::SYSTEM_ENV['GEM_PATH'] = Gem.default_path
+                Autobuild::ORIGINAL_ENV['GEM_PATH'] = orig_gem_path.join(":")
 
                 Autoproj.manifest.each_reused_autoproj_installation do |p|
                     p_gems = File.join(Autoproj.root_dir, '.gems')
@@ -453,8 +450,8 @@ fi
                             if gem_fetcher.respond_to?(:find_matching)
                                 gem_fetcher.find_matching(dep, true, true, GemManager.with_prerelease).map(&:first)
                             else # Post RubyGems-2.0
-                                type = if GemManager.with_prerelease then :prerelease
-                                       else :complete
+                                type = if GemManager.with_prerelease then :complete
+                                       else :released
                                        end
 
                                 gem_fetcher.detect(type) do |tuple|
@@ -690,6 +687,7 @@ fi
             PackageManagers::GemManager,
             PackageManagers::EmergeManager,
             PackageManagers::PacmanManager,
+            PackageManagers::PacmanManager,
             PackageManagers::YumManager,
             PackageManagers::PortManager,
             PackageManagers::PipManager]
@@ -697,6 +695,7 @@ fi
             'debian' => 'apt-dpkg',
             'gentoo' => 'emerge',
             'arch' => 'pacman',
+            'manjarolinux' => 'pacman',
             'fedora' => 'yum',
             'darwin' => 'port'
         }
@@ -885,12 +884,14 @@ fi
                 Autoproj.message "  autodetecting the operating system"
                 lsb_name, lsb_versions = os_from_lsb
                 if lsb_name
-                    if lsb_name != "debian"
-                        if File.exists?("/etc/debian_version")
-                            @operating_system = [[lsb_name, "debian"], lsb_versions]
-                        else
-                            @operating_system = [[lsb_name], lsb_versions]
-                        end
+                    if lsb_name != 'debian' && File.exists?("/etc/debian_version")
+                        @operating_system = [[lsb_name, "debian"], lsb_versions]
+                    elsif lsb_name != 'arch' && File.exists?("/etc/arch-release")
+                        @operating_system = [[lsb_name, "arch"], lsb_versions]
+                    elsif lsb_name != 'debian'
+                        # Debian unstable cannot be detected with lsb_release,
+                        # so debian has its own detection logic
+                        @operating_system = [[lsb_name], lsb_versions]
                     end
                 end
             end
@@ -1306,25 +1307,27 @@ usually able to install those automatically, but unfortunately your operating
 system is not (yet) supported by autoproj's osdeps mechanism, it can only offer
 you some limited support.
 
-RubyGem packages are a cross-platform mechanism, and are therefore supported.
-However, you will have to install the kind of OS dependencies (so-called OS
-packages)
+Some package handlers are cross-platform, and are therefore supported.  However,
+you will have to install the kind of OS dependencies (so-called OS packages)
 
 This option is meant to allow you to control autoproj's behaviour while handling
 OS dependencies.
 
+* if you say "all", all OS-independent packages are going to be installed.
 * if you say "gem", the RubyGem packages will be installed.
+* if you say "pip", the Pythin PIP packages will be installed.
 * if you say "none", autoproj will not do anything related to the OS
   dependencies.
 
 As any configuration value, the mode can be changed anytime by calling
   autoproj reconfigure
 
-Finally, the "autoproj osdeps" command will give you the necessary information about the OS packages that you will need to install manually.
+Finally, the "autoproj osdeps" command will give you the necessary information
+about the OS packages that you will need to install manually.
 
-So, what do you want ? (either 'all', 'none', or a comma-separated list of 'gem' and 'pip' -- without the quotes)
+So, what do you want ? (all, none or a comma-separated list of: gem pip)
             EOT
-            message = [ "Which prepackaged software (a.k.a. 'osdeps') should autoproj install automatically ('all', 'none', or a comma-separated list of 'gem' and 'pip' -- without the quotes) ?", long_doc.strip ]
+            message = [ "Which prepackaged software (a.k.a. 'osdeps') should autoproj install automatically (all, none or a comma-separated list of: gem pip) ?", long_doc.strip ]
 
 	    Autoproj.configuration_option 'osdeps_mode', 'string',
 		:default => 'ruby',
@@ -1355,14 +1358,17 @@ while handling OS dependencies.
 * if you say "none", autoproj will not do anything related to the
   OS dependencies.
 
+Finally, you can provide a comma-separated list of pip gem and os.
+
 As any configuration value, the mode can be changed anytime by calling
   autoproj reconfigure
 
-Finally, the "autoproj osdeps" command 
+Finally, the "autoproj osdeps" command will give you the necessary information
+about the OS packages that you will need to install manually.
 
-So, what do you want ? (either 'all', 'none', or a comma-separated list of 'os', 'gem' and 'pip' -- without the quotes)
+So, what do you want ? (all, none or a comma-separated list of: os gem pip)
             EOT
-            message = [ "Which prepackaged software (a.k.a. 'osdeps') should autoproj install automatically ('all', 'none', or a comma-separated list of 'os', 'gem' and 'pip' -- without the quotes) ?", long_doc.strip ]
+            message = [ "Which prepackaged software (a.k.a. 'osdeps') should autoproj install automatically (all, none or a comma-separated list of: os gem pip) ?", long_doc.strip ]
 
 	    Autoproj.configuration_option 'osdeps_mode', 'string',
 		:default => 'all',
@@ -1379,14 +1385,20 @@ So, what do you want ? (either 'all', 'none', or a comma-separated list of 'os',
         end
 
         def self.osdeps_mode_string_to_value(string)
-            string = string.to_s.downcase
-            case string
-            when 'all'  then ['os', 'gem', 'pip']
-            when 'ruby' then ['gem']
-            when 'os'   then ['os']
-            when 'none' then ['none']
-            else string.split(',')
+            string = string.to_s.downcase.split(',')
+            modes = []
+            string.map do |str|
+                case str
+                when 'all'  then modes.concat(['os', 'gem', 'pip'])
+                when 'ruby' then modes << 'gem'
+                when 'gem'  then modes << 'gem'
+                when 'pip'  then modes << 'pip'
+                when 'os'   then modes << 'os'
+                when 'none' then modes << 'none'
+                else raise ArgumentError, "#{str} is not a known package handler"
+                end
             end
+            modes
         end
 
         # If set to true (the default), #install will try to remove the list of
@@ -1466,7 +1478,7 @@ So, what do you want ? (either 'all', 'none', or a comma-separated list of 'os',
             package_handlers.each_value do |handler|
                 handler.enabled = false
             end
-            osdeps_mode.each do |m|
+            options[:osdeps_mode].each do |m|
                 if m == 'os'
                     os_package_handler.enabled = true
                 else

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.9.5.rc3"
+    VERSION = "1.9.5.rc4"
 end

metadata

@@ -1,105 +1,101 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: autoproj
-version: !ruby/object:Gem::Version 
-  hash: 2119809063
+version: !ruby/object:Gem::Version
+  version: 1.9.5.rc4
   prerelease: 6
-  segments: 
-  - 1
-  - 9
-  - 5
-  - rc
-  - 3
-  version: 1.9.5.rc3
 platform: ruby
-authors: 
+authors:
 - Rock Core Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-07-26 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-10-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: autobuild
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 7
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.7.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: utilrb
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 6
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+- !ruby/object:Gem::Dependency
+  name: utilrb
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    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: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !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: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 4
-        - 0
-        version: "4.0"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 3
-        - 7
-        version: "3.7"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.7'
   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: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.7'
+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:
 - alocate
 - amake
 - aup
@@ -117,13 +113,12 @@ executables:
 - autoproj_bootstrap.in
 - 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
@@ -184,46 +179,37 @@ files:
 - test/package_managers/test_pip.rb
 - .gemtest
 homepage: http://rock-robotics.org/documentation/autoproj
-licenses: 
+licenses:
 - MIT
 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.23
 signing_key: 
 specification_version: 3
 summary: Easy installation and management of sets of software packages
-test_files: 
+test_files:
 - test/test_manifest.rb
-- test/package_managers/test_apt_dpkg_manager.rb
-- test/package_managers/test_gem.rb
-- test/package_managers/test_pip.rb
-- test/test_debian.rb
 - test/test_package_manifest.rb
 - test/test_os_dependencies.rb
+- test/test_debian.rb
+- test/package_managers/test_pip.rb
+- test/package_managers/test_apt_dpkg_manager.rb
+- test/package_managers/test_gem.rb