autoproj 1.8.2.b6 → 1.8.2.b7

data/bin/autoproj_bootstrap

@@ -742,7 +742,7 @@ fi
             else
                 if !@operating_system.nil?
                     return @operating_system
-                elsif Autoproj.has_config_key?('operating_system') && !(user_os = ENV['AUTOPROJ_OS'])
+                elsif Autoproj.has_config_key?('operating_system')
                     os = Autoproj.user_config('operating_system')
                     if os.respond_to?(:to_ary)
                         if os[0].respond_to?(:to_ary) && os[0].all? { |s| s.respond_to?(:to_str) } &&
@@ -951,7 +951,7 @@ fi
             found = false
             nonexistent = false
             result = []
-            found_keys = Hash.new
+            found_keys = []
             Array(dep_def).each do |names, values|
                 if !values
                     # Raw array of packages. Possible only if we are not at toplevel
@@ -997,15 +997,9 @@ 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)
-                        # 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
+
+                        if rec_found
+                            idx = keys.index(matching_name)
                             found_keys[idx] ||= [0, []]
                             found_keys[idx][0] += rec_found
                             found_keys[idx][1].concat(rec_result)
@@ -1013,9 +1007,7 @@ fi
                     end
                 end
             end
-            first_entry = found_keys.keys.sort.first
-            found_keys = found_keys[first_entry]
-            if found_keys
+            if found_keys = found_keys.compact.first
                 if found_keys[0] > 0
                     nonexistent = true
                 else
@@ -1649,7 +1641,6 @@ module Autoproj
     def self.set_initial_env
         Autoproj.env_set 'RUBYOPT', "-rubygems"
         Autoproj.env_set 'GEM_HOME', Autoproj.gem_home
-        Autoproj.env_add_path 'GEM_PATH', Autoproj.gem_home
         Autoproj.env_set_path 'PATH', "#{Autoproj.gem_home}/bin", "/usr/local/bin", "/usr/bin", "/bin"
         Autoproj.env_set 'PKG_CONFIG_PATH'
         Autoproj.env_set 'RUBYLIB'
@@ -1679,7 +1670,7 @@ module Autoproj
                     Autoproj.message
                     Autoproj.message "autodetected the shell to be #{shell_kind}, sourcing autoproj shell helpers"
                     Autoproj.message "add \"Autoproj.shell_helpers = false\" in autoproj/init.rb to disable"
-                    Autobuild.env_source_after(shell_file)
+                    Autobuild.env_source_file(shell_file)
                 end
             end
         end
@@ -1744,86 +1735,93 @@ module Autoproj
 end
 
 DEFS = <<EODEFS
---- 
-git: 
-  debian: 
-    default: git-core
-    lenny: git
-  arch: git
-  gentoo: dev-vcs/git
-  ubuntu: git-core
-autotools: 
-  debian,ubuntu: 
-  - automake1.9
-  - autoconf
-  arch: automake autoconf
-  gentoo: 
-  - sys-devel/automake:1.9
-  - sys-devel/autoconf
+---
 none: ignore
-cvs: 
-  debian,ubuntu: cvs
-cmake: 
-  debian,ubuntu: cmake
-  arch: cmake
-  gentoo: dev-util/cmake
-lsb_release: 
-  debian,ubuntu: lsb-release
-  arch: ignore
-  gentoo: sys-apps/lsb-release
-zlib: 
-  debian,ubuntu: zlib1g-dev
-autoproj: gem
-ruby19: 
-  debian: 
+ruby18:
+  debian,ubuntu:
+  - ruby1.8-dev
+  - ruby1.8
+  - rubygems1.8
+  - ri1.8
+  - libopenssl-ruby1.8
+  - rake
+  gentoo:
+  - dev-lang/ruby:1.8
+  - rake
+ruby19:
+  debian:
   - ruby1.9.1
   - ruby1.9.1-dev
   - rubygems1.9.1
   - rake
-  - rubygems-integration
-  arch: 
-  - ruby
-  - rake
-  gentoo: 
-  - dev-lang/ruby:1.9
-  - rake
-  ubuntu: 
+  ubuntu:
   - ruby1.9.1
   - ruby1.9.1-dev
   - rubygems1.9.1
   - ri1.9.1
   - libopenssl-ruby1.9.1
   - rake
-ruby18: 
-  debian,ubuntu: 
-  - ruby1.8-dev
-  - ruby1.8
-  - rubygems1.8
-  - ri1.8
-  - libopenssl-ruby1.8
+  gentoo:
+  - dev-lang/ruby:1.9
   - rake
-  gentoo: 
-  - dev-lang/ruby:1.8
+  arch:
+  - ruby
   - rake
-svn: 
+build-essential:
+  debian,ubuntu: build-essential
+  gentoo: ignore
+  arch: ignore
+libxml2:
+  debian,ubuntu: libxml2-dev
+  gentoo: dev-libs/libxml2
+  arch: libxml2
+libxslt:
+  debian,ubuntu: libxslt1-dev
+  gentoo: dev-libs/libxslt
+  arch: libxslt
+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
-  arch: subversion
   gentoo: dev-util/subversion
-archive: 
-  debian,ubuntu: 
-  - tar
-  - unzip
-  arch: 
+  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: 
+  gentoo:
   - app-arch/tar
   - app-arch/unzip
-autobuild: gem
-build-essential: 
-  debian,ubuntu: build-essential
-  arch: ignore
-  gentoo: ignore
+  arch:
+  - tar
+  - unzip
+cvs:
+  debian,ubuntu: cvs
 
 EODEFS
 

data/lib/autoproj/cmdline.rb

@@ -187,6 +187,9 @@ module Autoproj
                 Autoproj.load_if_present(source, source.local_dir, "init.rb")
             end
 
+            # Loads OS package definitions once and for all
+            Autoproj.load_osdeps_from_package_sets
+
             # Load the required autobuild definitions
             if !silent
                 Autoproj.message("autoproj: loading ...", :bold)
@@ -232,9 +235,6 @@ module Autoproj
             # is done (since we need to process the package setup blocks), but
             # save the current state of the configuration anyway.
             Autoproj.save_config
-
-            # Loads OS package definitions once and for all
-            Autoproj.load_osdeps_from_package_sets
         end
 
         def self.update_configuration

data/lib/autoproj/default.osdeps

@@ -19,7 +19,6 @@ ruby19:
         - ruby1.9.1-dev
         - rubygems1.9.1
         - rake
-        - rubygems-integration
 
     ubuntu:
         - ruby1.9.1
@@ -40,6 +39,16 @@ build-essential:
     gentoo: ignore
     arch: ignore
 
+libxml2:
+    debian,ubuntu: libxml2-dev
+    gentoo: dev-libs/libxml2
+    arch: libxml2
+
+libxslt:
+    debian,ubuntu: libxslt1-dev
+    gentoo: dev-libs/libxslt
+    arch: libxslt
+
 zlib:
     debian,ubuntu: zlib1g-dev
 

data/lib/autoproj/manifest.rb

@@ -125,18 +125,6 @@ module Autoproj
         Autobuild.env_source_file(file)
     end
 
-    # Requests that autoproj source the given shell script in its own env.sh
-    # script
-    def self.env_source_after(file)
-        Autobuild.env_source_after(file)
-    end
-
-    # Requests that autoproj source the given shell script in its own env.sh
-    # script
-    def self.env_source_before(file)
-        Autobuild.env_source_before(file)
-    end
-
     # Representation of a VCS definition contained in a source.yml file or in
     # autoproj/manifest
     class VCSDefinition
@@ -574,7 +562,7 @@ module Autoproj
             if local?
                 File.expand_path(vcs.url)
             else
-                File.expand_path(File.join(Autoproj.remotes_dir, vcs.create_autobuild_importer.repository_id.gsub(/[^\w]/, '_')))
+                File.expand_path(File.join(Autoproj.remotes_dir, vcs.to_s.gsub(/[^\w]/, '_')))
             end
         end
 
@@ -1739,11 +1727,7 @@ module Autoproj
             elsif !available_as_source
                 raise ConfigError, "cannot resolve #{name}: it is not a package, not a metapackage and not an osdeps"
             end
-            if source_packages
-                return source_packages
-            else
-                return [[:package, name]]
-            end
+            return [[:package, name]]
         end
 
         # +name+ can either be the name of a source or the name of a package. In

data/lib/autoproj/osdeps.rb

@@ -643,7 +643,7 @@ fi
             else
                 if !@operating_system.nil?
                     return @operating_system
-                elsif Autoproj.has_config_key?('operating_system') && !(user_os = ENV['AUTOPROJ_OS'])
+                elsif Autoproj.has_config_key?('operating_system')
                     os = Autoproj.user_config('operating_system')
                     if os.respond_to?(:to_ary)
                         if os[0].respond_to?(:to_ary) && os[0].all? { |s| s.respond_to?(:to_str) } &&
@@ -852,7 +852,7 @@ fi
             found = false
             nonexistent = false
             result = []
-            found_keys = Hash.new
+            found_keys = []
             Array(dep_def).each do |names, values|
                 if !values
                     # Raw array of packages. Possible only if we are not at toplevel
@@ -898,15 +898,9 @@ 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)
-                        # 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
+
+                        if rec_found
+                            idx = keys.index(matching_name)
                             found_keys[idx] ||= [0, []]
                             found_keys[idx][0] += rec_found
                             found_keys[idx][1].concat(rec_result)
@@ -914,9 +908,7 @@ fi
                     end
                 end
             end
-            first_entry = found_keys.keys.sort.first
-            found_keys = found_keys[first_entry]
-            if found_keys
+            if found_keys = found_keys.compact.first
                 if found_keys[0] > 0
                     nonexistent = true
                 else

data/lib/autoproj/system.rb

@@ -106,7 +106,6 @@ module Autoproj
     def self.set_initial_env
         Autoproj.env_set 'RUBYOPT', "-rubygems"
         Autoproj.env_set 'GEM_HOME', Autoproj.gem_home
-        Autoproj.env_add_path 'GEM_PATH', Autoproj.gem_home
         Autoproj.env_set_path 'PATH', "#{Autoproj.gem_home}/bin", "/usr/local/bin", "/usr/bin", "/bin"
         Autoproj.env_set 'PKG_CONFIG_PATH'
         Autoproj.env_set 'RUBYLIB'
@@ -136,7 +135,7 @@ module Autoproj
                     Autoproj.message
                     Autoproj.message "autodetected the shell to be #{shell_kind}, sourcing autoproj shell helpers"
                     Autoproj.message "add \"Autoproj.shell_helpers = false\" in autoproj/init.rb to disable"
-                    Autobuild.env_source_after(shell_file)
+                    Autobuild.env_source_file(shell_file)
                 end
             end
         end

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.8.2.b6"
+    VERSION = "1.8.2.b7"
 end

data/test/test_os_dependencies.rb

@@ -25,10 +25,12 @@ 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(['apt-dpkg']))
+        osdeps.os_package_handler = flexmock(PackageManagers::Manager.new)
+        osdeps.os_package_handler.should_receive('names').and_return(['apt-dpkg'])
         osdeps.package_handlers.clear
         osdeps.package_handlers['apt-dpkg'] = osdeps.os_package_handler
-        osdeps.package_handlers['gem'] = flexmock(PackageManagers::Manager.new(['gem']))
+        osdeps.package_handlers['gem'] = flexmock(PackageManagers::Manager.new)
+        osdeps.package_handlers['gem'].should_receive('names').and_return(['gem'])
         flexmock(osdeps)
     end
 
@@ -105,13 +107,12 @@ class TC_OSDependencies < Test::Unit::TestCase
     end
 
     def test_resolve_specific_os_name_and_version_fallback
-        data = { 'pkg' =>
-                 { 'test' => 
-                   { 'v1.1' => 'pkg1.1',
-                     'default' => 'pkgdef'
-                   }
-                 }        
-               }
+        data = { 'pkg' => {
+                'test' => {
+                    'v1.1' => 'pkg1.1',
+                    'default' => 'pkgdef'
+                 }
+        } }
         osdeps = create_osdep(data)
 
         expected = [[osdeps.os_package_handler, FOUND_PACKAGES, ['pkgdef']]]
@@ -320,28 +321,6 @@ class TC_OSDependencies < Test::Unit::TestCase
         assert_equal expected, osdeps.resolve_package('pkg')
     end
 
-    def test_specific_os_version_supersedes_nonspecific_one
-        data = { 'pkg' =>
-                 {
-                   'debian' => 'binary_package',
-                   'test' => { 'gem' => 'gempkg' }
-                 }
-               }
-        osdeps = create_osdep(data)
-        expected = [[osdeps.package_handlers['gem'], FOUND_PACKAGES, ['gempkg']]]
-        assert_equal expected, osdeps.resolve_package('pkg')
-
-        data = { 'pkg' =>
-                 {
-                   'default' => { 'gem' => 'gem_package' },
-                   'test' => 'binary_package'
-                 }
-               }
-        osdeps = create_osdep(data)
-        expected = [[osdeps.os_package_handler, FOUND_PACKAGES, ['binary_package']]]
-        assert_equal expected, osdeps.resolve_package('pkg')
-    end
-
     def test_availability_of
         osdeps = flexmock(OSDependencies.new)
         osdeps.should_receive(:resolve_package).with('pkg0').once.and_return(

metadata

@@ -1,107 +1,76 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: autoproj
-version: !ruby/object:Gem::Version 
-  hash: 2914478081
+version: !ruby/object:Gem::Version
+  version: 1.8.2.b7
   prerelease: 6
-  segments: 
-  - 1
-  - 8
-  - 2
-  - b
-  - 6
-  version: 1.8.2.b6
 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-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: autobuild
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &17010120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3474568203
-        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: *17010120
+- !ruby/object:Gem::Dependency
+  name: utilrb
+  requirement: &17009160 !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: *17009160
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: &17008280 !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: *17008280
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &17007580 !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: *17007580
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &17006800 !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: *17006800
+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
@@ -112,13 +81,12 @@ 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
@@ -157,49 +125,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