autoproj 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edb94a99f41c2bd7fa5cd1787e3717a5ace88746
-  data.tar.gz: c1663aaa8f9cb260cfa34bff60f140dc9f14952b
+  metadata.gz: 99c12d40c6ed5bf39360d3f3e39b3a602841f5f8
+  data.tar.gz: c2f379b779b1f5ba68ec9a3b00add4e90142fdfc
 SHA512:
-  metadata.gz: 90fda7a5cdf528fe0b9204735d11a493e7f6f73ed1a211140ab5561a1c99642c0fb6a2ac35ca035bfb329fd5595f86d70f723c55f17983582821cbb5dcc61061
-  data.tar.gz: 178ca221ace71d37b099b41ceab29f8e0ad40f4c7931eaedaecd5df465469a2f7a807017175f7c851f672f8edd4e04bcae6d857838bf9fd1763d2179ba7bc871
+  metadata.gz: db6011b85a68c112ce7fa950c8c33dbf3a7229d3538d23fdf0093d72b3d74fe593cbe4d68c434a7231d937e21852a7ceb985f3dbacaa451db55c89e87a4c58fe
+  data.tar.gz: 3197a556775041572721f3a9bb4e6c84bf058deee78b5bc0f8a031e32d8ab5b87dc723a30991779cb85e41cea9bc404460367ea8062ffa39d077563fdc5f7055

data/.travis.yml

@@ -1,14 +1,15 @@
 sudo: true
 language: ruby
 rvm:
-  - '2.0'
   - 2.1.10
   - 2.2.5
   - 2.3.1
-  - jruby-9.1.5.0
+  - 2.4.1
+  - 2.5.0
+  - jruby-9.1.15.0
 matrix:
     allow_failures:
-        - rvm: jruby-9.1.5.0
+        - rvm: jruby-9.1.15.0
 
 cache: bundler
 

data/.vscode/launch.json

@@ -0,0 +1,25 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Minitest - all",
+            "type": "Ruby",
+            "request": "launch",
+            "useBundler": true,
+            "cwd": "${workspaceRoot}",
+            "program": "/usr/bin/rake",
+            "args": ["test"]
+        },
+        {
+            "name": "Minitest - active tasks only",
+            "type": "Ruby",
+            "request": "launch",
+            "useBundler": true,
+            "cwd": "${workspaceRoot}",
+            "program": "${file}"
+        }
+    ]
+}

data/Gemfile

@@ -1,6 +1,13 @@
 source 'https://rubygems.org'
 
-gem 'pry'
-gem 'pry-byebug'
-gem 'autobuild', github: 'rock-core/autobuild', branch: 'master'
+gem 'autobuild', git: 'https://github.com/rock-core/autobuild', branch: 'master'
+
+group :vscode do
+    gem 'pry'
+    gem 'pry-byebug'
+    gem 'rubocop', '>= 0.6.0'
+    gem 'ruby-debug-ide', '>= 0.6.0'
+    gem 'debase', '>= 0.2.2.beta10'
+    gem 'solargraph'
+end
 gemspec

data/autoproj.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
     s.homepage = "http://rock-robotics.org"
     s.licenses = ["BSD"]
 
-    s.required_ruby_version = ">= 2.0.0"
+    s.required_ruby_version = '>= 2.1.0'
     s.bindir = 'bin'
     s.executables = ['autoproj', 'aup', 'amake', 'alocate', 'alog']
     s.require_paths = ["lib"]

data/bin/autoproj_bootstrap

@@ -1,7 +1,7 @@
 #! /usr/bin/ruby
 
-if RUBY_VERSION < "2.0.0"
-    STDERR.puts "autoproj requires Ruby >= 2.0.0"
+if RUBY_VERSION < "2.1.0"
+    STDERR.puts "autoproj requires Ruby >= 2.1.0"
     exit 1
 elsif ENV['AUTOPROJ_CURRENT_ROOT'] && (ENV['AUTOPROJ_CURRENT_ROOT'] != Dir.pwd)
     STDERR.puts "it seems that you've already loaded an env.sh script in this console, open a new console and try again"
@@ -609,5 +609,7 @@ ops.stage1
 if !ops.skip_stage2?
     ops.call_stage2
 end
-ops.run_autoproj 'bootstrap', *bootstrap_options
+if !ops.run_autoproj 'bootstrap', *bootstrap_options
+    exit 1
+end
 

data/bin/autoproj_bootstrap.in

@@ -1,7 +1,7 @@
 #! /usr/bin/ruby
 
-if RUBY_VERSION < "2.0.0"
-    STDERR.puts "autoproj requires Ruby >= 2.0.0"
+if RUBY_VERSION < "2.1.0"
+    STDERR.puts "autoproj requires Ruby >= 2.1.0"
     exit 1
 elsif ENV['AUTOPROJ_CURRENT_ROOT'] && (ENV['AUTOPROJ_CURRENT_ROOT'] != Dir.pwd)
     STDERR.puts "it seems that you've already loaded an env.sh script in this console, open a new console and try again"
@@ -18,5 +18,7 @@ ops.stage1
 if !ops.skip_stage2?
     ops.call_stage2
 end
-ops.run_autoproj 'bootstrap', *bootstrap_options
+if !ops.run_autoproj 'bootstrap', *bootstrap_options
+    exit 1
+end
 

data/bin/autoproj_install

@@ -1,7 +1,7 @@
 #! /usr/bin/ruby
 
-if RUBY_VERSION < "2.0.0"
-    STDERR.puts "autoproj requires Ruby >= 2.0.0"
+if RUBY_VERSION < "2.1.0"
+    STDERR.puts "autoproj requires Ruby >= 2.1.0"
     exit 1
 elsif ENV['AUTOPROJ_CURRENT_ROOT'] && (ENV['AUTOPROJ_CURRENT_ROOT'] != Dir.pwd)
     STDERR.puts "it seems that you've already loaded an env.sh script in this console, open a new console and try again"

data/bin/autoproj_install.in

@@ -1,7 +1,7 @@
 #! /usr/bin/ruby
 
-if RUBY_VERSION < "2.0.0"
-    STDERR.puts "autoproj requires Ruby >= 2.0.0"
+if RUBY_VERSION < "2.1.0"
+    STDERR.puts "autoproj requires Ruby >= 2.1.0"
     exit 1
 elsif ENV['AUTOPROJ_CURRENT_ROOT'] && (ENV['AUTOPROJ_CURRENT_ROOT'] != Dir.pwd)
     STDERR.puts "it seems that you've already loaded an env.sh script in this console, open a new console and try again"

data/lib/autoproj.rb

@@ -31,7 +31,9 @@
 require 'autoproj/ops/import'
 # Required for auto-saving in import_packages
 require 'autoproj/ops/snapshot'
-require 'autoproj/query'
+require 'autoproj/query_base'
+require 'autoproj/source_package_query'
+require 'autoproj/os_package_query'
 
 require 'autoproj/ops/tools'
 require 'autoproj/ops/loader'

data/lib/autoproj/build_option.rb

@@ -47,10 +47,10 @@ def doc
 
         def ask(current_value, doc = nil)
             default_value =
-		if !current_value.nil? then current_value.to_s
-		elsif options[:default] then options[:default].to_str
-		else ''
-		end
+                if !current_value.nil? then current_value.to_s
+                elsif options[:default] then options[:default].to_str
+                else ''
+                end
 
             STDOUT.print "  #{doc || self.doc} [#{default_value}] "
             STDOUT.flush

data/lib/autoproj/cli.rb

@@ -1,6 +1,15 @@
 module Autoproj
     module CLI
-        class InvalidArguments < Exception
+        class CLIException < RuntimeError
+            def fatal?
+                true
+            end
+        end
+        class CLIInvalidArguments < CLIException
+        end
+        class CLIAmbiguousArguments < CLIException
+        end
+        class CLIInvalidSelection < CLIException
         end
 
         def self.load_plugins

data/lib/autoproj/cli/base.rb

@@ -1,6 +1,7 @@
 require 'tty/color'
 require 'autoproj'
 require 'autoproj/autobuild'
+require 'autoproj/cli'
 
 module Autoproj
     module CLI
@@ -57,7 +58,11 @@ def normalize_command_line_package_selection(selection)
             #   resolved
             def resolve_user_selection(selected_packages, **options)
                 if selected_packages.empty?
-                    selection = ws.manifest.default_packages
+                    selection =
+                        begin ws.manifest.default_packages
+                        rescue ExcludedSelection => e
+                            raise CLIInvalidSelection, e.message, e.backtrace
+                        end
                     if Autoproj.verbose
                         Autoproj.message "selected packages: #{selection.each_package_name.to_a.sort.join(", ")}"
                     end
@@ -65,8 +70,11 @@ def resolve_user_selection(selected_packages, **options)
                 end
                 selected_packages = selected_packages.to_set
 
-                selected_packages, nonresolved = ws.manifest.
-                    expand_package_selection(selected_packages, **options)
+                selected_packages, nonresolved =
+                    begin ws.manifest.expand_package_selection(selected_packages, **options)
+                    rescue ExcludedSelection => e
+                        raise CLIInvalidSelection, e.message, e.backtrace
+                    end
 
                 # Try to auto-add stuff if nonresolved
                 nonresolved.delete_if do |sel|
@@ -144,6 +152,8 @@ def resolve_selection(user_selection, checkout_only: true, only_local: false, re
                     auto_exclude: auto_exclude)
 
                 return source_packages, osdep_packages, resolved_selection
+            rescue ExcludedSelection => e
+                raise CLIInvalidSelection, e.message, e.backtrace
             end
 
             def validate_user_selection(user_selection, resolved_selection)
@@ -151,7 +161,7 @@ def validate_user_selection(user_selection, resolved_selection)
                     !resolved_selection.has_match_for?(pkg_name)
                 end
                 if !not_matched.empty?
-                    raise ConfigError.new, "autoproj: wrong package selection on command line, cannot find a match for #{not_matched.to_a.sort.join(", ")}"
+                    raise CLIInvalidArguments, "autoproj: wrong package selection on command line, cannot find a match for #{not_matched.to_a.sort.join(", ")}"
                 end
             end
 

data/lib/autoproj/cli/bootstrap.rb

@@ -12,7 +12,7 @@ class Bootstrap
 
             def initialize(root_dir = Dir.pwd)
                 if File.exist?(File.join(root_dir, 'autoproj', "manifest"))
-                    raise ConfigError, "this installation is already bootstrapped. Remove the autoproj directory if it is not the case"
+                    raise CLIException, "this installation is already bootstrapped. Remove the autoproj directory if it is not the case"
                 end
                 @root_dir = root_dir
             end
@@ -26,7 +26,7 @@ def validate_options(args, options)
 
                     path = File.expand_path(path)
                     if !File.directory?(path) || !File.directory?(File.join(path, 'autoproj'))
-                        raise ArgumentError, "#{path} does not look like an autoproj installation"
+                        raise CLIInvalidArguments, "#{path} does not look like an autoproj installation"
                     end
                     options[:reuse] = [path]
                 end

data/lib/autoproj/cli/cache.rb

@@ -10,27 +10,21 @@ def validate_options(argv, options = Hash.new)
                 if argv.empty?
                     default_cache_dirs = Autobuild::Importer.default_cache_dirs
                     if !default_cache_dirs || default_cache_dirs.empty?
-                        raise ArgumentError, "no cache directory defined with e.g. the AUTOBUILD_CACHE_DIR environment variable, expected one cache directory as argument"
+                        raise CLIInvalidArguments, "no cache directory defined with e.g. the AUTOBUILD_CACHE_DIR environment variable, expected one cache directory as argument"
                     end
                     Autoproj.warn "using cache directory #{default_cache_dirs.first} from the autoproj configuration"
                     argv << default_cache_dirs.first
-                elsif argv.size > 1
-                    raise ArgumentError, "expected only one cache directory as argument"
                 end
 
-                return File.expand_path(argv.first, ws.root_dir), options
+                return File.expand_path(argv.first, ws.root_dir), *argv[1..-1], options
             end
 
