Merge pull request #3 from polydice/feature/swift-lint

Merge branch 'feature/swift-lint' into develop

Author: bcylin

.hound.yml

@@ -0,0 +1,3 @@
+swift:
+  enabled: true
+  config_file: .swiftlint.yml

.swiftlint.yml

@@ -0,0 +1,18 @@
+disabled_rules:
+  - conditional_binding_cascade
+  - force_cast
+  - force_try
+  - line_length
+  - nesting
+type_name:
+  excluded:
+    - iCookTVKeys
+    - iCookTVTests
+variable_name:
+  excluded:
+    - id
+    - URL
+excluded:
+  - Carthage
+  - Pods
+  - iCookTV/R.generated.swift

Brewfile

@@ -1,3 +1,4 @@
 tap "caskroom/cask"
 
+brew "swiftlint"
 brew "xcproj"

iCookTV.xcodeproj/project.pbxproj

@@ -319,6 +319,7 @@
 				24D096314DA4D14E4EDFA5EB /* 📦 Check Pods Manifest.lock */,
 				B5BA3B4A1CF6D19800B0A022 /* Run R.swift Script */,
 				B5F7BF441BA9C95F00A75099 /* Sources */,
+				B52DFA9C1CF8006E005B9D67 /* Swiftlint */,
 				B5F7BF451BA9C95F00A75099 /* Frameworks */,
 				B5F7BF461BA9C95F00A75099 /* Resources */,
 				B51A95351CCDFFEB00E5ED97 /* Run Fabric Script */,
@@ -490,6 +491,20 @@
 			shellPath = /bin/sh;
 			shellScript = "if [ \"$CI\" != true ]; then\n  FABRIC_APIKEY=$(cat ${SRCROOT}/keys/fabric.apikey);\n  FABRIC_BUILDSECRET=$(cat ${SRCROOT}/keys/fabric.buildsecret);\n  ${PODS_ROOT}/Fabric/run ${FABRIC_APIKEY} ${FABRIC_BUILDSECRET};\nfi";
 		};
+		B52DFA9C1CF8006E005B9D67 /* Swiftlint */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = Swiftlint;
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "if which swiftlint >/dev/null; then swiftlint; fi";
+		};
 		B5BA3B4A1CF6D19800B0A022 /* Run R.swift Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

iCookTV/GroundControl.swift

@@ -30,7 +30,7 @@ import Alamofire
 struct GroundControl {
 
   enum VideoSource {
-    case HLS ,YouTube
+    case HLS, YouTube
   }
 
   /// Returns the URL of default background image URL.

iCookTV/Tracker.swift

@@ -61,7 +61,7 @@ enum Tracker {
     }
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0)) {
       let description = String(error)
-      Debug.print(description)
+      Debug.print(description, file: file, function: function, line: line)
       Answers.logCustomEventWithName("Error", customAttributes: ["Description": description])
       TreasureData.sharedInstance().addEvent([
         "description": description,

iCookTV/UIImage+Grid.swift

@@ -29,7 +29,7 @@ import UIKit
 extension UIImage {
 
   func image(byReplacingImage image: UIImage, atCorner corner: Grid) -> UIImage! {
-    UIGraphicsBeginImageContextWithOptions(size, true, 0);
+    UIGraphicsBeginImageContextWithOptions(size, true, 0)
 
     let canvas = CGRect(origin: CGPoint.zero, size: size)
     self.drawInRect(canvas)
@@ -72,5 +72,3 @@ extension UIImage {
   }
 
 }
-
-

iCookTV/VideosViewController.swift

@@ -221,7 +221,7 @@ class VideosViewController: BlurBackgroundViewController,
 
   // MARK: - Trackable
 
-  var pageView: PageView?{
+  var pageView: PageView? {
     return PageView(name: "Videos", details: [
       TrackableKey.categoryID: categoryID,
       TrackableKey.categoryTitle: title ?? ""