Xcode 7 beta 5 updates

realm · Aug 23, 2015 · 92baed1 · 92baed1
1 parent 9b7dae2
commit 92baed1
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 19 deletions.
diff --git a/Source/SwiftLintFramework/Linter.swift b/Source/SwiftLintFramework/Linter.swift
@@ -33,7 +33,7 @@ public struct Linter {
     ]
 
     public var styleViolations: [StyleViolation] {
-        return rules.flatMap { $0.validateFile(file) }
+        return rules.flatMap { $0.validateFile(self.file) }
     }
 
     public var ruleExamples: [RuleExample] {

diff --git a/Source/SwiftLintFramework/NSFileManager+SwiftLint.swift b/Source/SwiftLintFramework/NSFileManager+SwiftLint.swift
@@ -12,6 +12,6 @@ extension NSFileManager {
     public func allFilesRecursively(directory directory: String) -> [String] {
         let relativeFiles = (try! contentsOfDirectoryAtPath(directory)) +
             (try! subpathsOfDirectoryAtPath(directory))
-        return relativeFiles.map(directory.stringByAppendingPathComponent)
+        return relativeFiles.map((directory as NSString).stringByAppendingPathComponent)
     }
 }
diff --git a/Source/SwiftLintFramework/Rules/FunctionBodyLengthRule.swift b/Source/SwiftLintFramework/Rules/FunctionBodyLengthRule.swift
@@ -33,8 +33,8 @@ public struct FunctionBodyLengthRule: ASTRule, ParameterizedRule {
             if let subDict = subItem as? XPCDictionary,
                 let kindString = subDict["key.kind"] as? String,
                 let kind = SwiftDeclarationKind(rawValue: kindString) {
-                violations.extend(validateFile(file, dictionary: subDict))
-                violations.extend(validateFile(file, kind: kind, dictionary: subDict))
+                violations.extend(self.validateFile(file, dictionary: subDict))
+                violations.extend(self.validateFile(file, kind: kind, dictionary: subDict))
             }
             return violations
         }

diff --git a/Source/SwiftLintFramework/Rules/NestingRule.swift b/Source/SwiftLintFramework/Rules/NestingRule.swift
@@ -25,8 +25,8 @@ public struct NestingRule: ASTRule {
             if let subDict = subItem as? XPCDictionary,
                 let kindString = subDict["key.kind"] as? String,
                 let kind = SwiftDeclarationKind(rawValue: kindString) {
-                    violations.extend(validateFile(file, dictionary: subDict))
-                    violations.extend(validateFile(file, kind: kind, dictionary: subDict))
+                    violations.extend(self.validateFile(file, dictionary: subDict))
+                    violations.extend(self.validateFile(file, kind: kind, dictionary: subDict))
             }
             return violations
         }
@@ -78,7 +78,7 @@ public struct NestingRule: ASTRule {
             }
             return nil
         }.flatMap { (kind, dict) -> [StyleViolation] in
-            return validateFile(file, kind: kind, dictionary: dict, level: level + 1)
+            return self.validateFile(file, kind: kind, dictionary: dict, level: level + 1)
         })
         return violations
     }

diff --git a/Source/SwiftLintFramework/Rules/TypeBodyLengthRule.swift b/Source/SwiftLintFramework/Rules/TypeBodyLengthRule.swift
@@ -33,8 +33,8 @@ public struct TypeBodyLengthRule: ASTRule, ParameterizedRule {
             if let subDict = subItem as? XPCDictionary,
                 let kindString = subDict["key.kind"] as? String,
                 let kind = SwiftDeclarationKind(rawValue: kindString) {
-                    violations.extend(validateFile(file, dictionary: subDict))
-                    violations.extend(validateFile(file, kind: kind, dictionary: subDict))
+                    violations.extend(self.validateFile(file, dictionary: subDict))
+                    violations.extend(self.validateFile(file, kind: kind, dictionary: subDict))
             }
             return violations
         }

diff --git a/Source/SwiftLintFramework/Rules/TypeNameRule.swift b/Source/SwiftLintFramework/Rules/TypeNameRule.swift
@@ -25,8 +25,8 @@ public struct TypeNameRule: ASTRule {
             if let subDict = subItem as? XPCDictionary,
                 let kindString = subDict["key.kind"] as? String,
                 let kind = SwiftDeclarationKind(rawValue: kindString) {
-                violations.extend(validateFile(file, dictionary: subDict))
-                violations.extend(validateFile(file, kind: kind, dictionary: subDict))
+                violations.extend(self.validateFile(file, dictionary: subDict))
+                violations.extend(self.validateFile(file, kind: kind, dictionary: subDict))
             }
             return violations
         }

diff --git a/Source/SwiftLintFramework/Rules/VariableNameRule.swift b/Source/SwiftLintFramework/Rules/VariableNameRule.swift
@@ -25,8 +25,8 @@ public struct VariableNameRule: ASTRule {
             if let subDict = subItem as? XPCDictionary,
                 let kindString = subDict["key.kind"] as? String,
                 let kind = SwiftDeclarationKind(rawValue: kindString) {
-                violations.extend(validateFile(file, dictionary: subDict))
-                violations.extend(validateFile(file, kind: kind, dictionary: subDict))
+                violations.extend(self.validateFile(file, dictionary: subDict))
+                violations.extend(self.validateFile(file, kind: kind, dictionary: subDict))
             }
             return violations
         }

diff --git a/Source/SwiftLintFrameworkTests/IntegrationTests.swift b/Source/SwiftLintFrameworkTests/IntegrationTests.swift
@@ -15,9 +15,10 @@ class IntegrationTests: XCTestCase {
     func testSwiftLintLints() {
         // This is as close as we're ever going to get to a self-hosting linter.
         let fileManager = NSFileManager.defaultManager()
-        let directory = __FILE__.stringByDeletingLastPathComponent
-            .stringByDeletingLastPathComponent
-            .stringByDeletingLastPathComponent
+        let directory = ((((__FILE__ as NSString)
+            .stringByDeletingLastPathComponent as NSString)
+            .stringByDeletingLastPathComponent as NSString)
+            .stringByDeletingLastPathComponent as NSString)
             .stringByAppendingPathComponent("Source")
         let allFiles = fileManager.allFilesRecursively(directory: directory)
         let swiftFiles = allFiles.filter { $0.isSwiftFile() }

diff --git a/Source/swiftlint/LintCommand.swift b/Source/swiftlint/LintCommand.swift
@@ -41,16 +41,15 @@ struct LintCommand: CommandType {
     private func lint(path: String) -> Result<(), CommandantError<()>> {
         let filesToLint = filesToLintAtPath(path)
         if filesToLint.count > 0 {
-
             if path == "" {
                 print("Linting Swift files in current working directory")
             } else {
                 print("Linting Swift files at path \(path)")
             }
-
             var numberOfViolations = 0, numberOfSeriousViolations = 0
             for (index, file) in filesToLint.enumerate() {
-                print("Linting '\(file.lastPathComponent)' (\(index + 1)/\(filesToLint.count))")
+                let filename = (file as NSString).lastPathComponent
+                print("Linting '\(filename)' (\(index + 1)/\(filesToLint.count))")
                 for violation in Linter(file: File(path: file)!).styleViolations {
                     print(violation)
                     numberOfViolations++