Merge branch 'feature/FindMutansCommand'

SoriUR · Aug 1, 2022 · 7d71cab · 7d71cab
2 parents 8b791cb + 0bfe238
commit 7d71cab
Show file tree

Hide file tree

Showing 12 changed files with 190 additions and 1,966 deletions.
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/Mutanus.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/Mutanus.xcscheme
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1340"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "mutanus"
+               BuildableName = "mutanus"
+               BlueprintName = "mutanus"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "MutanusTests"
+               BuildableName = "MutanusTests"
+               BlueprintName = "MutanusTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "MutanusTests"
+               BuildableName = "MutanusTests"
+               BlueprintName = "MutanusTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "mutanus"
+            BuildableName = "mutanus"
+            BlueprintName = "mutanus"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "mutanus"
+            BuildableName = "mutanus"
+            BlueprintName = "mutanus"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Mutanus.xcodeproj/project.pbxproj b/Mutanus.xcodeproj/project.pbxproj
diff --git a/Mutanus.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Mutanus.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/Mutanus.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Mutanus.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/Package.resolved b/Package.resolved
@@ -6,17 +6,17 @@
         "repositoryURL": "https://github.com/apple/swift-argument-parser",
         "state": {
           "branch": null,
-          "revision": "d2930e8fcf9c33162b9fcc1d522bc975e2d4179b",
-          "version": "1.0.1"
+          "revision": "df9ee6676cd5b3bf5b330ec7568a5644f547201b",
+          "version": "1.1.3"
         }
       },
       {
         "package": "SwiftSyntax",
         "repositoryURL": "https://github.com/apple/swift-syntax.git",
         "state": {
           "branch": null,
-          "revision": "2fff9fc25cdc059379b6bd309377cfab45d8520c",
-          "version": "0.50400.0"
+          "revision": "0b6c22b97f8e9320bca62e82cdbee601cf37ad3f",
+          "version": "0.50600.1"
         }
       }
     ]

diff --git a/Package.swift b/Package.swift
@@ -1,29 +1,39 @@
 // swift-tools-version:5.4
+// The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
-#if swift(<5.5)
-let swiftSyntaxVersion = Package.Dependency.Requirement.exact("0.50400.0")
+var dependencies: [Target.Dependency] = [
+    .product(name: "SwiftSyntax", package: "SwiftSyntax"),
+    .product(name: "ArgumentParser", package: "ArgumentParser")
+]
+
+#if swift(>=5.6)
+let swiftSyntaxVersion = Package.Dependency.Requirement.exact("0.50600.1")
+dependencies.append(.product(name: "SwiftSyntaxParser", package: "SwiftSyntax"))
 #elseif swift(>=5.5)
