autoproj 1.13.0.b8 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f250951e26c204e89314f6959db2648261ae3c15
-  data.tar.gz: 1e7c8987de9f3dcc03e48d6a2c5e2818d7f83691
+  metadata.gz: 26fd2b3055fed7ae05cf424070645adff0461145
+  data.tar.gz: d3b0a4563a5a33767f57ceae457e46d3296a7cd2
 SHA512:
-  metadata.gz: f043202d310d0d90173f039a6db8e128adef5dc3ec258d4dcba382accc96aa03f37dde1ae7fb2c5db440980559c03ca12acbb12fc5a1799248d11495c9a50014
-  data.tar.gz: 4b6a533dae5d8aaab547f5bc6f38ef8d0291513b095da6ac115c1c93871675baeeab5452416b7db503094b13435eb6204ee6522351fd4204e65b9d6725c7c670
+  metadata.gz: 0ff86e87b351d820f46895f3560f5672b02e2fd42106ae89e94f1501d1d249eda8070f67516182cdfcf5cc1c074a141fe60dad3f79932ef456680d4afc1c5b20
+  data.tar.gz: 21d74bf9a38419528efa7059d1ca6622f9e278d551f024ec3e2e723a58023fa816602961c79ce1329390c1021dae562b224e56777e3d36e087b3da37f4514ea2

data/bin/autoproj-show

@@ -68,6 +68,18 @@ def vcs_to_array(vcs)
     end
 end
 
+def compute_all_revdeps(pkg_revdeps, revdeps)
+    pkg_revdeps = pkg_revdeps.dup
+    all_revdeps = Array.new
+    while !pkg_revdeps.empty?
+        parent_name = pkg_revdeps.shift
+        next if all_revdeps.include?(parent_name)
+        all_revdeps << parent_name
+        pkg_revdeps.concat(revdeps[parent_name].to_a)
+    end
+    all_revdeps
+end
+
 packages.each do |name|
     result = Autoproj.manifest.resolve_package_name(name, :filter => false)
     packages, osdeps = result.partition { |type, name| type == :package }
@@ -129,25 +141,21 @@ packages.each do |name|
         if !File.directory?(Autobuild::Package[pkg_name].srcdir)
             puts Autobuild.color("  this package is not checked out yet, the dependency information will probably be incomplete", :magenta)
         end
-        all_reverse_dependencies = Set.new
-        pkg_revdeps = revdeps[pkg_name].dup.to_a
-        while !pkg_revdeps.empty?
-            parent_name = pkg_revdeps.shift
-            next if all_reverse_dependencies.include?(parent_name)
-            all_reverse_dependencies << parent_name
-            pkg_revdeps.concat(revdeps[parent_name].to_a)
-        end
-        if all_reverse_dependencies.empty?
+
+        pkg_revdeps = revdeps[pkg_name].to_a
+        all_revdeps = compute_all_revdeps(pkg_revdeps, revdeps)
+        if pkg_revdeps.empty?
             puts "  no reverse dependencies"
         else
-            puts "  reverse dependencies: #{all_reverse_dependencies.sort.join(", ")}"
+            puts "  direct reverse dependencies: #{pkg_revdeps.sort.join(", ")}"
+            puts "  recursive reverse dependencies: #{all_revdeps.sort.join(", ")}"
         end
 
         selections = Set.new
-        all_reverse_dependencies = all_reverse_dependencies.to_a.sort
-        all_reverse_dependencies.each do |parent_name|
-            if default_packages.include?(parent_name)
-                selections |= default_packages.selection[parent_name]
+        all_revdeps = all_revdeps.to_a.sort
+        all_revdeps.each do |revdep_parent_name|
+            if default_packages.include?(revdep_parent_name)
+                selections |= default_packages.selection[revdep_parent_name]
             end
         end
 
@@ -161,7 +169,8 @@ packages.each do |name|
 
         pkg = Autobuild::Package[pkg_name]
         puts "  directly depends on: #{pkg.dependencies.sort.join(", ")}"
-        puts "  OS dependencies: #{pkg.os_packages.sort.join(", ")}"
+        puts "  optionally depends on: #{pkg.optional_dependencies.sort.join(", ")}"
+        puts "  dependencies on OS packages: #{pkg.os_packages.sort.join(", ")}"
     end
 
     osdeps.each do |pkg_name|
@@ -169,6 +178,15 @@ packages.each do |name|
         Autoproj.osdeps.resolve_os_dependencies([pkg_name]).each do |manager, packages|
             puts "  #{manager.names.first}: #{packages.map { |*subnames| subnames.join(" ") }.join(", ")}"
         end
+
+        pkg_revdeps = revdeps[pkg_name].dup.to_a
+        all_revdeps = compute_all_revdeps(pkg_revdeps, revdeps)
+        if pkg_revdeps.empty?
+            puts "  no reverse dependencies"
+        else
+            puts "  direct reverse dependencies: #{pkg_revdeps.sort.join(", ")}"
+            puts "  recursive reverse dependencies: #{all_revdeps.sort.join(", ")}"
+        end
     end
 end
 

data/bin/autoproj_bootstrap

@@ -827,12 +827,7 @@ fi
                 packages = packages.uniq
                 result = `brew info --json=v1 '#{packages.join("' '")}'`
                 result = begin
-                             result = JSON.parse(result)
-                             if packages.size == 1
-                                 [result]
-                             else
-                                 result
-                             end
+                             JSON.parse(result)
                          rescue JSON::ParserError
                              if result && !result.empty?
                                  Autoproj.warn "Error while parsing result of brew info --json=v1"
@@ -3150,11 +3145,13 @@ end
 # version of autoproj. If it is "localdev", expect him to install autoproj and
 # run autoproj bootstrap manually.
 if ARGV.first != "localdev"
-    if ARGV.first == "dev" || (ENV['AUTOPROJ_USE_PRERELEASE'] == '1')
+    if ARGV.first == "dev"
         ENV['AUTOPROJ_USE_PRERELEASE'] = '1'
-        Autoproj::PackageManagers::GemManager.with_prerelease = true
         ARGV.shift
     end
+
+    Autoproj::PackageManagers::GemManager.with_prerelease =
+        (ENV['AUTOPROJ_USE_PRERELEASE'] == '1')
     begin
         osdeps_management.install(['autobuild'])
         osdeps_management.install(['autoproj'])

data/bin/autoproj_bootstrap.in

@@ -216,11 +216,13 @@ end
 # version of autoproj. If it is "localdev", expect him to install autoproj and
 # run autoproj bootstrap manually.
 if ARGV.first != "localdev"
-    if ARGV.first == "dev" || (ENV['AUTOPROJ_USE_PRERELEASE'] == '1')
+    if ARGV.first == "dev"
         ENV['AUTOPROJ_USE_PRERELEASE'] = '1'
-        Autoproj::PackageManagers::GemManager.with_prerelease = true
         ARGV.shift
     end
+
+    Autoproj::PackageManagers::GemManager.with_prerelease =
+        (ENV['AUTOPROJ_USE_PRERELEASE'] == '1')
     begin
         osdeps_management.install(['autobuild'])
         osdeps_management.install(['autoproj'])

data/lib/autoproj/autobuild.rb

@@ -687,3 +687,12 @@ def remove_from_default(*names)
     end
 end
 
+def renamed_package(current_name, old_name, options)
+    if options[:obsolete] && !Autoproj.manifest.explicitely_selected_in_layout?(old_name)
+        import_package old_name
+        Autoproj.manifest.add_exclusion old_name, "#{old_name} has been renamed to #{current_name}, you still have the option of using the old name by adding '- #{old_name}' explicitely in the layout in autoproj/manifest, but be warned that the name will stop being usable at all in the near future"
+    else
+        metapackage old_name, current_name
+    end
+end
+

data/lib/autoproj/manifest.rb

@@ -231,6 +231,16 @@ module Autoproj
             end
         end
 
+        # Returns true if the given package name has been explicitely added to
+        # the layout (not indirectly)
+        #
+        # @param [String] package_name
+        # @return [Boolean]
+        def explicitely_selected_in_layout?(package_name)
+            package_name = package_name.to_str
+            normalized_layout.has_key?(package_name)
+        end
+
         # True if the given package should not be built and its dependencies
         # should be considered as met.
         #
@@ -239,9 +249,7 @@ module Autoproj
         def excluded?(package_name)
             package_name = package_name.to_str
 
-            if normalized_layout.has_key?(package_name)
-                false
-            elsif excluded_in_manifest?(package_name)
+            if excluded_in_manifest?(package_name)
                 true
             elsif automatic_exclusions.any? { |pkg_name, | pkg_name == package_name }
                 true
@@ -266,7 +274,7 @@ module Autoproj
                 next if source_name && source.name != source_name
                 done_something = true
 
-                Dir.glob(File.join(source.local_dir, "*.autobuild")).each do |file|
+                Dir.glob(File.join(source.local_dir, "*.autobuild")).sort.each do |file|
                     yield(source, file)
                 end
             end
@@ -883,13 +891,15 @@ module Autoproj
         #
         # Right now, the absence of a manifest makes autoproj only issue a
         # warning. This will later be changed into an error.
-        def load_package_manifest(pkg_name)
-            pkg = packages.values.
-                find { |pkg| pkg.autobuild.name == pkg_name }
+        def load_package_manifest(pkg)
+            if pkg.respond_to?(:to_str)
+                pkg = packages.values.
+                    find { |p| p.autobuild.name == pkg }
+            end
             package, package_set, file = pkg.autobuild, pkg.package_set, pkg.file
 
-            if !pkg_name
-                raise ArgumentError, "package #{pkg_name} is not defined"
+            if !pkg
+                raise ArgumentError, "package #{pkg} is not defined"
             end
 
             manifest_paths =
@@ -1159,6 +1169,12 @@ module Autoproj
                 pkg.dependencies.each do |pkg_name|
                     result[pkg_name] << pkg.name
                 end
+                pkg.optional_dependencies.each do |pkg_name|
+                    result[pkg_name] << pkg.name
+                end
+                pkg.os_packages.each do |pkg_name|
+                    result[pkg_name] << pkg.name
+                end
             end
             result
         end

data/lib/autoproj/osdeps.rb

@@ -312,12 +312,7 @@ fi
                 packages = packages.uniq
                 result = `brew info --json=v1 '#{packages.join("' '")}'`
                 result = begin
-                             result = JSON.parse(result)
-                             if packages.size == 1
-                                 [result]
-                             else
-                                 result
-                             end
+                             JSON.parse(result)
                          rescue JSON::ParserError
                              if result && !result.empty?
                                  Autoproj.warn "Error while parsing result of brew info --json=v1"

data/lib/autoproj/package_manifest.rb

@@ -115,11 +115,19 @@ module Autoproj
             return each_dependency(modes, &block)
         end
 
-        def each_maintainer
-            if !block_given?
-                return enum_for(:each_maintainer)
+        def each_rock_maintainer
+            return enum_for(__method__) if !block_given?
+            xml.elements.each('package/rock_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
 
+        def each_maintainer
+            return enum_for(__method__) if !block_given?
             xml.elements.each('package/maintainer') do |maintainer|
                 (maintainer.text || "").strip.split(',').each do |str|
                     name, email = str.split('/').map(&:strip)

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.13.0.b8"
+    VERSION = "1.13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.13.0.b8
+  version: 1.13.0
 platform: ruby
 authors:
 - Rock Core Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
@@ -241,9 +241,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2