Merge pull request #6059 from CocoaPods/dani_strip_newlines

[Validator] Strip newlines from .swift-version files

CHANGELOG.md

@@ -12,7 +12,9 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
 
 ##### Bug Fixes
 
-* None.  
+* Strip newlines from .swift-version files.  
+  [Danielle Tomlinson](https://github.com/dantoml)
+  [#6059](https://github.com/CocoaPods/CocoaPods/pull/6059)
 
 
 ## 1.1.0 (2016-10-19)

lib/cocoapods/validator.rb

@@ -259,7 +259,7 @@ module Pod
     #
     def dot_swift_version
       swift_version_path = file.dirname + '.swift-version'
-      swift_version_path.read if swift_version_path.exist?
+      swift_version_path.read.strip if swift_version_path.exist?
     end
 
     # @return [String] A string representing the Swift version used during linting

spec/unit/validator_spec.rb

@@ -867,6 +867,13 @@ module Pod
           Pathname.any_instance.expects(:read).returns('1.0')
           validator.dot_swift_version.should == '1.0'
         end
+
+        it 'strips newlines from .swift-version files' do
+          validator = test_swiftpod
+          Pathname.any_instance.stubs(:exist?).returns(true)
+          Pathname.any_instance.stubs(:read).returns("2.1\n")
+          validator.swift_version.should == '2.1'
+        end
       end
 
       describe 'Getting the Swift value used by the validator' do