autoproj 2.0.0.rc39 → 2.0.0.rc40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d50b298207a3006893877e6c968a46ec5614ed91
-  data.tar.gz: f6e394d4adb73e2d0f4ed6f9d2e8113e041aede9
+  metadata.gz: 2a07dcff0dd83e7effa40c2e49cb6e7c787b8e91
+  data.tar.gz: 10d415d8951ffd95569ecdcceb6e57b21bc5f50d
 SHA512:
-  metadata.gz: 267238c6a85992b631faaa5283558e5e90ad05d4cac54cedb4ed3a8cf480445b569536c324089b17a7f91d3f89965f6c93f1adfd27076b8750e5a317dd95036f
-  data.tar.gz: 329ac2bb6222d965f9aa4121cfce725a9e4911301a606913a00b062f6f42c5ad3a037a3c327e773c9d9518b75f410185b3d5d973db31c6a712aa7704da79852a
+  metadata.gz: 9e5dbc3159967f110d135b2a698ddfac4832ad19c7c6155c80dd3a9d45d7118563bec8e7e035c75b39f5110a2d39242290f01eb9a0a64733a68e4b499fa55c83
+  data.tar.gz: ad22069f7b21df19a71daf6e0e9c6b1c58c875b8883645dd04e35fb3f5c6a13285ce9054de2dbc74f852f322877fc6808601513f0f0f88f5e3a70e4ad8c005d8

data/autoproj.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
     s.add_runtime_dependency "thor", '~> 0.19.0', '>= 0.19.1'
     s.add_runtime_dependency 'concurrent-ruby'
     s.add_runtime_dependency 'tty-color', '~> 0.3.0', '>= 0.3.0'
+    s.add_runtime_dependency 'tty-prompt'
     s.add_development_dependency "flexmock", ">= 2.0.0"
     s.add_development_dependency "minitest", ">= 5.0", "~> 5.0"
     s.add_development_dependency "fakefs"

data/lib/autoproj/cli/bootstrap.rb

@@ -46,7 +46,7 @@ def run(buildconf_info, options)
                         FileUtils.cp seed_config, File.join(ws.config_dir, 'config.yml')
                     end
 
-                    STDERR.puts <<-EOTEXT
+                    STDOUT.puts <<-EOTEXT
 
 
 #{Autoproj.color('autoproj bootstrap successfully finished', :green, :bold)}

data/lib/autoproj/cli/locate.rb

@@ -108,32 +108,68 @@ def initialize_from_workspace
                 @package_sets = ws.manifest.each_package_set.to_a
             end
 
-            def run(selections, cache: !!packages, build: false, prefix: false)
-                if !cache
-                    initialize_from_workspace
+            def validate_options(selections, options = Hash.new)
+                selections, options = super
+                mode = if options.delete(:build)
+                           :build_dir
+                       elsif options.delete(:prefix)
+                           :prefix_dir
+                       elsif log_type = options[:log]
+                           if log_type == 'log'
+                               options.delete(:log)
+                           end
+                           :log
+                       else
+                           :source_dir
+                       end
+                options[:mode] ||= mode
+                if selections.empty?
+                    selections << ws.root_dir
                 end
+                return selections, options
+            end
 
-                if selections.empty?
-                    if prefix || build
-                        puts ws.prefix_dir
-                    else
-                        puts ws.root_dir
-                    end
+            RESOLUTION_MODES = [:source_dir, :build_dir, :prefix_dir, :log]
+
+            def run(selections, cache: !!packages, mode: :source_dir, log: nil)
+                if !RESOLUTION_MODES.include?(mode)
+                    raise ArgumentError, "'#{mode}' was expected to be one of #{RESOLUTION_MODES}"
+                elsif !cache
+                    initialize_from_workspace
                 end
 
                 selections.each do |string|
                     if File.directory?(string)
                         string = "#{File.expand_path(string)}/"
                     end
-                    puts location_of(string, build: build, prefix: prefix)
+                    if mode == :source_dir
+                        puts source_dir_of(string)
+                    elsif mode == :build_dir
+                        puts build_dir_of(string)
+                    elsif mode == :prefix_dir
+                        puts prefix_dir_of(string)
+                    elsif mode == :log
+                        if all_logs = (log == 'all')
+                            log = nil
+                        end
+                        result = logs_of(string, log: log)
+                        if (result.size == 1) || all_logs
+                            result.each { |p| puts p }
+                        elsif result.size > 1
+                            puts select_log_file(result)
+                        elsif result.empty?
+                            raise NotFound, "no logs found for #{string}"
+                        end
+                    end
                 end
             end
 
-            def location_of(selection, prefix: false, build: false)
-                if pkg_set = find_package_set(selection)
-                    return pkg_set.user_local_dir
-                end
-
+            # Resolve the package that matches a given selection
+            #
+            # @return [PackageDefinition]
+            # @raise [NotFound] if nothing matches
+            # @raise [AmbiguousSelection] if the selection is ambiguous
+            def resolve_package(selection)
                 matching_packages = find_packages(selection)
                 if matching_packages.empty?
                     matching_packages = find_packages_with_directory_shortnames(selection)
@@ -153,19 +189,103 @@ def location_of(selection, prefix: false, build: false)
                 elsif matching_packages.size > 1
                     raise AmbiguousSelection, "multiple packages match '#{selection}' in the current autoproj installation: #{matching_packages.map(&:name).sort.join(", ")}"
                 else
-                    pkg = matching_packages.first
-                    if prefix
-                        pkg.prefix
-                    elsif build
-                        if pkg.respond_to?(:builddir) && pkg.builddir
-                            pkg.builddir
-                        else
-                            raise ArgumentError, "#{pkg.name} does not have a build directory"
-                        end
+                    return matching_packages.first
+                end
+            end
+
+            # Tests whether 'selection' points to one of the workspace's root
+            # directories
+            def workspace_dir?(selection)
+                selection == "#{ws.root_dir}/" || selection == "#{ws.prefix_dir}/"
+            end
+
+            # Returns the source directory for a given selection
+            def source_dir_of(selection)
+                if workspace_dir?(selection)
+                    ws.root_dir
+                elsif pkg_set = find_package_set(selection)
+                    pkg_set.user_local_dir
+                else
+                    resolve_package(selection).srcdir
+                end
+            end
+
+            # Returns the prefix directory for a given selection
+            #
+            # @raise [ArgumentError] if the selection points to a package set
+            def prefix_dir_of(selection)
+                if workspace_dir?(selection)
+                    ws.prefix_dir
+                elsif find_package_set(selection)
+                    raise ArgumentError, "#{selection} is a package set, and package sets do not have prefixes"
+                else
+                    resolve_package(selection).prefix
+                end
+            end
+
+            # Returns the build directory for a given selection
+            #
+            # @raise [ArgumentError] if the selection points to a package set,
+            #   or to a package that has no build directory
+            def build_dir_of(selection)
+                if workspace_dir?(selection)
+                    raise ArgumentError, "#{selection} points to the workspace itself, which has no build dir"
+                elsif find_package_set(selection)
+                    raise ArgumentError, "#{selection} is a package set, and package sets do not have build directories"
+                else
+                    pkg = resolve_package(selection)
+                    if pkg.respond_to?(:builddir) && pkg.builddir
+                        pkg.builddir
+                    else
+                        raise ArgumentError, "#{selection} resolves to the package #{pkg.name}, which does not have a build directory"
+                    end
+                end
+            end
+
+            # Resolve logs available for what points to the given selection
+            #
+            # The workspace is resolved as the main configuration
+            #
+            # If 'log' is nil and multiple logs are available, 
+            def logs_of(selection, log: nil)
+                if workspace_dir?(selection) || (pkg_set = find_package_set(selection))
+                    if log && log != 'import'
+                        return []
+                    end
+                    name = if pkg_set then pkg_set.name
+                           else "autoproj main configuration"
+                           end
+
+                    import_log = File.join(ws.log_dir, "#{name}-import.log")
+                    if File.file?(import_log)
+                        return [import_log]
+                    else return []
+                    end
+                else
+                    pkg = resolve_package(selection)
+                    Dir.enum_for(:glob, File.join(pkg.logdir, "#{pkg.name}-#{log || '*'}.log")).to_a
+                end
+            end
+
+            # Interactively select a log file among a list
+            def select_log_file(log_files)
+                require 'tty/prompt'
+
+                log_files = log_files.map do |path|
+                    [path, File.stat(path).mtime]
+                end.sort_by(&:last).reverse
+
+                choices = Hash.new
+                log_files.each do |path, mtime|
+                    if path =~ /-(\w+)\.log/
+                        choices["(#{mtime}) #{$1}"] = path
                     else
-                        pkg.srcdir
+                        choices["(#{mtime}) #{path}"] = path
                     end
                 end
+
+                prompt = TTY::Prompt.new
+                prompt.select("Select the log file", choices)
             end
         end
     end

data/lib/autoproj/cli/main.rb

@@ -173,6 +173,8 @@ def clean(*packages)
                 desc: "outputs the package's prefix directory instead of its source directory"
             option :build, aliases: :b, type: :boolean,
                 desc: "outputs the package's build directory instead of its source directory"
+            option :log, aliases: :l,
+                desc: "outputs the path to a package's log file"
             def locate(*packages)
                 run_autoproj_cli(:locate, :Locate, Hash[], *packages)
             end

data/lib/autoproj/environment.rb

