autobuild 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d07251a9467505108e7d4ffa2a83480e77b4051
-  data.tar.gz: f9d440c442f763d121bb589810fb2e97210911c7
+  metadata.gz: 6091962c49f811cded44e5f054555f732e33ffc9
+  data.tar.gz: 1bacc77f147d5e195035cb395adc4c11f49112a4
 SHA512:
-  metadata.gz: 11958c9d1bfa46c8d3abfe37dfe4e414f316b7e0162cafdcf0abda4228e27ed902b02bc2ff942ef42ba41996878a6c18eb38d82d2708b7ee2c808d073fd85a5b
-  data.tar.gz: 78b12476fd6c0a16573db0a46f6e4e500dd42da24fd8471440b5487ca00236f51e003afa5c56b8fd1a6d5b449ae4a04420e5e5f95b3c0ffeb816d654fa37423b
+  metadata.gz: acf99d4e1f49fd393f71c6482b67c35283d68f95b1ae12326abd5ed139aa77c3e48965400e3333401494ae0d45a98dd61032987d2ee306890b3d9523e8e1cfcb
+  data.tar.gz: 314c0ba8e3e9ffac67f027b8176785f8ce345551f78f114d27c50634668fb230c678908d3a48f14af7e1cdfe8898a713e7e6b6c39b5157f3dfb191e4a3f10431

data/lib/autobuild/import/archive.rb

@@ -286,7 +286,7 @@ module Autobuild
         #       also used to infer the mode
         # [:mode] The unpack mode: one of Zip, Bzip, Gzip or Plain, this is
         #       usually automatically inferred from the filename
-        def initialize(url, options)
+        def initialize(url, options = Hash.new)
             sourceopts, options = Kernel.filter_options options,
                 :source_id, :repository_id, :filename, :mode
             super(options)
@@ -302,13 +302,13 @@ module Autobuild
 
         # Changes the URL from which we should pick the archive
         def relocate(url, options = Hash.new)
-            parsed_url = URI.parse(url)
+            parsed_url = URI.parse(url).normalize
             @url = parsed_url
             if !VALID_URI_SCHEMES.include?(@url.scheme)
                 raise ConfigException, "invalid URL #{@url} (local files must be prefixed with file://)" 
             end
-            @repository_id = options[:repository_id] || parsed_url
-            @source_id = options[:source_id] || parsed_url
+            @repository_id = options[:repository_id] || parsed_url.to_s
+            @source_id = options[:source_id] || parsed_url.to_s
 
             @filename = options[:filename] || @filename || File.basename(url).gsub(/\?.*/, '')
 
@@ -426,7 +426,9 @@ module Autobuild
         rescue OpenURI::HTTPError
             raise Autobuild::PackageException.new(package.name, :import)
         rescue SubcommandFailed
-            FileUtils.rm_f cachefile
+            if cachefile != url.path
+                FileUtils.rm_f cachefile
+            end
             raise
         end
     end

data/lib/autobuild/importer.rb

@@ -82,6 +82,7 @@ class Importer
     # two git importers that point to the same repository but different branches
     # would have the same repository_id but different source_id
     #
+    # @return [String]
     # @see source_id
     attr_reader :repository_id
 
@@ -92,6 +93,7 @@ class Importer
     # point to the same repository but different branches would have the same
     # repository_id but different source_id
     #
+    # @return [String]
     # @see repository_id
     attr_reader :source_id
 

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.9.1" unless defined? Autobuild::VERSION
+    VERSION = "1.9.2" unless defined? Autobuild::VERSION
 end
 
 

data/test/import/test_tar.rb

@@ -25,6 +25,25 @@ class TC_TarImporter < Minitest::Test
         assert_equal(TarImporter::Bzip, TarImporter.filename_to_mode('tarfile.tar.bz2'))
     end
 
+    def test_it_sets_the_repository_id_to_the_normalized_URL
+        importer = TarImporter.new "FILE://test/file"
+        assert_equal "file://test/file", importer.repository_id.to_str
+    end
+
+    def test_it_sets_the_source_id_to_the_normalized_URL
+        importer = TarImporter.new "FILE://test/file"
+        assert_equal "file://test/file", importer.source_id.to_str
+    end
+
+    def test_it_does_not_delete_a_locally_specified_archive_on_error
+        dummy_tar = File.join(@datadir, "dummy.tar")
+        FileUtils.touch dummy_tar
+        importer = TarImporter.new "file://#{dummy_tar}"
+        pkg = Package.new 'tarimport'
+        assert_raises(Autobuild::SubcommandFailed) { importer.checkout(pkg) }
+        assert File.file?(dummy_tar)
+    end
+
     def test_tar_valid_url
         assert_raises(ConfigException) {
             TarImporter.new 'ccc://localhost/files/tarimport.tar.gz', :cachedir => @cachedir

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2015-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake