autobuild 1.4.5 → 1.4.6

data/Changes.txt

@@ -1,3 +1,6 @@
+== Version 1.4.6
+* add missing importer/archive.rb file
+
 == Version 1.4.5
 * add support for zip in TarImporter, which is renamed ArchiveImporter to
   reflect that. Backward compatibility is retained.

data/Manifest.txt

@@ -13,6 +13,7 @@ lib/autobuild/import/cvs.rb
 lib/autobuild/import/darcs.rb
 lib/autobuild/import/git.rb
 lib/autobuild/import/svn.rb
+lib/autobuild/import/archive.rb
 lib/autobuild/import/tar.rb
 lib/autobuild/importer.rb
 lib/autobuild/package.rb

data/lib/autobuild.rb

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

data/lib/autobuild/import/archive.rb

@@ -0,0 +1,161 @@
+require 'autobuild/importer'
+require 'open-uri'
+require 'fileutils'
+
+module Autobuild
+    class ArchiveImporter < Importer
+	# The tarball is not compressed
+        Plain = 0
+	# The tarball is compressed with gzip
+        Gzip  = 1
+	# The tarball is compressed using bzip
+        Bzip  = 2
+        # Not a tarball but a zip
+        Zip   = 3
+
+        TAR_OPTION = {
+            Plain => '',
+            Gzip => 'z',
+            Bzip => 'j'
+        }
+
+	# Known URI schemes for +url+
+        VALID_URI_SCHEMES = [ 'file', 'http', 'https', 'ftp' ]
+
+	# Returns the unpack mode from the file name
+        def self.filename_to_mode(filename)
+            case filename
+                when /\.zip$/; Zip
+                when /\.tar$/; Plain
+                when /\.tar\.gz|\.tgz$/;  Gzip
+                when /\.bz2$/; Bzip
+                else
+                    raise "unknown file type '#{filename}'"
+            end
+        end
+
+	# Updates the downloaded file in cache only if it is needed
+        def update_cache(package)
+            do_update = true
+
+            if File.file?(cachefile)
+                cached_size = File.lstat(cachefile).size
+                cached_mtime = File.lstat(cachefile).mtime
+
+                size, mtime = nil
+                open @url, :content_length_proc => lambda { |size| } do |file| 
+                    mtime = file.last_modified
+                end
+
+                if mtime && size
+                    do_update = (size != cached_size || mtime > cached_mtime)
+                elsif mtime
+                    $stderr.puts "WARNING: size is not available for #{@url}, relying on modification time"
+                    do_update = (mtime > cached_mtime)
+                elsif size
+                    $stderr.puts "WARNING: modification time is not available for #{@url}, relying on size"
+                    do_update = (size != cached_size)
+                else
+                    $stderr.puts "WARNING: neither size nor modification time available for #{@url}, will always update"
+                end
+            end
+
+            if do_update
+                FileUtils.mkdir_p(cachedir)
+                Subprocess.run(package, :import, Autobuild.tool('wget'), '-q', '-P', cachedir, @url)
+                true
+            end
+        end
+
+	# The source URL
+        attr_reader :url
+	# The local file (either a downloaded file if +url+ is not local, or +url+ itself)
+	attr_reader :cachefile
+	# The unpack mode. One of Zip, Bzip, Gzip or Plain
+	attr_reader :mode
+	# The directory in which remote files are cached
+        def cachedir; @options[:cachedir] end
+	# The directory contained in the tar file
+        #
+        # DEPRECATED use #archive_dir instead
+	def tardir; @options[:tardir] end
+        # The directory contained in the archive. If not set, we assume that it
+        # is the same than the source dir
+        def archive_dir; @options[:archive_dir] || tardir end
+
+	# Creates a new importer which downloads +url+ in +cachedir+ and unpacks it. The following options
+	# are allowed:
+	# [:cachedir] the cache directory. Defaults to "#{Autobuild.prefix}/cache"
+        # [:archive_dir] the directory contained in the archive file. If set,
+        #       the importer will rename that directory to make it match
+        #       Package#srcdir
+        # [:no_subdirectory] the archive does not have the custom archive
+        #       subdirectory.
+        def initialize(url, options)
+            @options = options.dup
+            @options[:cachedir] ||= "#{Autobuild.prefix}/cache"
+
+            @url = URI.parse(url)
+            raise ConfigException, "invalid URL #{@url}" unless VALID_URI_SCHEMES.include?(@url.scheme)
+
+            @mode = options[:mode] || ArchiveImporter.filename_to_mode(options[:filename] || url)
+            if @url.scheme == 'file'
+                @cachefile = @url.path
+            else
+                @cachefile = File.join(cachedir, @options[:filename] || File.basename(url))
+            end
+        end
+
+        def update(package) # :nodoc:
+            checkout(package) if update_cache(package)
+        rescue OpenURI::HTTPError
+            raise Autobuild::Exception.new(package.name, :import)
+        end
+
+        def checkout(package) # :nodoc:
+            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
+                cmd = [ 'unzip', '-o', '-f', cachefile, '-d', main_dir ]
+            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 ?"
+            end
+
+        rescue OpenURI::HTTPError
+            raise Autobuild::Exception.new(package.name, :import)
+        rescue SubcommandFailed
+            FileUtils.rm_f cachefile
+            raise
+        end
+    end
+
+    # For backwards compatibility
+    TarImporter = ArchiveImporter
+
+    # Creates an importer which downloads a tarball from +source+ and unpacks
+    # it. The allowed values in +options+ are described in ArchiveImporter.new.
+    def self.archive(source, options = {})
+	ArchiveImporter.new(source, options)
+    end
+
+    # DEPRECATED. Use Autobuild.archive instead.
+    def self.tar(source, options = {})
+	ArchiveImporter.new(source, options)
+    end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  version: 1.4.5
+  version: 1.4.6
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-23 00:00:00 +01:00
+date: 2009-12-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,7 +60,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.4.0
+        version: 2.3.3
     version: 
 description: |-
   This work is licensed under the GPLv2 license. See License.txt for details
@@ -106,6 +106,7 @@ files:
 - lib/autobuild/import/darcs.rb
 - lib/autobuild/import/git.rb
 - lib/autobuild/import/svn.rb
+- lib/autobuild/import/archive.rb
 - lib/autobuild/import/tar.rb
 - lib/autobuild/importer.rb
 - lib/autobuild/package.rb