autoproj 2.12.1 → 2.15.1

data/lib/autoproj/ops/loader.rb

@@ -1,77 +1,81 @@
 module Autoproj
     module Ops
-    class Loader
-        # The path w.r.t. which we should resolve relative paths
-        #
-        # @return [String]
-        attr_reader :root_dir
-        # @return [Array<String>] information about what is being loaded
-        attr_reader :file_stack
+        class Loader
+            # The path w.r.t. which we should resolve relative paths
+            #
+            # @return [String]
+            attr_reader :root_dir
+            # @return [Array<String>] information about what is being loaded
+            attr_reader :file_stack
 
-        def initialize(root_dir)
-            @root_dir = root_dir
-            @file_stack = Array.new
-            @loaded_autobuild_files = Set.new
-        end
+            def initialize(root_dir)
+                @root_dir = root_dir
+                @file_stack = Array.new
+                @loaded_autobuild_files = Set.new
+            end
 
-        def in_package_set(pkg_set, path)
-            if path
-                path = File.expand_path(path, root_dir)
+            def in_package_set(pkg_set, path)
+                path = File.expand_path(path, root_dir) if path
+                @file_stack.push([pkg_set, path])
+                yield
+            ensure
+                @file_stack.pop
             end
-            @file_stack.push([pkg_set, path])
-            yield
-        ensure
-            @file_stack.pop
-        end
 
-        def filter_load_exception(error, package_set, path)
-            raise error if Autoproj.verbose
-            rx_path = Regexp.quote(path)
-            if error_line = error.backtrace.find { |l| l =~ /#{rx_path}/ }
-                if line_number = Integer(/#{rx_path}:(\d+)/.match(error_line)[1])
+            def filter_load_exception(error, package_set, path)
+                raise error if Autoproj.verbose
+
+                rx_path = Regexp.quote(path)
+                unless (error_line = error.backtrace.find { |l| l =~ /#{rx_path}/ })
+                    raise error
+                end
+
+                if (line_number = Integer(/#{rx_path}:(\d+)/.match(error_line)[1]))
                     line_number = "#{line_number}:"
                 end
 
                 if package_set.local?
-                    raise ConfigError.new(path), "#{path}:#{line_number} #{error.message}", error.backtrace
+                    raise ConfigError.new(path),
+                          "#{path}:#{line_number} #{error.message}", error.backtrace
                 else
-                    raise ConfigError.new(path), "#{File.basename(path)}(package_set=#{package_set.name}):#{line_number} #{error.message}", error.backtrace
+                    raise ConfigError.new(path),
+                          "#{File.basename(path)}(package_set=#{package_set.name}):"\
+                          "#{line_number} #{error.message}", error.backtrace
                 end
-            else
-                raise error
             end
-        end
 
-        # Returns the information about the file that is currently being loaded
-        #
-        # The return value is [package_set, path], where +package_set+ is the
-        # PackageSet instance and +path+ is the path of the file w.r.t. the autoproj
-        # root directory
-        def current_file
-            if file = @file_stack.last
+            # Returns the information about the file that is currently being loaded
+            #
+            # The return value is [package_set, path], where +package_set+ is the
+            # PackageSet instance and +path+ is the path of the file w.r.t. the autoproj
+            # root directory
+            def current_file
+                unless (file = @file_stack.last)
+                    raise ArgumentError, "not in a #in_package_set context"
+                end
+
                 file
-            else raise ArgumentError, "not in a #in_package_set context"
             end
-        end
 
-        # The PackageSet object representing the package set that is currently being
-        # loaded
-        def current_package_set
-            current_file.first
-        end
+            # The PackageSet object representing the package set that is currently being
+            # loaded
+            def current_package_set
+                current_file.first
+            end
 
-        # Load a definition file from a package set
-        #
-        # If any error is detected, the backtrace will be filtered so that it is
-        # easier to understand by the user. Moreover, if +source+ is non-nil, the
-        # package set name will be mentionned.
-        #
-        # @param [PackageSet] pkg_set
-        # @param [Array<String>] path
-        def load(pkg_set, *path)
-            path = File.join(*path)
-            in_package_set(pkg_set, File.expand_path(path).gsub(/^#{Regexp.quote(root_dir)}\//, '')) do
-                begin
+            # Load a definition file from a package set
+            #
+            # If any error is detected, the backtrace will be filtered so that it is
+            # easier to understand by the user. Moreover, if +source+ is non-nil, the
+            # package set name will be mentionned.
+            #
+            # @param [PackageSet] pkg_set
+            # @param [Array<String>] path
+            def load(pkg_set, *path)
+                path = File.join(*path)
+                relative_path =
+                    File.expand_path(path).gsub(/^#{Regexp.quote(root_dir)}\//, "")
+                in_package_set(pkg_set, relative_path) do
                     Kernel.load path
                 rescue Interrupt
                     raise
@@ -81,30 +85,27 @@ module Autoproj
                     filter_load_exception(e, pkg_set, path)
                 end
             end
-        end
 
-        # Load a definition file from a package set if the file is present
-        #
-        # (see load)
-        def load_if_present(pkg_set, *path)
-            path = File.join(*path)
-            if File.file?(path)
-                load(pkg_set, *path)
+            # Load a definition file from a package set if the file is present
+            #
+            # (see load)
+            def load_if_present(pkg_set, *path)
+                path = File.join(*path)
+                load(pkg_set, *path) if File.file?(path)
             end
-        end
 
-        def import_autobuild_file(package_set, path)
-            return if @loaded_autobuild_files.include?(path)
-            load(package_set, path)
-            @loaded_autobuild_files << path
+            def import_autobuild_file(package_set, path)
+                return if @loaded_autobuild_files.include?(path)
+
+                load(package_set, path)
+                @loaded_autobuild_files << path
+            end
         end
-    end
 
-    # @deprecated use Autoproj.workspace, or better make sure all ops classes
-    #   get their own workspace object as argument
-    def self.loader
-        Autoproj.workspace
-    end
+        # @deprecated use Autoproj.workspace, or better make sure all ops classes
+        #   get their own workspace object as argument
+        def self.loader
+            Autoproj.workspace
+        end
     end
 end
-

data/lib/autoproj/ops/main_config_switcher.rb

@@ -16,10 +16,9 @@ module Autoproj
             EXPECTED_ROOT_ENTRIES = [".", "..", "autoproj_bootstrap",
                                      ".autoproj", "bootstrap.sh", ENV_FILENAME].to_set
 
-
             def check_root_dir_empty?
-                (ENV['AUTOPROJ_NONINTERACTIVE'] != '1') &&
-                    (ENV['AUTOPROJ_BOOTSTRAP_IGNORE_NONEMPTY_DIR'] != '1')
+                (ENV["AUTOPROJ_NONINTERACTIVE"] != "1") &&
+                    (ENV["AUTOPROJ_BOOTSTRAP_IGNORE_NONEMPTY_DIR"] != "1")
             end
 
             # Verifies that {#root_dir} contains only expected entries, to make
@@ -28,23 +27,21 @@ module Autoproj
             # If the environment variable AUTOPROJ_BOOTSTRAP_IGNORE_NONEMPTY_DIR
             # is set to 1, the check is skipped
             def check_root_dir_empty
-                require 'set'
+                require "set"
                 curdir_entries = Dir.entries(ws.root_dir).map { |p| File.basename(p) }.to_set -
-                    EXPECTED_ROOT_ENTRIES
+                                 EXPECTED_ROOT_ENTRIES
                 return if curdir_entries.empty?
 
-                while true
+                loop do
                     print "The current directory is not empty, continue bootstrapping anyway ? [yes] "
                     STDOUT.flush
                     answer = STDIN.readline.chomp
-                    if answer == "no"
-                        raise Interrupt, "Interrupted by user"
-                    end
+                    raise Interrupt, "Interrupted by user" if answer == "no"
 
                     if answer == "" || answer == "yes"
                         # Set this environment variable since we might restart
                         # autoproj later on.
-                        ENV['AUTOPROJ_BOOTSTRAP_IGNORE_NONEMPTY_DIR'] = '1'
+                        ENV["AUTOPROJ_BOOTSTRAP_IGNORE_NONEMPTY_DIR"] = "1"
                         return
                     else
                         STDOUT.puts "invalid answer. Please answer 'yes' or 'no'"
@@ -62,29 +59,27 @@ module Autoproj
             # @param [Array<String>] reuse set of autoproj roots that are being reused
             # @raise ConfigError
             def validate_autoproj_current_root(reuse)
-                if current_root = ENV['AUTOPROJ_CURRENT_ROOT']
-                    # Allow having a current root only if it is being reused
-                    if (current_root != ws.root_dir) && !reuse.include?(current_root)
-                        Autoproj.error "the env.sh from #{ENV['AUTOPROJ_CURRENT_ROOT']} seem to already be sourced"
-                        Autoproj.error "start a new shell and try to bootstrap again"
-                        Autoproj.error ""
-                        Autoproj.error "you are allowed to boostrap from another autoproj installation"
-                        Autoproj.error "only if you reuse it with the --reuse flag"
-                        raise Autobuild::Exception, ""
-                    end
-                end
+                return unless (current_root = ENV["AUTOPROJ_CURRENT_ROOT"])
+                return if (current_root == ws.root_dir) || reuse.include?(current_root)
+
+                Autoproj.error "the env.sh from #{ENV['AUTOPROJ_CURRENT_ROOT']} seem to already be sourced"
+                Autoproj.error "start a new shell and try to bootstrap again"
+                Autoproj.error ""
+                Autoproj.error "you are allowed to boostrap from another autoproj installation"
+                Autoproj.error "only if you reuse it with the --reuse flag"
+                raise Autobuild::Exception, ""
             end
 
-            MAIN_CONFIGURATION_TEMPLATE = File.expand_path(File.join("..", "..", "..", "samples", 'autoproj'), File.dirname(__FILE__))
+            MAIN_CONFIGURATION_TEMPLATE = File.expand_path(File.join("..", "..", "..", "samples", "autoproj"), File.dirname(__FILE__))
 
             def bootstrap(buildconf_info,
-                          check_root_dir_empty: check_root_dir_empty?,
-                          reuse: Array.new)
+                check_root_dir_empty: check_root_dir_empty?,
+                reuse: Array.new)
                 self.check_root_dir_empty if check_root_dir_empty
                 validate_autoproj_current_root(reuse)
 
                 ws.config.validate_ruby_executable
-                ws.config.set 'reused_autoproj_installations', reuse, true
+                ws.config.set "reused_autoproj_installations", reuse, true
                 ws.env.export_env_sh(shell_helpers: ws.config.shell_helpers?)
 
                 # If we are not getting the installation setup from a VCS, copy the template
@@ -97,10 +92,10 @@ module Autoproj
                     manifest_url = buildconf_info.first
                     Autoproj.message("autoproj: downloading manifest file #{manifest_url}", :bold)
                     manifest_data =
-                        begin open(manifest_url) { |file| file.read }
+                        begin open(manifest_url, &:read)
                         rescue
                             # Delete the autoproj directory
-                            FileUtils.rm_rf 'autoproj'
+                            FileUtils.rm_rf "autoproj"
                             raise ConfigError.new, "cannot read file / URL #{manifest_url}, did you mean 'autoproj bootstrap VCSTYPE #{manifest_url}' ?"
                         end
 
@@ -122,9 +117,11 @@ module Autoproj
                 if args.first =~ /^(\w+)=/
                     # First argument is an option string, we are simply setting the
                     # options without changing the type/url
-                    type, url = vcs.type, vcs.url
+                    type = vcs.type
+                    url = vcs.url
                 else
-                    type, url = args.shift, args.shift
+                    type = args.shift
+                    url = args.shift
                 end
                 options = args
 
@@ -133,7 +130,7 @@ module Autoproj
                 if vcs.type == type && vcs.url == url
                     vcs = vcs.to_hash
                     options.each do |opt|
-                        opt_name, opt_value = opt.split('=')
+                        opt_name, opt_value = opt.split("=")
                         vcs[opt_name.to_sym] = opt_value
                     end
                     # Validate the VCS definition, but save the hash as-is
@@ -145,10 +142,10 @@ module Autoproj
                 else
                     # We will have to delete the current autoproj directory. Ask the user.
                     opt = Autoproj::BuildOption.new("delete current config", "boolean",
-                                Hash[:default => "false",
-                                    :doc => "delete the current configuration ? (required to switch)"], nil)
+                                                    Hash[default: "false",
+                                                         doc: "delete the current configuration ? (required to switch)"], nil)
 
-                    return if !opt.ask(nil)
+                    return unless opt.ask(nil)
 
                     do_switch_config(true, type, url, *options)
                     ws.config.save
@@ -163,9 +160,7 @@ module Autoproj
                 vcs_def[:url]  = VCSDefinition.to_absolute_url(url, ws.root_dir)
                 options.each do |opt|
                     name, value = opt.split("=")
-                    if value =~ /^\d+$/
-                        value = Integer(value)
-                    end
+                    value = Integer(value) if value =~ /^\d+$/
 
                     vcs_def[name] = value
                 end
@@ -193,7 +188,8 @@ module Autoproj
                 ops.update_configuration_repository(
                     vcs,
                     "autoproj main configuration",
-                    config_dir)
+                    config_dir
+                )
 
                 # If the new tree has a configuration file, load it but override
                 # the already known parameters once it is loaded
@@ -207,9 +203,9 @@ module Autoproj
                 # options will not be reused
                 #
                 # TODO: cleanup the options to only keep the relevant ones
-                vcs_def = Hash['type' => type, 'url' => url]
+                vcs_def = Hash["type" => type, "url" => url]
                 options.each do |opt|
-                    opt_name, opt_val = opt.split '='
+                    opt_name, opt_val = opt.split "="
                     vcs_def[opt_name] = opt_val
                 end
                 # Validate the option hash, just in case
@@ -217,7 +213,6 @@ module Autoproj
                 # Save the new options
                 ws.config.set "manifest_source", vcs_def.dup, true
                 ws.config.save
-
             rescue Exception => e
                 Autoproj.error "switching configuration failed: #{e.message}"
                 if backup_name
@@ -227,12 +222,8 @@ module Autoproj
                 end
                 raise
             ensure
-                if backup_name
-                    FileUtils.rm_rf backup_name
-                end
+                FileUtils.rm_rf backup_name if backup_name
             end
         end
     end
 end
-
-

data/lib/autoproj/ops/phase_reporting.rb

@@ -15,13 +15,13 @@ module Autoproj
 
                 dump = JSON.dump(
                     "#{@name}_report" => {
-                        'timestamp' => Time.now,
-                        'packages' => info
+                        "timestamp" => Time.now,
+                        "packages" => info
                     }
                 )
 
                 FileUtils.mkdir_p File.dirname(@path)
-                File.open(@path, 'w') do |io|
+                File.open(@path, "w") do |io|
                     io.write dump
                 end
             end
@@ -37,7 +37,7 @@ module Autoproj
                 @incremental_report.concat(
                     "#{prefix}\"#{autobuild_package.name}\": #{JSON.dump(new_metadata)}"
                 )
-                File.open(@path, 'w') do |io|
+                File.open(@path, "w") do |io|
                     io.write "{ \"#{@name}_report\": "\
                              "{\"timestamp\": #{JSON.dump(Time.now)}, \"packages\": {"
                     io.write(@incremental_report)