autoproj 1.6.2.rc2 → 1.6.2.rc3

data/bin/autoproj

@@ -68,7 +68,7 @@ where
   'vcs_options' are optional values that can be given to the chosen VCS
 EOTEXT
             end
-            raise
+            raise e
         end
 
     # Expand directories in the selected_packages set, before we chdir to the

data/doc/guide/src/autoproj_bootstrap

@@ -581,9 +581,12 @@ fi
                 if !installed.empty? && Autobuild.do_update
                     # Look if we can update the package ...
                     dep = Gem::Dependency.new(name, version_requirements)
-                    available = gem_fetcher.find_matching(dep)
+                    available = gem_fetcher.find_matching(dep, false, true, OSDependencies.gem_with_prerelease)
                     installed_version = installed.map(&:version).max
                     available_version = available.map { |(name, v), source| v }.max
+                    if !available_version
+                        raise ConfigError, "cannot find any gem with the name '#{name}'"
+                    end
                     needs_update = (available_version > installed_version)
                     !needs_update
                 else
@@ -716,7 +719,6 @@ with the corresponding option (--all, --ruby, --os or --none).
         end
 
         def self.osdeps_mode
-            puts caller.join("\n  ")
             while true
                 mode =
                     if !Autoproj.has_config_key?('osdeps_mode') &&
@@ -1097,16 +1099,50 @@ end
 
 DEFS = <<EODEFS
 --- 
+svn: 
+  arch: subversion
+  gentoo: dev-util/subversion
+  debian,ubuntu: subversion
+autobuild: gem
+zlib: 
+  debian,ubuntu: zlib1g-dev
+libxml2: 
+  arch: libxml2
+  gentoo: dev-libs/libxml2
+  debian,ubuntu: libxml2-dev
 none: ignore
+autotools: 
+  arch: automake autoconf
+  gentoo: 
+  - sys-devel/automake:1.9
+  - sys-devel/autoconf
+  debian,ubuntu: 
+  - automake1.9
+  - autoconf
+autoproj: gem
+archive: 
+  arch: 
+  - tar
+  - unzip
+  gentoo: 
+  - app-arch/tar
+  - app-arch/unzip
+  debian,ubuntu: 
+  - tar
+  - unzip
+lsb_release: 
+  arch: 
+  gentoo: sys-apps/lsb-release
+  debian,ubuntu: lsb-release
 ruby18: 
+  gentoo: 
+  - dev-lang/ruby:1.8
   debian,ubuntu: 
   - ruby1.8-dev
   - ruby1.8
   - rubygems1.8
   - ri1.8
   - libopenssl-ruby1.8
-  gentoo: 
-  - dev-lang/ruby:1.8
 ruby19: 
   debian: 
     squeeze,sid: 
@@ -1117,67 +1153,33 @@ ruby19:
     - ruby1.9.1
     - ruby1.9.1-dev
     - rubygems1.9.1
+  arch: 
+  - ruby
+  gentoo: 
+  - dev-lang/ruby:1.9
   ubuntu: 
   - ruby1.9.1
   - ruby1.9.1-dev
   - rubygems1.9.1
   - ri1.9.1
   - libopenssl-ruby1.9.1
-  gentoo: 
-  - dev-lang/ruby:1.9
-  arch: 
-  - ruby
-rdoc: gem
-build-essential: 
-  debian,ubuntu: build-essential
-  gentoo: 
-  arch: 
-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,ubuntu: git-core
-  gentoo: dev-vcs/git
   arch: git
-svn: 
-  debian,ubuntu: subversion
-  gentoo: dev-util/subversion
-  arch: subversion
+  gentoo: dev-vcs/git
+  debian,ubuntu: git-core
 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
+  gentoo: dev-util/cmake
+  debian,ubuntu: cmake
+build-essential: 
   arch: 
-archive: 
-  debian,ubuntu: 
-  - tar
-  - unzip
   gentoo: 
-  - app-arch/tar
-  - app-arch/unzip
-  arch: 
-  - tar
-  - unzip
+  debian,ubuntu: build-essential
+libxslt: 
+  arch: libxslt
+  gentoo: dev-libs/libxslt
+  debian,ubuntu: libxslt1-dev
+rdoc: gem
 
 EODEFS
 

data/lib/autoproj/cmdline.rb

@@ -97,15 +97,15 @@ module Autoproj
             Autoproj.osdeps = Autoproj::OSDependencies.load_default
             Autoproj.osdeps.silent = !osdeps?
             Autoproj.osdeps.filter_uptodate_packages = osdeps_filter_uptodate?
-            if Autoproj::CmdLine.osdeps_forced_mode
-                Autoproj.osdeps.osdeps_mode = Autoproj::CmdLine.osdeps_forced_mode
-            end
-            if @update_os_dependencies || Autoproj::CmdLine.osdeps?
-                Autoproj.reset_option('operating_system')
+            if osdeps_forced_mode
+                Autoproj.osdeps.osdeps_mode = osdeps_forced_mode
             end
             # Do that AFTER we have properly setup Autoproj.osdeps as to avoid
             # unnecessarily redetecting the operating system
 	    Autoproj::OSDependencies.define_osdeps_mode_option
+            if update_os_dependencies? || osdeps?
+                Autoproj.reset_option('operating_system')
+            end
             Autoproj.osdeps.osdeps_mode
         end
 

data/lib/autoproj/default.osdeps

@@ -15,11 +15,7 @@ ruby18:
 
 ruby19:
     debian:
-        squeeze,sid:
-            - ruby1.9.1
-            - ruby1.9.1-dev
-            - rubygems1.9.1
-        stable:
+        stable,squeeze,sid:
             - ruby1.9.1
             - ruby1.9.1-dev
             - rubygems1.9.1

data/lib/autoproj/options.rb

@@ -32,11 +32,13 @@ module Autoproj
         def doc
             doc = (options[:doc] || "#{name} (no documentation for this option)")
             if doc.respond_to?(:to_ary) # multi-line
-                first_line = Autoproj.color(doc[0], :bold)
+                first_line = doc[0]
                 remaining = doc[1..-1]
-                if !remaining.empty?
+                if remaining.empty?
+                    first_line
+                else
                     remaining = remaining.join("\n").split("\n").join("\n    ")
-                    first_line + "\n    " + remaining
+                    Autoproj.color(first_line, :bold) + "\n    " + remaining
                 end
             else
                 doc

data/lib/autoproj/osdeps.rb

@@ -482,9 +482,12 @@ fi
                 if !installed.empty? && Autobuild.do_update
                     # Look if we can update the package ...
                     dep = Gem::Dependency.new(name, version_requirements)
-                    available = gem_fetcher.find_matching(dep)
+                    available = gem_fetcher.find_matching(dep, false, true, OSDependencies.gem_with_prerelease)
                     installed_version = installed.map(&:version).max
                     available_version = available.map { |(name, v), source| v }.max
+                    if !available_version
+                        raise ConfigError, "cannot find any gem with the name '#{name}'"
+                    end
                     needs_update = (available_version > installed_version)
                     !needs_update
                 else
@@ -617,7 +620,6 @@ with the corresponding option (--all, --ruby, --os or --none).
         end
 
         def self.osdeps_mode
-            puts caller.join("\n  ")
             while true
                 mode =
                     if !Autoproj.has_config_key?('osdeps_mode') &&

data/lib/autoproj/system.rb

@@ -149,6 +149,8 @@ module Autoproj
     def self.load(source, *path)
         path = File.join(*path)
         Kernel.load path
+    rescue Interrupt
+        raise
     rescue Exception => e
         Autoproj.filter_load_exception(e, source, path)
     end

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.6.2.rc2"
+    VERSION = "1.6.2.rc3"
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
+  hash: 977940580
   prerelease: true
   segments: 
   - 1
   - 6
   - 2
-  - rc2
-  version: 1.6.2.rc2
+  - rc3
+  version: 1.6.2.rc3
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -26,6 +27,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 17
         segments: 
         - 1
         - 5
@@ -41,6 +43,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
@@ -56,6 +59,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 1
         - 3
@@ -71,6 +75,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 1
         - 3
@@ -86,6 +91,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 1
         - 5
@@ -101,6 +107,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 2
         - 0
@@ -116,6 +123,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 0
         - 5
@@ -131,6 +139,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 2
         - 4
@@ -146,6 +155,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 2
         - 6
@@ -257,6 +267,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -265,6 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
       - 1
       - 3