autoproj 1.13.0 → 1.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26fd2b3055fed7ae05cf424070645adff0461145
-  data.tar.gz: d3b0a4563a5a33767f57ceae457e46d3296a7cd2
+  metadata.gz: e8c0eb43db5cb20d6097d40687891ce39ea963a2
+  data.tar.gz: 739b2709c825b0b726c87efbece61f644535f910
 SHA512:
-  metadata.gz: 0ff86e87b351d820f46895f3560f5672b02e2fd42106ae89e94f1501d1d249eda8070f67516182cdfcf5cc1c074a141fe60dad3f79932ef456680d4afc1c5b20
-  data.tar.gz: 21d74bf9a38419528efa7059d1ca6622f9e278d551f024ec3e2e723a58023fa816602961c79ce1329390c1021dae562b224e56777e3d36e087b3da37f4514ea2
+  metadata.gz: a4028b0a7ec006dc9553c6e1ba84e5ebd978bf5f20772163b527c223a4fd61757907f79d7f34e1232ed41a33cbb3a5a2324ec25e30e87ebe4a674379e36e72df
+  data.tar.gz: 6c0599dc5381ecab814f22672113f96e712aca049a04b0c79b7d0e8b9c7e13eb764ef0e9776da878babb4cbbe2326a21554297f031b0283050a70586bab29adc

data/lib/autoproj/vcs_definition.rb

@@ -73,12 +73,18 @@ module Autoproj
         def self.vcs_definition_to_hash(spec)
             plain = Array.new
             filtered_spec = Hash.new
-            spec.each do |key, value|
-                keys = key.to_s.split(/\s+/)
-                plain.concat(keys[0..-2])
-                filtered_spec[keys[-1].to_sym] = value
+
+            if spec.respond_to?(:to_str)
+                plain << spec
+                spec = Hash.new
+            else
+                Array(spec).each do |key, value|
+                    keys = key.to_s.split(/\s+/)
+                    plain.concat(keys[0..-2])
+                    filtered_spec[keys[-1].to_sym] = value
+                end
+                spec = filtered_spec
             end
-            spec = filtered_spec
 
             if plain.size > 1
                 raise ConfigError.new, "invalid syntax"
@@ -94,9 +100,14 @@ module Autoproj
                 elsif Autoproj.has_source_handler?(vcs)
                     spec = Autoproj.call_source_handler(vcs, url.join(':'), spec)
                 else
-                    source_dir = File.expand_path(File.join(Autoproj.config_dir, short_url))
+                    source_dir =
+                        if Pathname.new(short_url).absolute?
+                            File.expand_path(short_url)
+                        else
+                            File.expand_path(File.join(Autoproj.config_dir, short_url))
+                        end
                     if !File.directory?(source_dir)
-                        raise ConfigError.new, "'#{spec.inspect}' is neither a remote source specification, nor a local source definition"
+                        raise ConfigError.new, "'#{spec.inspect}' is neither a remote source specification, nor an existing local directory"
                     end
                     spec.merge!(:type => 'local', :url => source_dir)
                 end
@@ -168,12 +179,17 @@ module Autoproj
             url
         end
 
+        # Whether the underlying package needs to be imported
+        def needs_import?
+            type != 'none' && type != 'local'
+        end
+
         # Returns a properly configured instance of a subclass of
         # Autobuild::Importer that match this VCS definition
         #
-        # Returns nil if the VCS type is 'none'
+        # @return [Autobuild::Importer,nil] the autobuild importer
         def create_autobuild_importer
-            return if type == "none"
+            return if !needs_import?
 
             url = VCSDefinition.to_absolute_url(self.url)
             Autobuild.send(type, url, options)

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.13.0"
+    VERSION = "1.13.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.13.1
 platform: ruby
 authors:
 - Rock Core Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild