autoproj 1.9.7.rc9 → 1.9.7.rc10

data/Manifest.txt

@@ -58,7 +58,12 @@ shell/autoproj_zsh
 test/data/empty_manifest.xml
 test/data/full_manifest.xml
 test/data/invalid_manifest.xml
-test/data/test_manifest/autoproj/local/local.autobuild
+test/data/os_release.with_complex_version_field
+test/data/os_release.with_duplicate_values
+test/data/os_release.with_missing_optional_fields
+test/data/os_release.with_quoted_and_unquoted_fields
+test/data/test_manifest/autoproj/local_set/local.autobuild
+test/data/test_manifest/autoproj/local_set/source.yml
 test/data/test_manifest/autoproj/manifest
 test/package_managers/apt-dpkg-status
 test/package_managers/apt-dpkg-status.installed-last
@@ -66,7 +71,6 @@ test/package_managers/apt-dpkg-status.noninstalled-last
 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_manifest.rb
 test/test_os_dependencies.rb
 test/test_package_manifest.rb

data/bin/autoproj_bootstrap

@@ -86,6 +86,14 @@ module Autobuild
     def self.message(str)
         STDERR.puts "  #{str}"
     end
+    def self.progress(key, str)
+        STDERR.puts "  #{str}"
+    end
+    def self.progress_done(key)
+    end
+    def self.message(str)
+        STDERR.puts "  #{str}"
+    end
 
     class << self
         attr_reader :programs
@@ -471,15 +479,15 @@ fi
             # of GEM_PATH
             def self.initialize_environment
                 Autobuild::ORIGINAL_ENV['GEM_PATH'] =
-                    (ENV['GEM_PATH'] || "").split(":").find_all do |p|
+                    (ENV['GEM_PATH'] || "").split(File::PATH_SEPARATOR).find_all do |p|
                         !Autoproj.in_autoproj_installation?(p)
-                    end.join(":")
+                    end.join(File::PATH_SEPARATOR)
                 Autobuild.env_inherit 'GEM_PATH'
                 Autobuild.env_init_from_env 'GEM_PATH'
 
-                orig_gem_path = Autobuild::ORIGINAL_ENV['GEM_PATH'].split(':')
+                orig_gem_path = Autobuild::ORIGINAL_ENV['GEM_PATH'].split(File::PATH_SEPARATOR)
                 Autobuild::SYSTEM_ENV['GEM_PATH'] = Gem.default_path
-                Autobuild::ORIGINAL_ENV['GEM_PATH'] = orig_gem_path.join(":")
+                Autobuild::ORIGINAL_ENV['GEM_PATH'] = orig_gem_path.join(File::PATH_SEPARATOR)
 
                 Autoproj.manifest.each_reused_autoproj_installation do |p|
                     p_gems = File.join(Autoproj.root_dir, '.gems')
@@ -668,7 +676,7 @@ fi
         
           #{cmdlines.map { |c| c.join(" ") }.join("\n      ")}
         
-        Autoproj expects these Gems to be installed in #{Autoproj.gem_home} This can
+        Autoproj expects these Gems to be installed in #{GemManager.gem_home} This can
         be overridden by setting the AUTOPROJ_GEM_HOME environment variable manually
 
                 EOMSG
@@ -752,7 +760,7 @@ fi
         
           #{cmdlines.map { |c| c.join(" ") }.join("\n      ")}
         
-        Autoproj expects these Python packages to be installed in #{Autoproj.pip_home} This can
+        Autoproj expects these Python packages to be installed in #{PipManager.pip_home} This can
         be overridden by setting the AUTOPROJ_PYTHONUSERBASE environment variable manually
 
                 EOMSG
@@ -1052,18 +1060,26 @@ fi
                 end
             else
                 Autobuild.progress :operating_system_autodetection, "autodetecting the operating system"
-                lsb_name, lsb_versions = os_from_lsb
-                if lsb_name
-                    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 != 'opensuse' && File.exists?("/etc/SuSE-release")
-                        @operating_system = [[lsb_name, "opensuse"], 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]
+                names, versions = os_from_os_release
+                # Don't use the os-release information on Debian, since they
+                # refuse to put enough information to detect 'unstable'
+                # reliably. So, we use Debian's heuristic detection method below
+                if names && names[0] != 'debian'
+                    @operating_system = [names, versions]
+                else
+                    lsb_name, lsb_versions = os_from_lsb
+                    if lsb_name
+                        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 != 'opensuse' && File.exists?("/etc/SuSE-release")
+                            @operating_system = [[lsb_name, "opensuse"], 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
             end
@@ -1125,13 +1141,28 @@ fi
             Autobuild.progress_done :operating_system_autodetection
         end
 
+        def self.os_from_os_release(filename = '/etc/os-release')
+            return if !File.exists?(filename)
+
+            fields = Hash.new
+            File.readlines(filename).each do |line|
+                if line.strip =~ /^(\w+)=(?:["'])?([^"']+)(?:["'])?$/
+                    fields[$1] = $2
+                else Autoproj.warn "error parsing /etc/os-release, line: #{line.inspect}"
+                end
+            end
+
+            names = []
+            versions = []
+            names << fields['ID'] << fields['ID_LIKE']
+            versions << fields['VERSION_ID']
+            version = fields['VERSION'] || ''
+            versions.concat(version.gsub(/[^\w.]/, ' ').split(' '))
+            return names.compact.uniq, versions.compact.uniq
+        end
+
         def self.os_from_lsb
-            has_lsb_release = nil
-            begin
-                has_lsb_release = `which lsb_release`
-                return unless $?.success?
-            rescue Exception => e
-                #seems which is not installes (e.g. on windows)
+            if !Autobuild.find_in_path('lsb_release')
                 return
             end
 
@@ -2128,16 +2159,6 @@ module Autoproj
         Autobuild.env_inherit(*names)
     end
 
-    # Find the given program in PATH. It raises ArgumentError if the program
-    # can't be found
-    def self.find_in_path(name)
-        result = ENV['PATH'].split(':').find { |dir| File.file?(File.join(dir, name)) }
-        if !result
-            raise ArgumentError, "#{name} can not be found in PATH (#{ENV['PATH']})"
-        end
-        File.join(result, name)
-    end
-
     # @deprecated use isolate_environment instead
     def self.set_initial_env
         isolate_environment
@@ -2293,12 +2314,21 @@ ruby19:
   - rake
   - rubygems-integration
   ubuntu:
-  - ruby1.9.1
-  - ruby1.9.1-dev
-  - rubygems1.9.1
-  - ri1.9.1
-  - libopenssl-ruby1.9.1
-  - rake
+    '12.04':
+    - ruby1.9.1
+    - ruby1.9.1-dev
+    - rubygems1.9.1
+    - ri1.9.1
+    - libopenssl-ruby1.9.1
+    - rake
+    default:
+    - ruby1.9.1
+    - ruby1.9.1-dev
+    - rubygems1.9.1
+    - ri1.9.1
+    - libopenssl-ruby1.9.1
+    - rake
+    - rubygems-integration
   gentoo:
   - dev-lang/ruby:1.9
   - rake

data/bin/autoproj_bootstrap.in

@@ -86,6 +86,14 @@ module Autobuild
     def self.message(str)
         STDERR.puts "  #{str}"
     end
+    def self.progress(key, str)
+        STDERR.puts "  #{str}"
+    end
+    def self.progress_done(key)
+    end
+    def self.message(str)
+        STDERR.puts "  #{str}"
+    end
 
     class << self
         attr_reader :programs

data/lib/autoproj/default.osdeps

@@ -31,12 +31,21 @@ ruby19:
         - rubygems-integration
 
     ubuntu:
-        - ruby1.9.1
-        - ruby1.9.1-dev
-        - rubygems1.9.1
-        - ri1.9.1
-        - libopenssl-ruby1.9.1
-        - rake
+        '12.04':
+            - ruby1.9.1
+            - ruby1.9.1-dev
+            - rubygems1.9.1
+            - ri1.9.1
+            - libopenssl-ruby1.9.1
+            - rake
+        default:
+            - ruby1.9.1
+            - ruby1.9.1-dev
+            - rubygems1.9.1
+            - ri1.9.1
+            - libopenssl-ruby1.9.1
+            - rake
+            - rubygems-integration
     gentoo:
         - dev-lang/ruby:1.9
         - rake

data/lib/autoproj/environment.rb

@@ -2,7 +2,7 @@ module Autoproj
     # Sets an environment variable
     #
     # This sets (or resets) the environment variable +name+ to the given value.
-    # If multiple values are given, they are joined with ':'
+    # If multiple values are given, they are joined with File::PATH_SEPARATOR
     #
     # The values can contain configuration parameters using the
     # $CONF_VARIABLE_NAME syntax.
@@ -14,7 +14,7 @@ module Autoproj
     # Adds new values to a given environment variable
     #
     # Adds the given value(s) to the environment variable named +name+. The
-    # values are added using the ':' marker.
+    # values are added using the File::PATH_SEPARATOR marker
     #
     # The values can contain configuration parameters using the
     # $CONF_VARIABLE_NAME syntax.
@@ -27,8 +27,8 @@ module Autoproj
     # PATH, RUBYLIB, PYTHONPATH)
     #
     # This sets (or resets) the environment variable +name+ to the given value.
-    # If multiple values are given, they are joined with ':'. Unlike env_set,
-    # duplicate values will be removed.
+    # If multiple values are given, they are joined with File::PATH_SEPARATOR.
+    # Unlike env_set, duplicate values will be removed.
     #
     # The values can contain configuration parameters using the
     # $CONF_VARIABLE_NAME syntax.
@@ -41,7 +41,8 @@ module Autoproj
     # variable (such as PATH, RUBYLIB, PYTHONPATH)
     #
     # Adds the given value(s) to the environment variable named +name+. The
-    # values are added using the ':' marker. Unlike env_set, duplicate values
+    # values are added using the File::PATH_SEPARATOR marker. Unlike env_set,
+    # duplicate values
     # will be removed.
     #
     # The values can contain configuration parameters using the

data/lib/autoproj/osdeps.rb

@@ -355,15 +355,15 @@ fi
             # of GEM_PATH
             def self.initialize_environment
                 Autobuild::ORIGINAL_ENV['GEM_PATH'] =
-                    (ENV['GEM_PATH'] || "").split(":").find_all do |p|
+                    (ENV['GEM_PATH'] || "").split(File::PATH_SEPARATOR).find_all do |p|
                         !Autoproj.in_autoproj_installation?(p)
-                    end.join(":")
+                    end.join(File::PATH_SEPARATOR)
                 Autobuild.env_inherit 'GEM_PATH'
                 Autobuild.env_init_from_env 'GEM_PATH'
 
-                orig_gem_path = Autobuild::ORIGINAL_ENV['GEM_PATH'].split(':')
+                orig_gem_path = Autobuild::ORIGINAL_ENV['GEM_PATH'].split(File::PATH_SEPARATOR)
                 Autobuild::SYSTEM_ENV['GEM_PATH'] = Gem.default_path
-                Autobuild::ORIGINAL_ENV['GEM_PATH'] = orig_gem_path.join(":")
+                Autobuild::ORIGINAL_ENV['GEM_PATH'] = orig_gem_path.join(File::PATH_SEPARATOR)
 
                 Autoproj.manifest.each_reused_autoproj_installation do |p|
                     p_gems = File.join(Autoproj.root_dir, '.gems')
@@ -552,7 +552,7 @@ fi
         
           #{cmdlines.map { |c| c.join(" ") }.join("\n      ")}
         
-        Autoproj expects these Gems to be installed in #{Autoproj.gem_home} This can
+        Autoproj expects these Gems to be installed in #{GemManager.gem_home} This can
         be overridden by setting the AUTOPROJ_GEM_HOME environment variable manually
 
                 EOMSG
@@ -636,7 +636,7 @@ fi
         
           #{cmdlines.map { |c| c.join(" ") }.join("\n      ")}
         
-        Autoproj expects these Python packages to be installed in #{Autoproj.pip_home} This can
+        Autoproj expects these Python packages to be installed in #{PipManager.pip_home} This can
         be overridden by setting the AUTOPROJ_PYTHONUSERBASE environment variable manually
 
                 EOMSG
@@ -936,18 +936,26 @@ fi
                 end
             else
                 Autobuild.progress :operating_system_autodetection, "autodetecting the operating system"
-                lsb_name, lsb_versions = os_from_lsb
-                if lsb_name
-                    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 != 'opensuse' && File.exists?("/etc/SuSE-release")
-                        @operating_system = [[lsb_name, "opensuse"], 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]
+                names, versions = os_from_os_release
+                # Don't use the os-release information on Debian, since they
+                # refuse to put enough information to detect 'unstable'
+                # reliably. So, we use Debian's heuristic detection method below
+                if names && names[0] != 'debian'
+                    @operating_system = [names, versions]
+                else
+                    lsb_name, lsb_versions = os_from_lsb
+                    if lsb_name
+                        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 != 'opensuse' && File.exists?("/etc/SuSE-release")
+                            @operating_system = [[lsb_name, "opensuse"], 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
             end
@@ -1009,13 +1017,28 @@ fi
             Autobuild.progress_done :operating_system_autodetection
         end
 
+        def self.os_from_os_release(filename = '/etc/os-release')
+            return if !File.exists?(filename)
+
+            fields = Hash.new
+            File.readlines(filename).each do |line|
+                if line.strip =~ /^(\w+)=(?:["'])?([^"']+)(?:["'])?$/
+                    fields[$1] = $2
+                else Autoproj.warn "error parsing /etc/os-release, line: #{line.inspect}"
+                end
+            end
+
+            names = []
+            versions = []
+            names << fields['ID'] << fields['ID_LIKE']
+            versions << fields['VERSION_ID']
+            version = fields['VERSION'] || ''
+            versions.concat(version.gsub(/[^\w.]/, ' ').split(' '))
+            return names.compact.uniq, versions.compact.uniq
+        end
+
         def self.os_from_lsb
-            has_lsb_release = nil
-            begin
-                has_lsb_release = `which lsb_release`
-                return unless $?.success?
-            rescue Exception => e
-                #seems which is not installes (e.g. on windows)
+            if !Autobuild.find_in_path('lsb_release')
                 return
             end
 

data/lib/autoproj/package_set.rb

@@ -236,7 +236,7 @@ module Autoproj
             definition = @source_definition || raw_description_file
             @name = definition['name']
 
-            if @name !~ /^[\w_\.-]+$/
+            if @name !~ /^[\w\.-]+$/
                 raise ConfigError.new(source_file),
                     "in #{source_file}: invalid source name '#{@name}': source names can only contain alphanumeric characters, and .-_"
             elsif @name == "local"
@@ -373,7 +373,7 @@ module Autoproj
                     end
 
                     name_match = name
-                    if name_match =~ /[^\w\/_-]/
+                    if name_match =~ /[^\w\/-]/
                         name_match = Regexp.new("^" + name_match)
                     end
                     if name_match === package_name
@@ -435,7 +435,7 @@ module Autoproj
                 return enum_for(:each_package)
             end
 
-            Autoproj.manifest.packages.each_value do |pkg|
+            manifest.packages.each_value do |pkg|
                 if pkg.package_set.name == name
                     yield(pkg.autobuild)
                 end

data/lib/autoproj/system.rb

@@ -121,16 +121,6 @@ module Autoproj
         Autobuild.env_inherit(*names)
     end
 
-    # Find the given program in PATH. It raises ArgumentError if the program
-    # can't be found
-    def self.find_in_path(name)
-        result = ENV['PATH'].split(':').find { |dir| File.file?(File.join(dir, name)) }
-        if !result
-            raise ArgumentError, "#{name} can not be found in PATH (#{ENV['PATH']})"
-        end
-        File.join(result, name)
-    end
-
     # @deprecated use isolate_environment instead
     def self.set_initial_env
         isolate_environment

data/lib/autoproj/vcs_definition.rb

@@ -56,8 +56,6 @@ module Autoproj
         #   - package_name
         #     branch: value
         def self.vcs_definition_to_hash(spec)
-            options = Hash.new
-
             plain = Array.new
             filtered_spec = Hash.new
             spec.each do |key, value|

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.9.7.rc9"
+    VERSION = "1.9.7.rc10"
 end

data/test/data/os_release.with_complex_version_field

@@ -0,0 +1,3 @@
+ID="name"
+VERSION_ID="version_id"
+VERSION="version, codename (codename_bis)"

data/test/data/os_release.with_duplicate_values

@@ -0,0 +1,3 @@
+ID="id"
+VERSION="codename (version_id)"
+VERSION_ID=version_id

data/test/data/os_release.with_missing_optional_fields

@@ -0,0 +1,2 @@
+ID='name'
+VERSION_ID='version_id'

data/test/data/os_release.with_quoted_and_unquoted_fields

@@ -0,0 +1,2 @@
+ID=name
+VERSION_ID="version_id"

data/test/data/test_manifest/autoproj/local_set/source.yml

@@ -0,0 +1 @@
+name: local_set

data/test/data/test_manifest/autoproj/manifest

@@ -1,6 +1,5 @@
-sources:
-    - ./local
-    - git:remote1.git
+package_sets:
+    - ./local_set
     - type: git
       url: remote2.git
       branch: next

data/test/package_managers/test_gem.rb

@@ -87,6 +87,11 @@ class TC_OSDependencies_Gem < Test::Unit::TestCase
         assert_equal [], gem_manager.filter_uptodate_packages([['pkg0', '>= 0.9']])
     end
 
+    # Helper to have a shortcut for the default install options
+    def default_install_options
+        Autoproj::PackageManagers::GemManager.default_install_options
+    end
+
     def test_install_packages
         PackageManagers::GemManager.with_prerelease = false
         PackageManagers::GemManager.with_doc = false
@@ -94,11 +99,11 @@ class TC_OSDependencies_Gem < Test::Unit::TestCase
 
         packages = [['pkg0'], ['pkg1', '>= 0.5'], ['pkg2'], ['pkg3', '>= 0.9']]
         subprocess.should_receive(:run).
-            with(any, any, 'mygem', 'install', '--no-rdoc', '--no-ri', 'pkg0', 'pkg2').once
+            with(any, any, any, any, 'mygem', 'install', *default_install_options, '--no-rdoc', '--no-ri', 'pkg0', 'pkg2').once
         subprocess.should_receive(:run).
-            with(any, any, 'mygem', 'install', '--no-rdoc', '--no-ri', 'pkg1', '-v', '>= 0.5').once
+            with(any, any, any, any, 'mygem', 'install', *default_install_options, '--no-rdoc', '--no-ri', 'pkg1', '-v', '>= 0.5').once
         subprocess.should_receive(:run).
-            with(any, any, 'mygem', 'install', '--no-rdoc', '--no-ri', 'pkg3', '-v', '>= 0.9').once
+            with(any, any, any, any, 'mygem', 'install', *default_install_options, '--no-rdoc', '--no-ri', 'pkg3', '-v', '>= 0.9').once
         gem_manager.install(packages)
     end
 
@@ -109,7 +114,7 @@ class TC_OSDependencies_Gem < Test::Unit::TestCase
 
         packages = [['pkg0']]
         subprocess.should_receive(:run).
-            with(any, any, 'mygem', 'install', 'pkg0').once
+            with(any, any, any, any, 'mygem', 'install', *default_install_options, 'pkg0').once
         gem_manager.install([['pkg0']])
     end
 
@@ -119,7 +124,7 @@ class TC_OSDependencies_Gem < Test::Unit::TestCase
         subprocess = flexmock(Autobuild::Subprocess)
 
         subprocess.should_receive(:run).
-            with(any, any, 'mygem', 'install', '--prerelease', 'pkg0').once
+            with(any, any, any, any, 'mygem', 'install', *default_install_options, '--prerelease', 'pkg0').once
         gem_manager.install([['pkg0']])
     end
 

data/test/test_manifest.rb

@@ -8,30 +8,22 @@ class TC_Manifest < Test::Unit::TestCase
     DATA_DIR = File.expand_path('data', File.dirname(__FILE__))
     include Autoproj
 
-    def test_each_sources
+    def test_each_package_set
         Dir.chdir(File.join(DATA_DIR, 'test_manifest', 'autoproj')) do
             manifest = Manifest.load(File.join(DATA_DIR, 'test_manifest', 'autoproj', 'manifest'))
-            sources  = manifest.each_source.to_set
+            sources  = manifest.each_package_set(false).to_set
 
             test_data      = "#{DATA_DIR}/test_manifest"
             test_data_name = test_data.gsub '/', '_'
 
-            expected = [
-                 ["#{test_data_name}_autoproj_local", "local",
-                    "#{test_data}/autoproj/local",
-                    "#{test_data}/autoproj/local",
-                    {}],
-                 ["#{test_data_name}_remote1_git", "git",
-                    "#{test_data}/remote1.git",
-                    "#{test_data}/autoproj/remotes/_home_doudou_src_autoproj_test_data_test_manifest_remote1_git",
-                    {}],
-                 ["#{test_data_name}_remote2_git", "git",
-                    "#{test_data}/remote2.git",
-                    "#{test_data}/autoproj/remotes/_home_doudou_src_autoproj_test_data_test_manifest_remote2_git",
-                    {:branch=>"next"}]
-            ]
-
-            assert_equal(expected.to_set, sources)
+            local_set = sources.find { |pkg_set| pkg_set.name == 'local_set' }
+            assert local_set
+            assert_equal "#{test_data}/autoproj/local_set", local_set.raw_local_dir
+            assert local_set.local?
+
+            remote_set = sources.find { |pkg_set| pkg_set.name == "git:remote2.git branch=next"}
+            assert remote_set, "available package sets: #{sources.map(&:name)}"
+            assert_equal "#{test_data}/.remotes/git__home_doudou_dev_rock_master_tools_autoproj_test_data_test_manifest_remote2_git", remote_set.raw_local_dir
         end
     end
 

data/test/test_os_dependencies.rb

@@ -516,5 +516,37 @@ class TC_OSDependencies < Test::Unit::TestCase
         flexmock(OSDependencies).should_receive(:supported_operating_system?).and_return(false)
         assert_equal [[osdeps.os_package_handler, ['a_package']]], osdeps.resolve_os_dependencies(['a_package'])
     end
+
+    DATA_DIR = File.expand_path('data', File.dirname(__FILE__))
+    def test_os_from_os_release_returns_nil_if_the_os_release_file_is_not_found
+        assert !Autoproj::OSDependencies.os_from_os_release('does_not_exist')
+    end
+    def test_os_from_os_release_handles_quoted_and_unquoted_fields
+        names, versions = Autoproj::OSDependencies.os_from_os_release(
+            File.join(DATA_DIR, 'os_release.with_missing_optional_fields'))
+        assert_equal ['name'], names
+        assert_equal ['version_id'], versions
+    end
+    def test_os_from_os_release_handles_optional_fields
+        names, versions = Autoproj::OSDependencies.os_from_os_release(
+            File.join(DATA_DIR, 'os_release.with_missing_optional_fields'))
+        assert_equal ['name'], names
+        assert_equal ['version_id'], versions
+    end
+    def test_os_from_os_release_parses_the_version_field
+        _, versions = Autoproj::OSDependencies.os_from_os_release(
+            File.join(DATA_DIR, 'os_release.with_complex_version_field'))
+        assert_equal ['version_id', 'version', 'codename', 'codename_bis'], versions
+    end
+    def test_os_from_os_release_removes_duplicate_values
+        names, versions = Autoproj::OSDependencies.os_from_os_release(
+            File.join(DATA_DIR, 'os_release.with_duplicate_values'))
+        assert_equal ['id'], names
+        assert_equal ['version_id', 'codename'], versions
+    end
+    def test_os_from_lsb_returns_nil_if_lsb_release_is_not_found_in_path
+        flexmock(ENV).should_receive('[]').with('PATH').and_return('')
+        assert !Autoproj::OSDependencies.os_from_lsb
+    end
 end
 

data/test/test_package_manifest.rb

@@ -59,7 +59,7 @@ class TC_PackageManifest < Test::Unit::TestCase
 
     def test_failure_on_wrong_document
         data = File.join(DATA_DIR, 'invalid_manifest.xml')
-        assert_raises(Autoproj::ConfigError) { Autoproj::PackageManifest.load(pkg, data) }
+        assert_raises(Autobuild::PackageException) { Autoproj::PackageManifest.load(pkg, data) }
     end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.9.7.rc9
+  version: 1.9.7.rc10
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
@@ -183,7 +183,12 @@ files:
 - test/data/empty_manifest.xml
 - test/data/full_manifest.xml
 - test/data/invalid_manifest.xml
-- test/data/test_manifest/autoproj/local/local.autobuild
+- test/data/os_release.with_complex_version_field
+- test/data/os_release.with_duplicate_values
+- test/data/os_release.with_missing_optional_fields
+- test/data/os_release.with_quoted_and_unquoted_fields
+- test/data/test_manifest/autoproj/local_set/local.autobuild
+- test/data/test_manifest/autoproj/local_set/source.yml
 - test/data/test_manifest/autoproj/manifest
 - test/package_managers/apt-dpkg-status
 - test/package_managers/apt-dpkg-status.installed-last
@@ -191,7 +196,6 @@ files:
 - 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_manifest.rb
 - test/test_os_dependencies.rb
 - test/test_package_manifest.rb
@@ -225,7 +229,6 @@ specification_version: 3
 summary: Easy installation and management of sets of software packages
 test_files:
 - test/test_os_dependencies.rb
-- test/test_debian.rb
 - test/test_manifest.rb
 - test/package_managers/test_apt_dpkg_manager.rb
 - test/package_managers/test_gem.rb

data/test/test_debian.rb

@@ -1,16 +0,0 @@
-$LOAD_PATH.unshift File.expand_path('../lib', File.dirname(__FILE__))
-require 'test/unit'
-require 'autoproj/system'
-
-class TC_Debian < Test::Unit::TestCase
-    def test_debian_detection
-        assert Autoproj.on_debian?
-    end
-
-    def test_apt_version
-        apt_version = Autoproj.apt_version
-        version_string = apt_version.join(".")
-        assert `apt-get -v` =~ /#{Regexp.quote(version_string)}/
-    end
-end
-