Refactoring according to swxftlint.

Updated build settings.

Author: sonsongithub

.swiftlint.yml

@@ -1,61 +1,43 @@
-# 無効にするルール
 disabled_rules:
-- trailing_whitespace # 余分に改行がある方が視認性が上がる為、無効
+- trailing_whitespace
 - valid_docs
-- type_name # クラス名は長くして情報を詰めておく必要もある為、無効
-
-# ルール一覧を表示
-#- colon
-#- control_statement
-#- file_length
-#- force_cast
-#- function_body_length
-#- leading_whitespace
-#- line_length
-#- nesting
-#- operator_whitespace
-#- return_arrow_whitespace
-#- todo
-#- trailing_newline
-#- variable_name_max_length
-#- variable_name_min_length
-#- type_body_length
-- variable_name
-- function_parameter_count
-
-# 一行の文字列制限を100文字から300文字に変更
-line_length:
-- 800
-
-file_length:
-- 800
+- type_name
 
-excluded: # Lint対象から外すファイルのあるパスを記述
+excluded:
 - reddift/vendor
 - reddift.playground
 - reddiftTests
 - reddiftSample
 - reddiftSampleTV
 
-# クラスの行数
+file_length:
+  warning: 800
+  error: 1000
+
+line_length:
+  warning: 800
+  error: 1000
+
 type_body_length:
-- 400 # warning
-- 800 # error
+  warning: 400
+  error: 800
 
-# 変数名の最大文字数
-variable_name_max_length:
-- 60 # warning
-- 80 # error
+variable_name:
+  max_length:
+    warning: 50
+    error: 40
+  min_length:
+    warning: 1
+    error: 0
 
-# 変数名の最小文字数
-variable_name_min_length:
-- 1 # warning
-- 0 # error
+function_parameter_count:
+  warning: 10
+  error: 20
 
-# 関数の長さ
 function_body_length:
-- 100 # warning
-- 200 # error
+  warning: 100
+  error: 200
 
 cyclomatic_complexity:
-- 100
+  warning: 50
+  error: 100

reddift.xcodeproj/project.pbxproj

@@ -1238,6 +1238,7 @@
 				14364C891BEDA09F00FECE58 /* Frameworks */,
 				14364C8A1BEDA09F00FECE58 /* Headers */,
 				14364C8B1BEDA09F00FECE58 /* Resources */,
+				146576321CC85E1D005ED404 /* Swiftlint */,
 			);
 			buildRules = (
 			);
@@ -1289,8 +1290,8 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 14B5EBC41AF34D590065BC5E /* Build configuration list for PBXNativeTarget "reddift-iOS" */;
 			buildPhases = (
-				14B5EBAC1AF34D580065BC5E /* Sources */,
 				14E4D64C1C94473F00442A4A /* Swiftlint */,
+				14B5EBAC1AF34D580065BC5E /* Sources */,
 				14B5EBAD1AF34D580065BC5E /* Frameworks */,
 				14B5EBAE1AF34D580065BC5E /* Headers */,
 				14B5EBAF1AF34D580065BC5E /* Resources */,
@@ -1349,6 +1350,7 @@
 				14F811FC1AF9EA9F008F6F3C /* Frameworks */,
 				14F811FD1AF9EA9F008F6F3C /* Headers */,
 				14F811FE1AF9EA9F008F6F3C /* Resources */,
+				146576331CC85E32005ED404 /* Swiftlint */,
 			);
 			buildRules = (
 			);
@@ -1595,6 +1597,34 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
+		146576321CC85E1D005ED404 /* Swiftlint */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = Swiftlint;
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "if which swiftlint >/dev/null; then\n  echo \"SwiftLint\"\n  swiftlint\nelse\n  echo \"SwiftLint does not exist, download from https://github.com/realm/SwiftLint\"\nfi";
+		};
+		146576331CC85E32005ED404 /* Swiftlint */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = Swiftlint;
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "if which swiftlint >/dev/null; then\n  echo \"SwiftLint\"\n  swiftlint\nelse\n  echo \"SwiftLint does not exist, download from https://github.com/realm/SwiftLint\"\nfi";
+		};
 		14E4D64C1C94473F00442A4A /* Swiftlint */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

reddift/Network/Session+users.swift

@@ -24,7 +24,7 @@ public enum FriendType: String {
     case Friend             = "friend"
     case Enemy              = "enemy"
     case Moderator          = "moderator"
-    case ModeratorInvite   = "moderator_invite"
+    case ModeratorInvite    = "moderator_invite"
     case Contributor        = "contributor"
     case Banned             = "banned"
     case Muted              = "muted"

reddift/Utility/helper.swift

@@ -19,22 +19,23 @@ extension Dictionary {
 	}
 }
 
+
 extension Bool {
     var string: String {
         return self ? "true" : "false"
     }
 }
 
-private var time_buffer: timeval = timeval(tv_sec: 0, tv_usec: 0)
+private var timeBuffer: timeval = timeval(tv_sec: 0, tv_usec: 0)
 
 func tic() {
-    gettimeofday(&time_buffer, nil)
+    gettimeofday(&timeBuffer, nil)
 }
 
 func toc() {
     var time_buffer2: timeval = timeval(tv_sec: 0, tv_usec: 0)
     gettimeofday(&time_buffer2, nil)
-    let diff = time_buffer2.tv_sec - time_buffer.tv_sec
-    let diff_u = time_buffer2.tv_usec - time_buffer.tv_usec
+    let diff = time_buffer2.tv_sec - timeBuffer.tv_sec
+    let diff_u = time_buffer2.tv_usec - timeBuffer.tv_usec
     print("\(diff * 1000000 + diff_u)[msec]")
 }