autoproj 1.8.0.rc5 → 1.8.0.rc6

data/Rakefile

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

data/bin/autoproj_bootstrap

@@ -1736,17 +1736,51 @@ end
 
 DEFS = <<EODEFS
 --- 
-lsb_release: 
-  debian,ubuntu: lsb-release
+archive: 
+  arch: 
+  - tar
+  - unzip
+  debian,ubuntu: 
+  - tar
+  - unzip
+  gentoo: 
+  - app-arch/tar
+  - app-arch/unzip
+svn: 
+  arch: subversion
+  debian,ubuntu: subversion
+  gentoo: dev-util/subversion
+cmake: 
+  arch: cmake
+  debian,ubuntu: cmake
+  gentoo: dev-util/cmake
+libxml2: 
+  arch: libxml2
+  debian,ubuntu: libxml2-dev
+  gentoo: dev-libs/libxml2
+build-essential: 
   arch: ignore
-  gentoo: sys-apps/lsb-release
-autoproj: gem
+  debian,ubuntu: build-essential
+  gentoo: ignore
+git: 
+  arch: git
+  debian: 
+    default: git-core
+    lenny: git
+  ubuntu: git-core
+  gentoo: dev-vcs/git
+libxslt: 
+  arch: libxslt
+  debian,ubuntu: libxslt1-dev
+  gentoo: dev-libs/libxslt
 ruby19: 
   arch: 
   - ruby
   - rake
-  gentoo: 
-  - dev-lang/ruby:1.9
+  debian: 
+  - ruby1.9.1
+  - ruby1.9.1-dev
+  - rubygems1.9.1
   - rake
   ubuntu: 
   - ruby1.9.1
@@ -1755,10 +1789,8 @@ ruby19:
   - ri1.9.1
   - libopenssl-ruby1.9.1
   - rake
-  debian: 
-  - ruby1.9.1
-  - ruby1.9.1-dev
-  - rubygems1.9.1
+  gentoo: 
+  - dev-lang/ruby:1.9
   - rake
 ruby18: 
   debian,ubuntu: 
@@ -1771,57 +1803,25 @@ ruby18:
   gentoo: 
   - dev-lang/ruby:1.8
   - rake
-cvs: 
-  debian,ubuntu: cvs
-autobuild: gem
-cmake: 
-  debian,ubuntu: cmake
-  arch: cmake
-  gentoo: dev-util/cmake
-libxml2: 
-  debian,ubuntu: libxml2-dev
-  arch: libxml2
-  gentoo: dev-libs/libxml2
-git: 
-  arch: git
-  gentoo: dev-vcs/git
-  ubuntu: git-core
-  debian: 
-    lenny: git
-    default: git-core
-libxslt: 
-  debian,ubuntu: libxslt1-dev
-  arch: libxslt
-  gentoo: dev-libs/libxslt
-svn: 
-  debian,ubuntu: subversion
-  arch: subversion
-  gentoo: dev-util/subversion
-archive: 
-  debian,ubuntu: 
-  - tar
-  - unzip
-  arch: 
-  - tar
-  - unzip
-  gentoo: 
-  - app-arch/tar
-  - app-arch/unzip
 none: ignore
-build-essential: 
-  debian,ubuntu: build-essential
-  arch: ignore
-  gentoo: ignore
+autoproj: gem
+zlib: 
+  debian,ubuntu: zlib1g-dev
 autotools: 
+  arch: automake autoconf
   debian,ubuntu: 
   - automake1.9
   - autoconf
-  arch: automake autoconf
   gentoo: 
   - sys-devel/automake:1.9
   - sys-devel/autoconf
-zlib: 
-  debian,ubuntu: zlib1g-dev
+lsb_release: 
+  arch: ignore
+  debian,ubuntu: lsb-release
+  gentoo: sys-apps/lsb-release
+cvs: 
+  debian,ubuntu: cvs
+autobuild: gem
 
 EODEFS
 

data/lib/autoproj/base.rb

@@ -1,4 +1,12 @@
+require 'yaml'
 module Autoproj
+    YAML_LOAD_ERROR =
+        if defined? Psych::SyntaxError
+            Psych::SyntaxError
+        else
+            ArgumentError
+        end
+            
     class ConfigError < RuntimeError
         attr_accessor :file
         def initialize(file = nil)

data/lib/autoproj/manifest.rb

@@ -620,7 +620,7 @@ module Autoproj
                 raise ConfigError.new, "source #{vcs.type}:#{vcs.url} should have a source.yml file, but does not"
             end
 
-            source_definition = Autoproj.in_file(source_file, ArgumentError) do
+            source_definition = Autoproj.in_file(source_file, Autoproj::YAML_LOAD_ERROR) do
                 YAML.load(File.read(source_file))
             end
 
@@ -882,7 +882,7 @@ module Autoproj
         def raw_description_file
             path = source_file
             if File.file?(path)
-                data = Autoproj.in_file(path, ArgumentError) do
+                data = Autoproj.in_file(path, Autoproj::YAML_LOAD_ERROR) do
                     YAML.load(File.read(path)) || Hash.new
                 end
                 data['name'] = 'local'
@@ -1006,7 +1006,7 @@ module Autoproj
                 raise ConfigError.new(File.dirname(file)), "expected an autoproj configuration in #{File.dirname(file)}, but #{file} does not exist"
             end
 
-            data = Autoproj.in_file(file, ArgumentError) do
+            data = Autoproj.in_file(file, Autoproj::YAML_LOAD_ERROR) do
                 YAML.load(File.read(file))
             end
 

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.8.0.rc5"
+    VERSION = "1.8.0.rc6"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: -1441156394
+  hash: -1525039966
   prerelease: 6
   segments: 
   - 1
   - 8
   - 0
   - rc
-  - 5
-  version: 1.8.0.rc5
+  - 6
+  version: 1.8.0.rc6
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-04 00:00:00 Z
+date: 2012-09-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: autobuild
@@ -27,7 +27,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -1441156546
+        hash: -1525040052
         segments: 
         - 1
         - 6
@@ -75,13 +75,14 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 47
         segments: 
         - 2
-        - 12
-        version: "2.12"
+        - 8
+        - 0
+        version: 2.8.0
   type: :development
   version_requirements: *id004
 description: |-
@@ -170,8 +171,7 @@ files:
 - test/test_os_dependencies.rb
 - test/package_managers/test_gem.rb
 - test/test_package_manifest.rb
-- .gemtest
-homepage: 
+homepage: http://rock-robotics.org/documentation/autoproj
 licenses: []
 
 post_install_message: 
@@ -203,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: autobuild
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Easy installation and management of software packages