libarchive-ruby-swig 0.2.0 → 0.3.0

data/ext/libarchive-ruby-swig/writer.cpp

@@ -41,6 +41,31 @@ void Writer::close()
 }
 
 
+Writer *Writer::write_open_filename(const char *filename,
+    const char *cmd, int format)
+
+{
+    std::string error_msg;
+    struct archive *ar = archive_write_new();
+
+    archive_write_set_compression_program(ar, cmd);
+    try {
+        set_format_helper(ar, format);
+
+        if(archive_write_open_filename(ar, filename) != ARCHIVE_OK) {
+            error_msg = archive_error_string(ar);
+            throw Error(error_msg);
+        }
+
+    } catch(...) {
+        archive_write_finish(ar);
+        throw;
+    }
+
+    return new Writer(ar);
+}
+
+
 Writer *Writer::write_open_filename(const char *filename,
     int compression, int format)
 {
@@ -73,36 +98,7 @@ Writer *Writer::write_open_filename(const char *filename,
                 throw Error(error_msg);
         }
 
-        switch(format) {
-            case Archive::FORMAT_AR_BSD:
-                archive_write_set_format_ar_bsd(ar);
-                break;
-            case Archive::FORMAT_AR_SVR4:
-                archive_write_set_format_ar_svr4(ar);
-                break;
-            case Archive::FORMAT_CPIO:
-                archive_write_set_format_cpio(ar);
-                break;
-            case Archive::FORMAT_CPIO_NEWC:
-                archive_write_set_format_cpio_newc(ar);
-                break;
-            case Archive::FORMAT_MTREE:
-                archive_write_set_format_mtree(ar);
-                break;
-            case Archive::FORMAT_TAR:
-            case Archive::FORMAT_TAR_PAX_RESTRICTED:
-                archive_write_set_format_pax_restricted(ar);
-                break;
-            case Archive::FORMAT_TAR_PAX_INTERCHANGE:
-                archive_write_set_format_pax(ar);
-                break;
-            case Archive::FORMAT_TAR_USTAR:
-                archive_write_set_format_ustar(ar);
-                break;
-            default:
-                error_msg = "unknown or unsupported archive format";
-                throw Error(error_msg);
-        }
+        set_format_helper(ar, format);
 
         if(archive_write_open_filename(ar, filename) != ARCHIVE_OK) {
             error_msg = archive_error_string(ar);
@@ -123,6 +119,7 @@ Entry *Writer::new_entry_helper()
     return new Entry(archive_entry_new());
 }
 
+
 void Writer::write_header(Entry *entry)
 {
     if(archive_write_header(_ar, entry->_entry) != ARCHIVE_OK) {
@@ -131,6 +128,7 @@ void Writer::write_header(Entry *entry)
     }
 }
 
+
 void Writer::write_data_helper(const char *string, int length)
 {
     if(archive_write_data(_ar, (void*) string, length) == -1) {
@@ -139,3 +137,40 @@ void Writer::write_data_helper(const char *string, int length)
     }
 }
 
+
+void Writer::set_format_helper(struct archive *ar, int format)
+{
+    std::string error_msg;
+
+    switch(format) {
+        case Archive::FORMAT_AR_BSD:
+            archive_write_set_format_ar_bsd(ar);
+            break;
+        case Archive::FORMAT_AR_SVR4:
+            archive_write_set_format_ar_svr4(ar);
+            break;
+        case Archive::FORMAT_CPIO:
+            archive_write_set_format_cpio(ar);
+            break;
+        case Archive::FORMAT_CPIO_NEWC:
+            archive_write_set_format_cpio_newc(ar);
+            break;
+        case Archive::FORMAT_MTREE:
+            archive_write_set_format_mtree(ar);
+            break;
+        case Archive::FORMAT_TAR:
+        case Archive::FORMAT_TAR_PAX_RESTRICTED:
+            archive_write_set_format_pax_restricted(ar);
+            break;
+        case Archive::FORMAT_TAR_PAX_INTERCHANGE:
+            archive_write_set_format_pax(ar);
+            break;
+        case Archive::FORMAT_TAR_USTAR:
+            archive_write_set_format_ustar(ar);
+            break;
+        default:
+            error_msg = "unknown or unsupported archive format";
+            throw Error(error_msg);
+    }
+}
+

data/ext/libarchive-ruby-swig/writer.h

@@ -68,10 +68,15 @@ class Writer
 #endif
 
 #ifdef SWIG
+%newobject write_open_filename(const char *filename,
+    const char *cmd, int format);
 %newobject write_open_filename(const char *filename,
     int compression, int format);
 #endif
 
+        static Writer *write_open_filename(const char *filename,
+            const char *cmd, int format);
+
         static Writer *write_open_filename(const char *filename,
             int compression, int format);
 
@@ -94,6 +99,8 @@ class Writer
         Entry *new_entry_helper();
 
     private:
+        static void set_format_helper(struct archive *ar, int format);
+
         struct archive *_ar;
         char *_buf;
         int _buf_size;

data/lib/libarchive_rs.rb

@@ -12,6 +12,9 @@ require 'archive'
 
 module Archive
 
+  class Error < StandardError
+  end
+
   class Entry
     alias :file? :is_file
     alias :directory? :is_directory
@@ -100,6 +103,21 @@ module Archive
   end
 
   def self.write_open_filename(filename, compression, format)
+    if compression.is_a? String
+      if compression.index('/').nil?
+        ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+          if File.executable?(path + '/' + compression)
+            compression = path + '/' + compression
+            break
+          end
+        end
+      end
+
+      unless File.executable? compression
+        raise Error, "executable '#{compression}' not found."
+      end
+    end
+
     ar = Writer.write_open_filename(filename, compression, format)
 
     if block_given?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: libarchive-ruby-swig
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Tobias Koch
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-30 00:00:00 +02:00
+date: 2011-02-05 00:00:00 +02:00
 default_executable: 
 dependencies: []