@@ -32,8 +32,6 @@ def export_env_sh(subdir = nil, options = Hash.new)
 
             shell_dir = File.expand_path(File.join("..", "..", "shell"), File.dirname(__FILE__))
             if options[:shell_helpers]
-                Autoproj.message "sourcing autoproj shell helpers"
-                Autoproj.message "add \"Autoproj.config.shell_helpers = false\" in autoproj/init.rb to disable"
                 source_after(File.join(shell_dir, "autoproj_sh"))
             end
 

data/lib/autoproj/ops/configuration.rb

@@ -127,12 +127,6 @@ def update_remote_package_set(vcs,
                 return
             end
 
-            # YUK. I am stopping there in the refactoring
-            # TODO: figure out a better way
-            if !@remote_update_message_displayed
-                Autoproj.message("autoproj: updating remote definitions of package sets", :bold)
-                @remote_update_message_displayed = true
-            end
             ws.install_os_packages([vcs.type], all: nil)
             update_configuration_repository(
                 vcs, name, raw_local_dir,
@@ -473,7 +467,6 @@ def load_package_set_information(mainline: nil)
             load_osdeps_from_package_sets
 
             # Load the required autobuild definitions
-            Autoproj.message("autoproj: loading ...", :bold)
             manifest.each_package_set do |pkg_set|
                 pkg_set.each_autobuild_file do |path|
                     ws.import_autobuild_file pkg_set, path
@@ -607,12 +600,6 @@ def update_package_sets(only_local: false,
             package_sets.each do |pkg_set|
                 ws.manifest.register_package_set(pkg_set)
             end
-            # YUK. I am stopping there in the refactoring
-            # TODO: figure out a better way
-            if @remote_update_message_displayed
-                Autoproj.message
-            end
-
             failures
         end
     end

data/lib/autoproj/os_package_resolver.rb

@@ -4,20 +4,7 @@
 module Autoproj
     # Manager for packages provided by external package managers
     class OSPackageResolver
-	class << self
-	    # When requested to load a file called '$FILE', the osdeps code will
-	    # also look for files called '$FILE-suffix', where 'suffix' is an
-	    # element in +suffixes+
-	    #
-	    # A usage of this functionality is to make loading conditional to
-	    # the available version of certain tools, namely Ruby. Autoproj for
-	    # instance adds ruby18 when started on Ruby 1.8 and ruby19 when
-	    # started on Ruby 1.9
-	    attr_reader :suffixes
-	end
-	@suffixes = []
-
-        def self.load(file, **options)
+        def self.load(file, suffixes: [], **options)
 	    if !File.file?(file)
 		raise ArgumentError, "no such file or directory #{file}"
 	    end
@@ -45,22 +32,9 @@ def self.load(file, **options)
 	    result
         end
 
-        class << self
-            attr_reader :aliases
-        end
-        @aliases = Hash.new
-
         # The underlying workspace
         attr_reader :ws
 
-        def self.alias(old_name, new_name)
-            @aliases[new_name] = old_name
-        end
-
-	def self.ruby_version_keyword
-            "ruby#{RUBY_VERSION.split('.')[0, 2].join("")}"
-        end
-
         def self.autodetect_ruby_program
             ruby = RbConfig::CONFIG['RUBY_INSTALL_NAME']
             ruby_bindir = RbConfig::CONFIG['bindir']
@@ -69,12 +43,6 @@ def self.autodetect_ruby_program
             ruby_executable
         end
 
-        def self.autodetect_ruby
-            self.alias(ruby_version_keyword, "ruby")
-        end
-	self.suffixes << ruby_version_keyword
-        autodetect_ruby
-
         AUTOPROJ_OSDEPS = File.join(File.expand_path(File.dirname(__FILE__)), 'default.osdeps')
         def self.load_default
             file = ENV['AUTOPROJ_DEFAULT_OSDEPS'] || AUTOPROJ_OSDEPS
@@ -157,6 +125,9 @@ def os_package_manager
         # @return [Array<String>]
         attr_reader :package_managers
 
+        # Aliases for osdep packages
+        attr_reader :aliases
+
         # The Gem::SpecFetcher object that should be used to query RubyGems, and
         # install RubyGems packages
         def initialize(defs = Hash.new, file = nil,
@@ -170,6 +141,7 @@ def initialize(defs = Hash.new, file = nil,
             self.os_package_manager = os_package_manager
 
             @prefer_indep_over_os_packages = false
+            @aliases = Hash.new
 
             @sources     = Hash.new
             @installed_packages = Set.new
@@ -188,6 +160,14 @@ def initialize(defs = Hash.new, file = nil,
             end
         end
 
+        # Register new aliases
+        #
+        # @param [String=>String] new_aliases mapping of the alias to the exact
+        #   name
+        def add_aliases(new_aliases)
+            aliases.merge!(new_aliases)
+        end
+
         # Returns the name of all known OS packages
         #
         # It includes even the packages for which there are no definitions on
@@ -469,7 +449,7 @@ class InvalidRecursiveStatement < Autobuild::Exception; end
         #
         # returns an array contain the path starting with name and
         # ending at the resolved name
-        def self.resolve_name(name)
+        def resolve_name(name)
             path = [ name ]
             while aliases.has_key?(name)
                 name = aliases[name]
@@ -500,7 +480,7 @@ def resolve_package(name)
                 return resolve_package_cache[name]
             end
 
-            path = self.class.resolve_name(name)
+            path = resolve_name(name)
             name = path.last
 
             dep_def = definitions[name]
@@ -719,7 +699,7 @@ def resolve_os_packages(dependencies)
             dependencies.each do |name|
                 result = resolve_package(name)
                 if !result
-                    path = self.class.resolve_name(name)
+                    path = resolve_name(name)
                     raise MissingOSDep.new, "there is no osdeps definition for #{path.last} (search tree: #{path.join("->")})"
                 end
 

data/lib/autoproj/package_set.rb

@@ -166,7 +166,10 @@ def initialize(
 
         # Load a new osdeps file for this package set
         def load_osdeps(file, **options)
-            new_osdeps = OSPackageResolver.load(file, **options)
+            new_osdeps = OSPackageResolver.load(
+                file,
+                suffixes: ws.osdep_suffixes,
+                **options)
             all_osdeps << new_osdeps
             os_package_resolver.merge(all_osdeps.last)
             new_osdeps

data/lib/autoproj/version.rb

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

data/lib/autoproj/workspace.rb

@@ -18,10 +18,35 @@ class Workspace < Ops::Loader
         attr_reader :os_package_resolver
         attr_reader :os_package_installer
 
+        # The keyword used to represent the current ruby version.
+        #
+        # It is e.g. ruby21 for ruby 2.1.
+        #
+        # It is initialized to the local ruby version in {#initialize}. If one
+        # intends to override it, one must do it before {#setup} gets called
+        #
+        # This is aliased to 'ruby' in the osdep system, so one that depends on
+        # ruby should only refer to 'ruby' unless a specific version is
+        # requested.
+        #
+        # It is also used as an osdep suffix when loading osdep files (i.e. the
+        # osdep system will attempt to load `.osdep-ruby21` files on ruby 2.1 in
+        # addition to the plain .osdep files.
+        #
+        # @return [String]
+        attr_accessor :ruby_version_keyword
+
+        # Suffixes that should be considered when loading osdep files
+        #
+        # {#ruby_version_keyword} is automatically added there in {#setup}
+        attr_reader :osdep_suffixes
+
         def initialize(root_dir,
                        os_package_resolver: OSPackageResolver.new,
                        package_managers: OSPackageInstaller::PACKAGE_MANAGERS)
             @root_dir = root_dir
+            @ruby_version_keyword = "ruby#{RUBY_VERSION.split('.')[0, 2].join("")}"
+            @osdep_suffixes = Array.new
 
             @loader = loader
             @env = Environment.new
@@ -236,7 +261,13 @@ def setup_os_package_installer
             os_package_installer.osdeps_mode
         end
 
+        def setup_ruby_version_handling
+            os_package_resolver.add_aliases('ruby' => ruby_version_keyword)
+            osdep_suffixes << ruby_version_keyword
+        end
+
         def setup
+            setup_ruby_version_handling
             migrate_bundler_and_autoproj_gem_layout
             load_config
             rewrite_shims
@@ -318,6 +349,7 @@ def update_autoproj(restart_on_update: true)
                     self, 'autoproj', gemfile: gemfile)
             end
             begin
+                Autoproj.message "  updating autoproj"
                 PackageManagers::BundlerManager.run_bundler_install(
                     self, gemfile, binstubs: binstubs)
             ensure
@@ -431,11 +463,6 @@ def load_package_sets(only_local: false,
                 return
             end
 
-            if !reconfigure
-                Autoproj.message("run 'autoproj reconfigure' to change configuration options", :bold)
-                Autoproj.message("and use 'autoproj switch-config' to change the remote source for", :bold)
-                Autoproj.message("autoproj's main build configuration", :bold)
-            end
             Ops::Configuration.new(self).
                 load_package_sets(only_local: only_local,
                                   checkout_only: checkout_only,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc39
+  version: 2.0.0.rc40
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-13 00:00:00.000000000 Z
+date: 2016-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -106,6 +106,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: tty-prompt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: flexmock
   requirement: !ruby/object:Gem::Requirement
@@ -321,4 +335,3 @@ signing_key:
 specification_version: 4
 summary: Easy installation and management of sets of software packages
 test_files: []
-has_rdoc: