Merge pull request #6 from mackoj/feat/disableArgumentName

Improvement
mackoj · Oct 22, 2022 · e60b7be · e60b7be
2 parents b1bc8d2 + e26cec6
commit e60b7be
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 10 deletions.
diff --git a/Plugins/SchemeGeneratorPlugin/SchemeGenerator.swift b/Plugins/SchemeGeneratorPlugin/SchemeGenerator.swift
@@ -10,15 +10,18 @@ public struct SchemeGenerator {
     var toolConfig = getDefaultConfigurationName(toolConfigFileURL)
 
     /// Prepare configuration
-    let configurationFileURL = getConfigurationFileURL(packageDirectory, arguments)
+    toolConfig = updateDefaultConfigFileName(arguments, toolConfig)
+    saveToolConfig(toolConfig, toolConfigFileURL)
+    let configurationFileURL = getConfigurationFileURL(packageDirectory, arguments, toolConfig.defaultConfigFileName)
     if FileManager.default.fileExists(atPath: configurationFileURL.path) == false {
       createDefaultConfiguration(configurationFileURL)
     }
     let config = loadConfiguration(configurationFileURL)
     validateConfiguration(config, configurationFileURL)
 
-    if config.verbose { print("toolConfigFileURL:", toolConfigFileURL.path) }
-
+//    if config.verbose { print("toolConfigFileURL:", toolConfigFileURL.path) }
+    if config.verbose { print(toolConfig) }
+
     /// Prepare productNames
     toolConfig = testProductNamesContent(productNames, packageTempFolder, toolConfig)
     saveToolConfig(toolConfig, toolConfigFileURL)
@@ -35,7 +38,7 @@ public struct SchemeGenerator {
 
   // MARK: - Private
 
-  // MARK: Configuration
+  // MARK: Tool Configuration
   private static func saveToolConfig(_ toolConfig: ToolConfiguration, _ toolConfigFileURL: FileURL) {
     do {
       let data = try JSONEncoder().encode(toolConfig)
@@ -59,16 +62,23 @@ public struct SchemeGenerator {
     saveToolConfig(toolConfig, toolConfigFileURL)
     return toolConfig
   }
-
-  private static func getConfigurationFileURL(_ packageDirectory: FileURL, _ arguments: [String]) -> FileURL {
-    var configurationFileName = "schemeGenerator.json"
+
+  // MARK: Configuration
+  private static func updateDefaultConfigFileName(_ arguments: [String], _ toolConfig: ToolConfiguration) -> ToolConfiguration {
+    var toolConfig = toolConfig
+    var configurationFileName = toolConfig.defaultConfigFileName
     if let cf = arguments.firstIndex(of: "--confFile") {
       let param = arguments.index(after: cf)
       if param != cf {
         let confFile = arguments[param]
         configurationFileName = confFile
       }
     }
+    toolConfig.defaultConfigFileName = configurationFileName
+    return toolConfig
+  }
+
+  private static func getConfigurationFileURL(_ packageDirectory: FileURL, _ arguments: [String], _ configurationFileName: String) -> FileURL {
     let configurationFileURL = packageDirectory.appendingPathComponent(configurationFileName)
     return configurationFileURL
   }

diff --git a/Plugins/SchemeGeneratorPlugin/SchemeGeneratorConfiguration.swift b/Plugins/SchemeGeneratorPlugin/SchemeGeneratorConfiguration.swift
@@ -10,7 +10,6 @@ public struct SchemeGeneratorConfiguration: Codable, CustomStringConvertible {
   public var description: String {
     """
 SchemeGeneratorConfiguration:
------------------------------
 schemesDirectory: \(schemesDirectory?.path ?? "nil")
 verbose: \(verbose)
 overwriteAlreadyGeneratedSchemes: \(overwriteAlreadyGeneratedSchemes)

diff --git a/Plugins/SchemeGeneratorPlugin/ToolConfiguration.swift b/Plugins/SchemeGeneratorPlugin/ToolConfiguration.swift
@@ -1,9 +1,17 @@
 import Foundation
 
-struct ToolConfiguration: Codable {
-  let defaultConfigFileName: String
+struct ToolConfiguration: Codable, CustomStringConvertible {
+  var defaultConfigFileName: String
   var lastProductNamesHash: String?
 
+  var description: String {
+    """
+ToolConfiguration:
+lastProductNamesHash: \(lastProductNamesHash ?? "nil")
+defaultConfigFileName: \(defaultConfigFileName)
+"""
+  }
+
   init(defaultConfigFileName: String = "schemeGenerator.json", lastProductNamesHash: String? = nil) {
     self.defaultConfigFileName = defaultConfigFileName
     self.lastProductNamesHash = lastProductNamesHash