autoproj 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 340c2f6446333417f7b1a32b7a6726778c9a5b62
-  data.tar.gz: 9dad43165084ce864f68a82e7824ece5e5f6c665
+  metadata.gz: 8aea1688941d1dfc707196346c1c9cae42972827
+  data.tar.gz: 3745f079883b2571aee27bc39aed446734859363
 SHA512:
-  metadata.gz: eddbd53a7a1b4bb49f17af6b863559f987a5cbee3fd94e96890c0146f817124d5d5d7d88e047a8db45e0ea4fe7a7922cbabfbc8f1ce93120691fb0f67adca0c0
-  data.tar.gz: f6a605e57e30a4195ebdd62254780473261370a8c700e5160c4bfd654725832b36530c41e27957ae5bc958b38fc7d24d2efef6be02fd2cf21f7db1ca9f08ee26
+  metadata.gz: 46174f3a203203a2bc9194542933df1802465aaed4e8403a6362b370235f812ff50e017617f7314e8c3a9c9e1fcbd6a108e58f8f821a8ff9d27bfa0c0fc87b1f
+  data.tar.gz: 72b807eab619af7e488fe1b171404812f49a6804bfae3fb3675053c5f8419938541d5db86565a3e7f09b2ec202e4f390c10303182f066c85b8cea75f93b34338

data/autoproj.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
     s.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
 
     s.add_runtime_dependency "bundler"
-    s.add_runtime_dependency "autobuild", ">= 1.11.0"
+    s.add_runtime_dependency "autobuild", ">= 1.12.0"
     s.add_runtime_dependency "utilrb", '~> 3.0.0', ">= 3.0.0"
     s.add_runtime_dependency "thor", '~> 0.19.0', '>= 0.19.1'
     s.add_runtime_dependency 'concurrent-ruby', '~> 1.0.0', '>= 1.0.0'

data/bin/autoproj

@@ -8,5 +8,9 @@ argv = ARGV.find_all { |arg| arg != "--no-plugins" }
 if argv.size == ARGV.size
     Autoproj::CLI.load_plugins
 end
-Autoproj::CLI::Main.start(argv)
+begin
+    Autoproj::CLI::Main.start(argv)
+rescue Interrupt
+    # Already notified in the reporting infrastructure
+end
 

data/lib/autoproj/cli/build.rb

@@ -23,7 +23,8 @@ def run(selected_packages, options)
                 build_options, options = filter_options options,
                     force: false,
                     rebuild: false,
-                    parallel: nil
+                    parallel: nil,
+                    confirm: true
 
                 command_line_selection, source_packages, _osdep_packages =
                     super(selected_packages, options.merge(checkout_only: true))
@@ -54,10 +55,13 @@ def run(selected_packages, options)
                         mode_name = if build_options[:rebuild] then 'rebuild'
                                     else 'force-build'
                                     end
-                        opt = BuildOption.new("", "boolean", {:doc => "this is going to trigger a #{mode_name} of all packages. Is that really what you want ?"}, nil)
-                        if !opt.ask(false)
-                            raise Interrupt
+                        if build_options[:confirm] != false
+                            opt = BuildOption.new("", "boolean", {:doc => "this is going to trigger a #{mode_name} of all packages. Is that really what you want ?"}, nil)
+                            if !opt.ask(false)
+                                raise Interrupt
+                            end
                         end
+
                         if build_options[:rebuild]
                             ops.rebuild_all
                         else

data/lib/autoproj/cli/exec.rb

@@ -0,0 +1,20 @@
+require 'autoproj/cli/inspection_tool'
+module Autoproj
+    module CLI
+        class Exec < InspectionTool
+            def run(cmd, *args)
+                initialize_and_load
+                finalize_setup(Array.new)
+
+                # Resolve the command using the PATH if present
+                env = ws.full_env
+                if !File.file?(cmd)
+                    cmd = env.find_in_path(cmd) || cmd
+                end
+                exec(env.resolved_env, cmd, *args)
+            end
+        end
+    end
+end
+
+

data/lib/autoproj/cli/log.rb

@@ -15,11 +15,28 @@ def run(args, options = Hash.new)
                     return
                 end
 
-                exec(Autobuild.tool(:git), "--git-dir=#{ws.config_dir}/.git", 'reflog',
-                     Ops::Snapshot.import_state_log_ref, '--format=%Cgreen%gd %Cblue%cr %Creset%gs',
-                     *args)
+                common_args = [Autobuild.tool(:git), "--git-dir=#{ws.config_dir}/.git"]
+                if since = options[:since]
+                    exec(*common_args, 'diff', parse_log_entry(since), 'autoproj@{0}')
+                elsif args.empty?
+                    exec(*common_args, 'reflog',
+                        Ops::Snapshot.import_state_log_ref, '--format=%Cgreen%gd %Cblue%cr %Creset%gs')
+                elsif options[:diff]
+                    exec(*common_args, 'diff', *args.map { |entry| parse_log_entry(entry) })
+                else
+                    exec(*common_args, 'show', *args.map { |entry| parse_log_entry(entry) })
+                end
+            end
+
+            def parse_log_entry(entry)
+                if entry =~ /^autoproj@{\d+}$/
+                    entry
+                elsif entry =~ /^\d+$/
+                    "autoproj@{#{entry}}"
+                else
+                    raise ArgumentError, "unexpected revision name '#{entry}', expected either autoproj@{ID} or ID ('ID' being a number). Run 'autoproj log' without arguments for a list of known entries"
+                end
             end
         end
     end
 end
-

data/lib/autoproj/cli/main.rb

@@ -25,7 +25,15 @@ class Main < Thor
             no_commands do
                 def run_autoproj_cli(filename, classname, report_options, *args, **extra_options)
                     require "autoproj/cli/#{filename}"
-                    Autoproj.report(Hash[silent: !options[:debug], debug: options[:debug]].merge(report_options)) do
+                    if Autobuild::Subprocess.transparent_mode = options[:tool]
+                        Autobuild.silent = true
+                        Autobuild.color = false
+                        report_options[:silent] = true
+                        report_options[:on_package_failures] = :exit_silent
+                        extra_options[:silent] = true
+                    end
+
+                    Autoproj.report(**Hash[silent: !options[:debug], debug: options[:debug]].merge(report_options)) do
                         options = self.options.dup
                         # We use --local on the CLI but the APIs are expecting
                         # only_local
@@ -131,7 +139,12 @@ def doc(*packages)
             option :auto_exclude, type: :boolean,
                 desc: 'if true, packages that fail to import will be excluded from the build'
             def update(*packages)
-                run_autoproj_cli(:update, :Update, Hash[silent: false], *packages)
+                report_options = Hash[silent: false, on_package_failures: :exit]
+                if options[:auto_exclude]
+                    report_options[:on_package_failures] = :report
+                end
+
+                run_autoproj_cli(:update, :Update, report_options, *packages)
             end
 
             desc 'build [PACKAGES]', 'build packages'
@@ -146,7 +159,7 @@ def update(*packages)
             option :rebuild, type: :boolean, default: false,
                 desc: 'clean and build the requested packages'
             option :osdeps, type: :boolean,
-                desc: 'controls whether missing osdeps should be installed. In rebuild mode, also controls whether the osdeps should be reinstalled or not (the default is to reinstall them)' 
+                desc: 'controls whether missing osdeps should be installed. In rebuild mode, also controls whether the osdeps should be reinstalled or not (the default is to reinstall them)'
             option :deps, type: :boolean,
                 desc: "controls whether the operation should apply to the package's dependencies as well. -n is a shortcut for --no-deps",
                 long_desc: <<-EOD
@@ -161,8 +174,17 @@ def update(*packages)
                 desc: 'maximum number of parallel jobs'
             option :auto_exclude, type: :boolean,
                 desc: 'if true, packages that fail to import will be excluded from the build'
+            option :tool, type: :boolean,
+                desc: "act as a build tool, transparently passing the subcommand's outputs to STDOUT"
+            option :confirm, type: :boolean, default: nil,
+                desc: '--force and --rebuild will ask confirmation if applied to the whole workspace. Use --no-confirm to disable this confirmation'
             def build(*packages)
