autoproj 1.9.0.rc3 → 1.9.0.rc4

data/bin/autoproj-inspect

@@ -19,6 +19,20 @@ end
 resolved_selection = Autoproj::CmdLine.resolve_user_selection(user_selection, :filter => false)
 packages = resolved_selection.selection.keys
 
+def find_selection_path(from, to)
+    path = [from]
+    if from == to
+        return path
+    end
+
+    Autobuild::Package[from].dependencies.each do |dep_pkg_name|
+        if result = find_selection_path(dep_pkg_name, to)
+            return path + result
+        end
+    end
+    nil
+end
+
 packages.each do |name|
     result = Autoproj.manifest.resolve_package_name(name, :filter => false)
     packages, osdeps = result.partition { |type, name| type == :package }
@@ -37,13 +51,13 @@ packages.each do |name|
                 puts "  is directly selected by the manifest via #{selection.to_a.join(", ")}"
             end
         else
-            puts " is not directly selected by the manifest"
+            puts "  is not directly selected by the manifest"
         end
         if Autoproj.manifest.ignored?(pkg_name)
-            puts " is ignored"
+            puts "  is ignored"
         end
         if Autoproj.manifest.excluded?(pkg_name)
-            puts " is excluded: #{Autoproj.manifest.exclusion_reason(pkg_name)}"
+            puts "  is excluded: #{Autoproj.manifest.exclusion_reason(pkg_name)}"
         end
 
         all_reverse_dependencies = Set.new
@@ -54,10 +68,10 @@ packages.each do |name|
             all_reverse_dependencies << parent_name
             pkg_revdeps.concat(revdeps[parent_name].to_a)
         end
-        if pkg_revdeps.empty?
+        if all_reverse_dependencies.empty?
             puts "  no reverse dependencies"
         else
-            puts "  reverse dependencies: #{pkg_revdeps.map(&:name).sort.join(", ")}"
+            puts "  reverse dependencies: #{all_reverse_dependencies.sort.join(", ")}"
         end
 
         selections = Set.new
@@ -67,8 +81,13 @@ packages.each do |name|
                 selections |= default_packages.selection[parent_name]
             end
         end
+
         if !selections.empty?
-            puts "  selected by way of #{selections.to_a.join(", ")}"
+            puts "  selected by way of"
+            selections.each do |root_pkg|
+                path = find_selection_path(root_pkg, pkg_name)
+                puts "    #{path.join(">")}"
+            end
         end
         puts "  directly depends on: #{Autobuild::Package[pkg_name].dependencies.sort.join(", ")}"
     end

data/bin/autoproj_bootstrap

@@ -1424,12 +1424,6 @@ So, what do you want ? (all, ruby, os or none)
 
         # Requests the installation of the given set of packages
         def install(packages, package_osdeps = Hash.new)
-            #not sure here, simply show that it is installed even we dont install anything,
-            #because this functions seems to called sometimes even --no-osdeps is given or the installs_os_packages? return false
-            #it seems its not checked everywhere, so add this sainty check here
-            return true if not installs_os_packages?
-			
-			
             os_package_handler.enabled = installs_os_packages?
             os_package_handler.silent = self.silent?
             package_handlers['gem'].enabled = installs_ruby_packages?
@@ -1841,6 +1835,9 @@ module Autoproj
 
         File.open(filename, "w") do |io|
             Autobuild.export_env_sh(io)
+            if Autobuild.environment.has_key?('GEM_PATH')
+                io.puts "export GEM_PATH=$GEM_PATH:#{Gem.default_path.join(":")}"
+            end
         end
     end
 

data/lib/autoproj/cmdline.rb

@@ -899,6 +899,9 @@ where 'mode' is one of:
                     @color = flag
                     Autobuild.color = flag
                 end
+                opts.on("--[no-]progress", "enable or disable progress display (enabled by default)") do |flag|
+                    Autobuild.progress_display_enabled = flag
+                end
                 opts.on("--version", "displays the version and then exits") do
                     puts "autoproj v#{Autoproj::VERSION}"
                     exit(0)

data/lib/autoproj/osdeps.rb

@@ -1325,12 +1325,6 @@ So, what do you want ? (all, ruby, os or none)
 
         # Requests the installation of the given set of packages
         def install(packages, package_osdeps = Hash.new)
-            #not sure here, simply show that it is installed even we dont install anything,
-            #because this functions seems to called sometimes even --no-osdeps is given or the installs_os_packages? return false
-            #it seems its not checked everywhere, so add this sainty check here
-            return true if not installs_os_packages?
-			
-			
             os_package_handler.enabled = installs_os_packages?
             os_package_handler.silent = self.silent?
             package_handlers['gem'].enabled = installs_ruby_packages?

data/lib/autoproj/system.rb

@@ -175,6 +175,9 @@ module Autoproj
 
         File.open(filename, "w") do |io|
             Autobuild.export_env_sh(io)
+            if Autobuild.environment.has_key?('GEM_PATH')
+                io.puts "export GEM_PATH=$GEM_PATH:#{Gem.default_path.join(":")}"
+            end
         end
     end
 

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.9.0.rc3"
+    VERSION = "1.9.0.rc4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.9.0.rc3
+  version: 1.9.0.rc4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-26 00:00:00.000000000 Z
+date: 2012-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
-  requirement: &13808300 !ruby/object:Gem::Requirement
+  requirement: &17687980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.0.rc1
   type: :runtime
   prerelease: false
-  version_requirements: *13808300
+  version_requirements: *17687980
 - !ruby/object:Gem::Dependency
   name: utilrb
-  requirement: &13807640 !ruby/object:Gem::Requirement
+  requirement: &17686580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *13807640
+  version_requirements: *17686580
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &13806680 !ruby/object:Gem::Requirement
+  requirement: &17685660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *13806680
+  version_requirements: *17685660
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &13805300 !ruby/object:Gem::Requirement
+  requirement: &17684660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *13805300
+  version_requirements: *17684660
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &13804400 !ruby/object:Gem::Requirement
+  requirement: &17700960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *13804400
+  version_requirements: *17700960
 description: autoproj is a manager for sets of software packages. It allows the user
   to import and build packages from source, still using the underlying distribution's
   native package manager for software that is available on it.