Allow comments in the MergeFile

* Bump the CocoaPods version to 1.10.1
* Remove a warning related to the unused CocoaPods master specs repo

Author: Vkt0r

Gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'cocoapods', '1.9.1'
+  gem 'cocoapods', '1.10.1'
 
   gem 'mocha'
   gem 'bacon'

PodMergeExample/Gemfile

@@ -4,5 +4,5 @@ source "https://rubygems.org"
 
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
-gem 'cocoapods', '1.9.1'
+gem 'cocoapods', '1.10.1'
 gem 'cocoapods-pod-merge', :path => '../'

PodMergeExample/Gemfile.lock

@@ -6,26 +6,27 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.2)
-    activesupport (4.2.11.1)
-      i18n (~> 0.7)
+    CFPropertyList (3.0.3)
+    activesupport (5.2.5)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    algoliasearch (1.27.1)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     atomos (0.1.3)
     claide (1.0.3)
-    cocoapods (1.9.1)
-      activesupport (>= 4.0.2, < 5)
+    cocoapods (1.10.1)
+      addressable (~> 2.6)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.9.1)
+      cocoapods-core (= 1.10.1)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 1.2.2, < 2.0)
+      cocoapods-downloader (>= 1.4.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
-      cocoapods-stats (>= 1.0.0, < 2.0)
       cocoapods-trunk (>= 1.4.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
@@ -35,61 +36,63 @@ GEM
       molinillo (~> 0.6.6)
       nap (~> 1.0)
       ruby-macho (~> 1.4)
-      xcodeproj (>= 1.14.0, < 2.0)
-    cocoapods-core (1.9.1)
-      activesupport (>= 4.0.2, < 6)
+      xcodeproj (>= 1.19.0, < 2.0)
+    cocoapods-core (1.10.1)
+      activesupport (> 5.0, < 6)
+      addressable (~> 2.6)
       algoliasearch (~> 1.0)
       concurrent-ruby (~> 1.1)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
       netrc (~> 0.11)
+      public_suffix
       typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.4)
-    cocoapods-downloader (1.3.0)
+    cocoapods-downloader (1.4.0)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
-    cocoapods-stats (1.1.0)
-    cocoapods-trunk (1.4.1)
+    cocoapods-trunk (1.5.0)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
-    cocoapods-try (1.1.0)
+    cocoapods-try (1.2.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.8)
     escape (0.0.4)
     ethon (0.12.0)
       ffi (>= 1.3.0)
-    ffi (1.12.2)
+    ffi (1.15.0)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     httpclient (2.8.3)
-    i18n (0.9.5)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    json (2.3.0)
-    minitest (5.14.0)
+    json (2.5.1)
+    minitest (5.14.4)
     molinillo (0.6.6)
-    nanaimo (0.2.6)
+    nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
+    public_suffix (4.0.6)
     ruby-macho (1.4.0)
     thread_safe (0.3.6)
-    typhoeus (1.3.1)
+    typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (1.2.6)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    xcodeproj (1.15.0)
+    xcodeproj (1.19.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.2.6)
+      nanaimo (~> 0.3.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (= 1.9.1)
+  cocoapods (= 1.10.1)
   cocoapods-pod-merge!
 
 BUNDLED WITH

PodMergeExample/MergeFile

@@ -1,4 +1,5 @@
 group 'Networking'
+	# Networking
 	pod 'AFNetworking', '2.7.0'
 	pod 'SDWebImage', '~> 5.0'
 end
@@ -11,6 +12,7 @@ group 'UI'
 end
 
 group 'MergedSwiftPods' do
+  # Swift Pods
   pod 'SnapKit', '5.0.1'
   pod 'SwiftyJSON', '5.0.0'
 end

PodMergeExample/Podfile

@@ -1,6 +1,7 @@
 platform :ios, '11.0'
 
 plugin 'cocoapods-pod-merge'
+install! "cocoapods", :warn_for_unused_master_specs_repo => false
 
 target 'PodMergeExample' do
   use_frameworks!

PodMergeExample/Podfile.lock

@@ -13,7 +13,7 @@ DEPENDENCIES:
   - UI (from `MergedPods/UI`)
 
 SPEC REPOS:
-  https://cdn.cocoapods.org/:
+  trunk:
     - Nuke
 
 EXTERNAL SOURCES:
@@ -33,6 +33,6 @@ SPEC CHECKSUMS:
   Nuke: 85fb80f8df0cb26c28d2f4e0cb7fb93bcd6548d3
   UI: 2aa82721ee430cd2f0ab314904bbe1a281fa2ff9
 
-PODFILE CHECKSUM: 88ffe01efb39e0f819cf88bf11786182ab6f4441
+PODFILE CHECKSUM: 689012d73798a7fea312905128d4dadb72554cf1
 
-COCOAPODS: 1.9.1
+COCOAPODS: 1.10.1

lib/cocoapods-pod-merge/Main.rb

@@ -144,8 +144,8 @@ def parse_mergefile
         group_name = ''
         f.each_line do |line|
           next if line.strip.empty?
+          next if line.strip.start_with?('#')
 
-          line = line.gsub(/\#.+/, '') if line.include?('#') # Remove any comments
           if parsing_a_group
             if line.strip == 'end'
               parsing_a_group = false