-                run_autoproj_cli(:build, :Build, Hash[silent: false], *packages)
+                report_options = Hash[silent: false, on_package_failures: :exit]
+                if options[:auto_exclude]
+                    report_options[:on_package_failures] = :report
+                end
+
+                run_autoproj_cli(:build, :Build, Hash[silent: false].merge(report_options), *packages)
             end
 
             desc 'cache CACHE_DIR', 'create or update a cache directory that can be given to AUTOBUILD_CACHE_DIR'
@@ -268,7 +290,11 @@ def versions(*packages)
             end
 
             stop_on_unknown_option! :log
-            desc 'log', "shows the log of autoproj updates"
+            desc 'log [REF]', "shows the log of autoproj updates"
+            option :since, type: :string, default: nil,
+                desc: 'show what got updated since the given version'
+            option :diff, type: :boolean, default: false,
+                desc: 'show the difference between two stages in the log'
             def log(*args)
                 run_autoproj_cli(:log, :Log, Hash[], *args)
             end
@@ -324,6 +350,25 @@ def commit(*packages)
             end
 
             desc 'switch-config VCS URL [OPTIONS]', 'switches the main build configuration'
+            long_desc <<-EOD
+Changes source of the main configuration that is checked out in autoproj/
+
+For instance,
+  autoproj switch-config git http://github.com/rock-core/buildconf
+
+Options are of the form key=value. To for instance specify a git branch one does
+  autoproj switch-config git http://github.com/rock-core/buildconf branch=test
+
+The VCS types and options match the types and options available in the source.yml
+files.
+
+If the URL is changed, autoproj will delete the existing autoproj folder. Alternatively,
+when using a VCS that supports it (right now, git), it is possible to change a VCS
+option without deleting the folder. Simply omit the VCS type and URL:
+
+  autoproj switch-config branch=master
+            EOD
+
             def switch_config(*args)
                 run_autoproj_cli(:switch_config, :SwitchConfig, Hash[], *args)
             end
@@ -393,7 +438,12 @@ def unpatch(*packages)
             def manifest(*name)
                 run_autoproj_cli(:manifest, :Manifest, Hash[silent: true], *name)
             end
+
+            desc 'exec', "runs a command, applying the workspace's environment first"
+            def exec(*args)
+                require 'autoproj/cli/exec'
+                CLI::Exec.new.run(*args)
+            end
         end
     end
 end
-

data/lib/autoproj/cli/main_test.rb

@@ -7,12 +7,21 @@ class MainTest < Thor
 
             no_commands do
                 def report(report_options = Hash.new)
-                    Autoproj.report(Hash[silent: !options[:debug], debug: options[:debug]].merge(report_options)) do
-                        yield
+                    options = self.options.merge(parent_options)
+                    extra_options = Hash.new
+                    if Autobuild::Subprocess.transparent_mode = options[:tool]
+                        Autobuild.silent = true
+                        Autobuild.color = false
+                        report_options[:silent] = true
+                        report_options[:on_package_failures] = :exit_silent
+                        extra_options[:silent] = true
+                    end
+                    Autoproj.report(**Hash[debug: options[:debug]].merge(report_options)) do
+                        yield(extra_options)
                     end
                 end
             end
-            
+
             desc 'enable [PACKAGES]', 'enable tests for the given packages (or for all packages if none are given)'
             option :deps, type: :boolean, default: false,
                 desc: 'controls whether the dependencies of the packages given on the command line should be enabled as well (the default is not)'
@@ -59,19 +68,25 @@ def list(*packages)
                 desc: 'return with a nonzero exit code if the test does not pass'
             option :coverage, type: :boolean, default: false,
                 desc: 'whether code coverage should be generated if possible'
+            option :tool, type: :boolean, default: false,
+                desc: "build in tool mode, which do not redirect the subcommand's outputs"
+            option :color, type: :boolean, default: TTY::Color.color?,
+                desc: 'enables or disables colored display (enabled by default if the terminal supports it)'
+            option :progress, type: :boolean, default: TTY::Color.color?,
+                desc: 'enables or disables progress display (enabled by default if the terminal supports it)'
             def exec(*packages)
                 require 'autoproj/cli/test'
-                report do
+                options = self.options.merge(parent_options)
+                report do |extra_options|
                     cli = Test.new
-                    Autobuild.pass_test_errors = options[:fail]
-                    Autobuild.ignore_errors = options[:keep_going]
-                    Autobuild::TestUtility.coverage_enabled = options[:coverage]
-                    args = cli.validate_options(packages, deps: options[:deps])
+                    Autobuild.pass_test_errors = options.delete(:fail)
+                    Autobuild.ignore_errors = options.delete(:keep_going)
+                    Autobuild::TestUtility.coverage_enabled = options.delete(:coverage)
+                    options.delete(:tool)
+                    args = cli.validate_options(packages, options.merge(extra_options))
                     cli.run(*args)
                 end
             end
         end
     end
 end
-
-

data/lib/autoproj/cli/update.rb

@@ -129,12 +129,14 @@ def run(selected_packages, options)
 
                 export_env_sh
 
-                if import_failure && configuration_import_failure
-                    raise ImportFailed.new(configuration_import_failure.original_errors + import_failure.original_errors)
-                elsif import_failure
-                    raise import_failure
-                elsif configuration_import_failure
-                    raise configuration_import_failure
+                if !options[:auto_exclude]
+                    if import_failure && configuration_import_failure
+                        raise ImportFailed.new(configuration_import_failure.original_errors + import_failure.original_errors)
+                    elsif import_failure
+                        raise import_failure
+                    elsif configuration_import_failure
+                        raise configuration_import_failure
+                    end
                 end
 
                 return command_line_selection, source_packages, osdep_packages

data/lib/autoproj/installation_manifest.rb

@@ -1,8 +1,8 @@
 module Autoproj
     # Manifest of installed packages imported from another autoproj installation
     class InstallationManifest
-        Package = Struct.new :name, :srcdir, :prefix, :builddir, :logdir, :dependencies
-        PackageSet = Struct.new :name, :raw_local_dir, :user_local_dir
+        Package = Struct.new :name, :type, :vcs, :srcdir, :prefix, :builddir, :logdir, :dependencies
+        PackageSet = Struct.new :name, :vcs, :raw_local_dir, :user_local_dir
 
         attr_reader :path
         attr_reader :packages
@@ -47,11 +47,11 @@ def load
                 raw.each do |entry|
                     if entry['package_set']
                         pkg_set = PackageSet.new(
-                            entry['package_set'], entry['raw_local_dir'], entry['user_local_dir'])
+                            entry['package_set'], entry['vcs'], entry['raw_local_dir'], entry['user_local_dir'])
                         package_sets[pkg_set.name] = pkg_set
                     else
                         pkg = Package.new(
-                            entry['name'], entry['srcdir'], entry['prefix'],
+                            entry['name'], entry['type'], entry['vcs'], entry['srcdir'], entry['prefix'],
                             entry['builddir'], entry['logdir'], entry['dependencies'])
                         packages[pkg.name] = pkg
                     end
@@ -64,12 +64,15 @@ def save(path = self.path)
             File.open(path, 'w') do |io|
                 marshalled_package_sets = each_package_set.map do |v|
                     Hash['package_set' => v.name,
+                         'vcs' => v.vcs.to_hash,
                          'raw_local_dir' => v.raw_local_dir,
                          'user_local_dir' => v.user_local_dir]
                 end
