autoproj 2.0.0.rc23 → 2.0.0.rc24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 817b21d65c9eeeac6eae117f038a4d67d175bfbe
-  data.tar.gz: 986a8083ddd65049128c60512d95f241babdaadd
+  metadata.gz: 91f23754f570b1d5e584512e527f2e0f546769e6
+  data.tar.gz: 8a01846ea05397a0831f2e7e390799f878be6e22
 SHA512:
-  metadata.gz: 6a6378285a457d2ea2d74e619e9245cdd3ced190fef47873f22a02ed2d1cbdd39001d1f7d250dbac61ace64aa346b6b45e3ea16952c935d2e48608cc56ba1ddc
-  data.tar.gz: a4c558ba8e077f1350ee447375c824ed0db62ded2b7e7cb7d0067eedf9c436c5e95e5f46f8ab1dcd4fa4cb914cb9b810fc72f796e5e22eb34231fcb37585a52c
+  metadata.gz: 54e4d351034d56840b6995da79bd34069fa782dbe7d63bcd9f44c0abff18663acf2ce1336abc91127ee570cb2267df59378028c3ef46d7532cc1b8c48dc7161c
+  data.tar.gz: 4e8146bb970912be4a8ca11d086991111e5122b618294360b58bb51f53491bf3fecd8b23e30302efcd6c2e67b9ec9a3145c8e340343278fe069a3ef52801236f

data/lib/autoproj/cli/main.rb

@@ -182,6 +182,8 @@ def reconfigure
             desc 'show [PACKAGES]', 'show informations about package(s)'
             option :mainline, type: :string,
                 desc: "compare to the given baseline. if 'true', the comparison will ignore any override, otherwise it will take into account overrides only up to the given package set"
+            option :env, type: :boolean,
+                desc: "display the package's own environment", default: false
             def show(*packages)
                 run_autoproj_cli(:show, :Show, Hash[], *packages)
             end

data/lib/autoproj/cli/show.rb

@@ -6,7 +6,7 @@ module CLI
         class Show < InspectionTool
             def run(user_selection, options = Hash.new)
                 options = Kernel.validate_options options,
-                    mainline: false
+                    mainline: false, env: false
 
                 initialize_and_load(mainline: options.delete(:mainline))
                 default_packages = ws.manifest.default_packages
@@ -24,14 +24,14 @@ def run(user_selection, options = Hash.new)
                 revdeps = ws.manifest.compute_revdeps
 
                 source_packages.each do |pkg_name|
-                    display_source_package(pkg_name, default_packages, revdeps)
+                    display_source_package(pkg_name, default_packages, revdeps, env: options[:env])
                 end
                 osdep_packages.each do |pkg_name|
                     display_osdep_package(pkg_name, default_packages, revdeps)
                 end
             end
 
-            def display_source_package(pkg_name, default_packages, revdeps)
+            def display_source_package(pkg_name, default_packages, revdeps, options = Hash.new)
                 puts Autoproj.color("source package #{pkg_name}", :bold)
                 pkg = ws.manifest.find_autobuild_package(pkg_name)
                 if !File.directory?(pkg.srcdir)
@@ -77,6 +77,20 @@ def display_source_package(pkg_name, default_packages, revdeps)
                 puts "  directly depends on: #{pkg.dependencies.sort.join(", ")}"
                 puts "  optionally depends on: #{pkg.optional_dependencies.sort.join(", ")}"
                 puts "  dependencies on OS packages: #{pkg.os_packages.sort.join(", ")}"
+                if options[:env]
+                    puts "  environment"
+                    pkg.resolved_env.sort_by(&:first).each do |name, v|
+                        values = v.split(File::PATH_SEPARATOR)
+                        if values.size == 1
+                            puts "    #{name}: #{values.first}"
+                        else
+                            puts "    #{name}:"
+                            values.each do |single_v|
+                                puts "      #{single_v}"
+                            end
+                        end
+                    end
+                end
             end
 
             def display_osdep_package(pkg_name, default_packages, revdeps)

data/lib/autoproj/package_managers/bundler_manager.rb

@@ -208,7 +208,9 @@ def merge_gemfiles(*path, unlock: [])
                         end
                         deps.each do |d|
                             if d.source
-                                options = d.source.options.map { |k, v| "#{k}: \"#{v}\"" }
+                                options = d.source.options.dup
+                                options.delete 'root_path'
+                                options = options.map { |k, v| "#{k}: \"#{v}\"" }
                             end
                             contents << ["  #{platform_indent}gem \"#{d.name}\", \"#{d.requirement}\"", *options].join(", ")
                         end

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.0.0.rc23"
+    VERSION = "2.0.0.rc24"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc23
+  version: 2.0.0.rc24
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
@@ -293,9 +293,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Easy installation and management of sets of software packages
 test_files: []
-has_rdoc: