Lint output (#15)

SwiftGen · Feb 12, 2017 · 28be61a · 28be61a
1 parent 08137d9
commit 28be61a
Show file tree

Hide file tree

Showing 46 changed files with 282 additions and 158 deletions.
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -0,0 +1,11 @@
+disabled_rules:
+ - type_name
+
+opt_in_rules:
+ - force_unwrapping
+
+# Rules customization
+line_length:
+  warning: 120
+  error: 200
+
diff --git a/.travis.yml b/.travis.yml
@@ -9,6 +9,9 @@ env:
  - RAKETASK=test
 
 script:
+  - Scripts/install_swiftlint.sh
+  - PROJECT_DIR=Tests Scripts/swiftlint-code.sh
   - rake "$RAKETASK"
+  - Scripts/swiftlint-output.sh
   - Scripts/compile-modules.sh
   - Scripts/compile-output.sh
diff --git a/Scripts/install_swiftlint.sh b/Scripts/install_swiftlint.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Installs the SwiftLint package.
+# Tries to get the precompiled .pkg file from Github, but if that
+# fails just recompiles from source.
+#
+# Original script: https://alexplescan.com/posts/2016/03/03/setting-up-swiftlint-on-travis-ci/
+
+set -e
+
+SWIFTLINT_PKG_PATH="/tmp/SwiftLint.pkg"
+SWIFTLINT_PKG_URL="https://github.com/realm/SwiftLint/releases/download/0.16.1/SwiftLint.pkg"
+
+wget --output-document=$SWIFTLINT_PKG_PATH $SWIFTLINT_PKG_URL
+
+if [ -f $SWIFTLINT_PKG_PATH ]; then
+  echo "SwiftLint package exists! Installing it..."
+  sudo installer -pkg $SWIFTLINT_PKG_PATH -target /
+else
+  echo "SwiftLint package doesn't exist. Compiling from source..." &&
+  git clone https://github.com/realm/SwiftLint.git /tmp/SwiftLint &&
+  cd /tmp/SwiftLint &&
+  git submodule update --init --recursive &&
+  sudo make install
+fi
diff --git a/Scripts/swiftlint-code.sh b/Scripts/swiftlint-code.sh
@@ -0,0 +1,6 @@
+if which swiftlint >/dev/null; then
+  # Lint SwiftGen's source itself
+  swiftlint lint --path "${PROJECT_DIR}/TestSuites"
+else
+  echo "warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint"
+fi
diff --git a/Scripts/swiftlint-output.sh b/Scripts/swiftlint-output.sh
@@ -0,0 +1,6 @@
+if which swiftlint >/dev/null; then
+  # Lint generated code in Tests/Expected
+  swiftlint lint --path "Tests/Expected"
+else
+  echo "warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint"
+fi
diff --git a/Tests/Expected/Storyboards-iOS/default-context-all.swift b/Tests/Expected/Storyboards-iOS/default-context-all.swift
@@ -174,12 +174,12 @@ enum StoryboardSegue {
     case Test = "test"
   }
   enum Message: String, StoryboardSegueType {
-    case CustomBack = "CustomBack"
-    case Embed = "Embed"
-    case NonCustom = "NonCustom"
+    case CustomBack
+    case Embed
+    case NonCustom
     case Show_NavCtrl = "Show-NavCtrl"
   }
   enum Wizard: String, StoryboardSegueType {
-    case ShowPassword = "ShowPassword"
+    case ShowPassword
   }
 }
diff --git a/Tests/Expected/Storyboards-iOS/default-context-customname.swift b/Tests/Expected/Storyboards-iOS/default-context-customname.swift
@@ -174,12 +174,12 @@ enum XCTStoryboardsSegue {
     case Test = "test"
   }
   enum Message: String, StoryboardSegueType {
-    case CustomBack = "CustomBack"
-    case Embed = "Embed"
-    case NonCustom = "NonCustom"
+    case CustomBack
+    case Embed
+    case NonCustom
     case Show_NavCtrl = "Show-NavCtrl"
   }
   enum Wizard: String, StoryboardSegueType {
-    case ShowPassword = "ShowPassword"
+    case ShowPassword
   }
 }
diff --git a/Tests/Expected/Storyboards-iOS/lowercase-context-all.swift b/Tests/Expected/Storyboards-iOS/lowercase-context-all.swift
@@ -174,13 +174,12 @@ enum StoryboardSegue {
     case Test = "test"
   }
   enum Message: String, StoryboardSegueType {
-    case CustomBack = "CustomBack"
-    case Embed = "Embed"
-    case NonCustom = "NonCustom"
+    case CustomBack
+    case Embed
+    case NonCustom
     case Show_NavCtrl = "Show-NavCtrl"
   }
   enum Wizard: String, StoryboardSegueType {
-    case ShowPassword = "ShowPassword"
+    case ShowPassword
   }
 }
-
diff --git a/Tests/Expected/Storyboards-iOS/lowercase-context-customname.swift b/Tests/Expected/Storyboards-iOS/lowercase-context-customname.swift
@@ -174,13 +174,12 @@ enum XCTStoryboardsSegue {
     case Test = "test"
   }
   enum Message: String, StoryboardSegueType {
-    case CustomBack = "CustomBack"
-    case Embed = "Embed"
-    case NonCustom = "NonCustom"
+    case CustomBack
+    case Embed
+    case NonCustom
     case Show_NavCtrl = "Show-NavCtrl"
   }
   enum Wizard: String, StoryboardSegueType {
-    case ShowPassword = "ShowPassword"
+    case ShowPassword
   }
 }
-
diff --git a/Tests/Expected/Storyboards-iOS/lowercase-context-empty.swift b/Tests/Expected/Storyboards-iOS/lowercase-context-empty.swift
@@ -42,4 +42,3 @@ extension UIViewController {
 }
 
 // No storyboard found
-
diff --git a/Tests/Expected/Storyboards-iOS/swift3-context-all.swift b/Tests/Expected/Storyboards-iOS/swift3-context-all.swift
@@ -171,7 +171,7 @@ enum StoryboardScene {
 
 enum StoryboardSegue {
   enum AdditionalImport: String, StoryboardSegueType {
-    case test = "test"
+    case test
   }
   enum Message: String, StoryboardSegueType {
     case customBack = "CustomBack"
@@ -183,4 +183,3 @@ enum StoryboardSegue {
     case showPassword = "ShowPassword"
   }
 }
-
diff --git a/Tests/Expected/Storyboards-iOS/swift3-context-customname.swift b/Tests/Expected/Storyboards-iOS/swift3-context-customname.swift
@@ -171,7 +171,7 @@ enum XCTStoryboardsScene {
 
 enum XCTStoryboardsSegue {
   enum AdditionalImport: String, StoryboardSegueType {
-    case test = "test"
+    case test
   }
   enum Message: String, StoryboardSegueType {
     case customBack = "CustomBack"
@@ -183,4 +183,3 @@ enum XCTStoryboardsSegue {
     case showPassword = "ShowPassword"
   }
 }
-
diff --git a/Tests/Expected/Storyboards-iOS/swift3-context-empty.swift b/Tests/Expected/Storyboards-iOS/swift3-context-empty.swift
@@ -42,4 +42,3 @@ extension UIViewController {
 }
 
 // No storyboard found
-
diff --git a/Tests/Expected/Storyboards-iOS/uppercase-context-all.swift b/Tests/Expected/Storyboards-iOS/uppercase-context-all.swift
@@ -55,7 +55,7 @@ enum StoryboardScene {
       return vc
     }
 
-    case SomeSlackViewControllerInstance = "SomeSlackViewControllerInstance"
+    case SomeSlackViewControllerInstance
     static func someSlackViewControllerInstanceViewController() -> SlackTextViewController.SLKTextViewController {
       guard let vc = StoryboardScene.AdditionalImport.SomeSlackViewControllerInstance.viewController() as? SlackTextViewController.SLKTextViewController
       else {
@@ -77,20 +77,20 @@ enum StoryboardScene {
   enum Dependency: String, StoryboardSceneType {
     static let storyboardName = "Dependency"
 
-    case Dependent = "Dependent"
+    case Dependent
     static func dependentViewController() -> UIViewController {
       return StoryboardScene.Dependency.Dependent.viewController()
     }
   }
   enum Message: String, StoryboardSceneType {
     static let storyboardName = "Message"
 
-    case Composer = "Composer"
+    case Composer
     static func composerViewController() -> UIViewController {
       return StoryboardScene.Message.Composer.viewController()
     }
 
-    case MessagesList = "MessagesList"
+    case MessagesList
     static func messagesListViewController() -> UITableViewController {
       guard let vc = StoryboardScene.Message.MessagesList.viewController() as? UITableViewController
       else {
@@ -99,7 +99,7 @@ enum StoryboardScene {
       return vc
     }
 
-    case NavCtrl = "NavCtrl"
+    case NavCtrl
     static func navCtrlViewController() -> UINavigationController {
       guard let vc = StoryboardScene.Message.NavCtrl.viewController() as? UINavigationController
       else {
@@ -108,7 +108,7 @@ enum StoryboardScene {
       return vc
     }
 
-    case URLChooser = "URLChooser"
+    case URLChooser
     static func urlChooserViewController() -> XXPickerViewController {
       guard let vc = StoryboardScene.Message.URLChooser.viewController() as? XXPickerViewController
       else {
@@ -120,7 +120,7 @@ enum StoryboardScene {
   enum Placeholder: String, StoryboardSceneType {
     static let storyboardName = "Placeholder"
 
-    case Navigation = "Navigation"
+    case Navigation
     static func navigationViewController() -> UINavigationController {
       guard let vc = StoryboardScene.Placeholder.Navigation.viewController() as? UINavigationController
       else {
@@ -144,7 +144,7 @@ enum StoryboardScene {
       return StoryboardScene.Wizard.Accept_CGU.viewController()
     }
 
-    case CreateAccount = "CreateAccount"
+    case CreateAccount
     static func createAccountViewController() -> CreateAccViewController {
       guard let vc = StoryboardScene.Wizard.CreateAccount.viewController() as? CreateAccViewController
       else {
@@ -153,7 +153,7 @@ enum StoryboardScene {
       return vc
     }
 
-    case Preferences = "Preferences"
+    case Preferences
     static func preferencesViewController() -> UITableViewController {
       guard let vc = StoryboardScene.Wizard.Preferences.viewController() as? UITableViewController
       else {
@@ -162,7 +162,7 @@ enum StoryboardScene {
       return vc
     }
 
-    case Validate_Password = "Validate_Password"
+    case Validate_Password
     static func validatePasswordViewController() -> UIViewController {
       return StoryboardScene.Wizard.Validate_Password.viewController()
     }
@@ -174,13 +174,12 @@ enum StoryboardSegue {
     case Test = "test"
   }
   enum Message: String, StoryboardSegueType {
-    case CustomBack = "CustomBack"
-    case Embed = "Embed"
-    case NonCustom = "NonCustom"
+    case CustomBack
+    case Embed
+    case NonCustom
     case Show_NavCtrl = "Show-NavCtrl"
   }
   enum Wizard: String, StoryboardSegueType {
-    case ShowPassword = "ShowPassword"
+    case ShowPassword
   }
 }
-
diff --git a/Tests/Expected/Storyboards-iOS/uppercase-context-customname.swift b/Tests/Expected/Storyboards-iOS/uppercase-context-customname.swift
@@ -55,7 +55,7 @@ enum XCTStoryboardsScene {
       return vc
     }
 
-    case SomeSlackViewControllerInstance = "SomeSlackViewControllerInstance"
+    case SomeSlackViewControllerInstance
     static func someSlackViewControllerInstanceViewController() -> SlackTextViewController.SLKTextViewController {
       guard let vc = XCTStoryboardsScene.AdditionalImport.SomeSlackViewControllerInstance.viewController() as? SlackTextViewController.SLKTextViewController
       else {
@@ -77,20 +77,20 @@ enum XCTStoryboardsScene {
   enum Dependency: String, StoryboardSceneType {
     static let storyboardName = "Dependency"
 
-    case Dependent = "Dependent"
+    case Dependent
     static func dependentViewController() -> UIViewController {
       return XCTStoryboardsScene.Dependency.Dependent.viewController()
     }
   }
   enum Message: String, StoryboardSceneType {
     static let storyboardName = "Message"
 
-    case Composer = "Composer"
+    case Composer
     static func composerViewController() -> UIViewController {
       return XCTStoryboardsScene.Message.Composer.viewController()
     }
 
-    case MessagesList = "MessagesList"
+    case MessagesList
     static func messagesListViewController() -> UITableViewController {
       guard let vc = XCTStoryboardsScene.Message.MessagesList.viewController() as? UITableViewController
       else {
@@ -99,7 +99,7 @@ enum XCTStoryboardsScene {
       return vc
     }
 
-    case NavCtrl = "NavCtrl"
+    case NavCtrl
     static func navCtrlViewController() -> UINavigationController {
       guard let vc = XCTStoryboardsScene.Message.NavCtrl.viewController() as? UINavigationController
       else {
@@ -108,7 +108,7 @@ enum XCTStoryboardsScene {
       return vc
     }
 
-    case URLChooser = "URLChooser"
+    case URLChooser
     static func urlChooserViewController() -> XXPickerViewController {
       guard let vc = XCTStoryboardsScene.Message.URLChooser.viewController() as? XXPickerViewController
       else {
@@ -120,7 +120,7 @@ enum XCTStoryboardsScene {
   enum Placeholder: String, StoryboardSceneType {
     static let storyboardName = "Placeholder"
 
-    case Navigation = "Navigation"
+    case Navigation
     static func navigationViewController() -> UINavigationController {
       guard let vc = XCTStoryboardsScene.Placeholder.Navigation.viewController() as? UINavigationController
       else {
@@ -144,7 +144,7 @@ enum XCTStoryboardsScene {
       return XCTStoryboardsScene.Wizard.Accept_CGU.viewController()
     }
 
-    case CreateAccount = "CreateAccount"
+    case CreateAccount
     static func createAccountViewController() -> CreateAccViewController {
       guard let vc = XCTStoryboardsScene.Wizard.CreateAccount.viewController() as? CreateAccViewController
       else {
@@ -153,7 +153,7 @@ enum XCTStoryboardsScene {
       return vc
     }
 
-    case Preferences = "Preferences"
+    case Preferences
     static func preferencesViewController() -> UITableViewController {
       guard let vc = XCTStoryboardsScene.Wizard.Preferences.viewController() as? UITableViewController
       else {
@@ -162,7 +162,7 @@ enum XCTStoryboardsScene {
       return vc
     }
 
-    case Validate_Password = "Validate_Password"
+    case Validate_Password
     static func validatePasswordViewController() -> UIViewController {
       return XCTStoryboardsScene.Wizard.Validate_Password.viewController()
     }
@@ -174,13 +174,12 @@ enum XCTStoryboardsSegue {
     case Test = "test"
   }
   enum Message: String, StoryboardSegueType {
-    case CustomBack = "CustomBack"
-    case Embed = "Embed"
-    case NonCustom = "NonCustom"
+    case CustomBack
+    case Embed
+    case NonCustom
     case Show_NavCtrl = "Show-NavCtrl"
   }
   enum Wizard: String, StoryboardSegueType {
-    case ShowPassword = "ShowPassword"
+    case ShowPassword
   }
 }
-
diff --git a/Tests/Expected/Storyboards-iOS/uppercase-context-empty.swift b/Tests/Expected/Storyboards-iOS/uppercase-context-empty.swift
@@ -42,4 +42,3 @@ extension UIViewController {
 }
 
 // No storyboard found
-