autoproj 1.8.2.b4 → 1.8.2.b5

data/bin/autoproj_bootstrap

@@ -742,7 +742,7 @@ fi
             else
                 if !@operating_system.nil?
                     return @operating_system
-                elsif Autoproj.has_config_key?('operating_system')
+                elsif Autoproj.has_config_key?('operating_system') && !(user_os = ENV['AUTOPROJ_OS'])
                     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) } &&
@@ -1004,6 +1004,9 @@ fi
                             found_keys[idx][0] += rec_found
                             found_keys[idx][1].concat(rec_result)
                         end
+
+                        # We only consider the first matching entry
+                        keys = nil
                     end
                 end
             end
@@ -1641,6 +1644,7 @@ 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'
@@ -1670,7 +1674,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_file(shell_file)
+                    Autobuild.env_source_after(shell_file)
                 end
             end
         end
@@ -1735,93 +1739,86 @@ module Autoproj
 end
 
 DEFS = <<EODEFS
----
-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
-ruby19:
-  debian:
+--- 
+build-essential: 
+  arch: ignore
+  gentoo: ignore
+  debian,ubuntu: build-essential
+ruby19: 
+  ubuntu: 
   - ruby1.9.1
   - ruby1.9.1-dev
   - rubygems1.9.1
+  - ri1.9.1
+  - libopenssl-ruby1.9.1
   - rake
-  ubuntu:
+  arch: 
+  - ruby
+  - rake
+  gentoo: 
+  - dev-lang/ruby:1.9
+  - rake
+  debian: 
   - ruby1.9.1
   - ruby1.9.1-dev
   - rubygems1.9.1
-  - ri1.9.1
-  - libopenssl-ruby1.9.1
   - rake
-  gentoo:
-  - dev-lang/ruby:1.9
+  - rubygems-integration
+ruby18: 
+  gentoo: 
+  - dev-lang/ruby:1.8
   - rake
-  arch:
-  - ruby
+  debian,ubuntu: 
+  - ruby1.8-dev
+  - ruby1.8
+  - rubygems1.8
+  - ri1.8
+  - libopenssl-ruby1.8
   - rake
-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
-  gentoo: dev-util/subversion
-  arch: subversion
-cmake:
-  debian,ubuntu: cmake
-  gentoo: dev-util/cmake
-  arch: cmake
-autotools:
-  debian,ubuntu:
-  - automake1.9
-  - autoconf
-  gentoo:
-  - sys-devel/automake:1.9
-  - sys-devel/autoconf
-  arch: automake autoconf
-lsb_release:
-  debian,ubuntu: lsb-release
-  gentoo: sys-apps/lsb-release
-  arch: ignore
-archive:
-  debian,ubuntu:
+archive: 
+  arch: 
   - tar
   - unzip
-  gentoo:
+  gentoo: 
   - app-arch/tar
   - app-arch/unzip
-  arch:
+  debian,ubuntu: 
   - tar
   - unzip
-cvs:
+cmake: 
+  arch: cmake
+  gentoo: dev-util/cmake
+  debian,ubuntu: cmake
+svn: 
+  arch: subversion
+  gentoo: dev-util/subversion
+  debian,ubuntu: subversion
+autobuild: gem
+autotools: 
+  arch: automake autoconf
+  gentoo: 
+  - sys-devel/automake:1.9
+  - sys-devel/autoconf
+  debian,ubuntu: 
+  - automake1.9
+  - autoconf
+git: 
+  ubuntu: git-core
+  arch: git
+  gentoo: dev-vcs/git
+  debian: 
+    lenny: git
+    default: git-core
+none: ignore
+cvs: 
   debian,ubuntu: cvs
+lsb_release: 
+  arch: ignore
+  gentoo: sys-apps/lsb-release
+  debian,ubuntu: lsb-release
+autoproj: gem
+zlib: 
+  debian,ubuntu: zlib1g-dev
 
 EODEFS
 

data/lib/autoproj/default.osdeps

@@ -19,6 +19,7 @@ ruby19:
         - ruby1.9.1-dev
         - rubygems1.9.1
         - rake
+        - rubygems-integration
 
     ubuntu:
         - ruby1.9.1
@@ -39,16 +40,6 @@ 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,6 +125,18 @@ 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
@@ -562,7 +574,7 @@ module Autoproj
             if local?
                 File.expand_path(vcs.url)
             else
-                File.expand_path(File.join(Autoproj.remotes_dir, vcs.to_s.gsub(/[^\w]/, '_')))
+                File.expand_path(File.join(Autoproj.remotes_dir, vcs.create_autobuild_importer.repository_id.gsub(/[^\w]/, '_')))
             end
         end
 
@@ -1727,7 +1739,11 @@ module Autoproj
             elsif !available_as_source
                 raise ConfigError, "cannot resolve #{name}: it is not a package, not a metapackage and not an osdeps"
             end
-            return [[:package, name]]
+            if source_packages
+                return source_packages
+            else
+                return [[:package, name]]
+            end
         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')
+                elsif Autoproj.has_config_key?('operating_system') && !(user_os = ENV['AUTOPROJ_OS'])
                     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) } &&
@@ -905,6 +905,9 @@ fi
                             found_keys[idx][0] += rec_found
                             found_keys[idx][1].concat(rec_result)
                         end
+
+                        # We only consider the first matching entry
+                        keys = nil
                     end
                 end
             end

data/lib/autoproj/system.rb

@@ -106,6 +106,7 @@ 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'
@@ -135,7 +136,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_file(shell_file)
+                    Autobuild.env_source_after(shell_file)
                 end
             end
         end

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.8.2.b4"
+    VERSION = "1.8.2.b5"
 end

data/test/test_os_dependencies.rb

@@ -107,12 +107,13 @@ 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']]]
@@ -321,6 +322,26 @@ class TC_OSDependencies < Test::Unit::TestCase
         assert_equal expected, osdeps.resolve_package('pkg')
     end
 
+    def test_specific_os_version_supersedes_nonspecific_one
+        data = { 'pkg' =>
+                 { 'test' => { 'gem' => 'gempkg' },
+                   'debian' => 'binary_package'
+                 }
+               }
+        osdeps = create_osdep(data)
+        expected = [[osdeps.package_handlers['gem'], FOUND_PACKAGES, ['gempkg']]]
+        assert_equal expected, osdeps.resolve_package('pkg')
+
+        data = { 'pkg' =>
+                 { 'test' => 'binary_package',
+                   'default' => { 'gem' => 'gem_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,76 +1,107 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: autoproj
-version: !ruby/object:Gem::Version
-  version: 1.8.2.b4
+version: !ruby/object:Gem::Version 
+  hash: 1750541319
   prerelease: 6
+  segments: 
+  - 1
+  - 8
+  - 2
+  - b
+  - 5
+  version: 1.8.2.b5
 platform: ruby
-authors:
+authors: 
 - Rock Core Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-10-04 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: autobuild
-  requirement: &6460040 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3080299933
+        segments: 
+        - 1
+        - 6
+        - 0
+        - rc
+        - 1
         version: 1.6.0.rc1
   type: :runtime
-  prerelease: false
-  version_requirements: *6460040
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: utilrb
-  requirement: &6441180 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 6
+        - 0
         version: 1.6.0
   type: :runtime
-  prerelease: false
-  version_requirements: *6441180
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: highline
-  requirement: &6440380 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 5
+        - 0
         version: 1.5.0
   type: :runtime
-  prerelease: false
-  version_requirements: *6440380
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: &6439300 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 3
+        - 10
+        version: "3.10"
   type: :development
-  prerelease: false
-  version_requirements: *6439300
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: hoe
-  requirement: &6438600 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.1'
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        - 1
+        version: "3.1"
   type: :development
-  prerelease: false
-  version_requirements: *6438600
-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.
+  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.
 email: rock-dev@dfki.de
-executables:
+executables: 
 - amake
 - aup
 - autolocate
@@ -81,12 +112,13 @@ 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
@@ -125,39 +157,49 @@ 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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
+
 rubyforge_project: autobuild
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Easy installation and management of sets of software packages
-test_files:
-- test/test_manifest.rb
-- test/test_package_manifest.rb
+test_files: 
 - test/test_os_dependencies.rb
-- test/test_debian.rb
 - test/package_managers/test_gem.rb
+- test/test_manifest.rb
+- test/test_debian.rb
+- test/test_package_manifest.rb