autoproj 2.13.0 → 2.15.2

data/lib/autoproj/source_package_query.rb

@@ -29,18 +29,18 @@ module Autoproj
     #
     class SourcePackageQuery < QueryBase
         ALLOWED_FIELDS = [
-            'autobuild.name',
-            'autobuild.srcdir',
-            'autobuild.class.name',
-            'vcs.type',
-            'vcs.url',
-            'package_set.name'
+            "autobuild.name",
+            "autobuild.srcdir",
+            "autobuild.class.name",
+            "vcs.type",
+            "vcs.url",
+            "package_set.name"
         ]
         DEFAULT_FIELDS = {
-            'name' => 'autobuild.name',
-            'class' => 'autobuild.class.name',
-            'vcs' => 'vcs.url',
-            'package_set' => 'package_set.name'
+            "name" => "autobuild.name",
+            "class" => "autobuild.class.name",
+            "vcs" => "vcs.url",
+            "package_set" => "package_set.name"
         }
 
         # Match priorities
@@ -52,18 +52,18 @@ module Autoproj
         def initialize(fields, value, partial)
             super(fields, value, partial)
 
-            directories = value.split('/')
-            if !directories.empty?
+            directories = value.split("/")
+            unless directories.empty?
                 @use_dir_prefix = true
-                rx = directories.
-                    map { |d| "#{Regexp.quote(d)}\\w*" }.
-                    join("/")
+                rx = directories
+                     .map { |d| "#{Regexp.quote(d)}\\w*" }
+                     .join("/")
                 rx = Regexp.new(rx, true)
                 @dir_prefix_weak_rx = rx
 
-                rx_strict = directories[0..-2].
-                    map { |d| "#{Regexp.quote(d)}\\w*" }.
-                    join("/")
+                rx_strict = directories[0..-2]
+                            .map { |d| "#{Regexp.quote(d)}\\w*" }
+                            .join("/")
                 rx_strict = Regexp.new("#{rx_strict}/#{Regexp.quote(directories.last)}$", true)
                 @dir_prefix_strong_rx = rx_strict
             end
@@ -95,38 +95,32 @@ module Autoproj
             pkg_value = fields.inject(pkg) { |v, field_name| v.send(field_name) }
             pkg_value = pkg_value.to_s
 
-            if pkg_value == value
-                return EXACT
-            end
+            return EXACT if pkg_value == value
 
-            if !partial?
-                return
-            end
+            return unless partial?
 
-            if @value_rx === pkg_value
-                return PARTIAL
-            end
+            return PARTIAL if @value_rx === pkg_value
 
             # Special match for directories: match directory prefixes
             if use_dir_prefix?
                 if @dir_prefix_strong_rx === pkg_value
-                    return DIR_PREFIX_STRONG
+                    DIR_PREFIX_STRONG
                 elsif @dir_prefix_weak_rx === pkg_value
-                    return DIR_PREFIX_WEAK
+                    DIR_PREFIX_WEAK
                 end
             end
         end
 
         # Parse a single field in a query (i.e. a FIELD[=~]VALUE string)
         def self.parse(str)
-            if str !~ /[=~]/
-                match_name = parse("autobuild.name~#{str}")
-                match_dir  = parse("autobuild.srcdir~#{str}")
-                return Or.new([match_name, match_dir])
-            else
+            if str =~ /[=~]/
                 fields, value, partial =
                     super(str, default_fields: DEFAULT_FIELDS, allowed_fields: ALLOWED_FIELDS)
-                return new(fields, value, partial)
+                new(fields, value, partial)
+            else
+                match_name = parse("autobuild.name~#{str}")
+                match_dir  = parse("autobuild.srcdir~#{str}")
+                Or.new([match_name, match_dir])
             end
         end
     end
@@ -134,4 +128,3 @@ module Autoproj
     # For backward compatibility
     Query = SourcePackageQuery
 end
-

data/lib/autoproj/system.rb

@@ -11,7 +11,7 @@ module Autoproj
 
     # Returns true if +path+ is part of an autoproj installation
     def self.in_autoproj_installation?(path)
-        !!find_workspace_dir(path, 'workspace')
+        !!find_workspace_dir(path, "workspace")
     end
 
     # Forcefully sets the root directory
@@ -22,6 +22,7 @@ module Autoproj
         if @workspace && dir != @workspace.root_dir
             raise WorkspaceAlreadyCreated, "cannot switch global root directory after a workspace object got created"
         end
+
         @root_dir = dir
     end
 
@@ -36,10 +37,10 @@ module Autoproj
             @root_dir = ni
             return
         end
+
         path = Autoproj.find_workspace_dir(dir)
-        if !path
-            raise UserError, "not in a Autoproj installation"
-        end
+        raise UserError, "not in a Autoproj installation" unless path
+
         path
     end
 
@@ -49,12 +50,14 @@ module Autoproj
         caller.each { |l| Autoproj.warn "  #{l}" }
         workspace.config_dir
     end
+
     # @deprecated use workspace.overrides_dir instead
     def self.overrides_dir
         Autoproj.warn "#{__method__} is deprecated, use workspace.overrides_dir instead"
         caller.each { |l| Autoproj.warn "  #{l}" }
         workspace.overrides_dir
     end
+
     # @deprecated use Autobuild.find_in_path instead
     #
     # Warning: the autobuild method returns nil (instead of raising) if the
@@ -62,62 +65,71 @@ module Autoproj
     def self.find_in_path(name)
         Autoproj.warn "#{__method__} is deprecated, use Autobuild.find_in_path instead"
         caller.each { |l| Autoproj.warn "  #{l}" }
-        if path = Autobuild.find_in_path(name)
-            return path
-        else raise ArgumentError, "cannot find #{name} in PATH (#{ENV['PATH']})"
+        unless (path = Autobuild.find_in_path(name))
+            raise ArgumentError, "cannot find #{name} in PATH (#{ENV['PATH']})"
         end
+
+        path
     end
+
     # @deprecated use workspace.prefix_dir instead
     def self.prefix
-        Autoproj.warn_deprecated(__method__, 'workspace.prefix_dir')
+        Autoproj.warn_deprecated(__method__, "workspace.prefix_dir")
         workspace.prefix_dir
     end
+
     # @deprecated use workspace.prefix_dir= instead
     def self.prefix=(path)
-        Autoproj.warn_deprecated(__method__, 'workspace.prefix_dir=')
+        Autoproj.warn_deprecated(__method__, "workspace.prefix_dir=")
         workspace.prefix_dir = path
     end
+
     # @deprecated use workspace.prefix_dir instead
     def self.build_dir
-        Autoproj.warn_deprecated(__method__, 'workspace.prefix_dir')
+        Autoproj.warn_deprecated(__method__, "workspace.prefix_dir")
         workspace.prefix_dir
     end
+
     # @deprecated compute the full path with File.join(config_dir, file)
     #   directly instead
     def self.config_file(file)
-        Autoproj.warn_deprecated(__method__, 'compute the full path with File.join(config_dir, ...) instead')
+        Autoproj.warn_deprecated(__method__, "compute the full path with File.join(config_dir, ...) instead")
         File.join(config_dir, file)
     end
+
     # @deprecated use workspace.remotes_dir instead
     def self.remotes_dir
-        Autoproj.warn_deprecated(__method__, 'use workspace.remotes_dir instead')
+        Autoproj.warn_deprecated(__method__, "use workspace.remotes_dir instead")
         workspace.remotes_dir
     end
+
     # @deprecated use workspace.load or add a separate Loader object to your class
     def self.load(package_set, *path)
         Autoproj.warn_deprecated(
             __method__,
-            'use workspace.load or add a separate Loader object to your class')
+            "use workspace.load or add a separate Loader object to your class"
+        )
         workspace.load(package_set, *path)
     end
+
     # @deprecated use workspace.load_if_present or add a separate Loader object to your class
     def self.load_if_present(package_set, *path)
         Autoproj.warn_deprecated(
             __method__,
-            'use workspace.load_if_present or add a separate Loader object to your class')
+            "use workspace.load_if_present or add a separate Loader object to your class"
+        )
         workspace.load_if_present(package_set, *path)
     end
 
     # Run the provided command as user
     def self.run_as_user(*args)
-        if !system(*args)
-            raise "failed to run #{args.join(" ")}"
-        end
+        raise "failed to run #{args.join(' ')}" unless system(*args)
     end
+
     # Run the provided command as root, using sudo to gain root access
-    def self.run_as_root(*args, env: self.workspace.env)
-        if !system(Autobuild.tool_in_path('sudo', env: env), *args)
-            raise "failed to run #{args.join(" ")} as root"
+    def self.run_as_root(*args, env: workspace.env)
+        unless system(Autobuild.tool_in_path("sudo", env: env), *args)
+            raise "failed to run #{args.join(' ')} as root"
         end
     end
 
@@ -135,4 +147,3 @@ module Autoproj
         end
     end
 end
-