Merge pull request #558 from CocoaPods/merge174_into_master

Merge `1-7-stable` (1.7.4) into `master`

CHANGELOG.md

@@ -33,6 +33,20 @@
   [CocoaPods/CocoaPods#8785](https://github.com/CocoaPods/CocoaPods/issues/8785)
 
 
+## 1.7.4 (2019-07-09)
+
+##### Enhancements
+
+* None.  
+
+##### Bug Fixes
+
+* Use URI escaping in `CDNSource`.  
+  [Igor Makarov](https://github.com/igor-makarov)
+  [#554](https://github.com/CocoaPods/Core/pull/554)
+  [CocoaPods#8951](https://github.com/CocoaPods/CocoaPods/issues/8951)
+
+
 ## 1.7.3 (2019-06-28)
 
 ##### Enhancements

Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    cocoapods-core (1.7.3)
+    cocoapods-core (1.7.4)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)

lib/cocoapods-core/cdn_source.rb

@@ -284,7 +284,7 @@ def relative_pod_path(pod_name)
     end
 
     def download_file(partial_url)
-      file_remote_url = url + partial_url.to_s
+      file_remote_url = URI.encode(url + partial_url.to_s)
       path = repo + partial_url
 
       if File.exist?(path)

lib/cocoapods-core/gem_version.rb

@@ -1,5 +1,5 @@
 module Pod
   # The version of the cocoapods-core.
   #
-  CORE_VERSION = '1.7.3'.freeze unless defined? Pod::CORE_VERSION
+  CORE_VERSION = '1.7.4'.freeze unless defined? Pod::CORE_VERSION
 end

spec/cdn_source_spec.rb

@@ -102,6 +102,11 @@ def cleanup
         @source.versions('Unknown_Pod').should.be.nil
       end
 
+      it 'does not error when a Pod name need URI escaping' do
+        @source.versions('СерафимиМногоꙮчитїи').map(&:to_s).should == %w(1.0.0)
+        @source.specification('СерафимиМногоꙮчитїи', '1.0.0').name.should == 'СерафимиМногоꙮчитїи'
+      end
+
       it 'raises if unexpected HTTP error' do
         REST.expects(:get).returns(REST::Response.new(500))
         should.raise Informative do

spec/fixtures/mock_cdn_repo_remote/Specs/3/8/f/СерафимиМногоꙮчитїи/1.0.0/СерафимиМногоꙮчитїи.podspec.json

@@ -0,0 +1,21 @@
+{
+  "name": "СерафимиМногоꙮчитїи",
+  "version": "1.0.1",
+  "summary": "Beacon detection framework using CoreBluetooth",
+  "description": "This is a framework that wraps around CoreBluetooth and detects beacons of different types.\nTested to compile with Swift 3.1, 3.2 & 4.0 for iOS 9.0 & macOS 10.12\nThe currently supported types are: Eddystone-UID, Eddystone-URL, AltBeacon, iBeacon.",
+  "homepage": "https://github.com/igor-makarov/BeaconKit",
+  "license": "MIT",
+  "authors": {
+    "Igor Makarov": "igormaka@gmail.com"
+  },
+  "source": {
+    "git": "https://github.com/igor-makarov/BeaconKit.git",
+    "tag": "1.0.1"
+  },
+  "platforms": {
+    "ios": "9.0",
+    "osx": "10.12"
+  },
+  "source_files": "Sources/Core/**/*.swift",
+  "pushed_with_swift_version": "3.0"
+}

spec/fixtures/mock_cdn_repo_remote/all_pods_versions_3_8_f.txt

@@ -0,0 +1 @@
+СерафимиМногоꙮчитїи/1.0.0