autoproj 2.12.1 → 2.15.1

data/lib/autoproj/ops/tools.rb

@@ -1,93 +1,91 @@
 module Autoproj
     module Ops
-    module Tools
-        # Data structure used to use autobuild importers without a package, to
-        # import configuration data.
-        #
-        # It has to match the interface of Autobuild::Package that is relevant
-        # for importers
-        class FakePackage < Autobuild::Package
-            attr_reader :srcdir
-            attr_reader :importer
-
-            # Used by the autobuild importers
-            attr_accessor :updated
-
-            def autoproj_name
-                name
-            end
-
-            def initialize(text_name, srcdir, importer = nil)
-                super(text_name)
-                @srcdir = srcdir
-                @importer = importer
-                @@packages.delete(text_name)
-            end
-
-            def import(options = Hash.new)
-                importer.import(self, options)
-            end
-
-            def add_stat(*args)
+        module Tools
+            # Data structure used to use autobuild importers without a package, to
+            # import configuration data.
+            #
+            # It has to match the interface of Autobuild::Package that is relevant
+            # for importers
+            class FakePackage < Autobuild::Package
+                attr_reader :srcdir
+                attr_reader :importer
+
+                # Used by the autobuild importers
+                attr_accessor :updated
+
+                def autoproj_name
+                    name
+                end
+
+                def initialize(text_name, srcdir, importer = nil)
+                    super(text_name)
+                    @srcdir = srcdir
+                    @importer = importer
+                    @@packages.delete(text_name)
+                end
+
+                def import(**options)
+                    importer.import(self, **options)
+                end
+
+                def add_stat(*args)
+                end
             end
-        end
-
-        # Creates an autobuild package whose job is to allow the import of a
-        # specific repository into a given directory.
-        #
-        # +vcs+ is the VCSDefinition file describing the repository, +text_name+
-        # the name used when displaying the import progress, +pkg_name+ the
-        # internal name used to represent the package and +into+ the directory
-        # in which the package should be checked out.
-        def create_autobuild_package(vcs, text_name, into)
-            importer     = vcs.create_autobuild_importer
-            FakePackage.new(text_name, into, importer)
 
-        rescue Autobuild::ConfigException => e
-            raise ConfigError.new, "cannot import #{text_name}: #{e.message}", e.backtrace
-        end
-
-        def load_autoprojrc
-            Autoproj.warn_deprecated __method__, "use workspace.load_autoprojrc instead"
-            Autoproj.workspace.load_autoprojrc
-        end
-
-        def load_main_initrb(*args)
-            Autoproj.warn_deprecated __method__, "use workspace.load_main_initrb instead"
-            Autoproj.workspace.load_main_initrb
-        end
-
-        def common_options(parser)
-            parser.on '--silent' do
-                Autoproj.silent = true
+            # Creates an autobuild package whose job is to allow the import of a
+            # specific repository into a given directory.
+            #
+            # +vcs+ is the VCSDefinition file describing the repository, +text_name+
+            # the name used when displaying the import progress, +pkg_name+ the
+            # internal name used to represent the package and +into+ the directory
+            # in which the package should be checked out.
+            def create_autobuild_package(vcs, text_name, into)
+                importer = vcs.create_autobuild_importer
+                FakePackage.new(text_name, into, importer)
+            rescue Autobuild::ConfigException => e
+                raise ConfigError.new, "cannot import #{text_name}: #{e.message}", e.backtrace
             end
 
-            parser.on '--verbose' do
-                Autoproj.verbose  = true
-                Autobuild.verbose = true
-                Rake.application.options.trace = false
-                Autobuild.debug = false
+            def load_autoprojrc
+                Autoproj.warn_deprecated __method__, "use workspace.load_autoprojrc instead"
+                Autoproj.workspace.load_autoprojrc
             end
 
-            parser.on '--debug' do
-                Autoproj.verbose  = true
-                Autobuild.verbose = true
-                Rake.application.options.trace = true
-                Autobuild.debug = true
+            def load_main_initrb(*args)
+                Autoproj.warn_deprecated __method__, "use workspace.load_main_initrb instead"
+                Autoproj.workspace.load_main_initrb
             end
 
-            parser.on("--[no-]color", "enable or disable color in status messages (enabled by default)") do |flag|
-                Autoproj.color = flag
-                Autobuild.color = flag
+            def common_options(parser)
+                parser.on "--silent" do
+                    Autoproj.silent = true
+                end
+
+                parser.on "--verbose" do
+                    Autoproj.verbose  = true
+                    Autobuild.verbose = true
+                    Rake.application.options.trace = false
+                    Autobuild.debug = false
+                end
+
+                parser.on "--debug" do
+                    Autoproj.verbose  = true
+                    Autobuild.verbose = true
+                    Rake.application.options.trace = true
+                    Autobuild.debug = true
+                end
+
+                parser.on("--[no-]color", "enable or disable color in status messages (enabled by default)") do |flag|
+                    Autoproj.color = flag
+                    Autobuild.color = flag
+                end
+
+                parser.on("--[no-]progress", "enable or disable progress display (enabled by default)") do |flag|
+                    Autobuild.progress_display_enabled = flag
+                end
             end
 
-            parser.on("--[no-]progress", "enable or disable progress display (enabled by default)") do |flag|
-                Autobuild.progress_display_enabled = flag
-            end
+            extend Tools
         end
-
-        extend Tools
-    end
     end
 end
-

data/lib/autoproj/ops/watch.rb

@@ -1,7 +1,7 @@
 module Autoproj
     module Ops
         def self.watch_marker_path(root_dir)
-            File.join(root_dir, '.autoproj', 'watch')
+            File.join(root_dir, ".autoproj", "watch")
         end
 
         def self.watch_running?(root_dir)
@@ -10,22 +10,22 @@ module Autoproj
         rescue Errno::ENOENT
             false
         ensure
-            io.close if io
+            io&.close
         end
 
         class WatchAlreadyRunning < RuntimeError; end
 
         def self.watch_create_marker(root_dir)
-            io = File.open(watch_marker_path(root_dir), 'a+')
-            if !io.flock(File::LOCK_EX | File::LOCK_NB)
+            io = File.open(watch_marker_path(root_dir), "a+")
+            unless io.flock(File::LOCK_EX | File::LOCK_NB)
                 raise WatchAlreadyRunning, "autoproj watch is already running as PID #{io.read.strip}"
             end
+
             io.truncate(0)
             io.puts Process.pid
             io.flush
-
         rescue Exception
-            io.close if io
+            io&.close
             raise
         end
 

data/lib/autoproj/ops/which.rb

@@ -1,6 +1,6 @@
-require 'pathname'
-require 'autoproj/exceptions'
-require 'autobuild/environment'
+require "pathname"
+require "autoproj/exceptions"
+require "autobuild/environment"
 
 module Autoproj
     module Ops
@@ -10,7 +10,7 @@ module Autoproj
         # `cmd` is not executable. Otherwise, looks for an executable named
         # `cmd` in PATH and returns it, or raises if it cannot be found. The
         # exception contains a more detailed reason for failure
-        # 
+        #
         #
         # @param [String] cmd
         # @return [String] the resolved program
@@ -20,24 +20,27 @@ module Autoproj
             path = Pathname.new(cmd)
             if path.absolute?
                 if path.file? && path.executable?
-                    return cmd
+                    cmd
                 elsif path.exist?
-                    raise ExecutableNotFound.new(cmd), "given command `#{cmd}` exists but is not an executable file"
+                    raise ExecutableNotFound.new(cmd),
+                          "given command `#{cmd}` exists but is not an executable file"
                 else
-                    raise ExecutableNotFound.new(cmd), "given command `#{cmd}` does not exist, an executable file was expected"
+                    raise ExecutableNotFound.new(cmd),
+                          "given command `#{cmd}` does not exist, "\
+                          "an executable file was expected"
                 end
             else
-                if path_entries.respond_to?(:call)
-                    path_entries = path_entries.call
-                end
+                path_entries = path_entries.call if path_entries.respond_to?(:call)
                 absolute = Autobuild::Environment.find_executable_in_path(cmd, path_entries)
 
                 if absolute
-                    return absolute
-                elsif file = Autobuild::Environment.find_in_path(cmd, path_entries)
-                    raise ExecutableNotFound.new(cmd), "`#{cmd}` resolves to #{file} which is not executable"
+                    absolute
+                elsif (file = Autobuild::Environment.find_in_path(cmd, path_entries))
+                    raise ExecutableNotFound.new(cmd),
+                          "`#{cmd}` resolves to #{file} which is not executable"
                 else
-                    raise ExecutableNotFound.new(cmd), "cannot resolve `#{cmd}` to an executable in the workspace"
+                    raise ExecutableNotFound.new(cmd),
+                          "cannot resolve `#{cmd}` to an executable in the workspace"
                 end
             end
         end

data/lib/autoproj/options.rb

@@ -4,51 +4,61 @@ module Autoproj
         Autoproj.warn_deprecated __method__, "use the API on Autoproj.config (from Autoproj::Configuration) instead"
         config.override(option_name, value)
     end
+
     # @deprecated use config.reset instead
     def self.reset_option(key)
         Autoproj.warn_deprecated __method__, "use the API on Autoproj.config (from Autoproj::Configuration) instead"
         config.reset(key)
     end
+
     # @deprecated use config.set(key, value, user_validated) instead
     def self.change_option(key, value, user_validated = false)
         Autoproj.warn_deprecated __method__, "use the API on Autoproj.config (from Autoproj::Configuration) instead"
         config.set(key, value, user_validated)
     end
+
     # @deprecated use config.validated_values instead
     def self.option_set
         Autoproj.warn_deprecated __method__, "use the API on Autoproj.config (from Autoproj::Configuration) instead"
         config.validated_values
     end
+
     # @deprecated use config.get(key) instead
     def self.user_config(key)
         Autoproj.warn_deprecated __method__, "use the API on Autoproj.config (from Autoproj::Configuration) instead"
         config.get(key)
     end
+
     # @deprecated use config.declare(name, type, options, &validator) instead
     def self.configuration_option(name, type, options, &validator)
         Autoproj.warn_deprecated __method__, "use the API on Autoproj.config (from Autoproj::Configuration) instead"
         config.declare(name, type, options, &validator)
     end
+
     # @deprecated use config.declared?(name, type, options, &validator) instead
     def self.declared_option?(name)
         Autoproj.warn_deprecated __method__, "use the API on Autoproj.config (from Autoproj::Configuration) instead"
         config.declared?(name)
     end
+
     # @deprecated use config.configure(option_name) instead
     def self.configure(option_name)
         Autoproj.warn_deprecated __method__, "use the API on Autoproj.config (from Autoproj::Configuration) instead"
         config.configure(option_name)
     end
+
     # @deprecated use config.has_value_for?(name)
     def self.has_config_key?(name)
         Autoproj.warn_deprecated __method__, "use the API on Autoproj.config (from Autoproj::Configuration) instead"
         config.has_value_for?(name)
     end
+
     # @deprecated use config.shell_helpers? instead
     def self.shell_helpers?
         Autoproj.warn_deprecated __method__, "use the API on Autoproj.config (from Autoproj::Configuration) instead"
         config.shell_helpers?
     end
+
     # @deprecated use config.shell_helpers= instead
     def self.shell_helpers=(flag)
         Autoproj.warn_deprecated __method__, "use the API on Autoproj.config (from Autoproj::Configuration) instead"
@@ -67,6 +77,7 @@ module Autoproj
     class << self
         attr_accessor :reconfigure
     end
-    def self.reconfigure?; @reconfigure end
+    def self.reconfigure?
+        @reconfigure
+    end
 end
-