autoproj 2.0.0.rc40 → 2.0.0.rc41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a07dcff0dd83e7effa40c2e49cb6e7c787b8e91
-  data.tar.gz: 10d415d8951ffd95569ecdcceb6e57b21bc5f50d
+  metadata.gz: 0d0b20db732502f99f80c293de6b432fa3efb44e
+  data.tar.gz: 5b94a0795ead67203aa0fb9a75b0c8539d94b88e
 SHA512:
-  metadata.gz: 9e5dbc3159967f110d135b2a698ddfac4832ad19c7c6155c80dd3a9d45d7118563bec8e7e035c75b39f5110a2d39242290f01eb9a0a64733a68e4b499fa55c83
-  data.tar.gz: ad22069f7b21df19a71daf6e0e9c6b1c58c875b8883645dd04e35fb3f5c6a13285ce9054de2dbc74f852f322877fc6808601513f0f0f88f5e3a70e4ad8c005d8
+  metadata.gz: e83690a10494761eb928876a783bc0dbe42468cdb46e4a9ff24a70b1d24164fb351adca407bea5cd506fd883c1f950b14a7789915058d79f6c12c5a4f3e04947
+  data.tar.gz: 79a383acbd91e887bf26912ac9a375f563a4881f125dad49cc2df58c66a762afb02c74ed16bb06d175c5e9c39a55b24396f93a065d06b0ceb4de31373f4f0e74

data/autoproj.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
 
     s.required_ruby_version = ">= 2.0.0"
     s.bindir = 'bin'
-    s.executables = ['autoproj', 'aup', 'amake', 'alocate']
+    s.executables = ['autoproj', 'aup', 'amake', 'alocate', 'alog']
     s.require_paths = ["lib"]
     s.extensions = []
     s.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }

data/bin/alog

@@ -0,0 +1,25 @@
+#! /usr/bin/env ruby
+
+require 'autoproj/cli/main'
+require 'autoproj/cli/locate'
+
+Autoproj::CLI.basic_setup
+Autoproj.report(silent: true) do
+    cli = Autoproj::CLI::Locate.new
+
+    arg = ARGV.first || Dir.pwd
+    if File.directory?(arg)
+        arg = "#{File.expand_path(arg)}/"
+    end
+    log_files = cli.logs_of(arg, log: nil)
+
+    if log_files.size == 1
+        logfile = log_files.first
+    elsif log_files.size > 1
+        logfile = cli.select_log_file(log_files)
+    elsif log_files.empty?
+        raise "no logs found for #{string}"
+    end
+
+    puts File.read(logfile)
+end

data/lib/autoproj/cli/query.rb

@@ -45,7 +45,9 @@ def format_package(format, priority, package)
                 autobuild_package = package.autobuild
                 fields = Hash.new
                 fields['SRCDIR']   = autobuild_package.srcdir
-                fields['BUILDDIR'] = autobuild_package.builddir
+                fields['BUILDDIR'] = if autobuild_package.respond_to?(:builddir)
+                                         autobuild_package.builddir
+                                     end
                 fields['PREFIX']   = autobuild_package.prefix
                 fields['NAME']     = package.name
                 fields['PRIORITY'] = priority

data/lib/autoproj/cli/show.rb

