autoproj 1.11.0.b3 → 1.11.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9bddbed5843f00a95b7b18d043b2b4b9793fbc6
-  data.tar.gz: 392659a2bb4009fde57fd5a72480193919752381
+  metadata.gz: 2355dd362e769ce1badfc7e1fee1fedfe9cdd0a8
+  data.tar.gz: 4240e201c16d859dae7c5694546407c150c2bbdb
 SHA512:
-  metadata.gz: 430da15aab04ac6421ff38116ffb24b151669d632bb70e81d360117c3a36b8381fdac41a0080129d419c5d39837126636d4606659784186222b86d888f32eefc
-  data.tar.gz: 8576957180d5a637bb43949ca77fe5cd7d411699054827ba4d56e00bc9ca600fa1bf6b66b349b316189b45bbfd1eaaf2f3a2c60fb7cca666de9d791da58cfe41
+  metadata.gz: 5ea9258e525c023bedb01672cb6b23384a5d55d77d6939153435e976a8009597db453cacabda6f7170fa140bb788c9dac15ea10528d9e4e595a8f360748dfe6e
+  data.tar.gz: 3cd7404f69a2d0d706ab170e8733123810867b58ef2256d1d351571b91df5671133e0f270169ec586a73b27117a100257cc7e99369219fbb2d9e6e8e9f94aa2b

data/bin/autoproj-bootstrap

@@ -43,13 +43,8 @@ EOTEXT
 #{color('autoproj bootstrap failed', :red, :bold)}
 To retry, first source the #{Autoproj::ENV_FILENAME} script with
   source #{root_dir}/#{Autoproj::ENV_FILENAME}
-and then re-run autoproj bootstrap with
-  autoproj bootstrap <vcs_type> <vcs_url> <vcs_options>
-
-where
-  'vcs_type' is git, svn, darcs, cvs
-  'vcs_url' is the vcs-specific URL to the repository, and
-  'vcs_options' are optional values that can be given to the chosen VCS
+and then re-run autoproj bootstrap
+  autoproj bootstrap '#{ARGV.join("'")}'
     EOTEXT
 
         raise

data/bin/autoproj-show

@@ -75,7 +75,7 @@ packages.each do |name|
 
     packages.each do |pkg_name|
         puts Autoproj.color("source package #{pkg_name}", :bold)
-        puts "  imported from"
+        puts "  source definition"
         vcs = Autoproj.manifest.importer_definition_for(pkg_name)
 
         fragments = []

data/lib/autoproj/package_manifest.rb

@@ -32,6 +32,16 @@ module Autoproj
             result
         end
 
+        def has_documentation?
+            xml.elements.each('package/description') do |node|
+                doc = (node.text || "").strip
+                if !doc.empty?
+                    return true
+                end
+            end
+            return false
+        end
+
         def documentation
             xml.elements.each('package/description') do |node|
                 doc = (node.text || "").strip
@@ -102,6 +112,20 @@ module Autoproj
             end
         end
 
+        def each_maintainer
+            if !block_given?
+                return enum_for(:each_maintainer)
+            end
+
+            xml.elements.each('package/maintainer') do |maintainer|
+                (maintainer.text || "").strip.split(',').each do |str|
+                    name, email = str.split('/').map(&:strip)
+                    email = nil if email && email.empty?
+                    yield(name, email)
+                end
+            end
+        end
+
         # Enumerates the name and email of each author. If no email is present,
         # yields (name, nil)
         def each_author

data/lib/autoproj/package_set.rb

@@ -13,6 +13,20 @@ module Autoproj
             end
         end
 
+        @source_files = ["source.yml"]
+        class << self
+            attr_reader :source_files
+
+            def master_source_file
+                source_files.first
+            end
+
+            def add_source_file(name)
+                source_files.delete(name)
+                source_files << name
+            end
+        end
+
         # @return [Manifest] the manifest this package set is being used by
         attr_reader :manifest
 
@@ -249,19 +263,30 @@ module Autoproj
                 raise InternalError, "source #{vcs} has not been fetched yet, cannot load description for it"
             end
 
-            source_file = File.join(raw_local_dir, "source.yml")
-            if !File.exists?(source_file)
+            master_source_file = File.join(raw_local_dir, PackageSet.master_source_file)
+            if !File.exists?(master_source_file)
                 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, Autoproj::YAML_LOAD_ERROR) do
-                YAML.load(File.read(source_file))
-            end
+            source_definition = Hash.new
+            PackageSet.source_files.each do |name|
+                source_file = File.join(raw_local_dir, name)
+                next if !File.file?(source_file)
 
-            if !source_definition || !source_definition['name']
-                raise ConfigError.new(source_file), "in #{source_file}: missing a 'name' field"
+                newdefs = Autoproj.in_file(source_file, Autoproj::YAML_LOAD_ERROR) do
+                    YAML.load(File.read(source_file))
+                end
+                source_definition.merge!(newdefs || Hash.new) do |k, old, new|
+                    if old.respond_to?(:to_ary)
+                        old + new
+                    else new
+                    end
+                end
             end
 
+            if !source_definition['name']
+                raise ConfigError.new(master_source_file), "in #{master_source_file}: missing a 'name' field"
+            end
             source_definition
         end
 

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.11.0.b3"
+    VERSION = "1.11.0.rc1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.11.0.b3
+  version: 1.11.0.rc1
 platform: ruby
 authors:
 - Rock Core Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2014-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild