fix: errors from valid plugin setups (#20)

- No longer errors if file deletion fails
- No longer errors if tests are not present
- No longer errors if file is named `Plugin.swift`

Author: markemer

Sources/CapacitorPluginTools/CapacitorPluginPackage.swift

@@ -6,6 +6,7 @@ public enum CapacitorPluginError: Error {
     case objcFileCount(Int)
     case objcHeaderCount(Int)
     case oldPluginMissing
+    case cantFindPluginSwift(String)
 
     public var message: String {
         switch self {
@@ -15,6 +16,8 @@ public enum CapacitorPluginError: Error {
             return "Can't find OldPlugin"
         case .objcHeaderCount(let numberOfFiles):
             return "Found \(numberOfFiles) Objective-C Header files, expected \(numberOfFiles)"
+        case .cantFindPluginSwift(let name):
+            return "Can't find \(name) or Plugin.swift in directory"
         }
     }
 }
@@ -73,12 +76,30 @@ public class CapacitorPluginPackage {
         return url
     }
 
-    public func findSwiftPluginFile() throws(CapacitorPluginError)  -> URL {
+    public func findSwiftPluginFile() throws(CapacitorPluginError) -> URL {
         guard let oldPlugin else { throw .oldPluginMissing }
 
         let fileName = "\(oldPlugin.capacitorPlugin.identifier).swift"
 
-        return URL(filePath: fileName, directoryHint: .notDirectory, relativeTo: pluginSrcDirectoryURL)
+        let fileURL = URL(filePath: fileName,
+                          directoryHint: .notDirectory,
+                          relativeTo: pluginSrcDirectoryURL)
+
+        if (try? fileURL.checkResourceIsReachable()) == true {
+            return fileURL
+        } else {
+            print("Warning: file \(fileURL.path()) not found, trying Plugin.swift")
+        }
+
+        let backupFileURL = URL(filePath: "Plugin.swift",
+                                directoryHint: .notDirectory,
+                                relativeTo: pluginSrcDirectoryURL)
+
+        if (try? backupFileURL.checkResourceIsReachable()) == true {
+            return backupFileURL
+        }
+
+        throw .cantFindPluginSwift(fileName)
     }
 
     public func findPodspecFile() throws -> URL {

Sources/CommandLineTool/CLIFileOperations.swift

@@ -6,7 +6,7 @@ extension Cap2SPM {
         if shouldBackup {
             try fileBackup(of: fileList)
         } else {
-            try fileDelete(of: fileList)
+            fileDelete(of: fileList)
         }
     }
 
@@ -15,9 +15,13 @@ extension Cap2SPM {
 
         try moveItemCreatingIntermediaryDirectories(at: package.iosSrcDirectoryURL.appending(path: "Plugin"),
                                                     to: package.iosSrcDirectoryURL.appending(path: "Sources").appending(path: identifer))
-        
-        try moveItemCreatingIntermediaryDirectories(at: package.iosSrcDirectoryURL.appending(path: "PluginTests"),
-                                                    to: package.iosSrcDirectoryURL.appending(path: "Tests").appending(path: "\(identifer)Tests"))
+
+        do {
+            try moveItemCreatingIntermediaryDirectories(at: package.iosSrcDirectoryURL.appending(path: "PluginTests"),
+                                                        to: package.iosSrcDirectoryURL.appending(path: "Tests").appending(path: "\(identifer)Tests"))
+        } catch {
+            print("Warning: can't move PluginTests, as directory was not found")
+        }
     }
 
     func moveItemCreatingIntermediaryDirectories(at: URL, to: URL) throws {
@@ -37,10 +41,15 @@ extension Cap2SPM {
         }
     }
 
-    func fileDelete(of fileURLs: [URL]) throws {
+    func fileDelete(of fileURLs: [URL]) {
         for fileURL in fileURLs {
             print("Deleting \(fileURL.path())...")
-            try FileManager.default.removeItem(at: fileURL)
+            do {
+                try FileManager.default.removeItem(at: fileURL)
+            } catch {
+                print("Warning: Deleting \(fileURL.path()) failed.")
+            }
+
         }
     }