@@ -20,17 +20,24 @@ def run(user_selection, short: false, recursive: false, mainline: false, env: fa
                     source_packages, osdep_packages = Array.new, Array.new
                 end
 
-                if package_set_names.empty? && source_packages.empty? && osdep_packages.empty?
+                all_matching_osdeps = osdep_packages.map { |pkg| [pkg, true] }
+                user_selection.each do |sel|
+                    if !osdep_packages.include?(sel) && ws.os_package_resolver.all_definitions.has_key?(sel)
+                        all_matching_osdeps << [sel, false]
+                    end
+                end
+
+                if package_set_names.empty? && source_packages.empty? && all_matching_osdeps.empty?
                     Autoproj.error "no package set, packages or OS packages match #{user_selection.join(" ")}"
                     return
-                elsif !source_packages.empty? || !osdep_packages.empty?
+                elsif !source_packages.empty? || !all_matching_osdeps.empty?
                     load_all_available_package_manifests
                     revdeps = ws.manifest.compute_revdeps
                 end
 
                 package_set_names = package_set_names.sort
                 source_packages   = source_packages.sort
-                osdep_packages    = osdep_packages.sort
+                all_matching_osdeps = all_matching_osdeps.sort_by { |name, _| name }
 
                 if short
                     package_set_names.each do |name|
@@ -39,8 +46,8 @@ def run(user_selection, short: false, recursive: false, mainline: false, env: fa
                     source_packages.each do |name|
                         puts "pkg     #{name}"
                     end
-                    osdep_packages.each do |name|
-                        puts "osdep   #{name}"
+                    all_matching_osdeps.each do |name, sel|
+                        puts "osdep   #{name} (#{sel ? "not selected" : "selected"})"
                     end
                 else
                     package_set_names.each do |pkg_set_name|
@@ -49,8 +56,8 @@ def run(user_selection, short: false, recursive: false, mainline: false, env: fa
                     source_packages.each do |pkg_name|
                         display_source_package(pkg_name, default_packages, revdeps, env: env)
                     end
-                    osdep_packages.each do |pkg_name|
-                        display_osdep_package(pkg_name, default_packages, revdeps)
+                    all_matching_osdeps.each do |pkg_name, selected|
+                        display_osdep_package(pkg_name, default_packages, revdeps, selected)
                     end
                 end
             end
@@ -160,12 +167,31 @@ def display_vcs(vcs)
                 end
             end
 
-            def display_osdep_package(pkg_name, default_packages, revdeps)
+            def display_osdep_package(pkg_name, default_packages, revdeps, selected)
                 puts Autoproj.color("the osdep '#{pkg_name}'", :bold)
-                ws.os_package_resolver.resolve_os_packages([pkg_name]).each do |manager_name, packages|
-                    puts "  #{manager_name}: #{packages.map { |*subnames| subnames.join(" ") }.join(", ")}"
+                begin
+                    ws.os_package_resolver.resolve_os_packages([pkg_name]).each do |manager_name, packages|
+                        puts "  #{manager_name}: #{packages.map { |*subnames| subnames.join(" ") }.join(", ")}"
+                    end
+                rescue MissingOSDep => e
+                    puts "  #{e.message}"
                 end
 
+                if !selected
+                    puts "  is present, but won't be used by autoproj for '#{pkg_name}'"
+                end
+
+                entries = ws.os_package_resolver.all_definitions[pkg_name]
+                puts "  #{entries.inject(0) { |c, (files, _)| c + files.size }} matching entries:"
+                entries.each do |files, entry|
+                    puts "    in #{files.join(", ")}:"
+                    lines = YAML.dump(entry).split("\n")
+                    lines[0] = lines[0].gsub(/---\s*/, '')
+                    if lines[0].empty?
+                        lines.shift
+                    end
+                    puts "        " + lines.join("\n      ")
+                end
                 display_common_information(pkg_name, default_packages, revdeps)
             end
 

data/lib/autoproj/installation_manifest.rb

@@ -1,7 +1,7 @@
 module Autoproj
     # Manifest of installed packages imported from another autoproj installation
     class InstallationManifest
-        Package = Struct.new :name, :srcdir, :prefix, :builddir, :dependencies
+        Package = Struct.new :name, :srcdir, :prefix, :builddir, :logdir, :dependencies
         PackageSet = Struct.new :name, :raw_local_dir, :user_local_dir
 
         attr_reader :path
@@ -52,7 +52,7 @@ def load
                     else
                         pkg = Package.new(
                             entry['name'], entry['srcdir'], entry['prefix'],
-                            entry['builddir'], entry['dependencies'])
+                            entry['builddir'], entry['logdir'], entry['dependencies'])
                         packages[pkg.name] = pkg
                     end
                 end
@@ -72,6 +72,7 @@ def save(path = self.path)
                     Hash['name' => v.name,
                          'srcdir' => v.srcdir,
                          'builddir' => (v.builddir if v.respond_to?(:builddir)),
+                         'logdir' => v.logdir,
                          'prefix' => v.prefix,
                          'dependencies' => v.dependencies]
                 end

data/lib/autoproj/test.rb

@@ -315,8 +315,8 @@ def ws_add_metapackage_to_layout(name, *packages)
             meta
         end
 
-        def ws_define_osdep_entries(entries)
-            ws_os_package_resolver.add_entries(entries)
+        def ws_define_osdep_entries(entries, file: nil)
+            ws_os_package_resolver.add_entries(entries, file: file)
         end
 
         def ws_add_osdep_entries_to_layout(entries)

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.0.0.rc40"
+    VERSION = "2.0.0.rc41"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc40
+  version: 2.0.0.rc41
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-20 00:00:00.000000000 Z
+date: 2016-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -191,6 +191,7 @@ executables:
 - aup
 - amake
 - alocate
+- alog
 extensions: []
 extra_rdoc_files: []
 files:
@@ -203,6 +204,7 @@ files:
 - Rakefile
 - autoproj.gemspec
 - bin/alocate
+- bin/alog
 - bin/amake
 - bin/aup
 - bin/autoproj