autoproj 2.9.0 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a79f0dc8faf8c992dedb96e65c997ab35f41d62107845dd9dd20bc260630f0a2
-  data.tar.gz: 2e3db38917f2cefa9defa70fa248ced0c05ad909817003b135d9b7f6179ca8bc
+  metadata.gz: c58d48dd3fb77e9691f4ac7497e66ed4aa365c840d0bb89eee68c2c918f96363
+  data.tar.gz: 700769852945f7cde110a489ef41cbad3249a88e244659f69e650e4794145f3d
 SHA512:
-  metadata.gz: 346bdce3bf52c42187143908ef04767a03e1e71b24738b0c333591bd73d113355a871ccdf67bec9b69018d30e3302e6a53946e007922a4a3e01fb82fa371eae8
-  data.tar.gz: 470faaa51b2d58609f70e794173d07d41003feee472c3c9e3dd9bb8024e66746403a480becad1dc0222066084e76c0205104465e138afc714d8555fc32d60d55
+  metadata.gz: 2f8f4f28d4b41301c80e9a9305bcda37207e54ec9a640d471d0cb12aef9c3ccae343afc4cd3878b7b6ca9f046d6768098b04e6edadf4e6006548bdc7fcb83e9c
+  data.tar.gz: bee15c0034a14bddcc8e8be292194ef9178f222247c7ca4efd2238b9cf2da51f6bb6eb94c6526002f3b98a41658ecfb2aede32a2ac1c8c74877f6fd60bb5aa8b

data/.rubocop.yml

@@ -0,0 +1,113 @@
+inherit_gem:
+  rubocop-rock: defaults.yml
+
+AllCops:
+    TargetRubyVersion: "2.3"
+    Exclude:
+    - lib/autobuild/packages/genom.rb
+    - vendor/**/*
+    - pkg/**/*
+
+Style/ClassVars:
+    Enabled: false
+
+Style/TrivialAccessors:
+    IgnoreClassMethods: true
+
+Naming/PredicateName:
+    Enabled: false
+
+Lint/SplatKeywordArguments:
+    Enabled: false
+
+Style/FrozenStringLiteralComment:
+    Enabled: false
+
+Style/AccessModifierDeclarations:
+    EnforcedStyle: inline
+
+Naming/FileName:
+    Exclude:
+      - lib/autobuild/import/git-lfs.rb
+
+Metrics/ParameterLists:
+    Enabled: false
+
+Naming/UncommunicativeMethodParamName:
+    AllowedNames: [io, id, to, by, on, in, at, ip, db, ws]
+
+
+
+
+Layout/AlignParameters:
+    Enabled: false
+
+Layout/DotPosition:
+    Enabled: false
+
+Layout/FirstParameterIndentation:
+    Enabled: false
+
+Layout/IndentAssignment:
+    Enabled: false
+
+Layout/IndentationWidth:
+    Enabled: false
+
+Layout/MultilineMethodCallBraceLayout:
+    Enabled: false
+
+Layout/MultilineMethodCallIndentation:
+    Enabled: false
+
+Lint/RescueException:
+    Enabled: false
+
+Metrics/AbcSize:
+    Enabled: false
+
+Metrics/BlockLength:
+    Enabled: false
+
+Metrics/ClassLength:
+    Enabled: false
+
+Metrics/CyclomaticComplexity:
+    Enabled: false
+
+Metrics/MethodLength:
+    Enabled: false
+
+Metrics/PerceivedComplexity:
+    Enabled: false
+
+Style/ClassCheck:
+    Enabled: false
+
+Style/Documentation:
+    Enabled: false
+
+Style/EmptyLiteral:
+    Enabled: false
+
+Style/GuardClause:
+    Enabled: false
+
+Style/HashSyntax:
+    Enabled: false
+
+Style/PerlBackrefs:
+    Enabled: false
+
+Style/StringLiterals:
+    Enabled: false
+
+Layout/IndentHeredoc:
+    Enabled: false
+
+Metrics/LineLength:
+    Max: 90
+    Exclude:
+    - test/**/*
+
+

data/.travis.yml

@@ -1,8 +1,6 @@
 sudo: true
 language: ruby
 rvm:
-  - 2.1.10
-  - 2.2.5
   - 2.3.6
   - 2.4.3
   - 2.5.0

data/Gemfile

@@ -6,6 +6,7 @@ group :vscode do
     gem 'pry'
     gem 'pry-byebug'
     gem 'rubocop', '>= 0.6.0'
+    gem 'rubocop-rock'
     gem 'ruby-debug-ide', '>= 0.6.0'
     gem 'debase', '>= 0.2.2.beta10'
     gem 'solargraph'

data/README.md

@@ -43,8 +43,7 @@ Each package definition includes:
 * on what the package depends. This can be either another package built by
   autoproj, or an operating system package.
 
-See this
-page[http://www.rock-robotics.org/stable/documentation/autoproj/writing_manifest.html] for more information.
+See [this page](https://www.rock-robotics.org/documentation/autoproj/writing_manifest.html) for more information.
 
 ## Software packages in Autoproj
 
@@ -60,7 +59,7 @@ using pkg-config for C/C++ packages.
 
 To describe the package, and more importantly to setup cross-package
 dependencies, an optional manifest file can be
-added[http://www.rock-robotics.org/stable/documentation/autoproj/advanced/manifest-xml.html].
+added [link to documentation here](https://www.rock-robotics.org/documentation/autoproj/advanced/manifest-xml.html).
 
 # Migrating from v1 to v2
 
@@ -104,7 +103,7 @@ saved under a new .autoproj directory (as e.g. the config files and
 remotes). The upgrade process does not delete these to allow for
 "downgrading".
 
-In addition, autoproj now uses [bundler](bundler.io) to manage the gems. This means
+In addition, autoproj now uses [bundler](http://bundler.io) to manage the gems. This means
 that, by default, the gems are shared between all autoproj installs,
 bundler making sure that upgrading a gem on one install does not
 affect another. This makes bootstrapping a lot faster (since already
@@ -119,10 +118,10 @@ anymore.
 
 To add a gem to the workspace, create or edit `autoproj/Gemfile` and add `gem`
 entries following [the bundler documentation](http://bundler.io/gemfile.html).
-Once the file is edited, run `autoproj osdeps` and reload the updated `env.sh`. 
+Once the file is edited, run `autoproj osdeps` and reload the updated `env.sh`.
 
 To remove gems, remove the corresponding line in `autoproj/Gemfile`, run
-`autoproj osdeps` and reload env.sh.
+`autoproj osdeps` and reload `env.sh`
 
 Alternatively to the main `autoproj/Gemfile`, files with the `.gemfile`
 extension in `autoproj/overrides.d` are also considered
@@ -174,7 +173,7 @@ The option is also available to "autoproj show"
 The environment is not global anymore, but per-package. This means
 that builds that were missing dependencies could be previously passing
 and will fail. It also means that the environment of packages that
-have been used but are not anymore will not pollute env.sh.
+have been used but are not anymore will not pollute `env.sh`
 
 ### Separate build directories
 
@@ -232,22 +231,68 @@ osdep can be excluded or ignored now.
 autoproj update learned --force-reset to reset to the expected commit,
 bypassing any check. Great for CI environments.
 
-# Developing autoproj 2.x
+# Developing Autoproj
+
+The best way to work on Autoproj's own codebase is to check it out from
+git, setup a Bundler environment for it and develop as you would for a
+normal Ruby gem: code, test, rince, repeat.
+
+Once you're happy with your functionality and its unit tests, you can
+work with it on an existing workspace.
+
+## Installing Autoproj dependencies and working on the tests
+
+Run
+
+~~~
+bundle install --path=vendor
+~~~
+
+Note that Autoproj's own test suite assumes that Bundler is setup with
+`--path=vendor`. Keep it that way
+
+To run the test suite,
+
+~~~
+bundle exec rake test
+~~~
+
+Or, for a single file
+
+~~~
+bundle exec ruby PATH_TO_FILE
+~~~
+
+Minitest's `-n` option allows you to select tests based on a match to their
+names:
+
+~~~
+bundle exec rake test TESTOPTS="-n=/build/"
+bundle exec ruby PATH_TO_FILE -n=/build/
+~~~
+
+Note that the TESTOPTS method splits arguments on spaces. Use dots (`.`)
+instead of spaces.
+
+## Using Autoproj git in workspaces
 
 The best way to use autoproj 2.x from git is to checkout autoproj and
 autobuild manually, and write a Gemfile.autoproj-2.0 containing
 
 ```
-   source "https://rubygems.org"
-   gem "autoproj", path: '/home/doudou/dev/gems/autoproj'
-   gem "autobuild", path: '/home/doudou/dev/gems/autobuild'
-   gem "utilrb", ">= 3.0.0.a"
+source "https://rubygems.org"
+gem "autoproj", path: '/home/doudou/dev/gems/autoproj'
+gem "autobuild", path: '/home/doudou/dev/gems/autobuild'
 ```
 Then, pass this gemfile to the --gemfile argument to autoproj_install
 or autoproj_bootstrap. Note that one can re-run autoproj_install in an
 already bootstrapped autoproj workspace, e.g.
 
 ```
-   wget https://raw.githubusercontent.com/rock-core/autoproj/master/bin/autoproj_install
-   ruby autoproj_install --gemfile=../Gemfile.autoproj-2.0
+wget https://raw.githubusercontent.com/rock-core/autoproj/master/bin/autoproj_install
+ruby autoproj_install --gemfile=../Gemfile.autoproj-2.0
 ```
+
+If you work `lib/autoproj/ops/install.rb`, you must re-generate and test the
+`autoproj_install` and `autoproj_bootstrap` scripts which integrate the code
+from `install.rb`.

data/bin/autoproj_bootstrap

@@ -1,7 +1,7 @@
 #! /usr/bin/ruby
 
-if RUBY_VERSION < "2.1.0"
-    STDERR.puts "autoproj requires Ruby >= 2.1.0"
+if RUBY_VERSION < "2.3.0"
+    STDERR.puts "autoproj requires Ruby >= 2.3.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"
@@ -239,6 +239,9 @@ module Autoproj
                     opt.on '--skip-stage2', 'do not run the stage2 install' do
                         @skip_stage2 = true
                     end
+                    opt.on '--debug', 'Run in debug mode' do
+                        @autoproj_options << '--debug'
+                    end
                     opt.on '--gem-source=URL', String, "use this source for RubyGems "\
                         "instead of rubygems.org" do |url|
                         @gem_source = url
@@ -275,19 +278,25 @@ module Autoproj
                     end
                     opt.on '--[no-]color', 'do not use colored output (enabled by "\
                         "default if the terminal supports it)' do |color|
-                        if color then autoproj_options << "--color"
-                        else autoproj_options << '--no-color'
+                        if color then @autoproj_options << "--color"
+                        else @autoproj_options << '--no-color'
                         end
                     end
                     opt.on '--[no-]progress', 'do not use progress output (enabled by "\
-                        "default if the terminal supports it)' do |color|
-                        if color then autoproj_options << "--progress"
-                        else autoproj_options << '--no-progress'
+                        "default if the terminal supports it)' do |progress|
+                        if progress then @autoproj_options << "--progress"
+                        else @autoproj_options << '--no-progress'
+                        end
+                    end
+                    opt.on '--[no-]interactive', 'if non-interactive, use default "\
+                           "answer for questions' do |flag|
+                        if flag then @autoproj_options << "--interactive"
+                        else @autoproj_options << "--no-interactive"
                         end
                     end
                 end
                 args = options.parse(ARGV)
-                autoproj_options + args
+                @autoproj_options + args
             end
 
             def find_bundler(gem_program)
@@ -677,7 +686,7 @@ require 'bundler/setup'
 
             def run_autoproj(*args)
                 system env_for_child.merge('BUNDLE_GEMFILE' => autoproj_gemfile_path),
-                    Gem.ruby, autoproj_path, *args, *autoproj_options
+                    Gem.ruby, autoproj_path, *args, *@autoproj_options
             end
 
             def v1_workspace?
@@ -701,7 +710,7 @@ require 'bundler/setup'
                 clean_env = env_for_child
                 stage2_vars = clean_env.map { |k, v| "#{k}=#{v}" }
                 puts "starting the newly installed autoproj for stage2 install"
-                if !run_autoproj('install-stage2', root_dir, *stage2_vars)
+                if !run_autoproj('install-stage2', root_dir, *stage2_vars, *@autoproj_options)
                     raise "failed to execute autoproj install-stage2"
                 end
             end
@@ -711,7 +720,7 @@ require 'bundler/setup'
                 puts "saving temporary env.sh and .autoproj/env.sh"
                 save_env_sh(*vars)
                 puts "running 'autoproj envsh' to generate a proper env.sh"
-                if !system(Gem.ruby, autoproj_path, 'envsh', *autoproj_options)
+                if !system(Gem.ruby, autoproj_path, 'envsh', *@autoproj_options)
                     STDERR.puts "failed to run autoproj envsh on the newly installed "\
                         "autoproj (#{autoproj_path})"
                     exit 1
@@ -719,7 +728,7 @@ require 'bundler/setup'
                 # This is really needed on an existing install to install the
                 # gems that were present in the v1 layout
                 puts "running 'autoproj osdeps' to re-install missing gems"
-                if !system(Gem.ruby, autoproj_path, 'osdeps')
+                if !system(Gem.ruby, autoproj_path, 'osdeps', *@autoproj_options)
                     STDERR.puts "failed to run autoproj osdeps on the newly installed "\
                         "autoproj (#{autoproj_path})"
                     exit 1

data/bin/autoproj_bootstrap.in

@@ -1,7 +1,7 @@
 #! /usr/bin/ruby
 
-if RUBY_VERSION < "2.1.0"
-    STDERR.puts "autoproj requires Ruby >= 2.1.0"
+if RUBY_VERSION < "2.3.0"
+    STDERR.puts "autoproj requires Ruby >= 2.3.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

@@ -1,7 +1,7 @@
 #! /usr/bin/ruby
 
-if RUBY_VERSION < "2.1.0"
-    STDERR.puts "autoproj requires Ruby >= 2.1.0"
+if RUBY_VERSION < "2.3.0"
+    STDERR.puts "autoproj requires Ruby >= 2.3.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"
@@ -239,6 +239,9 @@ module Autoproj
                     opt.on '--skip-stage2', 'do not run the stage2 install' do
                         @skip_stage2 = true
                     end
+                    opt.on '--debug', 'Run in debug mode' do
+                        @autoproj_options << '--debug'
+                    end
                     opt.on '--gem-source=URL', String, "use this source for RubyGems "\
                         "instead of rubygems.org" do |url|
                         @gem_source = url
@@ -275,19 +278,25 @@ module Autoproj
                     end
                     opt.on '--[no-]color', 'do not use colored output (enabled by "\
                         "default if the terminal supports it)' do |color|
-                        if color then autoproj_options << "--color"
-                        else autoproj_options << '--no-color'
+                        if color then @autoproj_options << "--color"
+                        else @autoproj_options << '--no-color'
                         end
                     end
                     opt.on '--[no-]progress', 'do not use progress output (enabled by "\
-                        "default if the terminal supports it)' do |color|
-                        if color then autoproj_options << "--progress"
-                        else autoproj_options << '--no-progress'
+                        "default if the terminal supports it)' do |progress|
+                        if progress then @autoproj_options << "--progress"
+                        else @autoproj_options << '--no-progress'
+                        end
+                    end
+                    opt.on '--[no-]interactive', 'if non-interactive, use default "\
+                           "answer for questions' do |flag|
+                        if flag then @autoproj_options << "--interactive"
+                        else @autoproj_options << "--no-interactive"
                         end
                     end
                 end
                 args = options.parse(ARGV)
-                autoproj_options + args
+                @autoproj_options + args
             end
 
             def find_bundler(gem_program)
@@ -677,7 +686,7 @@ require 'bundler/setup'
 
             def run_autoproj(*args)
                 system env_for_child.merge('BUNDLE_GEMFILE' => autoproj_gemfile_path),
-                    Gem.ruby, autoproj_path, *args, *autoproj_options
+                    Gem.ruby, autoproj_path, *args, *@autoproj_options
             end
 
             def v1_workspace?
@@ -701,7 +710,7 @@ require 'bundler/setup'
                 clean_env = env_for_child
                 stage2_vars = clean_env.map { |k, v| "#{k}=#{v}" }
                 puts "starting the newly installed autoproj for stage2 install"
-                if !run_autoproj('install-stage2', root_dir, *stage2_vars)
+                if !run_autoproj('install-stage2', root_dir, *stage2_vars, *@autoproj_options)
                     raise "failed to execute autoproj install-stage2"
                 end
             end
@@ -711,7 +720,7 @@ require 'bundler/setup'
                 puts "saving temporary env.sh and .autoproj/env.sh"
                 save_env_sh(*vars)
                 puts "running 'autoproj envsh' to generate a proper env.sh"
-                if !system(Gem.ruby, autoproj_path, 'envsh', *autoproj_options)
+                if !system(Gem.ruby, autoproj_path, 'envsh', *@autoproj_options)
                     STDERR.puts "failed to run autoproj envsh on the newly installed "\
                         "autoproj (#{autoproj_path})"
                     exit 1
@@ -719,7 +728,7 @@ require 'bundler/setup'
                 # This is really needed on an existing install to install the
                 # gems that were present in the v1 layout
                 puts "running 'autoproj osdeps' to re-install missing gems"
-                if !system(Gem.ruby, autoproj_path, 'osdeps')
+                if !system(Gem.ruby, autoproj_path, 'osdeps', *@autoproj_options)
                     STDERR.puts "failed to run autoproj osdeps on the newly installed "\
                         "autoproj (#{autoproj_path})"
                     exit 1