Merge branch 'thrau:master' into master

Author: PulseBeat02

README.md

@@ -85,7 +85,7 @@ stream.close();
 Dependencies
 ------------
 
-* commons-compress(tm) 1.20
+* commons-compress(tm) 1.21
 
 
 Compatibility

pom.xml

@@ -26,7 +26,7 @@
 
   <groupId>org.rauschig</groupId>
   <artifactId>jarchivelib</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.3.0-SNAPSHOT</version>
 
   <packaging>bundle</packaging>
 

src/main/java/org/rauschig/jarchivelib/CommonsArchiver.java

@@ -26,6 +26,7 @@
 import org.apache.commons.compress.archivers.ArchiveInputStream;
 import org.apache.commons.compress.archivers.ArchiveOutputStream;
 import org.apache.commons.compress.archivers.ArchiveStreamFactory;
+import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
 
 /**
  * Implementation of an {@link Archiver} that uses {@link ArchiveStreamFactory} to generate archive streams by a given
@@ -159,7 +160,13 @@ protected ArchiveInputStream createArchiveInputStream(InputStream archive) throw
      */
     protected ArchiveOutputStream createArchiveOutputStream(File archiveFile) throws IOException {
         try {
-            return CommonsStreamFactory.createArchiveOutputStream(this, archiveFile);
+            ArchiveOutputStream archiveOutputStream = CommonsStreamFactory.createArchiveOutputStream(this, archiveFile);
+
+            if (archiveOutputStream instanceof TarArchiveOutputStream) {
+                ((TarArchiveOutputStream) archiveOutputStream).setLongFileMode(TarArchiveOutputStream.LONGFILE_POSIX);
+            }
+
+            return archiveOutputStream;
         } catch (ArchiveException e) {
             throw new IOException(e);
         }

src/test/java/org/rauschig/jarchivelib/AbstractArchiverTest.java

@@ -167,8 +167,9 @@ public void stream_returnsCorrectEntries() throws IOException {
                 entries.add(entry.getName().replaceAll("/$", "")); // remove trailing slashes for test compatibility
             }
 
-            assertEquals(11, entries.size());
+            assertEquals(12, entries.size());
             assertTrue(entries.contains("file.txt"));
+            assertTrue(entries.contains("looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_filename.txt"));
             assertTrue(entries.contains("folder"));
             assertTrue(entries.contains("folder/folder_file.txt"));
             assertTrue(entries.contains("folder/subfolder/subfolder_file.txt"));

src/test/resources/Makefile

@@ -1,7 +1,17 @@
+.PHONY = permissions archives compress clean
+
 CPF = compress.txt
 AR  = archive
 
-all: archives compress
+all: permissions archives compress
+
+permissions:
+	cd $(AR); \
+	chmod 755 permissions/executable_file.txt; \
+	chmod 700 permissions/private_executable_file.txt; \
+	chmod 444 permissions/readonly_file.txt; \
+	chmod 700 permissions/private_folder; \
+	chmod 600 permissions/private_folder/private_file.txt;
 
 ## archives
 ## TODO: separate