-let swiftSyntaxVersion = Package.Dependency.Requirement.exactItem("0.50500.0")
+let swiftSyntaxVersion = Package.Dependency.Requirement.exact("0.50500.0")
+#else
+let swiftSyntaxVersion = Package.Dependency.Requirement.exact("0.50400.0")
 #endif
 
 let package = Package(
     name: "Mutanus",
     platforms: [
         .macOS(.v10_15)
     ],
+    products: [
+        .executable(name: "mutanus", targets: ["Mutanus"])
+    ],
     dependencies: [
-        .package(url: "https://github.com/apple/swift-argument-parser", from: "1.0.0"),
+        .package(name: "ArgumentParser", url: "https://github.com/apple/swift-argument-parser", from: "1.0.0"),
         .package(name: "SwiftSyntax", url: "https://github.com/apple/swift-syntax.git", swiftSyntaxVersion),
     ],
     targets: [
         .executableTarget(
             name: "Mutanus",
-            dependencies: [
-                "SwiftSyntax",
-                .product(name: "ArgumentParser", package: "swift-argument-parser"),
-            ]),
+            dependencies: dependencies
+        ),
         .testTarget(
             name: "MutanusTests",
             dependencies: ["Mutanus"]),

diff --git a/Sources/Mutanus/Commands/Mutanus+CreateConfig.swift b/Sources/Mutanus/Commands/Mutanus+CreateConfig.swift
@@ -12,7 +12,7 @@ extension Mutanus {
 
         private var fileManager: MutanusFileManger { CustomFileManager() }
 
-        @Option(name: .shortAndLong, help: "Path for configuration template to be created at")
+        @Argument(help: "Path for configuration template to be created at")
         var path: String?
 
         func run() throws {

diff --git a/Sources/Mutanus/Commands/Mutanus+ExtractSources.swift b/Sources/Mutanus/Commands/Mutanus+ExtractSources.swift
@@ -8,7 +8,7 @@ import ArgumentParser
 extension Mutanus {
     final class ExtractSources: ParsableCommand, PathValidator, ConfigValidator {
 
-        static let configuration = CommandConfiguration(abstract: "Extracts sources for given configuration or ")
+        static let configuration = CommandConfiguration(abstract: "Extracts sources for given configuration")
         var fileManager: MutanusFileManger { CustomFileManager() }
 
         @Option(name: .shortAndLong, help: "Relative or absolute path to the configuration file")
@@ -23,39 +23,12 @@ extension Mutanus {
             _ = try ExtractSourceFilesStep(
                 fileManager: fileManager,
                 configuration: configuration,
-                delegate: self
-            ).perform(.testSucceeded)
+                delegate: nil
+            ).executeStep(.testSucceeded)
         }
     }
 }
 
-extension Mutanus.ExtractSources : MutanusSequenceStepDelegate {
-    func stepStarted<T: ChainLink>(_ step: T) {
-        switch step {
-        case is ExtractSourceFilesStep:
-            Logger.logEvent(.sourceFilesStarted)
-        default:
-            break
-        }
-    }
-
-    func stepFinished<T: ChainLink>(_ step: T, result: T.Result) throws {
-
-        switch step {
-        case is ExtractSourceFilesStep:
-            try handleSourcesStepResult(result as! ExtractSourceFilesStep.Result)
-        default:
-            break
-        }
-    }
-
-    func handleSourcesStepResult(_ result: ExtractSourceFilesStep.Result) throws {
-        Logger.logEvent(.sourceFilesFinished(sources: result))
-
-        guard !result.isEmpty else { throw MutanusError.emptySources }
-    }
-}
-
 // MARK: - Validation
 extension Mutanus.ExtractSources {
     func validate() throws {

diff --git a/Sources/Mutanus/Commands/Mutanus+FindMutants.swift b/Sources/Mutanus/Commands/Mutanus+FindMutants.swift
@@ -0,0 +1,53 @@
+//
+//  Created by Iurii Sorokin on 08.03.2022.
+//
+
+import Foundation
+import ArgumentParser
+
+extension Mutanus {
+    final class FindMutants: ParsableCommand, PathValidator, ConfigValidator {
+
+        static let configuration = CommandConfiguration(abstract: "Find mutants for given configuration or file")
+        var fileManager: MutanusFileManger { CustomFileManager() }
+
+        @Option(name: .shortAndLong, help: "Relative or absolute path to the configuration file")
+        var configPath: String?
+
+        @Option(name: .shortAndLong, parsing: .upToNextOption, help: "Relative or absolute paths to files")
+        var files: [String] = []
+
+        func run() throws {
+
+            let filesTest: [String]
+
+            if let configPath = configPath {
+                let configuration = try validateConfig(atPath: configPath)
+
+                filesTest = try ExtractSourceFilesStep(
+                    fileManager: fileManager,
+                    configuration: configuration,
+                    delegate: self
+                ).executeStep(.testSucceeded)
+            } else {
+                filesTest = files
+            }
+
+            print(try FindMutantsStep().executeStep(filesTest))
+        }
+    }
+}
+
+// MARK: - Validation
+extension Mutanus.FindMutants {
+    func validate() throws {
+
+        guard configPath != nil || !files.isEmpty else { throw ValidationError("asd") }
+
+        if let configPath = configPath {
+            self.configPath = try validatePath(configPath)
+        }
+
+        files = try files.map { try validatePath($0) }
+    }
+}
diff --git a/Sources/Mutanus/Protocols/PathValidator.swift b/Sources/Mutanus/Protocols/PathValidator.swift
@@ -26,6 +26,6 @@ extension PathValidator {
             return relativeConfigurationPath
         }
 
-        throw ValidationError("Configuration file doesn't exits at given path")
+        throw ValidationError("File doesn't exits at: \(path)")
     }
 }
diff --git a/Sources/Mutanus/Steps/FindMutantsStep.swift b/Sources/Mutanus/Steps/FindMutantsStep.swift
@@ -7,14 +7,15 @@
 
 import Foundation
 import SwiftSyntax
+import SwiftSyntaxParser
 
 final class FindMutantsStep: MutanusSequenceStep {
 
-    let reportCompiler: ReportCompiler
+    let reportCompiler: ReportCompiler?
 
     init(
-        reportCompiler: ReportCompiler,
-        delegate: MutanusSequenceStepDelegate?
+        reportCompiler: ReportCompiler? = nil,
+        delegate: MutanusSequenceStepDelegate? = nil
     ) {
         self.reportCompiler = reportCompiler
         self.delegate = delegate
@@ -62,7 +63,7 @@ final class FindMutantsStep: MutanusSequenceStep {
             maxFileCount: maxCount
         )
 
-        reportCompiler.extractedSources(info)
+        reportCompiler?.extractedSources(info)
 
         return info
     }
@@ -82,8 +83,7 @@ final class FindMutantsStep: MutanusSequenceStep {
     }
 
     private func filePositionOrder(lhs: MutationPoint, rhs: MutationPoint) -> Bool {
-        return lhs.position.line < rhs.position.line &&
-            lhs.position.column < rhs.position.column
+        return lhs.position.line < rhs.position.line && lhs.position.column < rhs.position.column
     }
 }
 

diff --git a/Sources/Mutanus/main.swift b/Sources/Mutanus/main.swift
@@ -11,7 +11,8 @@ struct Mutanus: ParsableCommand {
         subcommands: [
             Run.self,
             CreateConfig.self,
-            ExtractSources.self
+            ExtractSources.self,
+            FindMutants.self
         ]
     )
 }