build-tool 0.6.4 → 0.6.5

data/History.rdoc

@@ -1,3 +1,8 @@
+== Version 0.6.5
+=== Enhancements
+- Archive Buildsystem now supports bzip2 compressed archives.
+- Archive Buildsystem is much more fault tolerant now.
+
 == Version 0.6.4
 === Enhancements
 - Check for xdg-open before using it and give error message if missing.

data/lib/build-tool/vcs/archive.rb

@@ -128,47 +128,75 @@ def fetch( verbose = false )
             FileUtils.mkdir_p( File.dirname( local_path ) ) if !$noop
 
             # Download the archive
-            logger.trace "get #{archive_name} from #{archive_url} to #{archive_local_path}"
+            logger.info"downloading #{archive_url}"
             if !$noop
-                target = open( archive_local_path, "wb" )
-                open( archive_url ) { |file|
-                    while c = file.getc
-                        target.putc c
+
+                begin
+
+                    # We first open the archive. Will throw an exception if the url is invalid.
+                    open( archive_url ) do |file|
+
+                        begin
+
+                            # Create the local file
+                            open( archive_local_path, "wb" ) do |target|
+
+                                # Copy
+                                while c = file.getc
+                                    target.putc( c )
+                                end
+
+                            end
+
+                        rescue
+
+                            # Clean up
+                            File.unlink( archive_local_path ) if File.exist?( archive_local_path )
+                            raise
+
+                        end
+
                     end
-                }
-                target.close()
+
+                rescue StandardError => e
+
+                    msg = "Failed to download #{archive_url}: #{e.to_s}"
+                    logger.error( msg )
+                    raise StandardError, msg
+
+                end
+
             end
             return 0
         end
 
         def guess_top_level_directory
             return "<topdir>" if $noop
-            topdir = nil
+
+            # Find the command to list the archive content
             if archive_name =~ /(\.tgz|\.tar\.gz)$/
-                if self.class.execute( "gunzip -c #{archive_local_path} | tar tf -" ) { |line|
-                    rc = /^([^\/]*)\//.match( line )
-                    if topdir and topdir != rc[1]
-                        raise StandardError, "Unable to determine toplevel directory for archive #{archive_name}!"
-                    end
-                    topdir = rc[1]
-                } != 0
-                    # No topdir
-                    return nil
-                end
+                cmd =  "gzip -dc #{archive_local_path} | tar tf -"
             elsif archive_name =~ /(\.txz|\.tar\.xz)$/
-                if self.class.execute( "xz -dc #{archive_local_path} | tar tf -" ) { |line|
-                    rc = /^([^\/]*)\//.match( line )
-                    if topdir and topdir != rc[1]
-                        raise StandardError, "Unable to determine toplevel directory for archive #{archive_name}!"
+                cmd = "xz -dc #{archive_local_path} | tar tf -"
+            elsif archive_name =~ /(\.tar\.bz2)$/
+                cmd = "bzip2 -dc #{archive_local_path} | tar tf -"
+            else
+                raise NotImplementedError, "'#{archive_name}' has a unsupported format."
+            end
+
+            # Then check for a toplevel directory.
+            topdir = nil
+            self.class.execute( cmd ) do |line|
+                rc = /^([^\/]*)\/?/.match( line )
+                if topdir
+                    if topdir != rc[1]
+                        return false
                     end
+                else
                     topdir = rc[1]
-                } != 0
-                    # No topdir
-                    return nil
                 end
-            else
-                raise NotImplementedError, "No idea how to unpack the archive '#{archive_name}'."
             end
+
             return topdir
         end
 
@@ -184,29 +212,31 @@ def rebase( verbose = false )
                 return 0
             end
 
-            # Create the directory we want to use to checkout
-            FileUtils.mkdir_p local_path if !$noop
+            # Check if there is a common top level dir
+            # eg. my-package-0.4.7
+            if guess_top_level_directory()
+                strip_components = 1
+            else
+                strip_components = 0
+            end
 
+            # Get the command to unpack
             if archive_name =~ /(\.tgz|\.tar\.gz)$/
-                if guess_top_level_directory()
-                    cmd = "gunzip -c #{archive_local_path} | tar --strip-components=1 --extract --file=- --directory=#{local_path}"
-                else
-                    cmd = "gunzip -c #{archive_local_path} | tar --strip-components=0 --extract --file=- --directory=#{local_path}"
-                end
-                if self.class.execute( cmd ) != 0
-                    raise StandardError, "Failed to unpack the archive: $?"
-                end
+                cmd = "gunzip -dc #{archive_local_path} | tar --strip-components=#{strip_components} --extract --file=- --directory=#{local_path}"
             elsif archive_name =~ /(\.txz|\.tar\.xz)$/
-                if guess_top_level_directory()
-                    cmd = "xz -dc #{archive_local_path} | tar --strip-components=1 --extract --file=- --directory=#{local_path}"
-                else
-                    cmd = "xz -dc #{archive_local_path} | tar --strip-components=0 --extract --file=- --directory=#{local_path}"
-                end
-                if self.class.execute( cmd ) != 0
-                    raise StandardError, "Failed to unpack the archive: $?"
-                end
+                cmd = "xz -dc #{archive_local_path} | tar --strip-components=#{strip_components} --extract --file=- --directory=#{local_path}"
+            elsif archive_name =~ /\.tar\.bz2$/
+                cmd = "bzip2 -dc #{archive_local_path} | tar --strip-components=#{strip_components} --extract --file=- --directory=#{local_path}"
             else
-                raise NotImplementedError, "No idea how to unpack the archive"
+                raise NotImplementedError, "'#{archive_name}' has unsupported format."
+            end
+
+            # Create the directory we want to use to checkout
+            FileUtils.mkdir_p local_path if !$noop
+
+            # Unpack
+            if self.class.execute( cmd ) != 0
+                raise StandardError, "Failed to unpack the archive: $?"
             end
 
             0

data/lib/build-tool/version.rb

@@ -26,5 +26,5 @@ def recipe_version()
 
     end
 
-    VERSION = Version.new( 0, 6, 4 )
+    VERSION = Version.new( 0, 6, 5 )
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: build-tool
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 6
-  - 4
-  version: 0.6.4
+  - 5
+  version: 0.6.5
 platform: ruby
 authors: 
 - Michael Jansen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-31 00:00:00 +02:00
+date: 2012-06-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency