Merge pull request #2 from marmelroy/swift3.0

Swift3.0

.gitignore

+# MacOS
+.DS_Store
 # Xcode
 #
 build/

.travis.yml

-osx_image: xcode7.2
+osx_image: xcode8
 language: objective-c
 env:
   global:
@@ -6,9 +6,7 @@ env:
   - LANG=en_US.UTF-8
 before_install:
   - brew update || brew update
-  - brew outdated xctool || brew upgrade xctool
   - gem install cocoapods
-  - xcrun simctl list
 install: echo "<3"
 env:
   - MODE=framework
@@ -19,3 +17,4 @@ script: ./build.sh $MODE
 branches:
   only:
     - master
+    - swift3.0

README.md

@@ -30,7 +30,7 @@ catch {
 
 ## Advanced Zip
 
-For more advanced usage, Zip has functions that let you set custom  destination paths, work with password protected zips and use a progress handling closure. These function throw if there is an error but don't return.
+For more advanced usage, Zip has functions that let you set custom  destination paths, work with password protected zips and use a progress handling closure. These functions throw if there is an error but don't return.
 ```swift
 do {
     let filePath = NSBundle.mainBundle().URLForResource("file", withExtension: "zip")!
@@ -51,6 +51,13 @@ catch {
 }
 ```
 
+## Custom File Extensions
+
+Zip supports '.zip' and '.cbz' files out of the box. To support additional zip-derivative file extensions:
+```
+Zip.addCustomFileExtension("file-extension-here")
+```
+
 
 ### Setting up with Carthage
 

Zip copy-Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.4.1</string>
+	<string>0.4.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>6</string>
+	<string>7</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

Zip.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "Zip"
-  s.version          = "0.4.1"
+  s.version          = "0.4.3"
   s.summary          = "Zip and unzip files in Swift."
 
 # This description is used to generate tags and improve search results.

Zip.xcodeproj/project.pbxproj

@@ -493,7 +493,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0720;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = "Roy Marmelstein";
 				TargetAttributes = {
 					343F50FE1C8DAEEC0028C434 = {
@@ -504,9 +504,11 @@
 					};
 					347E3A731C1DFFB500A11FD3 = {
 						CreatedOnToolsVersion = 7.2;
+						LastSwiftMigration = 0800;
 					};
 					347E3A7D1C1DFFB500A11FD3 = {
 						CreatedOnToolsVersion = 7.2;
+						LastSwiftMigration = 0800;
 					};
 				};
 			};
@@ -677,7 +679,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 6;
+				DYLIB_CURRENT_VERSION = 7;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = "Zip copy-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -702,7 +704,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 6;
+				DYLIB_CURRENT_VERSION = 7;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = "Zip copy-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -714,6 +716,7 @@
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "appletvsimulator appletvos";
 				SWIFT_INCLUDE_PATHS = "${SRCROOT}/Zip/minizip/**";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -724,10 +727,10 @@
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 6;
+				DYLIB_CURRENT_VERSION = 7;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_VERSION = A;
 				INFOPLIST_FILE = Zip/Info.plist;
@@ -747,10 +750,10 @@
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 6;
+				DYLIB_CURRENT_VERSION = 7;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_VERSION = A;
 				INFOPLIST_FILE = Zip/Info.plist;
@@ -762,6 +765,7 @@
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SWIFT_INCLUDE_PATHS = "${SRCROOT}/Zip/minizip/**";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 			};
 			name = Release;
 		};
@@ -812,7 +816,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -860,7 +864,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -889,7 +893,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 6;
+				DYLIB_CURRENT_VERSION = 7;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Zip/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -901,6 +905,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_INCLUDE_PATHS = "${SRCROOT}/Zip/minizip/**";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -911,7 +916,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 6;
+				DYLIB_CURRENT_VERSION = 7;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Zip/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -922,6 +927,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_INCLUDE_PATHS = "${SRCROOT}/Zip/minizip/**";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
@@ -932,6 +939,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.roymarmelstein.ZipTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -942,6 +950,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.roymarmelstein.ZipTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};

Zip.xcodeproj/project.xcworkspace/xcshareddata/Zip.xcscmblueprint

@@ -10,7 +10,7 @@
   "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "F3707899-72AE-49DA-9BDD-5CB0B64CF03A",
   "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
     "8DA5B175D3FDB92A3B3CCBD4109A734F1316A3DD" : "Zip\/Zip\/minizip\/",
-    "3DD768C8AB2D6A2647C9EF99992D3CC5820E77C4" : "Zip\/"
+    "3DD768C8AB2D6A2647C9EF99992D3CC5820E77C4" : "Zip-swift3\/"
   },
   "DVTSourceControlWorkspaceBlueprintNameKey" : "Zip",
   "DVTSourceControlWorkspaceBlueprintVersion" : 204,

Zip.xcodeproj/xcshareddata/xcschemes/Zip OSX.xcscheme

 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Zip.xcodeproj/xcshareddata/xcschemes/Zip tvOS.xcscheme

 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Zip.xcodeproj/xcshareddata/xcschemes/Zip.xcscheme

 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Zip.xcodeproj/xcshareddata/xcschemes/ZipTests.xcscheme

 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Zip/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.4.1</string>
+	<string>0.4.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>6</string>
+	<string>7</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

Zip/QuickZip.swift

@@ -21,7 +21,7 @@ extension Zip {
      
      - returns: NSURL of the destination folder.
      */
-    public class func quickUnzipFile(path: NSURL) throws -> NSURL {
+    public class func quickUnzipFile(_ path: URL) throws -> URL {
         return try quickUnzipFile(path, progress: nil)
     }
     
@@ -37,16 +37,21 @@ extension Zip {
      
      - returns: NSURL of the destination folder.
      */
-    public class func quickUnzipFile(path: NSURL, progress: ((progress: Double) -> ())?) throws -> NSURL {
-        let fileManager = NSFileManager.defaultManager()
-        guard let fileExtension = path.pathExtension, let fileName = path.lastPathComponent else {
-            throw ZipError.UnzipFail
-        }
-        let directoryName = fileName.stringByReplacingOccurrencesOfString(".\(fileExtension)", withString: "")
-        let documentsUrl = fileManager.URLsForDirectory(.DocumentDirectory, inDomains: .UserDomainMask)[0] as NSURL
-        let destinationUrl = documentsUrl.URLByAppendingPathComponent(directoryName, isDirectory: true)
+    public class func quickUnzipFile(_ path: URL, progress: ((progress: Double) -> ())?) throws -> URL {
+        let fileManager = FileManager.default
+
+        let fileExtension = path.pathExtension
+        let fileName = path.lastPathComponent
+
+        let directoryName = fileName.replacingOccurrences(of: ".\(fileExtension)", with: "")
+        let documentsUrl = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0] as URL
+        do {
+            let destinationUrl = documentsUrl.appendingPathComponent(directoryName, isDirectory: true)
             try self.unzipFile(path, destination: destinationUrl, overwrite: true, password: nil, progress: progress)
             return destinationUrl
+        }catch{
+            throw(ZipError.unzipFail)
+        }
     }
     
     //MARK: Quick Zip
@@ -63,7 +68,7 @@ extension Zip {
      
      - returns: NSURL of the destination folder.
      */
-    public class func quickZipFiles(paths: [NSURL], fileName: String) throws -> NSURL {
+    public class func quickZipFiles(_ paths: [URL], fileName: String) throws -> URL {
         return try quickZipFiles(paths, fileName: fileName, progress: nil)
     }
     
@@ -80,10 +85,10 @@ extension Zip {
      
      - returns: NSURL of the destination folder.
      */
-    public class func quickZipFiles(paths: [NSURL], fileName: String, progress: ((progress: Double) -> ())?) throws -> NSURL {
-        let fileManager = NSFileManager.defaultManager()
-        let documentsUrl = fileManager.URLsForDirectory(.DocumentDirectory, inDomains: .UserDomainMask)[0] as NSURL
-        let destinationUrl = documentsUrl.URLByAppendingPathComponent("\(fileName).zip")
+    public class func quickZipFiles(_ paths: [URL], fileName: String, progress: ((progress: Double) -> ())?) throws -> URL {
+        let fileManager = FileManager.default
+        let documentsUrl = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0] as URL
+        let destinationUrl = try! documentsUrl.appendingPathComponent("\(fileName).zip")
         try self.zipFiles(paths, zipFilePath: destinationUrl, password: nil, progress: progress)
         return destinationUrl
     }

Zip/ZipUtilities.swift

@@ -11,22 +11,17 @@ import Foundation
 internal class ZipUtilities {
     
     // File manager
-    let fileManager = NSFileManager.defaultManager()
+    let fileManager = FileManager.default
 
     /**
      *  ProcessedFilePath struct
      */
     internal struct ProcessedFilePath {
-        let filePathURL: NSURL
+        let filePathURL: URL
         let fileName: String?
         
         func filePath() -> String {
-            if let filePath = filePathURL.path {
-                return filePath
-            }
-            else {
-                return String()
-            }
+            return filePathURL.path
         }
     }
     
@@ -39,21 +34,19 @@ internal class ZipUtilities {
     
     - returns: Array of ProcessedFilePath structs.
     */
-    internal func processZipPaths(paths: [NSURL]) -> [ProcessedFilePath]{
+    internal func processZipPaths(_ paths: [URL]) -> [ProcessedFilePath]{
         var processedFilePaths = [ProcessedFilePath]()
         for path in paths {
-            guard let filePath = path.path else {
-                continue
-            }
+            let filePath = path.path
             var isDirectory: ObjCBool = false
-            fileManager.fileExistsAtPath(filePath, isDirectory: &isDirectory)
-            if !isDirectory {
+            fileManager.fileExists(atPath: filePath, isDirectory: &isDirectory)
+            if !isDirectory.boolValue {
                 let processedPath = ProcessedFilePath(filePathURL: path, fileName: path.lastPathComponent)
                 processedFilePaths.append(processedPath)
             }
             else {
                 let directoryContents = expandDirectoryFilePath(path)
-                processedFilePaths.appendContentsOf(directoryContents)
+                processedFilePaths.append(contentsOf: directoryContents)
             }
         }
         return processedFilePaths
@@ -67,24 +60,25 @@ internal class ZipUtilities {
      
      - returns: Array of ProcessedFilePath structs.
      */
-    internal func expandDirectoryFilePath(directory: NSURL) -> [ProcessedFilePath] {
+    internal func expandDirectoryFilePath(_ directory: URL) -> [ProcessedFilePath] {
         var processedFilePaths = [ProcessedFilePath]()
-        if let directoryPath = directory.path, let enumerator = fileManager.enumeratorAtPath(directoryPath) {
+        let directoryPath = directory.path
+        if let enumerator = fileManager.enumerator(atPath: directoryPath) {
             while let filePathComponent = enumerator.nextObject() as? String {
-                let path = directory.URLByAppendingPathComponent(filePathComponent)
-                guard let filePath = path.path, let directoryName = directory.lastPathComponent else {
-                    continue
-                }
+                let path = directory.appendingPathComponent(filePathComponent)
+                let filePath = path.path
+                let directoryName = directory.lastPathComponent
+
                 var isDirectory: ObjCBool = false
-                fileManager.fileExistsAtPath(filePath, isDirectory: &isDirectory)
-                if !isDirectory {
-                    let fileName = (directoryName as NSString).stringByAppendingPathComponent(filePathComponent)
+                fileManager.fileExists(atPath: filePath, isDirectory: &isDirectory)
+                if !isDirectory.boolValue {
+                    let fileName = (directoryName as NSString).appendingPathComponent(filePathComponent)
                     let processedPath = ProcessedFilePath(filePathURL: path, fileName: fileName)
                     processedFilePaths.append(processedPath)
                 }
                 else {
                     let directoryContents = expandDirectoryFilePath(path)
-                    processedFilePaths.appendContentsOf(directoryContents)
+                    processedFilePaths.append(contentsOf: directoryContents)
                 }
             }
         }

ZipTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.4.1</string>
+	<string>0.4.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>6</string>
+	<string>7</string>
 </dict>
 </plist>

build.sh

 #!/bin/bash
 
 # **** Update me when new Xcode versions are released! ****
-PLATFORM="platform=iOS Simulator,OS=9.2,name=iPhone 6"
-SDK="iphonesimulator9.2"
+PLATFORM="platform=iOS Simulator,OS=10.0,name=iPhone 6s"
+SDK="iphonesimulator10.0"
 
 
 # It is pitch black.
@@ -19,12 +19,12 @@ MODE="$1"
 
 if [ "$MODE" = "framework" ]; then
     echo "Building and testing Zip."
-    xctool \
+    xcodebuild \
         -project Zip.xcodeproj \
         -scheme Zip \
         -sdk "$SDK" \
         -destination "$PLATFORM" \
-        build test
+        test
     trap - EXIT
     exit 0
 fi
@@ -35,12 +35,11 @@ if [ "$MODE" = "examples" ]; then
     for example in examples/*/; do
         echo "Building $example."
         pod install --project-directory=$example
-        xctool \
+        xcodebuild \
             -workspace "${example}Sample.xcworkspace" \
             -scheme Sample \
             -sdk "$SDK" \
-            -destination "$PLATFORM" \
-            build
+            -destination "$PLATFORM"
     done
     trap - EXIT
     exit 0