autoproj 1.9.2 → 1.9.3.rc1

data/Manifest.txt

@@ -10,8 +10,10 @@ bin/autoproj
 bin/autoproj-clean
 bin/autoproj-create-set
 bin/autoproj-envsh
+bin/autoproj-list
 bin/autoproj-locate
 bin/autoproj-query
+bin/autoproj-show
 bin/autoproj_bootstrap
 bin/autoproj_bootstrap.in
 bin/autoproj_stress_test

data/bin/autoproj

@@ -18,7 +18,15 @@ def color(*args)
     Autoproj.color(*args)
 end
 
+if defined? Encoding # This is a 1.9-only thing
+    Encoding.default_internal = Encoding::UTF_8
+    Encoding.default_external = Encoding::UTF_8
+end
 Autoproj::OSDependencies.autodetect_ruby
+if defined? Encoding # This is a 1.9-only thing
+    Encoding.default_internal = Encoding::UTF_8
+    Encoding.default_external = Encoding::UTF_8
+end
 
 # Check the first element of ARGV. If a tool called autoproj-VALUE exists, just
 # pass the hand to it

data/bin/autoproj-list

@@ -0,0 +1,68 @@
+#! /usr/bin/env ruby
+
+require 'autoproj'
+require 'autoproj/cmdline'
+
+Autoproj.silent do
+    Autoproj::CmdLine.initialize_root_directory
+    Autoproj::CmdLine.initialize_and_load(ARGV)
+end
+manifest = Autoproj.manifest
+
+# Load the manifest for packages that are already present on the
+# file system
+manifest.packages.each_value do |pkg|
+    if File.directory?(pkg.autobuild.srcdir)
+        manifest.load_package_manifest(pkg.autobuild.name)
+    end
+end
+
+all_packages = Hash.new
+package_sets = manifest.each_package_set.to_a
+package_sets.each do |pkg_set|
+    pkg_set.each_package.each do |pkg|
+        all_packages[pkg.name] = [pkg, pkg_set.name]
+    end
+end
+
+metapackages = manifest.metapackages.values
+
+if package_sets.empty?
+    Autoproj.message("autoproj: no package sets defined in autoproj/manifest", :bold, :red)
+    exit(0)
+end
+
+Autoproj.message
+Autoproj.message("autoproj: package sets", :bold)
+package_sets.sort_by(&:name).each do |pkg_set|
+    next if pkg_set.empty?
+    if pkg_set.imported_from
+        Autoproj.message "  #{pkg_set.name} (imported by #{pkg_set.imported_from.name})"
+    else
+        Autoproj.message "  #{pkg_set.name} (listed in manifest)"
+    end
+end
+
+Autoproj.message
+Autoproj.message("autoproj: metapackages", :bold)
+metapackages.sort_by(&:name).each do |metap|
+    Autoproj.message "  #{metap.name}"
+end
+
+packages_not_present = []
+
+Autoproj.message
+Autoproj.message("autoproj: packages", :bold)
+all_packages.to_a.sort_by(&:first).map(&:last).each do |pkg, pkg_set|
+    if File.exists?(File.join(pkg.srcdir, "manifest.xml"))
+        manifest.load_package_manifest(pkg.name)
+        manifest.resolve_optional_dependencies
+    end
+
+    pkg_manifest = pkg.description
+    if File.directory?(pkg.srcdir)
+        Autoproj.message "  #{pkg.name}#{": #{pkg_manifest.short_documentation}" if pkg_manifest && pkg_manifest.short_documentation}"
+    else
+        Autoproj.message "  #{pkg.name}: not yet checked out", :magenta
+    end
+end

data/bin/autoproj-show

@@ -0,0 +1,102 @@
+#! /usr/bin/env ruby
+
+require 'autoproj'
+require 'autoproj/cmdline'
+Autoproj.silent = true
+Autoproj::CmdLine.initialize_root_directory
+Autoproj::CmdLine.initialize_and_load(ARGV)
+
+require 'pp'
+default_packages = Autoproj.manifest.default_packages
+revdeps = Autoproj.manifest.compute_revdeps
+
+user_selection = ARGV.map do |arg|
+    if File.directory?(arg)
+        File.expand_path(arg)
+    else arg
+    end
+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 }
+    packages = packages.map(&:last)
+    osdeps   = osdeps.map(&:last)
+
+    packages.each do |pkg_name|
+        puts "source package #{pkg_name}"
+        if default_packages.include?(pkg_name)
+            selection = default_packages.selection[pkg_name]
+            if selection.include?(pkg_name) && selection.size == 1
+                puts "  is directly selected by the manifest"
+            else
+                selection = selection.dup
+                selection.delete(pkg_name)
+                puts "  is directly selected by the manifest via #{selection.to_a.join(", ")}"
+            end
+        else
+            puts " is not directly selected by the manifest"
+        end
+        if Autoproj.manifest.ignored?(pkg_name)
+            puts " is ignored"
+        end
+        if Autoproj.manifest.excluded?(pkg_name)
+            puts " is excluded: #{Autoproj.manifest.exclusion_reason(pkg_name)}"
+        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?
+            puts "  no reverse dependencies"
+        else
+            puts "  reverse dependencies: #{all_reverse_dependencies.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]
+            end
+        end
+
+        if !selections.empty?
+            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
+
+    osdeps.each do |pkg_name|
+        puts "the osdep '#{pkg_name}'"
+        Autoproj.osdeps.resolve_os_dependencies(pkg_name).each do |manager, packages|
+            puts "  #{manager.names.first}: #{packages.map { |*subnames| subnames.join(" ") }.join(", ")}"
+        end
+    end
+end
+

data/bin/autoproj_bootstrap

@@ -521,7 +521,13 @@ 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, true, true, GemManager.with_prerelease)
+                        available =
+                            if gem_fetcher.respond_to?(:find_matching)
+                                gem_fetcher.find_matching(dep, true, true, GemManager.with_prerelease)
+                            else
+                                dep.prerelease = GemManager.with_prerelease
+                                gem_fetcher.search_for_dependency(dep).first
+                            end
                         installed_version = installed.map(&:version).max
                         available_version = available.map { |(name, v), source| v }.max
                         if !available_version

data/lib/autoproj/autobuild.rb

@@ -489,7 +489,7 @@ def ruby_package(options)
 
                 if pkg.rake_setup_task && File.file?(File.join(pkg.srcdir, 'Rakefile'))
                     Autobuild::Subprocess.run pkg, 'post-install',
-                        'rake', pkg.rake_setup_task, :working_directory => pkg.srcdir
+                        Autoproj::CmdLine.ruby_executable, Autoproj.find_in_path('rake'), pkg.rake_setup_task, :working_directory => pkg.srcdir
                 end
             end
         end
@@ -502,7 +502,7 @@ def ruby_package(options)
         if !pkg.has_doc? && pkg.rake_doc_task
             pkg.doc_task do
                 pkg.progress_start "generating documentation for %s", :done_message => 'generated documentation for %s' do
-                    Autobuild::Subprocess.run pkg, 'doc', 'rake', pkg.rake_doc_task, :working_directory => pkg.srcdir
+                    Autobuild::Subprocess.run pkg, 'doc', Autoproj::CmdLine.ruby_executable, Autoproj.find_in_path('rake'), pkg.rake_doc_task, :working_directory => pkg.srcdir
                 end
             end
         end

data/lib/autoproj/cmdline.rb

@@ -42,11 +42,15 @@ module Autoproj
     end
 
     module CmdLine
+        class << self
+            attr_reader :ruby_executable
+        end
+
         def self.handle_ruby_version
             ruby = RbConfig::CONFIG['RUBY_INSTALL_NAME']
             ruby_bindir = RbConfig::CONFIG['bindir']
 
-            ruby_executable = File.join(ruby_bindir, ruby)
+            @ruby_executable = File.join(ruby_bindir, ruby)
             if Autoproj.has_config_key?('ruby_executable')
                 expected = Autoproj.user_config('ruby_executable')
                 if expected != ruby_executable

data/lib/autoproj/osdeps.rb

@@ -404,7 +404,13 @@ 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, true, true, GemManager.with_prerelease)
+                        available =
+                            if gem_fetcher.respond_to?(:find_matching)
+                                gem_fetcher.find_matching(dep, true, true, GemManager.with_prerelease)
+                            else
+                                dep.prerelease = GemManager.with_prerelease
+                                gem_fetcher.search_for_dependency(dep).first
+                            end
                         installed_version = installed.map(&:version).max
                         available_version = available.map { |(name, v), source| v }.max
                         if !available_version

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.9.2"
+    VERSION = "1.9.3.rc1"
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.9.2
-  prerelease: 
+  version: 1.9.3.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Rock Core Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2013-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
-  requirement: &4895520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 1.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *4895520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: utilrb
-  requirement: &4893460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *4893460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &4907420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *4907420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &4905660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,18 +69,28 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *4905660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &4904220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.4'
   type: :development
   prerelease: false
-  version_requirements: *4904220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.4'
 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.
@@ -79,8 +104,10 @@ executables:
 - autoproj-clean
 - autoproj-create-set
 - autoproj-envsh
+- autoproj-list
 - autoproj-locate
 - autoproj-query
+- autoproj-show
 - autoproj_bootstrap
 - autoproj_bootstrap.in
 - autoproj_stress_test
@@ -103,8 +130,10 @@ files:
 - bin/autoproj-clean
 - bin/autoproj-create-set
 - bin/autoproj-envsh
+- bin/autoproj-list
 - bin/autoproj-locate
 - bin/autoproj-query
+- bin/autoproj-show
 - bin/autoproj_bootstrap
 - bin/autoproj_bootstrap.in
 - bin/autoproj_stress_test
@@ -163,19 +192,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: autobuild
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Easy installation and management of sets of software packages
 test_files:
+- test/test_os_dependencies.rb
+- test/test_debian.rb
 - test/test_manifest.rb
 - test/package_managers/test_apt_dpkg_manager.rb
 - test/package_managers/test_gem.rb
-- test/test_debian.rb
 - test/test_package_manifest.rb
-- test/test_os_dependencies.rb