-                marshalled_packages = each_package.map do |v|
-                    v = v.autobuild
+                marshalled_packages = each_package.map do |package_def|
+                    v = package_def.autobuild
                     Hash['name' => v.name,
+                         'type' => v.class.name,
+                         'vcs' => package_def.vcs.to_hash,
                          'srcdir' => v.srcdir,
                          'builddir' => (v.builddir if v.respond_to?(:builddir)),
                          'logdir' => v.logdir,

data/lib/autoproj/reporter.rb

@@ -33,6 +33,11 @@ def self.warn(message, *style)
         Autobuild.warn(message, *style)
     end
 
+    def self.report_interrupt(io = STDERR)
+        io.puts
+        io.puts color("Interrupted by user", :red, :bold)
+    end
+
     # Subclass of Autobuild::Reporter, used to display a message when the build
     # finishes/fails.
     class Reporter < Autobuild::Reporter
@@ -52,44 +57,44 @@ def success
         end
     end
 
-    def self.report(options = Hash.new)
-        options = Kernel.validate_options options,
-            root_dir: nil,
-            silent: false,
-            debug: Autobuild.debug
-
+    def self.report(root_dir: nil, silent: nil, debug: Autobuild.debug,
+                    on_package_success: :report,
+                    on_package_failures: Autobuild::Reporting.default_report_on_package_failures)
         reporter = Autoproj::Reporter.new
         Autobuild::Reporting << reporter
-        Autobuild::Reporting.report do
-            yield
+        interrupted = nil
+        package_failures = Autobuild::Reporting.report(on_package_failures: :report_silent) do
+            begin
+                yield
+            rescue Interrupt => e
+                interrupted = e
+            end
         end
-        if !options[:silent]
-            Autobuild::Reporting.success
+
+        if !silent.nil?
+            on_package_success = silent ? :silent : :report
         end
+        silent_errors = [:report_silent, :exit_silent].include?(on_package_failures)
 
-    rescue Interrupt
-        STDERR.puts
-        STDERR.puts Autobuild.color("Interrupted by user", :red, :bold)
-        if Autobuild.debug then raise
-        else exit 1
+        if package_failures.empty?
+            if interrupted
+                raise interrupted
+            elsif on_package_success == :report
+                Autobuild::Reporting.success
+            end
+            return []
+        else
+            Autobuild::Reporting.report_finish_on_error(
+                package_failures, on_package_failures: on_package_failures, interrupted_by: interrupted)
         end
+
     rescue SystemExit
         raise
-    rescue Exception => e
-        STDERR.puts
-        STDERR.puts Autobuild.color(e.message, :red, :bold)
-        if root_dir = options[:root_dir]
-            root_dir = /#{Regexp.quote(root_dir)}(?!\/\.gems)/
-            e.backtrace.find_all { |path| path =~ root_dir }.
-                each do |path|
-                    STDERR.puts Autobuild.color("  in #{path}", :red, :bold)
-                end
-        end
-        if options[:debug] then raise
-        else exit 1
-        end
     ensure
+        if !silent_errors && interrupted
+            report_interrupt
+        end
+
         Autobuild::Reporting.remove(reporter) if reporter
     end
 end
-

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.2.2"
+    VERSION = "2.3.0"
 end

data/lib/autoproj/workspace.rb

@@ -624,13 +624,18 @@ def export_installation_manifest
             install_manifest.save
         end
 
-        # Export the workspace's env.sh file
-        def export_env_sh(package_names = nil, shell_helpers: true)
+        # The environment as initialized by all selected packages
+        def full_env
             env = self.env.dup
             manifest.all_selected_source_packages.each do |pkg|
                 pkg.autobuild.apply_env(env)
             end
-            env.export_env_sh(shell_helpers: shell_helpers)
+            env
+        end
+
+        # Export the workspace's env.sh file
+        def export_env_sh(package_names = nil, shell_helpers: true)
+            full_env.export_env_sh(shell_helpers: shell_helpers)
         end
 
         def pristine_os_packages(packages, options = Hash.new)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-05 00:00:00.000000000 Z
+date: 2017-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: utilrb
   requirement: !ruby/object:Gem::Requirement
@@ -260,6 +260,7 @@ files:
 - lib/autoproj/cli/commit.rb
 - lib/autoproj/cli/doc.rb
 - lib/autoproj/cli/envsh.rb
+- lib/autoproj/cli/exec.rb
 - lib/autoproj/cli/inspection_tool.rb
 - lib/autoproj/cli/locate.rb
 - lib/autoproj/cli/log.rb
@@ -365,4 +366,3 @@ signing_key:
 specification_version: 4
 summary: Easy installation and management of sets of software packages
 test_files: []
-has_rdoc: