autoproj 1.12.6 → 1.13.0.b1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30982dc07e20775dc8e9e2a2dd5a3210445f02d1
-  data.tar.gz: f3d8d1886e6c8ecd8140ba60c92e154de2c022a5
+  metadata.gz: 1d52be654ffd25aae59ee4d7142a32c3e87f7e97
+  data.tar.gz: 8e4668a6aa871d7a2e73784a731193aa176ef8f0
 SHA512:
-  metadata.gz: 23a44919a79b9428768958e6a5d60940f12f22f81b0227957a3effe09784a7b39c4a08ed5a02b48c2430c6cea7b91d7f6f7afb6ddd2ffbf49d02b4847e344f1a
-  data.tar.gz: ca149e32d50932a01db5a2ead6afc35aa367ed602eb20de2514fbb8ef9ba6f2e406b1a4d31aaf4ff86976f04a31966211e87036eac76e32013f787cdb6afce24
+  metadata.gz: ab7081988a90fbd4bcf8b12b0b349c25d8b84119165ce8acaacaf509b60245208ce51d5961e42925797180540af8d38ff171dc99ec9acd09e761039c67f97c45
+  data.tar.gz: c6704587e1cc8aa66dc197d87377edd3a0b5c28ade8bf2521c8184974fa961652b93362831edfca37871aabc4760dadc21adb52a39d190332be317670946ef1c

data/Manifest.txt

@@ -10,16 +10,21 @@ bin/autoproj
 bin/autoproj-bootstrap
 bin/autoproj-cache
 bin/autoproj-clean
+bin/autoproj-commit
 bin/autoproj-create-set
 bin/autoproj-doc
 bin/autoproj-envsh
 bin/autoproj-list
 bin/autoproj-locate
+bin/autoproj-log
 bin/autoproj-query
+bin/autoproj-reset
 bin/autoproj-show
 bin/autoproj-snapshot
 bin/autoproj-switch-config
+bin/autoproj-tag
 bin/autoproj-test
+bin/autoproj-versions
 bin/autoproj_bootstrap
 bin/autoproj_bootstrap.in
 bin/autoproj_stress_test
@@ -27,6 +32,12 @@ lib/autoproj.rb
 lib/autoproj/autobuild.rb
 lib/autoproj/base.rb
 lib/autoproj/build_option.rb
+lib/autoproj/cli.rb
+lib/autoproj/cli/reset.rb
+lib/autoproj/cli/snapshot.rb
+lib/autoproj/cli/tag.rb
+lib/autoproj/cli/test.rb
+lib/autoproj/cli/versions.rb
 lib/autoproj/cmdline.rb
 lib/autoproj/configuration.rb
 lib/autoproj/default.osdeps
@@ -40,6 +51,7 @@ lib/autoproj/ops/cache.rb
 lib/autoproj/ops/configuration.rb
 lib/autoproj/ops/loader.rb
 lib/autoproj/ops/main_config_switcher.rb
+lib/autoproj/ops/snapshot.rb
 lib/autoproj/ops/tools.rb
 lib/autoproj/options.rb
 lib/autoproj/osdeps.rb
@@ -51,6 +63,7 @@ lib/autoproj/query.rb
 lib/autoproj/system.rb
 lib/autoproj/templates/create-set/packages.autobuild
 lib/autoproj/templates/create-set/source.yml
+lib/autoproj/test.rb
 lib/autoproj/variable_expansion.rb
 lib/autoproj/vcs_definition.rb
 lib/autoproj/version.rb
@@ -74,6 +87,7 @@ test/data/os_release.with_quoted_and_unquoted_fields
 test/data/test_manifest/autoproj/local_set/local.autobuild
 test/data/test_manifest/autoproj/local_set/source.yml
 test/data/test_manifest/autoproj/manifest
+test/ops/test_configuration.rb
 test/package_managers/apt-dpkg-status
 test/package_managers/apt-dpkg-status.installed-last
 test/package_managers/apt-dpkg-status.noninstalled-last

data/Rakefile

@@ -18,7 +18,7 @@ Utilrb::Rake.hoe do
             license 'BSD'
 
             extra_deps << 
-                ['autobuild',   '>= 1.7.0'] <<
+                ['autobuild',   '~> 1.9', '>= 1.9.0'] <<
                 ['utilrb', '>= 1.6.0'] <<
                 ['highline', '>= 1.5.0']
         end

data/bin/autoproj

@@ -1,5 +1,9 @@
 #! /usr/bin/env ruby
 
+if !defined?(ORIGINAL_ARGV)
+    ORIGINAL_ARGV = ARGV.dup
+end
+
 if RUBY_VERSION < "1.9.2"
     STDERR.puts "autoproj requires Ruby >= 1.9.2"
     exit 1

data/bin/autoproj-bootstrap

@@ -7,6 +7,22 @@ if File.exists?(File.join(root_dir, 'autoproj', "manifest"))
     raise ConfigError.new, "this installation is already bootstrapped. Remove the autoproj directory if it is not the case"
 end
 
+Ops::Tools.load_autoprojrc
+
+# Check if the .autoprojrc changed the PATH and therefore which autoproj script
+# should be executed ... and restart if it did
+autoproj_path = Autobuild.find_in_path('autoproj')
+if $0 != autoproj_path
+    puts "your .autoprojrc file changed PATH in a way that requires the restart of autoproj"
+
+    if ENV['AUTOPROJ_RESTARTING']
+        puts "infinite loop detected, will not restart this time"
+    else
+        require 'rbconfig'
+        exec(Autoproj.config.ruby_executable, autoproj_path, *Autoproj::CmdLine.argv)
+    end
+end
+
 Autoproj::CmdLine.report do
     switcher = Autoproj::Ops::MainConfigSwitcher.new(root_dir)
     begin

data/bin/autoproj-commit

@@ -0,0 +1,10 @@
+#! /bin/sh
+
+set -e
+
+cd $(autoproj locate)
+autoproj versions --save
+cd autoproj
+git add overrides.d/50-versions.yml
+git commit "$@"
+

data/bin/autoproj-list

@@ -20,7 +20,7 @@ end
 all_packages = Hash.new
 package_sets = manifest.each_package_set.to_a
 package_sets.each do |pkg_set|
-    pkg_set.each_autobuild_package.each do |pkg|
+    pkg_set.each_package do |pkg|
         all_packages[pkg.name] = [pkg, pkg_set.name]
     end
 end
@@ -36,8 +36,9 @@ 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})"
+    if !pkg_set.imported_from.empty?
+        imported_from = pkg_set.imported_from.map(&:name).sort
+        Autoproj.message "  #{pkg_set.name} (imported by #{imported_from.join(", ")})"
     else
         Autoproj.message "  #{pkg_set.name} (listed in manifest)"
     end

data/bin/autoproj-log

@@ -0,0 +1,5 @@
+#! /bin/sh
+
+set -e
+cd $(autolocate)/autoproj
+git reflog autoproj --format="%Cgreen%gd %Cblue%cr %Creset%gs"

data/bin/autoproj-reset

@@ -0,0 +1,13 @@
+#! /usr/bin/env ruby
+require 'autoproj/cli/reset'
+
+Autoproj::CmdLine.report(silent: true) do
+    Autoproj.silent do
+        Autoproj::CmdLine.initialize_root_directory
+        Autoproj::CmdLine.initialize_and_load([])
+    end
+
+    cli = Autoproj::CLI::Reset.new(Autoproj.manifest)
+    ref_name, options = cli.parse_options(ARGV)
+    cli.run(ref_name, options)
+end

data/bin/autoproj-show

@@ -80,7 +80,9 @@ packages.each do |name|
         vcs = Autoproj.manifest.importer_definition_for(pkg_name)
 
         fragments = []
-        if vcs.raw
+        if !vcs
+            fragments << ["has no VCS definition", []]
+        elsif vcs.raw
             first = true
             fragments << [nil, vcs_to_array(vcs)]
             vcs.raw.each do |pkg_set, vcs_info|

data/bin/autoproj-snapshot

@@ -1,38 +1,27 @@
 #! /usr/bin/env ruby
+require 'autoproj/cli/snapshot'
 
-require 'autoproj'
-require 'autoproj/cmdline'
-
-current_dir = Dir.pwd
-remaining_args = Autoproj.silent do
-    Autoproj::CmdLine.initialize_root_directory
-    Autoproj::CmdLine.initialize_and_load(ARGV)
-end
-
-snapshot_dir = File.expand_path(remaining_args.shift, current_dir)
-if !snapshot_dir
-    raise ConfigError.new, "target directory missing\nusage: autoproj snapshot target_dir"
-end
-
-user_selection = remaining_args.map do |arg|
+args = ARGV.map do |arg|
     if File.directory?(arg)
         File.expand_path(arg)
     else arg
     end
 end
-manifest = Autoproj.manifest
-Autoproj::CmdLine.report do
-    resolved_selection = Autoproj::CmdLine.
-        resolve_user_selection(user_selection, :filter => false)
-    resolved_selection.filter_excluded_and_ignored_packages(Autoproj.manifest)
-    # This calls #prepare, which is required to run build_packages
-    packages = Autoproj::CmdLine.import_packages(resolved_selection)
-    # Remove non-existing packages
-    packages.each do |pkg|
-        if !File.directory?(manifest.package(pkg).autobuild.srcdir)
-            raise ConfigError, "cannot snapshot #{pkg.name} as it is not checked out"
-        end
+
+Autoproj::CmdLine.report(silent: true) do
+    Autoproj.silent do
+        Autoproj::CmdLine.initialize_root_directory
+        Autoproj::CmdLine.initialize_and_load([])
     end
-    Autoproj::CmdLine.snapshot(Autoproj.manifest, snapshot_dir, packages)
-end
 
+    cli = Autoproj::CLI::Snapshot.new(Autoproj.manifest)
+    args, options = cli.parse_options(args)
+    if args.empty?
+        Autoproj.error "missing target directory on the command line"
+        exit 1
+    elsif args.size > 1
+        Autoproj.error "expected only one argument on the command line specifying the target directory"
+        exit 1
+    end
+    cli.run(args.first, options)
+end

data/bin/autoproj-tag

@@ -0,0 +1,13 @@
+#! /usr/bin/env ruby
+require 'autoproj/cli/tag'
+
+Autoproj::CmdLine.report(silent: true) do
+    Autoproj.silent do
+        Autoproj::CmdLine.initialize_root_directory
+        Autoproj::CmdLine.initialize_and_load([])
+    end
+
+    cli = Autoproj::CLI::Tag.new(Autoproj.manifest)
+    tag_name, options = cli.parse_options(ARGV)
+    cli.run(tag_name, options)
+end

data/bin/autoproj-test

@@ -1,36 +1,31 @@
 #! /usr/bin/env ruby
 
 require 'autoproj'
-require 'autoproj/cmdline'
+require 'autoproj/cli/test'
 
-user_selection = Autoproj.silent do
-    Autoproj::CmdLine.initialize_root_directory
-    Autoproj::CmdLine.initialize_and_load(ARGV)
-end
-
-user_selection = user_selection.map do |arg|
+argv = ARGV.map do |arg|
     if File.directory?(arg)
         File.expand_path(arg)
     else arg
     end
 end
 
+Autoproj.silent do
+    Autoproj::CmdLine.initialize_root_directory
+    Autoproj::CmdLine.initialize_and_load([])
+end
+
 Autobuild.pass_test_errors = true
 Autobuild.ignore_errors = true
 
-Autoproj::CmdLine.report do
-    resolved_selection = Autoproj::CmdLine.
-        resolve_user_selection(user_selection, :filter => false)
-    # Remove non-existing packages
-    Autoproj.manifest.each_autobuild_package do |pkg|
-        if !File.directory?(pkg.srcdir)
-            Autoproj.manifest.add_exclusion(pkg, "#{pkg.name} is not checked out")
-        end
+Autoproj::CmdLine.report(silent: true) do
+    cli = Autoproj::CLI::Test.new(Autoproj.manifest)
+    mode, user_selection, options = cli.parse_options(argv)
+
+    if mode == 'run'
+        cli.run(user_selection, options)
+    elsif mode == 'list'
+        cli.list(user_selection, options)
     end
-    resolved_selection.filter_excluded_and_ignored_packages(Autoproj.manifest)
-    # This calls #prepare, which is required to run build_packages
-    packages = Autoproj::CmdLine.import_packages(resolved_selection)
-    packages.each { |pkg| Autobuild::Package[pkg].disable_phases('import', 'prepare', 'install') }
-    Autobuild.apply(packages, "autoproj-test", ['test'])
 end
 

data/bin/autoproj-versions

@@ -0,0 +1,20 @@
+#! /usr/bin/env ruby
+require 'autoproj/cli/versions'
+
+args = ARGV.map do |arg|
+    if File.directory?(arg)
+        File.expand_path(arg)
+    else arg
+    end
+end
+
+Autoproj::CmdLine.report(silent: true) do
+    Autoproj.silent do
+        Autoproj::CmdLine.initialize_root_directory
+        Autoproj::CmdLine.initialize_and_load([])
+    end
+
+    cli = Autoproj::CLI::Versions.new(Autoproj.manifest)
+    user_selection, options = cli.parse_options(args)
+    cli.run(user_selection, options)
+end

data/bin/autoproj_bootstrap

@@ -444,13 +444,108 @@ module Autoproj
             end
         end
 
+        # Returns true if packages and prefixes should be auto-generated, based
+        # on the SHA of the package names. This is meant to be used for build
+        # services that want to check that dependencies are properly set
+        #
+        # The default is false (disabled)
+        #
+        # @return [Boolean]
         def randomize_layout?
             get('randomize_layout', false)
         end
 
+        # Sets whether the layout should be randomized
+        #
+        # @return [Boolean]
+        # @see randomize_layout?
         def randomize_layout=(value)
             set('randomize_layout', value, true)
         end
+
+        DEFAULT_UTILITY_SETUP = Hash[
+            'doc' => true,
+            'test' => false]
+
+        # The configuration key that should be used to store the utility
+        # enable/disable information 
+        #
+        # @param [String] the utility name
+        # @return [String] the config key
+        def utility_key(utility)
+            "autoproj_#{utility}_utility"
+        end
+
+        # Returns whether a given utility is enabled for the package
+        #
+        # If there is no specific configuration for the package, uses the global
+        # default set with utility_enable_all or utility_disable_all. If none of
+        # these methods has been called, uses the default in
+        # {DEFAULT_UTILITY_SETUP}
+        #
+        # @param [String] utility the utility name (e.g. 'doc' or 'test')
+        # @param [String] package the package name
+        # @return [Boolean] true if the utility should be enabled for the
+        #   requested package and false otherwise
+        def utility_enabled_for?(utility, package)
+            utility_config = get(utility_key(utility), Hash.new)
+            if utility_config.has_key?(package)
+                utility_config[package]
+            else get("#{utility_key(utility)}_default", DEFAULT_UTILITY_SETUP[utility])
+            end
+        end
+
+        # Enables a utility for all packages
+        #
+        # This both sets the default value for all packages and resets all
+        # package-specific values set with {utility_enable_for} and
+        # {utility_disable_for}
+        #
+        # @param [String] utility the utility name (e.g. 'doc' or 'test')
+        # @return [void]
+        def utility_enable_all(utility)
+            reset(utility_key(utility))
+            set("#{utility_key(utility)}_default", true)
+        end
+
+        # Enables a utility for a specific package
+        #
+        # Note that if the default for this utility is to be enabled, this is
+        # essentially a no-op.
+        #
+        # @param [String] utility the utility name (e.g. 'doc' or 'test')
+        # @param [String] package the package name
+        # @return [void]
+        def utility_enable_for(utility, package)
+            utility_config = get(utility_key(utility), Hash.new)
+            set(utility_key(utility), utility_config.merge(package => true))
+        end
+
+        # Disables a utility for all packages
+        #
+        # This both sets the default value for all packages and resets all
+        # package-specific values set with {utility_enable_for} and
+        # {utility_disable_for}
+        #
+        # @param [String] utility the utility name (e.g. 'doc' or 'test')
+        # @return [void]
+        def utility_disable_all(utility)
+            reset(utility_key(utility))
+            set("#{utility_key(utility)}_default", false)
+        end
+
+        # Disables a utility for a specific package
+        #
+        # Note that if the default for this utility is to be disabled, this is
+        # essentially a no-op.
+        #
+        # @param [String] utility the utility name (e.g. 'doc' or 'test')
+        # @param [String] package the package name
+        # @return [void]
+        def utility_disable_for(utility, package)
+            utility_config = get(utility_key(utility), Hash.new)
+            set(utility_key(utility), utility_config.merge(package => false))
+        end
     end
 end
 
@@ -832,6 +927,17 @@ fi
                         "zypper -n install '%s'")
             end
 
+            def filter_uptodate_packages(packages)
+                result = `LANG=C rpm -q --whatprovides '#{packages.join("' '")}'`
+                has_all_pkgs = $?.success?
+
+                if !has_all_pkgs
+                    return packages # let zypper filter, we need root now anyways
+                else 
+                    return []
+                end
+            end
+
             def install(packages)
                 patterns, packages = packages.partition { |pkg| pkg =~ /^@/ }
                 patterns = patterns.map { |str| str[1..-1] }
@@ -864,21 +970,21 @@ fi
                 result = `LANG=C rpm -q --queryformat "%{NAME}\n" '#{packages.join("' '")}'`
 
                 installed_packages = []
-		new_packages = []
+                new_packages = []
                 result.split("\n").each_with_index do |line, index|
-		    line = line.strip
+                    line = line.strip
                     if line =~ /package (.*) is not installed/
-			package_name = $1
-			if !packages.include?(package_name) # something is wrong, fallback to installing everything
-			    return packages
-			end
+                        package_name = $1
+                        if !packages.include?(package_name) # something is wrong, fallback to installing everything
+                            return packages
+                        end
                         new_packages << package_name
-		    else 
-			package_name = line.strip
-			if !packages.include?(package_name) # something is wrong, fallback to installing everything
-			    return packages
-			end
-		        installed_packages << package_name
+                    else 
+                        package_name = line.strip
+                        if !packages.include?(package_name) # something is wrong, fallback to installing everything
+                            return packages
+                        end
+                        installed_packages << package_name
                     end
                 end
                 new_packages
@@ -996,13 +1102,13 @@ fi
                 Autoproj.manifest.each_reused_autoproj_installation do |p|
                     p_gems = File.join(p, '.gems')
                     if File.directory?(p_gems)
-                        Autobuild.env_add_path 'GEM_PATH', p_gems
-                        Autobuild.env_add_path 'PATH', File.join(p_gems, 'bin')
+                        Autobuild.env_push_path 'GEM_PATH', p_gems
+                        Autobuild.env_push_path 'PATH', File.join(p_gems, 'bin')
                     end
                 end
-                Autobuild.env_add_path 'GEM_PATH', gem_home
+                Autobuild.env_push_path 'GEM_PATH', gem_home
                 Autobuild.env_set 'GEM_HOME', gem_home
-                Autobuild.env_add_path 'PATH', "#{gem_home}/bin"
+                Autobuild.env_push_path 'PATH', "#{gem_home}/bin"
 
                 # Now, reset the directories in our own RubyGems instance
                 Gem.paths = ENV
@@ -1012,6 +1118,7 @@ fi
                 if cache = cache_dir
                     gem_cache_dir = File.join(gem_home, 'cache')
                     if !File.symlink?(gem_cache_dir) || File.readlink(gem_cache_dir) != cache
+                        FileUtils.mkdir_p gem_home
                         FileUtils.rm_rf gem_cache_dir
                         Autoproj.create_symlink(cache, gem_cache_dir)
                     end
@@ -2563,23 +2670,26 @@ module Autoproj
             return @root_dir
         end
 
-        root_dir_rx =
-            if Autobuild.windows? then /^[a-zA-Z]:\\\\$/
-            else /^\/$/
+        path = Pathname.pwd
+        while !path.root?
+            if (path + "autoproj" + 'manifest').file?
+                break
             end
-
-        while root_dir_rx !~ dir && !File.directory?(File.join(dir, "autoproj"))
-            dir = File.dirname(dir)
+            path = path.parent
         end
-        if root_dir_rx =~ dir
+
+        if path.root?
             raise UserError, "not in a Autoproj installation"
         end
 
-        #Preventing backslashed in path, that might be confusing on some path compares
+        result = path.to_s
+        # I don't know if this is still useful or not ... but it does not hurt
+        #
+        # Preventing backslashed in path, that might be confusing on some path compares
         if Autobuild.windows?
-            dir = dir.gsub(/\\/,'/')
+            result = result.gsub(/\\/,'/')
         end
-        dir
+        result
     end
 
     # Returns the configuration directory for this autoproj installation.
@@ -2590,6 +2700,16 @@ module Autoproj
         File.join(root_dir, "autoproj")
     end
 
+    OVERRIDES_DIR = "overrides.d"
+
+    # Returns the directory containing overrides files
+    #
+    # If the current directory is not in an autoproj installation,
+    # raises UserError.
+    def self.overrides_dir
+        File.join(config_dir, OVERRIDES_DIR)
+    end
+
     # @deprecated use Autobuild.find_in_path instead
     #
     # Warning: the autobuild method returns nil (instead of raising) if the
@@ -2945,6 +3065,8 @@ pip:
   arch: python2-pip
   opensuse: python-pip
   fedora: python-pip
+sudo:
+  default: sudo
 
 EODEFS
 
@@ -2976,7 +3098,7 @@ rescue Autoproj::ConfigError => e
 end
 
 # Now try to find out the name of the gem binary
-PACKAGES      = []
+PACKAGES      = ['build-essential', 'sudo']
 
 STDERR.puts "autoproj: installing autoproj and its dependencies (this can take a long time)"
 # First install the dependencies of autoproj, as we don't want them to be
@@ -3009,7 +3131,6 @@ if ARGV.first != "localdev"
         ARGV.shift
     end
     begin
-        osdeps_management.install(['build-essential'])
         osdeps_management.install(['autobuild'])
         osdeps_management.install(['autoproj'])
     rescue Autoproj::ConfigError => e