autobuild 1.4.7 → 1.4.8

data/Changes.txt

@@ -1,3 +1,9 @@
+== Version 1.4.8
+* make the archive importer nicer to use:
+  - the archive_dir is unneeded for tarballs from now on
+  - filename detection works better (and therefore the :filename option will be
+    less needed)
+
 == Version 1.4.7
 * have the git importer update the autobuild remote on update.
 

data/lib/autobuild.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.4.7" unless defined? Autobuild::VERSION
+    VERSION = "1.4.8" unless defined? Autobuild::VERSION
 end
 
 require 'autobuild/config'

data/lib/autobuild/import/archive.rb

@@ -34,11 +34,15 @@ module Autobuild
             end
         end
 
+        def update_cached_file?; @options[:update_cached_file] end
+
 	# Updates the downloaded file in cache only if it is needed
         def update_cache(package)
-            do_update = true
+            do_update = false
 
-            if File.file?(cachefile)
+            if !File.file?(cachefile)
+                do_update = true
+            elsif self.update_cached_file?
                 cached_size = File.lstat(cachefile).size
                 cached_mtime = File.lstat(cachefile).mtime
 
@@ -57,6 +61,7 @@ module Autobuild
                     do_update = (size != cached_size)
                 else
                     $stderr.puts "WARNING: neither size nor modification time available for #{@url}, will always update"
+                    do_update = true
                 end
             end
 
@@ -93,6 +98,9 @@ module Autobuild
         #       subdirectory.
         def initialize(url, options)
             @options = options.dup
+            if !@options.has_key?(:update_cached_file)
+                @options[:update_cached_file] = true
+            end
             @options[:cachedir] ||= "#{Autobuild.prefix}/cache"
 
             @url = URI.parse(url)
@@ -102,7 +110,7 @@ module Autobuild
             if @url.scheme == 'file'
                 @cachefile = @url.path
             else
-                @cachefile = File.join(cachedir, @options[:filename] || File.basename(url))
+                @cachefile = File.join(cachedir, @options[:filename] || File.basename(url).gsub(/\?.*/, ''))
             end
         end
 
@@ -116,24 +124,26 @@ module Autobuild
             update_cache(package)
 
             base_dir = File.dirname(package.srcdir)
-            FileUtils.mkdir_p base_dir
-
-            main_dir = if @options[:no_subdirectory] then package.srcdir
-                       else base_dir
-                       end
 
             if mode == Zip
+                main_dir = if @options[:no_subdirectory] then package.srcdir
+                           else base_dir
+                           end
+
                 cmd = [ 'unzip', '-o', '-f', cachefile, '-d', main_dir ]
+                if archive_dir
+                    FileUtils.rm_rf File.join(package.srcdir)
+                    FileUtils.mv File.join(base_dir, archive_dir), package.srcdir
+                elsif !File.directory?(package.srcdir)
+                    raise Autobuild::Exception, "#{cachefile} does not contain directory called #{File.basename(package.srcdir)}. Did you forget to use the :archive_dir option ?"
+                end
             else
-                cmd = [ 'tar', "x#{TAR_OPTION[mode]}f", cachefile, '-C', main_dir ]
-            end
-
-            Subprocess.run(package, :import, *cmd)
-	    if archive_dir
-		FileUtils.mv File.join(base_dir, archive_dir), package.srcdir
-	    end
-            if !File.directory?(package.srcdir)
-                raise Autobuild::Exception, "#{cachefile} does not contain directory called #{File.basename(package.srcdir)}. Did you forget to use the :archive_dir option ?"
+                FileUtils.mkdir_p package.srcdir
+                cmd = ["x#{TAR_OPTION[mode]}f", cachefile, '-C', package.srcdir]
+                if !@options[:no_subdirectory]
+                    cmd << '--strip-components=1'
+                end
+                Subprocess.run(package, :import, Autobuild.tool('tar'), *cmd)
             end
 
         rescue OpenURI::HTTPError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  version: 1.4.7
+  version: 1.4.8
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-08 00:00:00 +01:00
+date: 2010-01-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency