cocoapods-mangle 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a7219337c8214823557116123d5ac17d7fa68727
-  data.tar.gz: 6c26d23f03759a183767d1c11d4e288e466db99d
+SHA256:
+  metadata.gz: 12bdc6a5d84c28840e77fd5b88b8a460460eec6886e77a069dd09764e7288d88
+  data.tar.gz: 5d8d4f20a4ddc3a6d0f580e9e27fc1836989a2ea47e62c69033d1c6354acdfdd
 SHA512:
-  metadata.gz: 38488de2b6e008c63a81c6c2521daad4dd6049af22c1c4550c19a29ecb71fe30cce656d254c639ce4a68ac71d2746e1158a8b0c2077b81dc8451c2803e3b421e
-  data.tar.gz: 115e91d3f16a99339f9abbc5da75a47aef7656f4a21b2864fe8a3430f6ff43fbaf542d3b04546e08bb74485d4ce21d18b056ecfaaebefb2bc877da51bf7a67d3
+  metadata.gz: b0d0292dc9c564f905f3e140c6401dffecf45fbfb4df9659365219d33486ea7c22c24beb3730fa494be71fd5f7cfe3d80c2bce6dbb4b54edbb5e382e73f1cbf8
+  data.tar.gz: 7400bc11b992f41aeb45f2f1747c6eb1f90c5cb9196425a0827632f063085a57e4e515d6da08e10e75c11452dd0e96619e0e4eefae33b60f108fee26f4b67663

data/lib/cocoapods_mangle/defines.rb

@@ -23,6 +23,8 @@ module CocoapodsMangle
     # @return [Array<String>] The classes defined in the binaries
     def self.classes(binaries)
       all_symbols = run_nm(binaries, '-gU')
+      all_symbols = all_symbols.reject { |symbol| swift_symbol?(symbol) }
+
       class_symbols = all_symbols.select do |symbol|
         symbol[/OBJC_CLASS_\$_/]
       end
@@ -36,6 +38,8 @@ module CocoapodsMangle
     # @return [Array<String>] The constants defined in the binaries
     def self.constants(binaries)
       all_symbols = run_nm(binaries, '-gU')
+      all_symbols = all_symbols.reject { |symbol| swift_symbol?(symbol) }
+
       consts = all_symbols.select { |const| const[/ S /] }
       consts = consts.reject { |const| const[/_OBJC_/] }
       consts = consts.reject { |const| const[/__block_descriptor.*/] }
@@ -110,6 +114,31 @@ module CocoapodsMangle
       defines
     end
 
+    # Is symbol a Swift symbol? This is used to avoid mangling Swift.
+    # @param [String] symbol
+    #        The symbol to check
+    # @return [Boolean] true if it is a Swift symbol, false otherwise
+    def self.swift_symbol?(symbol)
+      # Swift binaries have many symbols starting with $s_ that should be excluded
+      # e.g. '0000000000000258 S _$s9ManglePod9SomeClassCMF'
+      symbol[/ _\$s/] ||
+        # Internal Swift symbols starting with __swift or ___swift such as should not be mangled
+        # e.g. '00000000000050ac S ___swift_reflection_version' 
+        symbol[/ __(_)?swift/] ||
+        # Swift symbols starting with _symbolic should be ignored
+        # e.g. '0000000000000248 S _symbolic _____ 9ManglePod9SomeClassC'
+        symbol[/ _symbolic/] ||
+        # Swift symbol references to Objective-C symbols should not be mangled
+        # e.g. '00000000000108ca S _associated conformance So26SCNetworkReachabilityFlagsVs10SetAlgebraSCSQ'
+        symbol[/associated conformance/] ||
+        # _globalinit symbols should be skipped
+        # e.g. 0000000000000000 T _globalinit_33_A313450CFC1FC3D0CBEF4411412DB9E8_func0
+        symbol[/ _globalinit/] ||
+        # Swift classes inheriting from Objective-C classes should not be mangled
+        # e.g. '0000000000000290 S _OBJC_CLASS_$__TtC9ManglePod19SomeFoundationClass'
+        symbol[/_OBJC_CLASS_\$__/]
+    end
+
     def self.run_nm(binaries, flags)
       `nm #{flags} #{binaries.join(' ')}`.split("\n")
     end

data/lib/cocoapods_mangle/gem_version.rb

@@ -1,4 +1,4 @@
 module CocoapodsMangle
   NAME = 'cocoapods-mangle'
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

data/spec/integration/integration_spec.rb

@@ -36,60 +36,111 @@ describe CocoapodsMangle do
   before(:each) do
     fixtures_dir = File.expand_path("#{File.dirname(__FILE__)}/../fixtures")
     FileUtils.copy_entry(File.join(fixtures_dir, 'project'), project_dir)
-    FileUtils.copy_entry(File.join(fixtures_dir, 'pod'), pod_dir)
+    FileUtils.copy_entry(File.join(fixtures_dir, podpsec_fixture_dir), pod_dir)
     File.open(File.join(project_dir, 'Podfile'), 'w') do |podfile|
       podfile.write(podfile_contents)
     end
   end
 
-  context 'without frameworks' do
-    let(:podfile_contents) do
-      <<~PODFILE
-        platform :ios, '8.0'
-        plugin 'cocoapods-mangle'
-        target 'Mangle Integration' do
-          pod 'ManglePod', path: '../pod'
-        end
-      PODFILE
-    end
-    let(:expected_defines) do
-      %w[
-        PodsDummy_ManglePod=Mangle_Integration_PodsDummy_ManglePod
-        CPMObject=Mangle_Integration_CPMObject
-        CPMConstant=Mangle_Integration_CPMConstant
-        CPMStringFromIntegerFunction=Mangle_Integration_CPMStringFromIntegerFunction
-        cpm_doSomethingWithoutParams=Mangle_Integration_cpm_doSomethingWithoutParams
-        cpm_doSomethingWithParam=Mangle_Integration_cpm_doSomethingWithParam
-      ]
+  context "with a Swift pod" do
+    let(:podpsec_fixture_dir) { "swift-pod" }
+
+    context 'without frameworks' do
+      let(:podfile_contents) do
+        <<~PODFILE
+          platform :ios, '10.0'
+          plugin 'cocoapods-mangle'
+          target 'Mangle Integration' do
+            pod 'ManglePod', path: '../pod'
+            pod 'Alamofire', '5.2.2'
+          end
+        PODFILE
+      end
+      let(:expected_defines) do
+        %w[
+          PodsDummy_ManglePod=Mangle_Integration_PodsDummy_ManglePod
+          PodsDummy_Alamofire=Mangle_Integration_PodsDummy_Alamofire
+        ]
+      end
+  
+      include_examples 'mangling integration'
     end
 
-    include_examples 'mangling integration'
+    context 'with frameworks' do
+      let(:podfile_contents) do
+        <<~PODFILE
+          platform :ios, '10.0'
+          use_frameworks!
+          plugin 'cocoapods-mangle'
+          target 'Mangle Integration' do
+            pod 'ManglePod', path: '../pod'
+          end
+        PODFILE
+      end
+      let(:expected_defines) do
+        %w[
+          ManglePodVersionNumber=Mangle_Integration_ManglePodVersionNumber
+          ManglePodVersionString=Mangle_Integration_ManglePodVersionString
+          PodsDummy_ManglePod=Mangle_Integration_PodsDummy_ManglePod
+        ]
+      end
+  
+      include_examples 'mangling integration'
+    end
   end
 
-  context 'with frameworks' do
-    let(:podfile_contents) do
-      <<~PODFILE
-        platform :ios, '8.0'
-        use_frameworks!
-        plugin 'cocoapods-mangle'
-        target 'Mangle Integration' do
-          pod 'ManglePod', path: '../pod'
-        end
-      PODFILE
+  context "with an Objective-C pod" do
+    let(:podpsec_fixture_dir) { "objc-pod" }
+
+    context 'without frameworks' do
+      let(:podfile_contents) do
+        <<~PODFILE
+          platform :ios, '10.0'
+          plugin 'cocoapods-mangle'
+          target 'Mangle Integration' do
+            pod 'ManglePod', path: '../pod'
+          end
+        PODFILE
+      end
+      let(:expected_defines) do
+        %w[
+          PodsDummy_ManglePod=Mangle_Integration_PodsDummy_ManglePod
+          CPMObject=Mangle_Integration_CPMObject
+          CPMConstant=Mangle_Integration_CPMConstant
+          CPMStringFromIntegerFunction=Mangle_Integration_CPMStringFromIntegerFunction
+          cpm_doSomethingWithoutParams=Mangle_Integration_cpm_doSomethingWithoutParams
+          cpm_doSomethingWithParam=Mangle_Integration_cpm_doSomethingWithParam
+        ]
+      end
+  
+      include_examples 'mangling integration'
     end
-    let(:expected_defines) do
-      %w[
-        ManglePodVersionNumber=Mangle_Integration_ManglePodVersionNumber
-        ManglePodVersionString=Mangle_Integration_ManglePodVersionString
-        PodsDummy_ManglePod=Mangle_Integration_PodsDummy_ManglePod
-        CPMObject=Mangle_Integration_CPMObject
-        CPMConstant=Mangle_Integration_CPMConstant
-        CPMStringFromIntegerFunction=Mangle_Integration_CPMStringFromIntegerFunction
-        cpm_doSomethingWithoutParams=Mangle_Integration_cpm_doSomethingWithoutParams
-        cpm_doSomethingWithParam=Mangle_Integration_cpm_doSomethingWithParam
-      ]
+  
+    context 'with frameworks' do
+      let(:podfile_contents) do
+        <<~PODFILE
+          platform :ios, '10.0'
+          use_frameworks!
+          plugin 'cocoapods-mangle'
+          target 'Mangle Integration' do
+            pod 'ManglePod', path: '../pod'
+          end
+        PODFILE
+      end
+      let(:expected_defines) do
+        %w[
+          ManglePodVersionNumber=Mangle_Integration_ManglePodVersionNumber
+          ManglePodVersionString=Mangle_Integration_ManglePodVersionString
+          PodsDummy_ManglePod=Mangle_Integration_PodsDummy_ManglePod
+          CPMObject=Mangle_Integration_CPMObject
+          CPMConstant=Mangle_Integration_CPMConstant
+          CPMStringFromIntegerFunction=Mangle_Integration_CPMStringFromIntegerFunction
+          cpm_doSomethingWithoutParams=Mangle_Integration_cpm_doSomethingWithoutParams
+          cpm_doSomethingWithParam=Mangle_Integration_cpm_doSomethingWithParam
+        ]
+      end
+  
+      include_examples 'mangling integration'
     end
-
-    include_examples 'mangling integration'
   end
 end

data/spec/unit/defines_spec.rb

@@ -20,6 +20,7 @@ describe CocoapodsMangle::Defines do
       %w[
         PINDataTaskOperation
         PINProgressiveImage
+        PodsDummy_ManglePod
         PodsDummy_PINRemoteImage
         PINRemoteImageCallbacks
         PINRemoteImageCategoryManager

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-mangle
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - James Treanor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-08 00:00:00.000000000 Z
+date: 2020-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -72,8 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A CocoaPods plugin which mangles the symbols of your dependencies