autoproj 2.10.2 → 2.11.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.rubocop.yml +1 -1
- data/autoproj.gemspec +2 -1
- data/bin/autoproj_bootstrap +19 -19
- data/bin/autoproj_install +19 -19
- data/lib/autoproj/aruba_minitest.rb +15 -0
- data/lib/autoproj/autobuild_extensions/dsl.rb +34 -15
- data/lib/autoproj/base.rb +17 -6
- data/lib/autoproj/cli/build.rb +1 -0
- data/lib/autoproj/cli/doc.rb +4 -18
- data/lib/autoproj/cli/main.rb +8 -9
- data/lib/autoproj/cli/main_doc.rb +86 -0
- data/lib/autoproj/cli/main_plugin.rb +3 -0
- data/lib/autoproj/cli/main_test.rb +15 -0
- data/lib/autoproj/cli/test.rb +13 -84
- data/lib/autoproj/cli/update.rb +7 -4
- data/lib/autoproj/cli/utility.rb +139 -0
- data/lib/autoproj/configuration.rb +13 -0
- data/lib/autoproj/default.osdeps +7 -0
- data/lib/autoproj/manifest.rb +6 -15
- data/lib/autoproj/ops/build.rb +8 -14
- data/lib/autoproj/ops/import.rb +125 -78
- data/lib/autoproj/ops/install.rb +19 -19
- data/lib/autoproj/package_definition.rb +29 -10
- data/lib/autoproj/package_managers/bundler_manager.rb +167 -79
- data/lib/autoproj/package_manifest.rb +8 -5
- data/lib/autoproj/test.rb +3 -0
- data/lib/autoproj/version.rb +1 -1
- data/lib/autoproj/workspace.rb +16 -0
- metadata +20 -4
@@ -31,7 +31,7 @@ def self.load(package, file, ros_manifest: false)
|
|
31
31
|
# @return [PackageManifest]
|
32
32
|
# @see load
|
33
33
|
def self.parse(package, contents, path: '<loaded from string>', loader_class: Loader)
|
34
|
-
manifest = PackageManifest.new(package)
|
34
|
+
manifest = PackageManifest.new(package, path)
|
35
35
|
loader = loader_class.new(path, manifest)
|
36
36
|
begin
|
37
37
|
REXML::Document.parse_stream(contents, loader)
|
@@ -46,6 +46,7 @@ def self.parse(package, contents, path: '<loaded from string>', loader_class: Lo
|
|
46
46
|
|
47
47
|
# The Autobuild::Package instance this manifest applies on
|
48
48
|
attr_reader :package
|
49
|
+
attr_reader :path
|
49
50
|
attr_accessor :description
|
50
51
|
attr_accessor :brief_description
|
51
52
|
attr_reader :dependencies
|
@@ -76,11 +77,13 @@ def has_short_documentation?
|
|
76
77
|
|
77
78
|
def short_documentation
|
78
79
|
brief_description ||
|
79
|
-
"no documentation available for package '#{package.name}'
|
80
|
+
"no documentation available for package '#{package.name}' "\
|
81
|
+
"in its manifest.xml file"
|
80
82
|
end
|
81
83
|
|
82
|
-
def initialize(package, null: false)
|
84
|
+
def initialize(package, path = nil, null: false)
|
83
85
|
@package = package
|
86
|
+
@path = path
|
84
87
|
@dependencies = []
|
85
88
|
@authors = []
|
86
89
|
@maintainers = []
|
@@ -242,10 +245,10 @@ def toplevel_tag_end(name)
|
|
242
245
|
# REXML stream parser object used to load the XML contents into a
|
243
246
|
# {PackageManifest} object
|
244
247
|
class RosLoader < Loader
|
245
|
-
SUPPORTED_MODES = ['test'].freeze
|
248
|
+
SUPPORTED_MODES = ['test', 'doc'].freeze
|
246
249
|
DEPEND_TAGS = Set['depend', 'build_depend', 'build_export_depend',
|
247
250
|
'buildtool_depend', 'buildtool_export_depend',
|
248
|
-
'exec_depend', 'test_depend', 'run_depend']
|
251
|
+
'exec_depend', 'test_depend', 'run_depend', 'doc_depend']
|
249
252
|
|
250
253
|
def toplevel_tag_start(name, attributes)
|
251
254
|
if DEPEND_TAGS.include?(name)
|
data/lib/autoproj/test.rb
CHANGED
@@ -316,6 +316,9 @@ def ws_create(dir = make_tmpdir, partial_config: false)
|
|
316
316
|
ws.config.set 'gems_install_path', File.join(dir, 'gems')
|
317
317
|
ws.prefix_dir = make_tmpdir
|
318
318
|
ws.config.save
|
319
|
+
|
320
|
+
# Make a valid (albeit empty) Gemfile
|
321
|
+
File.open(File.join(ws.dot_autoproj_dir, 'Gemfile'), 'w').close
|
319
322
|
ws
|
320
323
|
end
|
321
324
|
|
data/lib/autoproj/version.rb
CHANGED
data/lib/autoproj/workspace.rb
CHANGED
@@ -243,6 +243,15 @@ def overrides_dir
|
|
243
243
|
File.join(config_dir, OVERRIDES_DIR)
|
244
244
|
end
|
245
245
|
|
246
|
+
IMPORT_REPORT_BASENAME = "import_report.json"
|
247
|
+
|
248
|
+
# The full path to the update report
|
249
|
+
#
|
250
|
+
# @return [String]
|
251
|
+
def import_report_path
|
252
|
+
File.join(log_dir, IMPORT_REPORT_BASENAME)
|
253
|
+
end
|
254
|
+
|
246
255
|
BUILD_REPORT_BASENAME = "build_report.json"
|
247
256
|
|
248
257
|
# The full path to the build report
|
@@ -252,6 +261,13 @@ def build_report_path
|
|
252
261
|
File.join(log_dir, BUILD_REPORT_BASENAME)
|
253
262
|
end
|
254
263
|
|
264
|
+
# The full path to the report generated by the given utility
|
265
|
+
#
|
266
|
+
# @return [String]
|
267
|
+
def utility_report_path(name)
|
268
|
+
File.join(log_dir, "#{name}_report.json")
|
269
|
+
end
|
270
|
+
|
255
271
|
# Load the configuration for this workspace from
|
256
272
|
# config_file_path
|
257
273
|
#
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: autoproj
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.
|
4
|
+
version: 2.11.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Sylvain Joyeux
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2019-
|
11
|
+
date: 2019-10-03 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
@@ -30,14 +30,14 @@ dependencies:
|
|
30
30
|
requirements:
|
31
31
|
- - ">="
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: 1.
|
33
|
+
version: 1.19.0
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
38
|
- - ">="
|
39
39
|
- !ruby/object:Gem::Version
|
40
|
-
version: 1.
|
40
|
+
version: 1.19.0
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: backports
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
@@ -264,6 +264,20 @@ dependencies:
|
|
264
264
|
- - ">="
|
265
265
|
- !ruby/object:Gem::Version
|
266
266
|
version: '0'
|
267
|
+
- !ruby/object:Gem::Dependency
|
268
|
+
name: timecop
|
269
|
+
requirement: !ruby/object:Gem::Requirement
|
270
|
+
requirements:
|
271
|
+
- - ">="
|
272
|
+
- !ruby/object:Gem::Version
|
273
|
+
version: '0'
|
274
|
+
type: :development
|
275
|
+
prerelease: false
|
276
|
+
version_requirements: !ruby/object:Gem::Requirement
|
277
|
+
requirements:
|
278
|
+
- - ">="
|
279
|
+
- !ruby/object:Gem::Version
|
280
|
+
version: '0'
|
267
281
|
description: autoproj is a manager for sets of software packages. It allows the user
|
268
282
|
to import and build packages from source, still using the underlying distribution's
|
269
283
|
native package manager for software that is available on it.
|
@@ -321,6 +335,7 @@ files:
|
|
321
335
|
- lib/autoproj/cli/locate.rb
|
322
336
|
- lib/autoproj/cli/log.rb
|
323
337
|
- lib/autoproj/cli/main.rb
|
338
|
+
- lib/autoproj/cli/main_doc.rb
|
324
339
|
- lib/autoproj/cli/main_global.rb
|
325
340
|
- lib/autoproj/cli/main_plugin.rb
|
326
341
|
- lib/autoproj/cli/main_test.rb
|
@@ -336,6 +351,7 @@ files:
|
|
336
351
|
- lib/autoproj/cli/tag.rb
|
337
352
|
- lib/autoproj/cli/test.rb
|
338
353
|
- lib/autoproj/cli/update.rb
|
354
|
+
- lib/autoproj/cli/utility.rb
|
339
355
|
- lib/autoproj/cli/version.rb
|
340
356
|
- lib/autoproj/cli/versions.rb
|
341
357
|
- lib/autoproj/cli/watch.rb
|