autoproj 2.12.0 → 2.15.0

data/lib/autoproj/variable_expansion.rb

@@ -32,17 +32,15 @@ module Autoproj
     # If the values listed in +definitions+ also contain configuration
     # variables, they do not get expanded
     def self.single_expansion(data, definitions)
-        if !data.respond_to?(:to_str)
-            return data
-        end
+        return data unless data.respond_to?(:to_str)
 
         data = data.gsub(/(.|^)\$(\w+)/) do |constant_name|
             prefix = constant_name[0, 1]
-            if prefix == "\\"
-                next(constant_name[1..-1])
-            end
+            next(constant_name[1..-1]) if prefix == "\\"
+
             if prefix == "$"
-                prefix, constant_name = "", constant_name[1..-1]
+                prefix = ""
+                constant_name = constant_name[1..-1]
             else
                 constant_name = constant_name[2..-1]
             end
@@ -75,12 +73,15 @@ module Autoproj
             if contains_expansion?(value)
                 raise ConfigError.new, "some expansions are not defined in #{value.inspect}"
             end
+
             value
         end
     end
 
     # True if the given string contains expansions
-    def self.contains_expansion?(string); string =~ /\$/ end
+    def self.contains_expansion?(string)
+        string.respond_to?(:to_str) && string.to_str =~ /\$/
+    end
 
     def self.resolve_one_constant(name, value, result, definitions)
         result[name] ||= single_expansion(value, result) do |missing_name|
@@ -95,7 +96,7 @@ module Autoproj
     # refers to variables defined in +constants+
     def self.resolve_constant_definitions(constants, definitions = Hash.new)
         definitions = definitions.merge(constants)
-        
+
         all_resolutions = Hash.new
         resolution_cache = Hash.new
         constants.each do |key, value|
@@ -104,4 +105,3 @@ module Autoproj
         all_resolutions
     end
 end
-

data/lib/autoproj/vcs_definition.rb

@@ -33,12 +33,14 @@ module Autoproj
         HistoryEntry  = Struct.new :package_set, :vcs
         RawEntry      = Struct.new :package_set, :file, :vcs
 
-        def initialize(type, url, vcs_options, from: nil, raw: Array.new, history: Array.new)
-            if !raw.respond_to?(:to_ary)
+        def initialize(type, url, vcs_options, from: nil, raw: [], history: [])
+            unless raw.respond_to?(:to_ary)
                 raise ArgumentError, "wrong format for the raw field (#{raw.inspect})"
             end
 
-            @type, @url, @options = type, url, vcs_options
+            @type = type
+            @url = url
+            @options = vcs_options
             if type != "none" && type != "local" && !Autobuild.respond_to?(type)
                 raise ConfigError.new, "version control #{type} is unknown to autoproj"
             end
@@ -49,17 +51,17 @@ module Autoproj
 
         # Create a null VCS object
         def self.none
-            from_raw(type: 'none')
+            from_raw({ type: "none" })
         end
 
         # Whether there is actually a version control definition
         def none?
-            @type == 'none'
+            @type == "none"
         end
 
         # Whether this points to a local directory
         def local?
-            @type == 'local'
+            @type == "local"
         end
 
         # Converts self to a Hash description that could be passed to {.from_raw}
@@ -83,7 +85,7 @@ module Autoproj
             if !new.has_key?(:type) || (type == new[:type])
                 new = to_hash.merge(new)
                 new_raw = self.raw + raw
-                new_history = self.history
+                new_history = history
             end
             self.class.from_raw(new, from: from, history: new_history, raw: new_raw)
         end
@@ -135,15 +137,15 @@ module Autoproj
                 raise ArgumentError, "invalid syntax"
             elsif plain.size == 1
                 short_url = plain.first
-                vcs, *url = short_url.split(':')
+                vcs, *url = short_url.split(":")
 
                 # Check if VCS is a known version control system or source handler
                 # shortcut. If it is not, look for a local directory called
                 # short_url
                 if Autobuild.respond_to?(vcs)
-                    spec.merge!(type: vcs, url: url.join(':'))
+                    spec.merge!(type: vcs, url: url.join(":"))
                 elsif Autoproj.has_source_handler?(vcs)
-                    spec = Autoproj.call_source_handler(vcs, url.join(':'), spec)
+                    spec = Autoproj.call_source_handler(vcs, url.join(":"), spec)
                 else
                     source_dir =
                         if Pathname.new(short_url).absolute?
@@ -151,18 +153,22 @@ module Autoproj
                         elsif base_dir
                             File.expand_path(short_url, base_dir)
                         else
-                            raise ArgumentError, "VCS path '#{short_url}' is relative and no base_dir was given"
+                            raise ArgumentError,
+                                  "VCS path '#{short_url}' is relative and no "\
+                                  "base_dir was given"
                         end
-                    if !File.directory?(source_dir)
-                        raise ArgumentError, "'#{short_url}' is neither a remote source specification, nor an existing local directory"
+                    unless File.directory?(source_dir)
+                        raise ArgumentError,
+                              "'#{short_url}' is neither a remote source "\
+                              "specification, nor an existing local directory"
                     end
-                    spec.merge!(type: 'local', url: source_dir)
+                    spec.merge!(type: "local", url: source_dir)
                 end
             end
 
             spec, vcs_options = Kernel.filter_options spec, type: nil, url: nil
             spec.merge!(vcs_options)
-            if !spec[:url]
+            unless spec[:url]
                 # Verify that none of the keys are source handlers. If it is the
                 # case, convert
                 filtered_spec = Hash.new
@@ -182,7 +188,7 @@ module Autoproj
         #
         # Converts a raw spec (a hash, really) into a nicely formatted string
         def self.raw_spec_to_s(spec)
-            "{ #{spec.sort_by(&:first).map { |k, v| "#{k}: #{v}" }.join(", ")} }"
+            "{ #{spec.sort_by(&:first).map { |k, v| "#{k}: #{v}" }.join(', ')} }"
         end
 
         # Converts a 'raw' VCS representation to a normalized hash.
@@ -195,21 +201,31 @@ module Autoproj
         # @return [VCSDefinition]
         # @raise ArgumentError if the raw specification does not match an
         #   expected format
-        def self.from_raw(spec, from: nil, raw: Array.new, history: Array.new)
+        def self.from_raw(spec, from: nil, raw: [], history: [])
             normalized_spec = normalize_vcs_hash(spec)
-            if !(type = normalized_spec.delete(:type))
-                raise ArgumentError, "the source specification #{raw_spec_to_s(spec)} normalizes into #{raw_spec_to_s(normalized_spec)}, which does not have a VCS type"
-            elsif !(url  = normalized_spec.delete(:url))
-                if type != 'none'
-                    raise ArgumentError, "the source specification #{raw_spec_to_s(spec)} normalizes into #{raw_spec_to_s(normalized_spec)}, which does not have a URL. Only VCS of type 'none' do not require one"
-                end
+            unless (type = normalized_spec.delete(:type))
+                raise ArgumentError,
+                      "the source specification #{raw_spec_to_s(spec)} normalizes "\
+                      "into #{raw_spec_to_s(normalized_spec)}, "\
+                      "which does not have a VCS type"
+            end
+
+            if !(url  = normalized_spec.delete(:url)) && type != "none"
+                raise ArgumentError,
+                      "the source specification #{raw_spec_to_s(spec)} normalizes "\
+                      "into #{raw_spec_to_s(normalized_spec)}, "\
+                      "which does not have a URL. "\
+                      "Only VCS of type 'none' do not require one"
             end
 
-            VCSDefinition.new(type, url, normalized_spec, from: from, history: history, raw: raw)
+            VCSDefinition.new(
+                type, url, normalized_spec, from: from, history: history, raw: raw
+            )
         end
 
         def ==(other_vcs)
-            return false if !other_vcs.kind_of?(VCSDefinition)
+            return false unless other_vcs.kind_of?(VCSDefinition)
+
             if local?
                 other_vcs.local? && url == other_vcs.url
             elsif other_vcs.local?
@@ -233,22 +249,21 @@ module Autoproj
             to_hash == other_vcs.to_hash
         end
 
-        ABSOLUTE_PATH_OR_URI = /^([\w+]+:\/)?\/|^[:\w]+\@|^(\w+\@)?[\w\.-]+:/
+        ABSOLUTE_PATH_OR_URI = /^([\w+]+:\/)?\/|^[:\w]+@|^(\w+@)?[\w.-]+:/
 
         def self.to_absolute_url(url, root_dir)
-            if url && url !~ ABSOLUTE_PATH_OR_URI
-                url = File.expand_path(url, root_dir)
-            end
+            url = File.expand_path(url, root_dir) if url && url !~ ABSOLUTE_PATH_OR_URI
             url
         end
 
         # Whether the underlying package needs to be imported
         def needs_import?
-            type != 'none' && type != 'local'
+            type != "none" && type != "local"
         end
 
         def overrides_key
             return if none?
+
             if local?
                 "local:#{url}"
             else
@@ -261,7 +276,7 @@ module Autoproj
         #
         # @return [Autobuild::Importer,nil] the autobuild importer
         def create_autobuild_importer
-            return if !needs_import?
+            return unless needs_import?
 
             importer = Autobuild.send(type, url, options)
             if importer.respond_to?(:declare_alternate_repository)
@@ -269,6 +284,7 @@ module Autoproj
                     package_set = entry.package_set
                     vcs         = entry.vcs
                     next if !package_set || package_set.main?
+
                     importer.declare_alternate_repository(package_set.name, vcs.url, vcs.options)
                 end
             end
@@ -281,8 +297,8 @@ module Autoproj
                 "none"
             else
                 desc = "#{type}:#{url}"
-                if !options.empty?
-                    desc = "#{desc} #{options.to_a.sort_by { |key, _| key.to_s }.map { |key, value| "#{key}=#{value}" }.join(" ")}"
+                unless options.empty?
+                    desc = "#{desc} #{options.to_a.sort_by { |key, _| key.to_s }.map { |key, value| "#{key}=#{value}" }.join(' ')}"
                 end
                 desc
             end
@@ -304,10 +320,10 @@ module Autoproj
     # definition as a hash
     def self.call_source_handler(vcs, url, options)
         handler = @custom_source_handlers[vcs.to_s]
-        if !handler
-            raise ArgumentError, "there is no source handler for #{vcs}"
+        if handler
+            handler.call(url, **options)
         else
-            return handler.call(url, options)
+            raise ArgumentError, "there is no source handler for #{vcs}"
         end
     end
 
@@ -333,7 +349,7 @@ module Autoproj
     # @yieldparam [Hash] the rest of the VCS hash
     # @return [Hash] a VCS hash with the information expanded
     def self.add_source_handler(name, &handler)
-        @custom_source_handlers[name.to_s] = lambda(&handler)
+        @custom_source_handlers[name.to_s] = handler
     end
 
     # Deregister a source handler defined with {.add_source_handler}

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.12.0"
+    VERSION = "2.15.0"
 end