-            def run(cache_dir, options = Hash.new)
-                options = Kernel.validate_options options,
-                    keep_going: false,
-                    checkout_only: false
-
+            def run(cache_dir, *package_names, all: true, keep_going: false, checkout_only: false)
                 initialize_and_load
                 finalize_setup
 
                 cache_op = Autoproj::Ops::Cache.new(cache_dir, ws.manifest)
-                cache_op.create_or_update(options)
+                cache_op.create_or_update(*package_names, all: all, keep_going: keep_going, checkout_only: checkout_only)
             end
         end
     end

data/lib/autoproj/cli/clean.rb

@@ -29,7 +29,7 @@ def run(selection, options = Hash.new)
                     packages,
                     recursive: deps)
                 if source_packages.empty?
-                    raise ArgumentError, "no packages or OS packages match #{selection.join(" ")}"
+                    raise CLIInvalidArguments, "no packages or OS packages match #{selection.join(" ")}"
                 end
 
                 source_packages.each do |pkg_name|

data/lib/autoproj/cli/commit.rb

@@ -9,7 +9,7 @@ def run(*user_selection, options = Hash.new)
                 pkg = manifest.main_package_set.create_autobuild_package
                 importer = pkg.importer
                 if !importer || !importer.kind_of?(Autobuild::Git)
-                    raise ConfigError, "cannot use autoproj tag if the main configuration is not managed by git"
+                    raise CLIInvalidArguments, "cannot use autoproj tag if the main configuration is not managed by git"
                 end
 
                 versions_file = File.join(

data/lib/autoproj/cli/exec.rb

@@ -6,12 +6,18 @@ 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
+                program = 
+                    begin ws.which(cmd)
+                    rescue ::Exception => e
+                        raise CLIInvalidArguments, e.message, e.backtrace
+                    end
+                env = ws.full_env.resolved_env
+
+                begin
+                    ::Process.exec(env, program, *args)
+                rescue ::Exception => e
+                    raise CLIInvalidArguments, e.message, e.backtrace
                 end
-                exec(env.resolved_env, cmd, *args)
             end
         end
     end

data/lib/autoproj/cli/locate.rb

@@ -9,11 +9,11 @@ module CLI
         # list that information and thus avoid loading the Autoproj
         # configuration (which takes fairly long).
         class Locate < InspectionTool
-            class NotFound < RuntimeError; end
-            class AmbiguousSelection < RuntimeError; end
-
             attr_reader :packages
             attr_reader :package_sets
+            
+            class NotFound < CLIException; end
+            class NoSuchDir < CLIException; end
 
             # Create the locate CLI interface
             #
@@ -167,7 +167,7 @@ def run(selections, cache: !!packages, mode: :source_dir, log: nil)
             # Resolve the package that matches a given selection
             #
             # @return [PackageDefinition]
-            # @raise [NotFound] if nothing matches
+            # @raise [CLIInvalidArguments] if nothing matches
             # @raise [AmbiguousSelection] if the selection is ambiguous
             def resolve_package(selection)
                 matching_packages = find_packages(selection)
@@ -185,9 +185,9 @@ def resolve_package(selection)
                 end
 
                 if matching_packages.empty?
-                    raise NotFound, "cannot find '#{selection}' in the current autoproj installation"
+                    raise CLIInvalidArguments, "cannot find '#{selection}' in the current autoproj installation"
                 elsif matching_packages.size > 1
-                    raise AmbiguousSelection, "multiple packages match '#{selection}' in the current autoproj installation: #{matching_packages.map(&:name).sort.join(", ")}"
+                    raise CLIAmbiguousArguments, "multiple packages match '#{selection}' in the current autoproj installation: #{matching_packages.map(&:name).sort.join(", ")}"
                 else
                     return matching_packages.first
                 end
@@ -212,12 +212,12 @@ def source_dir_of(selection)
 
             # Returns the prefix directory for a given selection
             #
-            # @raise [ArgumentError] if the selection points to a package set
+            # @raise [NoSuchDir] if the selection points to a package set
             def prefix_dir_of(selection)
                 if workspace_dir?(selection)
                     ws.prefix_dir
                 elsif find_package_set(selection)
-                    raise ArgumentError, "#{selection} is a package set, and package sets do not have prefixes"
+                    raise NoSuchDir, "#{selection} is a package set, and package sets do not have prefixes"
                 else
                     resolve_package(selection).prefix
                 end
@@ -225,19 +225,19 @@ def prefix_dir_of(selection)
 
             # Returns the build directory for a given selection
             #
-            # @raise [ArgumentError] if the selection points to a package set,
+            # @raise [NoSuchDir] if the selection points to a package set,
             #   or to a package that has no build directory
             def build_dir_of(selection)
                 if workspace_dir?(selection)
-                    raise ArgumentError, "#{selection} points to the workspace itself, which has no build dir"
+                    raise NoSuchDir, "#{selection} points to the workspace itself, which has no build dir"
                 elsif find_package_set(selection)
-                    raise ArgumentError, "#{selection} is a package set, and package sets do not have build directories"
+                    raise NoSuchDir, "#{selection} is a package set, and package sets do not have build directories"
                 else
                     pkg = resolve_package(selection)
                     if pkg.respond_to?(:builddir) && pkg.builddir
                         pkg.builddir
                     else
-                        raise ArgumentError, "#{selection} resolves to the package #{pkg.name}, which does not have a build directory"
+                        raise NoSuchDir, "#{selection} resolves to the package #{pkg.name}, which does not have a build directory"
                     end
                 end
             end

data/lib/autoproj/cli/log.rb

@@ -4,7 +4,6 @@ module Autoproj
     module CLI
         class Log < Base
             def run(args, options = Hash.new)
-                ws = Workspace.from_environment
                 ws.load_config
 
                 if !ws.config.import_log_enabled?
@@ -34,7 +33,7 @@ def parse_log_entry(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"
+                    raise CLIInvalidArguments, "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

data/lib/autoproj/cli/main.rb

@@ -22,7 +22,18 @@ class Main < Thor
             class_option :progress, type: :boolean, default: TTY::Color.color?,
                 desc: 'enables or disables progress display (enabled by default if the terminal supports it)'
 
+            stop_on_unknown_option! :exec
+            check_unknown_options!  except: :exec
+
             no_commands do
+                def default_report_on_package_failures
+                    if options[:debug]
+                        :raise
+                    else
+                        :exit
+                    end
+                end
+
                 def run_autoproj_cli(filename, classname, report_options, *args, **extra_options)
                     require "autoproj/cli/#{filename}"
                     if Autobuild::Subprocess.transparent_mode = options[:tool]
@@ -139,7 +150,7 @@ 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)
-                report_options = Hash[silent: false, on_package_failures: :exit]
+                report_options = Hash[silent: false, on_package_failures: default_report_on_package_failures]
                 if options[:auto_exclude]
                     report_options[:on_package_failures] = :report
                 end
@@ -179,7 +190,7 @@ def update(*packages)
             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)
-                report_options = Hash[silent: false, on_package_failures: :exit]
+                report_options = Hash[silent: false, on_package_failures: default_report_on_package_failures]
                 if options[:auto_exclude]
                     report_options[:on_package_failures] = :report
                 end
@@ -192,8 +203,10 @@ def build(*packages)
                 desc: 'do not stop on errors'
             option :checkout_only, aliases: :c, type: :boolean, default: false,
                 desc: "only checkout packages, do not update already-cached ones"
-            def cache(*cache_dir)
-                run_autoproj_cli(:cache, :Cache, Hash[], *cache_dir)
+            option :all, type: :boolean, default: true,
+                desc: "cache all defined packages (the default) or only the selected ones"
+            def cache(*args)
+                run_autoproj_cli(:cache, :Cache, Hash[], *args)
             end
 
             desc 'clean [PACKAGES]', 'remove build byproducts for the given packages'
@@ -444,6 +457,12 @@ def exec(*args)
                 require 'autoproj/cli/exec'
                 CLI::Exec.new.run(*args)
             end
+
+            desc 'which', "resolves the full path to a command within the Autoproj workspace"
+            def which(cmd)
+                require 'autoproj/cli/which'
+                CLI::Which.new.run(cmd)
+            end
         end
     end
 end