Fix swiftlint + improve fastlane

Author: Luc Dion

.swiftlint.yml

@@ -3,7 +3,6 @@ opt_in_rules: # some rules are only opt-in
   - closure_spacing
   - explicit_init
   - nimble_operator
-  - number_separator
   - operator_usage_whitespace
   - overridden_super_call
   - private_outlet

.travis.yml

@@ -4,9 +4,9 @@ osx_image: xcode9
 env:
   matrix:
     - SCHEME=PinLayout       SDK=iphonesimulator11.0
-    - SCHEME=PinLayout       SDK=iphonesimulator10.3
-    - SCHEME=PinLayoutSample SDK=iphonesimulator11.0
-    - SCHEME=PinLayoutTVOS   SDK=appletvsimulator11.0 
+    #- SCHEME=PinLayout       SDK=iphonesimulator10.3
+    #- SCHEME=PinLayoutSample SDK=iphonesimulator11.0
+    #- SCHEME=PinLayoutTVOS   SDK=appletvsimulator11.0 
 
 before_install:
 #  - brew outdated xctool || brew upgrade xctool;
@@ -22,13 +22,13 @@ script:
       bundle exec fastlane travis
     fi
 
-    if [[ $SCHEME = "PinLayoutSample" ]]; then
-      set -o pipefail && xcodebuild -workspace PinLayout.xcworkspace -scheme "$SCHEME" -sdk $SDK -destination 'platform=iOS Simulator,name=iPhone 6' build | xcpretty -f `xcpretty-travis-formatter`
-    fi
+    #if [[ $SCHEME = "PinLayoutSample" ]]; then
+    #  set -o pipefail && xcodebuild -workspace PinLayout.xcworkspace -scheme "$SCHEME" -sdk $SDK -destination 'platform=iOS Simulator,name=iPhone 6' build | xcpretty -f `xcpretty-travis-formatter`
+    #fi
 
-    if [[ $SCHEME = "PinLayoutTVOS" ]]; then
-      set -o pipefail && xcodebuild -workspace PinLayout.xcworkspace -scheme "$SCHEME" -sdk $SDK -destination 'platform=tvOS Simulator,name=Apple TV 1080p' build | xcpretty -f `xcpretty-travis-formatter`
-    fi
+    #if [[ $SCHEME = "PinLayoutTVOS" ]]; then
+    #  set -o pipefail && xcodebuild -workspace PinLayout.xcworkspace -scheme "$SCHEME" -sdk $SDK -destination 'platform=tvOS Simulator,name=Apple TV 1080p' build | xcpretty -f `xcpretty-travis-formatter`
+    #fi
 
 after_success:
   - |

Gemfile.lock

@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (2.3.5)
-    activesupport (4.2.9)
+    activesupport (4.2.10)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
@@ -41,15 +41,16 @@ GEM
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.0.0)
-    cocoapods-trunk (1.2.0)
+    cocoapods-trunk (1.3.0)
       nap (>= 0.8, < 2.0)
-      netrc (= 0.7.8)
+      netrc (~> 0.11)
     cocoapods-try (1.1.0)
     colored (1.2)
     colored2 (3.1.2)
     colorize (0.8.1)
     commander-fastlane (4.4.5)
       highline (~> 1.7.2)
+    concurrent-ruby (1.0.5)
     declarative (0.0.10)
     declarative-option (0.1.0)
     domain_name (0.5.20170404)
@@ -121,19 +122,16 @@ GEM
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (0.8.6)
-    jazzy (0.8.3)
-      cocoapods (~> 1.0)
+    i18n (0.9.0)
+      concurrent-ruby (~> 1.0)
+    jazzy (0.0.14)
+      activesupport (~> 4.1)
       mustache (~> 0.99)
-      open4
+      nokogiri (~> 1.6)
       redcarpet (~> 3.2)
-      rouge (~> 1.5)
       sass (~> 3.4)
-      sqlite3 (~> 1.3)
-      xcinvoke (~> 0.3.0)
     json (2.1.0)
     jwt (2.1.0)
-    liferaft (0.0.6)
     little-plugger (1.1.4)
     logging (2.2.2)
       little-plugger (~> 1.1)
@@ -143,6 +141,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_magick (4.5.1)
+    mini_portile2 (2.3.0)
     minitest (5.10.3)
     molinillo (0.5.7)
     multi_json (1.12.2)
@@ -151,8 +150,9 @@ GEM
     mustache (0.99.8)
     nanaimo (0.2.3)
     nap (1.1.0)
-    netrc (0.7.8)
-    open4 (1.3.4)
+    netrc (0.11.0)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
     os (0.9.6)
     plist (3.3.0)
     public_suffix (2.0.5)
@@ -165,10 +165,10 @@ GEM
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.1)
-    rouge (1.11.1)
+    rouge (2.0.7)
     ruby-macho (1.1.0)
     rubyzip (1.2.1)
-    sass (3.5.1)
+    sass (3.5.2)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -180,7 +180,6 @@ GEM
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
     slack-notifier (1.5.1)
-    sqlite3 (1.3.13)
     synx (0.2.1)
       clamp (~> 0.6)
       colorize (~> 0.7)
@@ -198,16 +197,14 @@ GEM
     unf_ext (0.0.7.4)
     unicode-display_width (1.3.0)
     word_wrap (1.0.0)
-    xcinvoke (0.3.0)
-      liferaft (~> 0.0.6)
     xcodeproj (1.5.3)
       CFPropertyList (~> 2.3.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.2.3)
-    xcpretty (0.2.6)
-      rouge (~> 1.8)
-    xcpretty-travis-formatter (0.0.4)
+    xcpretty (0.2.8)
+      rouge (~> 2.0.7)
+    xcpretty-travis-formatter (1.0.0)
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS

PinLayout.xcodeproj/xcshareddata/xcschemes/PinLayout.xcscheme

@@ -9,8 +9,8 @@
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES"
       codeCoverageEnabled = "YES">
       <Testables>
@@ -56,6 +57,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
@@ -80,15 +82,6 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "249EFE791E64FB4C00165E39"
-            BuildableName = "PinLayout.framework"
-            BlueprintName = "PinLayout"
-            ReferencedContainer = "container:PinLayout.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

Sources/PinLayoutGlobals.swift

@@ -40,4 +40,3 @@ public class PinLayoutGlobals {
 }
 
 public let Pin = PinLayoutGlobals()
-

Sources/PinLayoutImpl+Coordinates.swift

@@ -53,7 +53,7 @@ extension PinLayoutImpl {
     }
 
     internal func setLeft(_ value: CGFloat, _ context: Context) {
-        if let _right = _right, let width = width  {
+        if let _right = _right, let width = width {
             warnConflict(context, ["right": _right, "width": width])
         } else if let _hCenter = _hCenter {
             warnConflict(context, ["Horizontal Center": _hCenter])
@@ -94,7 +94,7 @@ extension PinLayoutImpl {
     }
 
     internal func setRight(_ value: CGFloat, _ context: Context) {
-        if let _left = _left, let width = width  {
+        if let _left = _left, let width = width {
             warnConflict(context, ["left": _left, "width": width])
         } else if let _hCenter = _hCenter {
             warnConflict(context, ["Horizontal Center": _hCenter])
@@ -109,7 +109,6 @@ extension PinLayoutImpl {
         }
     }
 
-    // TODO: Delete this function?
     internal func setEnd(_ value: CGFloat, _ context: Context) {
         if isLTR() {
             setRight(value, context)
@@ -291,7 +290,7 @@ extension PinLayoutImpl {
 
     internal func validateWidth(_ width: CGFloat, context: Context) -> Bool {
         if width < 0 {
-            warnWontBeApplied("the width (\(width)) must be greater than or equal to zero.", context);
+            warnWontBeApplied("the width (\(width)) must be greater than or equal to zero.", context)
             return false
         } else {
             return true
@@ -308,7 +307,7 @@ extension PinLayoutImpl {
 
     internal func validateHeight(_ height: CGFloat, context: Context) -> Bool {
         if height < 0 {
-            warnWontBeApplied("the height (\(height)) must be greater than or equal to zero.", context);
+            warnWontBeApplied("the height (\(height)) must be greater than or equal to zero.", context)
             return false
         } else {
             return true

Sources/PinLayoutImpl.swift

@@ -56,7 +56,7 @@ class PinLayoutImpl: PinLayout {
     internal var justify: HorizontalAlign?
     internal var align: VerticalAlign?
 
-    internal var _marginTop: CGFloat { return marginTop ?? 0  }
+    internal var _marginTop: CGFloat { return marginTop ?? 0 }
     internal var _marginLeft: CGFloat { return marginLeft ?? 0 }
     internal var _marginBottom: CGFloat { return marginBottom ?? 0 }
     internal var _marginRight: CGFloat { return marginRight ?? 0 }
@@ -300,7 +300,6 @@ class PinLayoutImpl: PinLayout {
         }
         return self
     }
-
 
     //
     // topLeft, topCenter, topRight,
@@ -694,12 +693,12 @@ class PinLayoutImpl: PinLayout {
 
     @discardableResult
     func aspectRatio(_ ratio: CGFloat) -> PinLayout {
-        return setAspectRatio(ratio, context: { "aspectRatio(\(ratio))"})
+        return setAspectRatio(ratio, context: { "aspectRatio(\(ratio))" })
     }
 
     @discardableResult
     func aspectRatio(of view: UIView) -> PinLayout {
-        return setAspectRatio(view.frame.width / view.frame.height, context: { "aspectRatio(of: \(viewDescription(view)))"})
+        return setAspectRatio(view.frame.width / view.frame.height, context: { "aspectRatio(of: \(viewDescription(view)))" })
     }
 
     @discardableResult
@@ -868,7 +867,7 @@ extension PinLayoutImpl {
         if shouldSizeToFit {
             warnConflict(context, ["fitSize": shouldSizeToFit])
         } else if ratio <= 0 {
-            warnWontBeApplied("the aspectRatio (\(ratio)) must be greater than zero.", context);
+            warnWontBeApplied("the aspectRatio (\(ratio)) must be greater than zero.", context)
         } else {
             _aspectRatio = ratio
         }
@@ -998,7 +997,7 @@ extension PinLayoutImpl {
             return warn("pinEdges() won't be applied, top, left, bottom and right coordinates are already set.")
         }
 
-        if let width = applyMinMax(toWidth: width), _left == nil || _right == nil  {
+        if let width = applyMinMax(toWidth: width), _left == nil || _right == nil {
             if let left = _left {
                 // convert the width into a right
                 assert(self._right == nil)
@@ -1047,7 +1046,7 @@ extension PinLayoutImpl {
         var width = computeWidth()
         var height = computeHeight()
 
-        if (width != nil || height != nil) {
+        if width != nil || height != nil {
             if shouldSizeToFit {
                 // Apply min/max width/height before calling sizeThatFits() ... and reapply them after.
                 width = applyMinMax(toWidth: width)
@@ -1126,7 +1125,7 @@ extension PinLayoutImpl {
         }
 
         // Handle maxWidth
-        if let maxWidth = maxWidth, maxWidth < (result ?? CGFloat.greatestFiniteMagnitude)  {
+        if let maxWidth = maxWidth, maxWidth < (result ?? CGFloat.greatestFiniteMagnitude) {
             result = maxWidth
         }
 
@@ -1192,7 +1191,7 @@ extension PinLayoutImpl {
         }
 
         // Handle maxHeight
-        if let maxHeight = maxHeight, maxHeight < (result ?? CGFloat.greatestFiniteMagnitude)  {
+        if let maxHeight = maxHeight, maxHeight < (result ?? CGFloat.greatestFiniteMagnitude) {
             result = maxHeight
         }
 

Tests/AccurencyTests.swift

@@ -23,7 +23,6 @@ import PinLayout
 
 @testable import PinLayout
 
-
 class AccurencyTests: QuickSpec {
     var viewController: UIViewController!
     var rootView: UIView!

Tests/AdjustSizeSpec.swift

@@ -284,7 +284,6 @@ class AdjustSizeSpec: QuickSpec {
             }
         }
 
-        
         describe("the result of the fitSize() method when pinning right edge + width") {
             it("should adjust the size with fitSize() and distribute extra width") {
                 aView.pin.right(100).width(200).fitSize()
@@ -479,7 +478,6 @@ class AdjustSizeSpec: QuickSpec {
                 expect(aView.frame).to(equal(CGRect(x: 35.0, y: 311.0, width: 180.0, height: 9.0)))
             }
 
-            
             it("should adjust the size with fitSize()") {
                 aView.pin.top(20).bottom(80).marginTop(10).marginBottom(10).fitSize().align(.center)
                 expect(aView.frame).to(equal(CGRect(x: 140.0, y: 30.0, width: 6.0, height: 280.0)))

Tests/JustifyAlignSpec.swift

@@ -183,7 +183,6 @@ class JustifyAlignSpec: QuickSpec {
             }
         }
 
-        
         //
         // align + height
         //