autoproj 1.9.3.rc9 → 1.9.3

data/Manifest.txt

@@ -11,7 +11,6 @@ bin/autoproj-bootstrap
 bin/autoproj-clean
 bin/autoproj-create-set
 bin/autoproj-envsh
-bin/autoproj-inspect
 bin/autoproj-list
 bin/autoproj-locate
 bin/autoproj-query

data/bin/autoproj

@@ -146,6 +146,18 @@ EOTEXT
     Autoproj.manifest.explicit_selection = resolved_selected_packages
     selected_packages = resolved_selected_packages
 
+    if other_root = Autoproj::CmdLine.update_from
+        Autobuild::Package.each do |_, pkg|
+            if pkg.importer.respond_to?(:pick_from_autoproj_root)
+                if !pkg.importer.pick_from_autoproj_root(pkg, other_root)
+                    pkg.update = false
+                end
+            else
+                pkg.update = false
+            end
+        end
+    end
+
     # If in verbose mode, or if we only update sources, list the sources
     if Autoproj.verbose || Autoproj::CmdLine.display_configuration?
         Autoproj::CmdLine.display_configuration(manifest, selected_packages.packages)

data/bin/autoproj-show

@@ -25,14 +25,48 @@ def find_selection_path(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
+    Autoproj.manifest.resolve_package_set(from).each do |pkg_name|
+        Autobuild::Package[pkg_name].dependencies.each do |dep_pkg_name|
+            if result = find_selection_path(dep_pkg_name, to)
+                return path + result
+            end
         end
     end
     nil
 end
 
+if packages.empty?
+    puts "no packages or OS packages match #{user_selection.join(" ")}"
+    exit 1
+end
+
+def vcs_to_array(vcs)
+    if vcs.kind_of?(Hash)
+        options = vcs.dup
+        type = options.delete('type')
+        url  = options.delete('url')
+    else 
+        options = vcs.options
+        type = vcs.type
+        url = vcs.url
+    end
+
+    value = []
+    if type
+        value << ['type', type]
+    end
+    if url
+        value << ['url', url]
+    end
+    value = value.concat(options.to_a.sort_by { |k, _| k.to_s })
+    value.map do |key, value|
+        if value.respond_to?(:to_str) && File.file?(value) && value =~ /^\//
+            value = Pathname.new(value).relative_path_from(Pathname.new(Autoproj.root_dir))
+        end
+        [key, value]
+    end
+end
+
 packages.each do |name|
     result = Autoproj.manifest.resolve_package_name(name, :filter => false)
     packages, osdeps = result.partition { |type, name| type == :package }
@@ -40,7 +74,36 @@ packages.each do |name|
     osdeps   = osdeps.map(&:last)
 
     packages.each do |pkg_name|
-        puts "source package #{pkg_name}"
+        puts Autoproj.color("source package #{pkg_name}", :bold)
+        puts "  imported from"
+        vcs = Autoproj.manifest.importer_definition_for(pkg_name)
+
+        fragments = []
+        if vcs.raw
+            first = true
+            fragments << [nil, vcs_to_array(vcs)]
+            vcs.raw.each do |pkg_set, vcs_info|
+                title = if first
+                            "first match: in #{pkg_set}"
+                        else "overriden in #{pkg_set}"
+                        end
+                first = false
+                fragments << [title, vcs_to_array(vcs_info)]
+            end
+        end
+        fragments.each do |title, elements|
+            if title
+                puts "    #{title}"
+                elements.each do |key, value|
+                    puts "      #{key}: #{value}"
+                end
+            else
+                elements.each do |key, value|
+                    puts "    #{key}: #{value}"
+                end
+            end
+        end
+
         if default_packages.include?(pkg_name)
             selection = default_packages.selection[pkg_name]
             if selection.include?(pkg_name) && selection.size == 1
@@ -51,15 +114,18 @@ 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
 
+        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?
@@ -93,7 +159,7 @@ packages.each do |name|
     end
 
     osdeps.each do |pkg_name|
-        puts "the osdep '#{pkg_name}'"
+        puts Autoproj.color("the osdep '#{pkg_name}'", :bold)
         Autoproj.osdeps.resolve_os_dependencies(pkg_name).each do |manager, packages|
             puts "  #{manager.names.first}: #{packages.map { |*subnames| subnames.join(" ") }.join(", ")}"
         end

data/bin/autoproj_bootstrap

@@ -54,7 +54,7 @@ if $LOADED_FEATURES.find { |str| str =~ /bygems/ }
         RUBY = RbConfig::CONFIG['RUBY_INSTALL_NAME']
 
         ENV['GEM_HOME'] = needed_gem_home
-        ENV.delete 'GEM_PATH'
+        ENV['GEM_PATH'] = nil
         exec RUBY, __FILE__, *ARGV
     end
 end
@@ -1696,7 +1696,7 @@ module Autoproj
 
     # OS-independent creation of symbolic links. Note that on windows, it only
     # works for directories
-    def create_symlink(from, to)
+    def self.create_symlink(from, to)
         if Autobuild.windows?
             Dir.create_junction(to, from)
         else

data/bin/autoproj_bootstrap.in

@@ -54,7 +54,7 @@ if $LOADED_FEATURES.find { |str| str =~ /bygems/ }
         RUBY = RbConfig::CONFIG['RUBY_INSTALL_NAME']
 
         ENV['GEM_HOME'] = needed_gem_home
-        ENV.delete 'GEM_PATH'
+        ENV['GEM_PATH'] = nil
         exec RUBY, __FILE__, *ARGV
     end
 end

data/lib/autoproj/autobuild.rb

@@ -174,6 +174,42 @@ module Autobuild
             @os_packages ||= Set.new
         end
     end
+
+    class Git
+        # Reconfigures this importer to use an already existing checkout located
+        # in the given autoproj root
+        #
+        # @param [Autobuild::Package] the package we are dealing with
+        # @param [Autoproj::InstallationManifest] the other root's installation
+        #   manifest
+        def pick_from_autoproj_root(package, installation_manifest)
+            other_pkg = installation_manifest[package.name]
+            return if !other_pkg
+            self.relocate(other_pkg.srcdir)
+            true
+        end
+    end
+
+    class ArchiveImporter
+        # Reconfigures this importer to use an already existing checkout located
+        # in the given autoproj root
+        #
+        # @param [Autobuild::Package] the package we are dealing with
+        # @param [Autoproj::InstallationManifest] the other root's installation
+        #   manifest
+        def pick_from_autoproj_root(package, installation_manifest)
+            # Get the cachefile w.r.t. the autoproj root
+            cachefile = Pathname.new(self.cachefile).
+                relative_path_from(Pathname.new(Autoproj.root_dir)).to_s
+
+            # The cachefile in the other autoproj installation
+            other_cachefile = File.join(installation_manifest.path, cachefile)
+            if File.file?(other_cachefile)
+                self.relocate("file://" + other_cachefile)
+                true
+            end
+        end
+    end
 end
 
 module Autoproj

data/lib/autoproj/cmdline.rb

@@ -80,7 +80,7 @@ module Autoproj
                 if File.file?(prg_path = File.join(ruby_bindir, prg_name))
                     File.open(File.join(bindir, name), 'w') do |io|
                         io.puts "#! #{File.join(ruby_bindir, ruby)}"
-                        io.puts "load \"#{prg_path}\""
+                        io.puts "exec \"#{prg_path}\", *ARGV"
                     end
                     FileUtils.chmod 0755, File.join(bindir, name)
                 end
@@ -881,6 +881,9 @@ module Autoproj
 
         def self.color?; @color end
 
+        class << self
+            attr_accessor :update_from
+        end
         def self.osdeps?; @mode == "osdeps" end
         def self.show_osdeps?; @mode == "osdeps" && @show_osdeps end
         def self.revshow_osdeps?; @mode == "osdeps" && @revshow_osdeps end
@@ -988,6 +991,9 @@ where 'mode' is one of:
                 opts.on("--reconfigure", "re-ask all configuration options (build modes only)") do
                     Autoproj.reconfigure = true
                 end
+                opts.on('--from PATH', 'in update mode, use this existing autoproj installation to check out the packages (for importers that support this)') do |path|
+                    self.update_from = Autoproj::InstallationManifest.from_root(File.expand_path(path))
+                end
                 opts.on("--[no-]color", "enable or disable color in status messages (enabled by default)") do |flag|
                     @color = flag
                     Autobuild.color = flag
@@ -1298,53 +1304,62 @@ where 'mode' is one of:
                 elsif !File.directory?(pkg.srcdir)
                     lines << Autoproj.color("  is not imported yet", :magenta)
                 else
-                    status = pkg.importer.status(pkg,@only_local)
-                    if status.uncommitted_code
-                        lines << Autoproj.color("  contains uncommitted modifications", :red)
-                        result.uncommitted = true
-                    end
+                    status = begin pkg.importer.status(pkg,@only_local)
+                             rescue Interrupt
+                                 raise
+                             rescue Exception => e
+                                 lines << Autoproj.color("  failed to fetch status information", :red)
+                                 nil
+                             end
+
+                    if status
+                        if status.uncommitted_code
+                            lines << Autoproj.color("  contains uncommitted modifications", :red)
+                            result.uncommitted = true
+                        end
 
-                    case status.status
-                    when Autobuild::Importer::Status::UP_TO_DATE
-                        if !status.uncommitted_code
-                            if sync_packages.size > 80
-                                Autoproj.message "#{sync_packages},"
-                                sync_packages = ""
+                        case status.status
+                        when Autobuild::Importer::Status::UP_TO_DATE
+                            if !status.uncommitted_code
+                                if sync_packages.size > 80
+                                    Autoproj.message "#{sync_packages},"
+                                    sync_packages = ""
+                                end
+                                msg = if sync_packages.empty?
+                                          pkg_name
+                                      else
+                                          ", #{pkg_name}"
+                                      end
+                                STDERR.print msg
+                                sync_packages = "#{sync_packages}#{msg}"
+                                next
+                            else
+                                lines << Autoproj.color("  local and remote are in sync", :green)
+                            end
+                        when Autobuild::Importer::Status::ADVANCED
+                            result.local = true
+                            lines << Autoproj.color("  local contains #{status.local_commits.size} commit that remote does not have:", :blue)
+                            status.local_commits.each do |line|
+                                lines << Autoproj.color("    #{line}", :blue)
+                            end
+                        when Autobuild::Importer::Status::SIMPLE_UPDATE
+                            result.remote = true
+                            lines << Autoproj.color("  remote contains #{status.remote_commits.size} commit that local does not have:", :magenta)
+                            status.remote_commits.each do |line|
+                                lines << Autoproj.color("    #{line}", :magenta)
+                            end
+                        when Autobuild::Importer::Status::NEEDS_MERGE
+                            result.local  = true
+                            result.remote = true
+                            lines << "  local and remote have diverged with respectively #{status.local_commits.size} and #{status.remote_commits.size} commits each"
+                            lines << Autoproj.color("  -- local commits --", :blue)
+                            status.local_commits.each do |line|
+                                lines << Autoproj.color("   #{line}", :blue)
+                            end
+                            lines << Autoproj.color("  -- remote commits --", :magenta)
+                            status.remote_commits.each do |line|
+                                lines << Autoproj.color("   #{line}", :magenta)
                             end
-                            msg = if sync_packages.empty?
-                                      pkg_name
-                                  else
-                                      ", #{pkg_name}"
-                                  end
-                            STDERR.print msg
-                            sync_packages = "#{sync_packages}#{msg}"
-                            next
-                        else
-                            lines << Autoproj.color("  local and remote are in sync", :green)
-                        end
-                    when Autobuild::Importer::Status::ADVANCED
-                        result.local = true
-                        lines << Autoproj.color("  local contains #{status.local_commits.size} commit that remote does not have:", :blue)
-                        status.local_commits.each do |line|
-                            lines << Autoproj.color("    #{line}", :blue)
-                        end
-                    when Autobuild::Importer::Status::SIMPLE_UPDATE
-                        result.remote = true
-                        lines << Autoproj.color("  remote contains #{status.remote_commits.size} commit that local does not have:", :magenta)
-                        status.remote_commits.each do |line|
-                            lines << Autoproj.color("    #{line}", :magenta)
-                        end
-                    when Autobuild::Importer::Status::NEEDS_MERGE
-                        result.local  = true
-                        result.remote = true
-                        lines << "  local and remote have diverged with respectively #{status.local_commits.size} and #{status.remote_commits.size} commits each"
-                        lines << Autoproj.color("  -- local commits --", :blue)
-                        status.local_commits.each do |line|
-                            lines << Autoproj.color("   #{line}", :blue)
-                        end
-                        lines << Autoproj.color("  -- remote commits --", :magenta)
-                        status.remote_commits.each do |line|
-                            lines << Autoproj.color("   #{line}", :magenta)
                         end
                     end
                 end

data/lib/autoproj/manifest.rb

@@ -1450,6 +1450,26 @@ module Autoproj
         # See create_autobuild_package for informations about the arguments.
         def self.update_package_set(vcs, text_name, into)
             fake_package = create_autobuild_package(vcs, text_name, into)
+            if other_root = CmdLine.update_from
+                # Define a package in the installation manifest that points to
+                # the desired folder in other_root
+                relative_path = Pathname.new(into).
+                    relative_path_from(Pathname.new(Autoproj.root_dir)).to_s
+                other_dir = File.join(other_root.path, relative_path)
+                if File.directory?(other_dir)
+                    other_root.packages.unshift(
+                        InstallationManifest::Package.new(fake_package.name, other_dir, File.join(other_dir, 'install')))
+                end
+
+                # Then move the importer there if possible
+                if fake_package.importer.respond_to?(:pick_from_autoproj_root)
+                    if !fake_package.importer.pick_from_autoproj_root(fake_package, other_root)
+                        fake_package.update = false
+                    end
+                else
+                    fake_package.update = false
+                end
+            end
             fake_package.import
 
         rescue Autobuild::ConfigException => e
@@ -2421,6 +2441,20 @@ module Autoproj
         def each(&block)
             packages.each(&block)
         end
+
+        def [](name)
+            packages.find { |pkg| pkg.name == name }
+        end
+
+        def self.from_root(root_dir)
+            manifest = InstallationManifest.new(root_dir)
+            manifest_file = File.join(root_dir,  ".autoproj-installation-manifest")
+            if !File.file?(manifest_file)
+                raise ConfigError.new, "no .autoproj-installation-manifest file exists in #{root_dir}. You should probably rerun autoproj envsh in that folder first"
+            end
+            manifest.load(manifest_file)
+            manifest
+        end
     end
 
     # Access to the information contained in a package's manifest.xml file

data/lib/autoproj/system.rb

@@ -3,7 +3,7 @@ module Autoproj
 
     # OS-independent creation of symbolic links. Note that on windows, it only
     # works for directories
-    def create_symlink(from, to)
+    def self.create_symlink(from, to)
         if Autobuild.windows?
             Dir.create_junction(to, from)
         else

data/lib/autoproj/version.rb

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

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.9.3.rc9
-  prerelease: 6
+  version: 1.9.3
+  prerelease: 
 platform: ruby
 authors:
 - Rock Core Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-25 00:00:00.000000000 Z
+date: 2013-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
-  requirement: &11383500 !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: *11383500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: utilrb
-  requirement: &11382680 !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: *11382680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &11735480 !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: *11735480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &11734440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *11734440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &11733600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +85,12 @@ dependencies:
         version: '3.6'
   type: :development
   prerelease: false
-  version_requirements: *11733600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.6'
 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.
@@ -80,7 +105,6 @@ executables:
 - autoproj-clean
 - autoproj-create-set
 - autoproj-envsh
-- autoproj-inspect
 - autoproj-list
 - autoproj-locate
 - autoproj-query
@@ -108,7 +132,6 @@ files:
 - bin/autoproj-clean
 - bin/autoproj-create-set
 - bin/autoproj-envsh
-- bin/autoproj-inspect
 - bin/autoproj-list
 - bin/autoproj-locate
 - bin/autoproj-query
@@ -171,19 +194,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 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_manifest.rb
-- test/test_package_manifest.rb
 - 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_package_manifest.rb

data/bin/autoproj-inspect

@@ -1,104 +0,0 @@
-#! /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
-
-    Autoproj.manifest.resolve_package_set(from).each do |pkg_name|
-        Autobuild::Package[pkg_name].dependencies.each do |dep_pkg_name|
-            if result = find_selection_path(dep_pkg_name, to)
-                return path + result
-            end
-        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
-