autoproj 1.2.5 → 1.2.6

data/History.txt

@@ -1,3 +1,6 @@
+= Version 1.2.6
+ * Fix mail reporting
+
 = Version 1.2.5
  * Quickfix release: fix "autoproj bootstrap VCS URL"
 

data/bin/autoproj

@@ -90,22 +90,22 @@ Additional options:
         exit
     end
     opts.on("--mail-from EMAIL", String, "From: field of the sent mails") do |from_email|
-        mail[:from] = from_email
+        mail_config[:from] = from_email
     end
     opts.on("--mail-to EMAILS", String, "comma-separated list of emails to which the reports should be sent") do |emails| 
-        mail[:to] ||= []
-        mail[:to] += emails.split(',')
+        mail_config[:to] ||= []
+        mail_config[:to] += emails.split(',')
     end
     opts.on("--mail-subject SUBJECT", String, "Subject: field of the sent mails") do |subject_email|
-        mail[:subject] = subject_email
+        mail_config[:subject] = subject_email
     end
     opts.on("--mail-smtp HOSTNAME", String, " address of the mail server written as hostname[:port]") do |smtp|
         raise "invalid SMTP specification #{smtp}" unless smtp =~ /^([^:]+)(?::(\d+))?$/
-            mail[:smtp] = $1
-        mail[:port] = Integer($2) if $2 && !$2.empty?
+            mail_config[:smtp] = $1
+        mail_config[:port] = Integer($2) if $2 && !$2.empty?
     end
     opts.on("--mail-only-errors", "send mail only on errors") do
-        mail[:only_errors] = true
+        mail_config[:only_errors] = true
     end
 end
 
@@ -401,7 +401,7 @@ begin
     Autobuild.doc_errors = false
     Autobuild.do_doc = false
     if mail_config[:to]
-        Autobuild::Reporting << MailReporter.new(mail_config)
+        Autobuild::Reporting << Autobuild::MailReporter.new(mail_config)
     end
 
     # First things first, see if we need to update ourselves

data/doc/guide/src/autoproj_bootstrap

@@ -157,7 +157,7 @@ module Autoproj
 
                 data = os_entry.last
                 # This package does not need to be installed on this operating system (example: build tools on Gentoo)
-                next if !data
+                next if !data || data == "ignore"
 
                 if data.kind_of?(Hash)
                     version_entry = data.find do |version_list, data|
@@ -187,21 +187,29 @@ module Autoproj
                 "\n" + shell_snippets
         end
 
-        def partition_packages(package_set)
+        # call-seq:
+        #   partition_packages(package_names) => os_packages, gem_packages
+        def partition_packages(package_set, package_osdeps = Hash.new)
             package_set = package_set.to_set
             osdeps, gems = [], []
             package_set.to_set.each do |name|
                 pkg_def = definitions[name]
                 if !pkg_def
-                    raise ConfigError, "I know nothing about a prepackaged '#{name}' software"
+                    msg = "I know nothing about a prepackaged software called '#{name}'"
+                    if pkg_names = package_osdeps[name]
+                        msg += ", it is listed as dependency of the following package(s): #{pkg_names.join(", ")}"
+                    end
+
+                    raise ConfigError, msg
                 end
 
                 if pkg_def.respond_to?(:to_str)
                     case(pkg_def.to_str)
+                    when "ignore" then
                     when "gem" then
                         gems << name
                     else
-                        raise ConfigError, "unknown OS-independent package management type #{pkg_def}"
+                        raise ConfigError, "unknown OS-independent package management type #{pkg_def} for #{name}"
                     end
                 else
                     osdeps << name
@@ -210,8 +218,9 @@ module Autoproj
             return osdeps, gems
         end
 
-        def install(packages)
-            osdeps, gems = partition_packages(packages)
+        # Requests the installation of the given set of packages
+        def install(packages, package_osdeps = Hash.new)
+            osdeps, gems = partition_packages(packages, package_osdeps)
 
             did_something = false
 
@@ -278,6 +287,8 @@ end
 
 DEFS = <<EODEFS
 # The following definitions are needed to bootstrap autoproj
+none: ignore
+
 ruby:
     debian,ubuntu:
         - ruby1.8-dev

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.2.5"
+    VERSION = "1.2.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-28 00:00:00 +01:00
+date: 2009-12-22 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -90,7 +90,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
+        version: 2.4.0
     version: 
 description: |-
   What is Autoproj