Update to 3.0.0

yonaskolb · Aug 24, 2018 · 7fc60bb · 7fc60bb
1 parent 44e21c9
commit 7fc60bb
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 # Change Log
+## Master
 
 ## [3.0.0](https://github.com/yonaskolb/SwagGen/compare/2.1.2...3.0.0)
 

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 TOOL_NAME = swaggen
-VERSION = 2.1.2
+VERSION = 3.0.0
 
 PREFIX = /usr/local
 INSTALL_PATH = $(PREFIX)/bin/$(TOOL_NAME)

diff --git a/Sources/SwagGen/main.swift b/Sources/SwagGen/main.swift
@@ -3,7 +3,7 @@ import PathKit
 import SwagGenKit
 import SwiftCLI
 
-let version = "2.1.2"
+let version = "3.0.0"
 let generateCommand = GenerateCommand()
 let cli = CLI(name: "swaggen", version: version, description: "Swagger code generator", commands: [generateCommand])
 cli.goAndExit()
diff --git a/Sources/SwagGenKit/CodeFormatter.swift b/Sources/SwagGenKit/CodeFormatter.swift
@@ -180,7 +180,7 @@ public class CodeFormatter {
 
         return context
     }
-    
+
     func getOperationContext(_ operation: Swagger.Operation) -> Context {
         var context: Context = [:]
 
@@ -218,7 +218,7 @@ public class CodeFormatter {
         context["formParams"] = operation.getParameters(type: .formData).map(getParameterContext)
         context["headerParams"] = operation.getParameters(type: .header).map(getParameterContext)
         context["hasFileParam"] = params.contains { $0.metadata.type == .file }
-        
+
         let securityRequirements = operation.securityRequirements ?? spec.securityRequirements
         context["securityRequirement"] = securityRequirements?.first.flatMap(getSecurityRequirementContext)
         context["securityRequirements"] = securityRequirements?.map(getSecurityRequirementContext)

diff --git a/Sources/SwagGenKit/Utilities.swift b/Sources/SwagGenKit/Utilities.swift
@@ -69,7 +69,7 @@ extension String {
         var index = 0
         let components = self.components(separatedBy: seperator)
         if uppercased() == self {
-            return components.map { $0.lowercased().mapFirstChar { $0.uppercased()} }.joined(separator: "")
+            return components.map { $0.lowercased().mapFirstChar { $0.uppercased() } }.joined(separator: "")
         }
         return components
             .map { string in
@@ -106,7 +106,7 @@ extension String {
     }
 
     private var hasSeparator: Bool {
-        return separators.contains(where: { contains($0)})
+        return separators.contains(where: { contains($0) })
     }
 
     private var isAcronym: Bool {

diff --git a/Tests/SwagGenKitTests/GeneratorTests.swift b/Tests/SwagGenKitTests/GeneratorTests.swift
@@ -1,7 +1,7 @@
 import Foundation
-import XCTest
 import Spectre
 @testable import SwagGenKit
+import XCTest
 
 public func testGenerator() {