autoproj 2.1.0.rc1 → 2.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/README.md +1 -1
- data/lib/autoproj/cli/main.rb +3 -1
- data/lib/autoproj/cli/osdeps.rb +14 -0
- data/lib/autoproj/templates/create-set/source.yml +3 -3
- data/lib/autoproj/version.rb +1 -1
- metadata +4 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 0c1d8d7ad1916b7e3ff7a7dfbf6429ee0e8e7fee
|
4
|
+
data.tar.gz: 89cdf0926ffd138bde66019f5b0b1d134fb91a15
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 926ae73a5629542ca9e29712b1b255a4bba8eff582b343f34d80674cbe2984ee0f0e9ade3b198cbd594f0ba113c4226c5bb7bcf757f47abb70a71236b744c552
|
7
|
+
data.tar.gz: 03230205ef8612be37400ed57580be7e6ebca5a7b929cde7323184b2497660ad0e610f9d0b78a8959434e739c5a2872f95402a915877e99ee9dc2a4e051a9ab8
|
data/README.md
CHANGED
@@ -81,7 +81,7 @@ manual. This is going to be a general policy going forward (2.x will
|
|
81
81
|
not upgrade to 3.x and so on). Moreover, it will remain possible to
|
82
82
|
bootstrap an autoproj 1.x workspace using this bootstrap script:
|
83
83
|
|
84
|
-
https://raw.githubusercontent.com/rock-core/autoproj/v1
|
84
|
+
https://raw.githubusercontent.com/rock-core/autoproj/v1/bin/autoproj_bootstrap
|
85
85
|
|
86
86
|
To bootstrap a new install using autoproj 2.0, just follow the
|
87
87
|
standard bootstrap process, which did not change. Note that by using
|
data/lib/autoproj/cli/main.rb
CHANGED
@@ -230,10 +230,12 @@ def show(*packages)
|
|
230
230
|
end
|
231
231
|
|
232
232
|
desc 'osdeps [PACKAGES]', 'install/update OS dependencies that are required by the given package (or for the whole installation if no packages are given'
|
233
|
+
option :system_info, type: :boolean,
|
234
|
+
desc: 'show information about the osdep system and quit'
|
233
235
|
option :update, type: :boolean, default: true,
|
234
236
|
desc: 'whether already installed packages should be updated or not'
|
235
237
|
def osdeps(*packages)
|
236
|
-
run_autoproj_cli(:osdeps, :OSDeps, Hash[], *packages)
|
238
|
+
run_autoproj_cli(:osdeps, :OSDeps, Hash[silent: options[:system_info]], *packages)
|
237
239
|
end
|
238
240
|
|
239
241
|
desc 'versions [PACKAGES]', 'generate a version file for the given packages, or all packages if none are given'
|
data/lib/autoproj/cli/osdeps.rb
CHANGED
@@ -5,6 +5,20 @@ module CLI
|
|
5
5
|
class OSDeps < InspectionTool
|
6
6
|
def run(user_selection, update: true, **options)
|
7
7
|
initialize_and_load
|
8
|
+
if options[:system_info]
|
9
|
+
os_names, os_versions = ws.os_package_resolver.operating_system
|
10
|
+
os_package_manager_names = OSPackageResolver::OS_PACKAGE_MANAGERS.values
|
11
|
+
os_indep_managers = ws.os_package_installer.package_managers.
|
12
|
+
each_key.find_all do |name, manager|
|
13
|
+
!os_package_manager_names.include?(name)
|
14
|
+
end
|
15
|
+
puts "OS Names: #{(os_names - ['default']).join(", ")}"
|
16
|
+
puts "OS Versions: #{(os_versions - ['default']).join(", ")}"
|
17
|
+
puts "OS Package Manager: #{ws.os_package_resolver.os_package_manager}"
|
18
|
+
puts "Available Package Managers: #{os_indep_managers.sort.join(", ")}"
|
19
|
+
return
|
20
|
+
end
|
21
|
+
|
8
22
|
_, osdep_packages, resolved_selection, _ =
|
9
23
|
finalize_setup(user_selection)
|
10
24
|
|
@@ -27,8 +27,8 @@ name: <%= new_set_name %>
|
|
27
27
|
pkg_import = render_vcs(pkg.vcs)
|
28
28
|
else
|
29
29
|
pkg_import = ["type: git",
|
30
|
-
"url: git://
|
31
|
-
"push_to: git@
|
30
|
+
"url: git://github.com/dummy_project/dummy_package.git",
|
31
|
+
"push_to: git@github.com:dummy_project/dummy_package.git"]
|
32
32
|
end
|
33
33
|
" - #{pkg.autobuild.name}\n #{pkg_import.join("\n ")}"
|
34
34
|
end %>
|
@@ -37,7 +37,7 @@ name: <%= new_set_name %>
|
|
37
37
|
#
|
38
38
|
# Example:
|
39
39
|
# - type: git
|
40
|
-
# url: git://
|
40
|
+
# url: git://github.com/rock-core/package_set.git
|
41
41
|
#
|
42
42
|
# See http://rock-robotics.org/documentation/autoproj/advanced/cross_set_dependencies.html
|
43
43
|
imports:
|
data/lib/autoproj/version.rb
CHANGED
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.1.0
|
4
|
+
version: 2.1.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: 2017-
|
11
|
+
date: 2017-08-02 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
@@ -355,9 +355,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
355
355
|
version: 2.0.0
|
356
356
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
357
357
|
requirements:
|
358
|
-
- - "
|
358
|
+
- - ">="
|
359
359
|
- !ruby/object:Gem::Version
|
360
|
-
version:
|
360
|
+
version: '0'
|
361
361
|
requirements: []
|
362
362
|
rubyforge_project:
|
363
363
|
rubygems_version: 2.5.1
|
@@ -365,4 +365,3 @@ signing_key:
|
|
365
365
|
specification_version: 4
|
366
366
|
summary: Easy installation and management of sets of software packages
|
367
367
|
test_files: []
|
368
|
-
has_rdoc:
|