libarchive 0.1.0 → 0.1.1

data/COPYING.libarchive

@@ -0,0 +1,60 @@
+The libarchive distribution as a whole is Copyright by Tim Kientzle
+and is subject to the copyright notice reproduced at the bottom of
+this file.
+
+Each individual file in this distribution should have a clear
+copyright/licensing statement at the beginning of the file.  If any do
+not, please let me know and I will rectify it.  The following is
+intended to summarize the copyright status of the individual files;
+the actual statements in the files are controlling.
+
+* Except as listed below, all C sources (including .c and .h files)
+  and documentation files are subject to the copyright notice reproduced
+  at the bottom of this file.
+
+* The following source files are also subject in whole or in part to
+  a 3-clause UC Regents copyright; please read the individual source
+  files for details:
+   libarchive/archive_entry.c
+   libarchive/archive_read_support_compression_compress.c
+   libarchive/archive_write_set_compression_compress.c
+   libarchive/mtree.5
+   tar/matching.c
+
+* The following source files are in the public domain:
+   tar/getdate.y
+
+* The build files---including Makefiles, configure scripts,
+  and auxiliary scripts used as part of the compile process---have
+  widely varying licensing terms.  Please check individual files before
+  distributing them to see if those restrictions apply to you.
+
+I intend for all new source code to use the license below and hope over
+time to replace code with other licenses with new implementations that
+do use the license below.  The varying licensing of the build scripts
+seems to be an unavoidable mess.
+
+
+Copyright (c) 2003-2008 <author(s)>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer
+   in this position and unchanged.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/LICENSE.libbzip2

@@ -0,0 +1,42 @@
+
+ --------------------------------------------------------------------------
+
+This program, "bzip2", the associated library "libbzip2", and all
+documentation, are copyright (C) 1996-2007 Julian R Seward.  All
+rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. The origin of this software must not be misrepresented; you must 
+   not claim that you wrote the original software.  If you use this 
+   software in a product, an acknowledgment in the product 
+   documentation would be appreciated but is not required.
+
+3. Altered source versions must be plainly marked as such, and must
+   not be misrepresented as being the original software.
+
+4. The name of the author may not be used to endorse or promote 
+   products derived from this software without specific prior written 
+   permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Julian Seward, jseward@bzip.org
+bzip2/libbzip2 version 1.0.5 of 10 December 2007
+
+ --------------------------------------------------------------------------

data/README.txt

@@ -63,7 +63,7 @@ gem install libarchive
 === reading archive
     require 'libarchive_ruby'
     
-    Archive::Reader.open_filename('foo.tar.gz') do |ar|
+    Archive.read_open_filename('foo.tar.gz') do |ar|
       while entry = ar.next_header
         name = entry.pathname
         data = ar.read_data
@@ -79,9 +79,8 @@ gem install libarchive
 
 === creating archive
     require 'libarchive_ruby'
-    include Archive
     
-    Writer.open_filename('foo.tar.bz2', COMPRESSION_BZIP2, FORMAT_TAR_USTAR) do |ar|
+    Archive.write_open_filename('foo.tar.bz2', Archive::COMPRESSION_BZIP2, Archive::FORMAT_TAR_USTAR) do |ar|
       Dir.glob('*.c').each do |fn|
         ar.new_entry do |entry|
           entry.copy_stat(fn)
@@ -97,12 +96,12 @@ gem install libarchive
         end
       end
     end
+
+=== creating archive by extarnal program
+    require 'libarchive_ruby'
     
-    Reader.open_filename('foo.zip') do |ar|
-      while entry = ar.next_header
-        p entry.pathname
-        p ar.read_data.size
-      end
+    Archive.write_open_filename('foo.tar.lzo', 'lzop', Archive::FORMAT_TAR_USTAR) do |ar|
+      ...
     end
 
 == License
@@ -132,7 +131,13 @@ gem install libarchive
     OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
     DAMAGE.
 
-=== Libarchive
-Libarchive/Ruby(mswin32) contains Libarchive 2.6.0.
-* http://people.freebsd.org/~kientzle/libarchive/
-* see {COPYING.libarchive}[link:files/COPYING_libarchive.html]
+=== Static link library
+Libarchive/Ruby(mswin32) contains Libarchive(2.6.0) and libbzip2(1.0.5).
+
+* Libarchive
+  * http://people.freebsd.org/~kientzle/libarchive/
+  * see {COPYING.libarchive}[link:files/COPYING_libarchive.html]
+
+* libbzip2
+  * http://www.bzip.org/
+  * see {LICENSE.libbzip2}[link:files/LICENSE_libbzip2.html]

data/ext/archive_read_support_format.c

@@ -12,7 +12,7 @@ static struct {
   { ARCHIVE_FORMAT_ZIP,        archive_read_support_format_zip     },
   { ARCHIVE_FORMAT_EMPTY,      archive_read_support_format_empty   },
   { ARCHIVE_FORMAT_AR,         archive_read_support_format_ar      },
-#if ARCHIVE_VERSION >= 2002007
+#ifdef ARCHIVE_FORMAT_MTREE
   { ARCHIVE_FORMAT_MTREE,      archive_read_support_format_mtree   },
 #endif
   { -1,                        NULL                                },

data/ext/libarchive_internal.h

@@ -45,7 +45,7 @@
 #define DLLEXPORT
 #endif
 
-#define VERSION          "0.1.0"
+#define VERSION          "0.1.1"
 #define BLOCK_SIZE       10240
 #define DATA_BUFFER_SIZE 65536
 

data/ext/libarchive_reader.c

@@ -20,7 +20,7 @@ static VALUE rb_libarchive_reader_close(VALUE self) {
   return Qnil;
 }
 
-static VALUE rb_libarchive_reader_s_open0(int (*archive_open)(struct rb_libarchive_archive_container *, void *), void *arg, int compression, int format) {
+static VALUE rb_libarchive_reader_s_open0(int (*archive_open)(struct rb_libarchive_archive_container *, void *), void *arg, int compression, int format, const char *cmd) {
   VALUE reader;
   struct rb_libarchive_archive_container *p;
   int r;
@@ -31,7 +31,9 @@ static VALUE rb_libarchive_reader_s_open0(int (*archive_open)(struct rb_libarchi
     rb_raise(rb_eArchiveError, "Open reader failed: %s", strerror(errno));
   }
 
-  if (compression != -1) {
+  if (cmd != NULL) {
+    r = archive_read_support_compression_program(p->ar, cmd);
+  } else if (compression != -1) {
     r = archive_read_support_compression(p->ar, compression);
   } else {
     r = archive_read_support_compression_all(p->ar);
@@ -100,11 +102,15 @@ static VALUE rb_libarchive_reader_s_open_filename(int argc, VALUE *argv, VALUE s
   VALUE v_filename, v_compression, v_format;
   const char *filename = NULL;
   int compression = -1, format = -1;
+  const char *cmd = NULL;
   rb_scan_args(argc, argv, "12", &v_filename, &v_compression, &v_format);
   Check_Type(v_filename, T_STRING);
   filename = RSTRING_PTR(v_filename);
 
-  if (!NIL_P(v_compression)) {
+  if (T_STRING == TYPE(v_compression)) {
+    compression = -1;
+    cmd = RSTRING_PTR(v_compression);
+  } else if (!NIL_P(v_compression)) {
     compression = NUM2INT(v_compression);
   }
 
@@ -112,7 +118,7 @@ static VALUE rb_libarchive_reader_s_open_filename(int argc, VALUE *argv, VALUE s
     format = NUM2INT(v_format);
   }
 
-  return rb_libarchive_reader_s_open0(rb_libarchive_reader_s_open_filename0, (void *) filename, compression, format);
+  return rb_libarchive_reader_s_open0(rb_libarchive_reader_s_open_filename0, (void *) filename, compression, format, cmd);
 }
 
 static int rb_libarchive_reader_s_open_memory0(struct rb_libarchive_archive_container *p, void *arg) {
@@ -124,10 +130,14 @@ static int rb_libarchive_reader_s_open_memory0(struct rb_libarchive_archive_cont
 static VALUE rb_libarchive_reader_s_open_memory(int argc, VALUE *argv, VALUE self) {
   VALUE v_memory, v_compression, v_format;
   int compression = -1, format = -1;
+  const char *cmd = NULL;
   rb_scan_args(argc, argv, "12", &v_memory, &v_compression, &v_format);
   Check_Type(v_memory, T_STRING);
 
-  if (!NIL_P(v_compression)) {
+  if (T_STRING == TYPE(v_compression)) {
+    compression = -1;
+    cmd = RSTRING_PTR(v_compression);
+  } else if (!NIL_P(v_compression)) {
     compression = NUM2INT(v_compression);
   }
 
@@ -135,7 +145,7 @@ static VALUE rb_libarchive_reader_s_open_memory(int argc, VALUE *argv, VALUE sel
     format = NUM2INT(v_format);
   }
 
-  return rb_libarchive_reader_s_open0(rb_libarchive_reader_s_open_memory0, (void *) v_memory, compression, format);
+  return rb_libarchive_reader_s_open0(rb_libarchive_reader_s_open_memory0, (void *) v_memory, compression, format, cmd);
 }
 
 /* */
@@ -306,7 +316,9 @@ void Init_libarchive_reader() {
   rb_define_alloc_func(rb_cArchiveReader, rb_libarchive_archive_alloc);
   rb_funcall(rb_cArchiveReader, rb_intern("private_class_method"), 1, ID2SYM(rb_intern("new")));
   rb_define_singleton_method(rb_cArchiveReader, "open_filename", rb_libarchive_reader_s_open_filename, -1);
+  rb_define_module_function(rb_mArchive, "read_open_filename", rb_libarchive_reader_s_open_filename, -1);
   rb_define_singleton_method(rb_cArchiveReader, "open_memory", rb_libarchive_reader_s_open_memory, -1);
+  rb_define_module_function(rb_mArchive, "read_open_memory", rb_libarchive_reader_s_open_memory, -1);
   rb_define_method(rb_cArchiveReader, "close", rb_libarchive_reader_close, 0);
   rb_define_method(rb_cArchiveReader, "next_header", rb_libarchive_reader_next_header, 0);
   rb_define_method(rb_cArchiveReader, "header_position", rb_libarchive_reader_header_position, 0);

data/ext/libarchive_writer.c

@@ -20,9 +20,10 @@ static VALUE rb_libarchive_writer_close(VALUE self) {
   return Qnil;
 }
 
-static VALUE rb_libarchive_writer_s_open0(int (*archive_open)(struct rb_libarchive_archive_container *, void *), void *arg, int compression, int format) {
+static VALUE rb_libarchive_writer_s_open0(int (*archive_open)(struct rb_libarchive_archive_container *, void *), void *arg, int compression, int format, const char *cmd) {
   VALUE writer;
   struct rb_libarchive_archive_container *p;
+  int r;
   writer = rb_funcall(rb_cArchiveWriter, rb_intern("new"), 0);
   Data_Get_Struct(writer, struct rb_libarchive_archive_container, p);
 
@@ -30,7 +31,13 @@ static VALUE rb_libarchive_writer_s_open0(int (*archive_open)(struct rb_libarchi
     rb_raise(rb_eArchiveError, "Open writer failed: %s", strerror(errno));
   }
 
-  if (archive_write_set_compression(p->ar, compression) != ARCHIVE_OK) {
+  if (cmd != NULL) {
+    r = archive_write_set_compression_program(p->ar,  cmd);
+  } else {
+    r = archive_write_set_compression(p->ar, compression);
+  }
+
+  if (r != ARCHIVE_OK) {
     char error_string[BUFSIZ];
     archive_copy_error_string(p->ar, error_string, BUFSIZ);
     rb_libarchive_writer_close0(p);
@@ -76,6 +83,7 @@ static int rb_libarchive_writer_s_open_filename0(struct rb_libarchive_archive_co
 static VALUE rb_libarchive_writer_s_open_filename(VALUE self, VALUE v_filename, VALUE v_compression, VALUE v_format) {
   const char *filename = NULL;
   int compression, format;
+  const char *cmd = NULL;
   Check_Type(v_filename, T_STRING);
 
   if (RSTRING_LEN(v_filename) < 1) {
@@ -83,9 +91,17 @@ static VALUE rb_libarchive_writer_s_open_filename(VALUE self, VALUE v_filename,
   }
 
   filename = RSTRING_PTR(v_filename);
-  compression = NUM2INT(v_compression);
+
+  if (T_STRING == TYPE(v_compression)) {
+    compression = -1;
+    cmd = RSTRING_PTR(v_compression);
+  } else {
+    compression = NUM2INT(v_compression);
+  }
+
+
   format = NUM2INT(v_format);
-  return rb_libarchive_writer_s_open0(rb_libarchive_writer_s_open_filename0, (void *) filename, compression, format);
+  return rb_libarchive_writer_s_open0(rb_libarchive_writer_s_open_filename0, (void *) filename, compression, format, cmd);
 }
 
 static int rb_libarchive_writer_s_open_memory0(struct rb_libarchive_archive_container *p, void *arg) {
@@ -97,10 +113,18 @@ static int rb_libarchive_writer_s_open_memory0(struct rb_libarchive_archive_cont
 /* */
 static VALUE rb_libarchive_writer_s_open_memory(VALUE self, VALUE v_memory, VALUE v_compression, VALUE v_format) {
   int compression, format;
+  const char *cmd = NULL;
   Check_Type(v_memory, T_STRING);
-  compression = NUM2INT(v_compression);
+
+  if (T_STRING == TYPE(v_compression)) {
+    compression = -1;
+    cmd = RSTRING_PTR(v_compression);
+  } else {
+    compression = NUM2INT(v_compression);
+  }
+
   format = NUM2INT(v_format);
-  return rb_libarchive_writer_s_open0(rb_libarchive_writer_s_open_memory0, (void *) v_memory, compression, format);
+  return rb_libarchive_writer_s_open0(rb_libarchive_writer_s_open_memory0, (void *) v_memory, compression, format, cmd);
 }
 
 /* */
@@ -212,7 +236,9 @@ void Init_libarchive_writer() {
   rb_define_alloc_func(rb_cArchiveWriter, rb_libarchive_archive_alloc);
   rb_funcall(rb_cArchiveWriter, rb_intern("private_class_method"), 1, ID2SYM(rb_intern("new")));
   rb_define_singleton_method(rb_cArchiveWriter, "open_filename", rb_libarchive_writer_s_open_filename, 3);
+  rb_define_singleton_method(rb_mArchive, "write_open_filename", rb_libarchive_writer_s_open_filename, 3);
   rb_define_singleton_method(rb_cArchiveWriter, "open_memory", rb_libarchive_writer_s_open_memory, 3);
+  rb_define_singleton_method(rb_mArchive, "write_open_memory", rb_libarchive_writer_s_open_memory, 3);
   rb_define_method(rb_cArchiveWriter, "close", rb_libarchive_writer_close, 0);
   rb_define_method(rb_cArchiveWriter, "new_entry", rb_libarchive_writer_new_entry, 0);
   rb_define_method(rb_cArchiveWriter, "write_header", rb_libarchive_writer_write_header, 1);

data/libarchive.c

@@ -1208,7 +1208,7 @@ static VALUE rb_libarchive_reader_close(VALUE self) {
   return Qnil;
 }
 
-static VALUE rb_libarchive_reader_s_open0(int (*archive_open)(struct rb_libarchive_archive_container *, void *), void *arg, int compression, int format) {
+static VALUE rb_libarchive_reader_s_open0(int (*archive_open)(struct rb_libarchive_archive_container *, void *), void *arg, int compression, int format, const char *cmd) {
   VALUE reader;
   struct rb_libarchive_archive_container *p;
   int r;
@@ -1219,7 +1219,9 @@ static VALUE rb_libarchive_reader_s_open0(int (*archive_open)(struct rb_libarchi
     rb_raise(rb_eArchiveError, "Open reader failed: %s", strerror(errno));
   }
 
-  if (compression != -1) {
+  if (cmd != NULL) {
+    r = archive_read_support_compression_program(p->ar, cmd);
+  } else if (compression != -1) {
     r = archive_read_support_compression(p->ar, compression);
   } else {
     r = archive_read_support_compression_all(p->ar);
@@ -1288,11 +1290,15 @@ static VALUE rb_libarchive_reader_s_open_filename(int argc, VALUE *argv, VALUE s
   VALUE v_filename, v_compression, v_format;
   const char *filename = NULL;
   int compression = -1, format = -1;
+  const char *cmd = NULL;
   rb_scan_args(argc, argv, "12", &v_filename, &v_compression, &v_format);
   Check_Type(v_filename, T_STRING);
   filename = RSTRING_PTR(v_filename);
 
-  if (!NIL_P(v_compression)) {
+  if (T_STRING == TYPE(v_compression)) {
+    compression = -1;
+    cmd = RSTRING_PTR(v_compression);
+  } else if (!NIL_P(v_compression)) {
     compression = NUM2INT(v_compression);
   }
 
@@ -1300,7 +1306,7 @@ static VALUE rb_libarchive_reader_s_open_filename(int argc, VALUE *argv, VALUE s
     format = NUM2INT(v_format);
   }
 
-  return rb_libarchive_reader_s_open0(rb_libarchive_reader_s_open_filename0, (void *) filename, compression, format);
+  return rb_libarchive_reader_s_open0(rb_libarchive_reader_s_open_filename0, (void *) filename, compression, format, cmd);
 }
 
 static int rb_libarchive_reader_s_open_memory0(struct rb_libarchive_archive_container *p, void *arg) {
@@ -1312,10 +1318,14 @@ static int rb_libarchive_reader_s_open_memory0(struct rb_libarchive_archive_cont
 static VALUE rb_libarchive_reader_s_open_memory(int argc, VALUE *argv, VALUE self) {
   VALUE v_memory, v_compression, v_format;
   int compression = -1, format = -1;
+  const char *cmd = NULL;
   rb_scan_args(argc, argv, "12", &v_memory, &v_compression, &v_format);
   Check_Type(v_memory, T_STRING);
 
-  if (!NIL_P(v_compression)) {
+  if (T_STRING == TYPE(v_compression)) {
+    compression = -1;
+    cmd = RSTRING_PTR(v_compression);
+  } else if (!NIL_P(v_compression)) {
     compression = NUM2INT(v_compression);
   }
 
@@ -1323,7 +1333,7 @@ static VALUE rb_libarchive_reader_s_open_memory(int argc, VALUE *argv, VALUE sel
     format = NUM2INT(v_format);
   }
 
-  return rb_libarchive_reader_s_open0(rb_libarchive_reader_s_open_memory0, (void *) v_memory, compression, format);
+  return rb_libarchive_reader_s_open0(rb_libarchive_reader_s_open_memory0, (void *) v_memory, compression, format, cmd);
 }
 
 /* */
@@ -1494,7 +1504,9 @@ void Init_libarchive_reader() {
   rb_define_alloc_func(rb_cArchiveReader, rb_libarchive_archive_alloc);
   rb_funcall(rb_cArchiveReader, rb_intern("private_class_method"), 1, ID2SYM(rb_intern("new")));
   rb_define_singleton_method(rb_cArchiveReader, "open_filename", rb_libarchive_reader_s_open_filename, -1);
+  rb_define_module_function(rb_mArchive, "read_open_filename", rb_libarchive_reader_s_open_filename, -1);
   rb_define_singleton_method(rb_cArchiveReader, "open_memory", rb_libarchive_reader_s_open_memory, -1);
+  rb_define_module_function(rb_mArchive, "read_open_memory", rb_libarchive_reader_s_open_memory, -1);
   rb_define_method(rb_cArchiveReader, "close", rb_libarchive_reader_close, 0);
   rb_define_method(rb_cArchiveReader, "next_header", rb_libarchive_reader_next_header, 0);
   rb_define_method(rb_cArchiveReader, "header_position", rb_libarchive_reader_header_position, 0);
@@ -1524,9 +1536,10 @@ static VALUE rb_libarchive_writer_close(VALUE self) {
   return Qnil;
 }
 
-static VALUE rb_libarchive_writer_s_open0(int (*archive_open)(struct rb_libarchive_archive_container *, void *), void *arg, int compression, int format) {
+static VALUE rb_libarchive_writer_s_open0(int (*archive_open)(struct rb_libarchive_archive_container *, void *), void *arg, int compression, int format, const char *cmd) {
   VALUE writer;
   struct rb_libarchive_archive_container *p;
+  int r;
   writer = rb_funcall(rb_cArchiveWriter, rb_intern("new"), 0);
   Data_Get_Struct(writer, struct rb_libarchive_archive_container, p);
 
@@ -1534,7 +1547,13 @@ static VALUE rb_libarchive_writer_s_open0(int (*archive_open)(struct rb_libarchi
     rb_raise(rb_eArchiveError, "Open writer failed: %s", strerror(errno));
   }
 
-  if (archive_write_set_compression(p->ar, compression) != ARCHIVE_OK) {
+  if (cmd != NULL) {
+    r = archive_write_set_compression_program(p->ar,  cmd);
+  } else {
+    r = archive_write_set_compression(p->ar, compression);
+  }
+
+  if (r != ARCHIVE_OK) {
     char error_string[BUFSIZ];
     archive_copy_error_string(p->ar, error_string, BUFSIZ);
     rb_libarchive_writer_close0(p);
@@ -1580,6 +1599,7 @@ static int rb_libarchive_writer_s_open_filename0(struct rb_libarchive_archive_co
 static VALUE rb_libarchive_writer_s_open_filename(VALUE self, VALUE v_filename, VALUE v_compression, VALUE v_format) {
   const char *filename = NULL;
   int compression, format;
+  const char *cmd = NULL;
   Check_Type(v_filename, T_STRING);
 
   if (RSTRING_LEN(v_filename) < 1) {
@@ -1587,9 +1607,17 @@ static VALUE rb_libarchive_writer_s_open_filename(VALUE self, VALUE v_filename,
   }
 
   filename = RSTRING_PTR(v_filename);
-  compression = NUM2INT(v_compression);
+
+  if (T_STRING == TYPE(v_compression)) {
+    compression = -1;
+    cmd = RSTRING_PTR(v_compression);
+  } else {
+    compression = NUM2INT(v_compression);
+  }
+
+
   format = NUM2INT(v_format);
-  return rb_libarchive_writer_s_open0(rb_libarchive_writer_s_open_filename0, (void *) filename, compression, format);
+  return rb_libarchive_writer_s_open0(rb_libarchive_writer_s_open_filename0, (void *) filename, compression, format, cmd);
 }
 
 static int rb_libarchive_writer_s_open_memory0(struct rb_libarchive_archive_container *p, void *arg) {
@@ -1601,10 +1629,18 @@ static int rb_libarchive_writer_s_open_memory0(struct rb_libarchive_archive_cont
 /* */
 static VALUE rb_libarchive_writer_s_open_memory(VALUE self, VALUE v_memory, VALUE v_compression, VALUE v_format) {
   int compression, format;
+  const char *cmd = NULL;
   Check_Type(v_memory, T_STRING);
-  compression = NUM2INT(v_compression);
+
+  if (T_STRING == TYPE(v_compression)) {
+    compression = -1;
+    cmd = RSTRING_PTR(v_compression);
+  } else {
+    compression = NUM2INT(v_compression);
+  }
+
   format = NUM2INT(v_format);
-  return rb_libarchive_writer_s_open0(rb_libarchive_writer_s_open_memory0, (void *) v_memory, compression, format);
+  return rb_libarchive_writer_s_open0(rb_libarchive_writer_s_open_memory0, (void *) v_memory, compression, format, cmd);
 }
 
 /* */
@@ -1716,7 +1752,9 @@ void Init_libarchive_writer() {
   rb_define_alloc_func(rb_cArchiveWriter, rb_libarchive_archive_alloc);
   rb_funcall(rb_cArchiveWriter, rb_intern("private_class_method"), 1, ID2SYM(rb_intern("new")));
   rb_define_singleton_method(rb_cArchiveWriter, "open_filename", rb_libarchive_writer_s_open_filename, 3);
+  rb_define_singleton_method(rb_mArchive, "write_open_filename", rb_libarchive_writer_s_open_filename, 3);
   rb_define_singleton_method(rb_cArchiveWriter, "open_memory", rb_libarchive_writer_s_open_memory, 3);
+  rb_define_singleton_method(rb_mArchive, "write_open_memory", rb_libarchive_writer_s_open_memory, 3);
   rb_define_method(rb_cArchiveWriter, "close", rb_libarchive_writer_close, 0);
   rb_define_method(rb_cArchiveWriter, "new_entry", rb_libarchive_writer_new_entry, 0);
   rb_define_method(rb_cArchiveWriter, "write_header", rb_libarchive_writer_write_header, 1);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: libarchive
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - winebarrel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-06 00:00:00 -05:00
+date: 2009-01-30 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -22,6 +22,8 @@ extensions:
 extra_rdoc_files: 
 - README.txt
 - libarchive.c
+- COPYING.libarchive
+- LICENSE.libbzip2
 files: 
 - ext/configure
 - ext/archive_read_support_compression.h
@@ -47,6 +49,8 @@ files:
 - ext/archive_write_open_rb_str.h
 - README.txt
 - libarchive.c
+- COPYING.libarchive
+- LICENSE.libbzip2
 has_rdoc: true
 homepage: http://libarchive.rubyforge.org
 post_install_message: