pod-builder 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: c824c35cc04aeefc113772db5ab4684c7e03f4b65040ae257cfe76de601116f6
-  data.tar.gz: 6095e1cf375390082bc614ffe2830fced05d31c4ab369f81ebf4066be94dcffd
+SHA1:
+  metadata.gz: 3588dfe03090d787eb486aa86b28e2a6669bf893
+  data.tar.gz: 608e0da72139cf4609f213996ac79bf53b42fa49
 SHA512:
-  metadata.gz: 2a46a55904d3d85d7855329811f0676ad38c995485c4ad890ad70cd10490b56ea056fbd19ea0407db8de690068d6da2d5b6a255683187f69c4d2bc24bd9e7c5c
-  data.tar.gz: f59570fb4f3b73309863f2aadc1d9876657ac65e2e28a37c77b94b3a9a55c8ee2ce3906613091e3e00bf07f6bb7e0cec8fb66b43c26896318a449828caf45a90
+  metadata.gz: a36f09e12e549f59bea9cd61ed7488e0732a3fd76bad0558d116842a2baac80bddaa34dbe73a4bf0521e150a7dd8e015f06e8119ed90491f16234449dee1065d
+  data.tar.gz: 8edebbdf7312fb7778db40a36561830bc45b13a163b153ad512b84d4136b1aa025704908337a86affde554a9c688328894c274750b8a477d16c02f48f9b64143

data/lib/pod_builder/command/build.rb

@@ -54,6 +54,8 @@ module PodBuilder
         # 2. pods to build in release
         # 3. pods to build in debug
 
+        check_not_building_development_pods(pods_to_build)
+
         pods_to_build_subspecs = pods_to_build.select { |x| x.is_subspec && Configuration.subspecs_to_split.include?(x.name) }
         pods_to_build -= pods_to_build_subspecs
         pods_to_build_debug = pods_to_build.select { |x| x.build_configuration == "debug" }
@@ -228,6 +230,13 @@ module PodBuilder
         end
       end
 
+      def self.check_not_building_development_pods(pods)
+        if (development_pods = pods.select { |x| x.is_development_pod }) && development_pods.count > 0
+          pod_names = development_pods.map(&:name).join(", ")
+          raise "Cannot build the following pods: `#{pod_names}` in development mode"
+        end
+      end
+
       def self.other_subspecs(pods_to_build, buildable_items)
         buildable_subspecs = buildable_items.select { |x| x.is_subspec }
         pods_to_build_subspecs = pods_to_build.select { |x| x.is_subspec }.map(&:root_name)

data/lib/pod_builder/install.rb

@@ -41,6 +41,7 @@ module PodBuilder
         add_framework_plist_info(podfile_items)
         cleanup_frameworks(podfile_items)
         copy_frameworks(podfile_items)
+        copy_libraries(podfile_items)
         if build_configuration != "debug"
           copy_dsyms(podfile_items)
         end
@@ -69,22 +70,24 @@ module PodBuilder
       Dir.chdir(current_dir)
     end
 
-    def self.framework_rel_path(framework_path, podfile_items)
-      framework_name = File.basename(framework_path)
-      framework_name_no_ext = File.basename(framework_name, File.extname(framework_name))
-      if podfile_item = podfile_items.detect { |x| x.module_name == framework_name_no_ext && Configuration.subspecs_to_split.include?(x.name) }
+    def self.rel_path(path, podfile_items)
+      name = File.basename(path)
+      name_no_ext = File.basename(name, File.extname(name))
+      if podfile_item = podfile_items.detect { |x| x.module_name == name_no_ext && Configuration.subspecs_to_split.include?(x.name) }
         return "#{podfile_item.prebuilt_rel_path}"
       else
-        return framework_name
+        return name
       end
     end
 
     def self.add_framework_plist_info(podfile_items)
       swift_version = PodBuilder::system_swift_version
       Dir.glob("#{Configuration.build_path}/Rome/*.framework") do |framework_path|
+        filename_ext = File.basename(framework_path)
         filename = File.basename(framework_path, ".*")
 
         specs = podfile_items.select { |x| x.module_name == filename }
+        specs += podfile_items.select { |x| x.vendored_items.map { |x| File.basename(x) }.include?(filename_ext) }
         if podfile_item = specs.first
           podbuilder_file = File.join(framework_path, Configuration.framework_plist_filename)
           entry = podfile_item.entry(true, false)
@@ -111,7 +114,7 @@ module PodBuilder
 
     def self.cleanup_frameworks(podfile_items)
       Dir.glob("#{Configuration.build_path}/Rome/*.framework") do |framework_path|
-        framework_rel_path = framework_rel_path(framework_path, podfile_items)
+        framework_rel_path = rel_path(framework_path, podfile_items)
         dsym_path = framework_rel_path + ".dSYM"
 
         PodBuilder::safe_rm_rf(PodBuilder::basepath("Rome/#{framework_rel_path}"))
@@ -122,7 +125,7 @@ module PodBuilder
 
     def self.copy_frameworks(podfile_items)
       Dir.glob("#{Configuration.build_path}/Rome/*.framework") do |framework_path|
-        framework_rel_path = framework_rel_path(framework_path, podfile_items)
+        framework_rel_path = rel_path(framework_path, podfile_items)
 
         destination_path = PodBuilder::basepath("Rome/#{framework_rel_path}")
         FileUtils.mkdir_p(File.dirname(destination_path))
@@ -130,9 +133,69 @@ module PodBuilder
       end
     end
 
+    def self.copy_libraries(podfile_items)
+      module_names = podfile_items.map(&:root_name).uniq
+      module_names.each do |module_name|
+        base_destination_dir = PodBuilder::basepath("Rome/#{module_name}")
+        PodBuilder::safe_rm_rf(base_destination_dir)
+      end
+
+      Dir.glob("#{Configuration.build_path}/Rome/*.a") do |library_path|
+        library_name = File.basename(library_path)
+
+        # Find vendored libraries in the build folder:
+        # This allows to determine which Pod is associated to the vendored_library
+        # because there are cases where vendored_libraries are specified with wildcards (*.a)
+        # making it impossible to determine the associated Pods when building multiple pods at once
+        search_base = "#{Configuration.build_path}/Pods/"
+        podfile_items.each do |podfile_item|
+          podfile_item.vendored_items.each do |vendored_item|
+            unless vendored_item.end_with?(".a")
+              next
+            end
+            
+            if result = Dir.glob("#{search_base}**/#{vendored_item}").first
+              result_path = result.gsub(search_base, "")
+              module_name = result_path.split("/").first
+              if module_name == podfile_item.module_name
+                library_rel_path = rel_path(module_name, podfile_items)
+                                
+                result_path = result_path.split("/").drop(1).join("/")
+
+                destination_path = PodBuilder::basepath("Rome/#{library_rel_path}/#{result_path}")
+                FileUtils.mkdir_p(File.dirname(destination_path))
+                FileUtils.cp_r(library_path, destination_path)        
+              end
+            end
+          end
+
+          # A pod might depend upon a static library that is shipped with a prebuilt framework
+          # which is not added to the Rome folder and the PodBuilder.podspec
+          # 
+          # An example is Google-Mobile-Ads-SDK which adds
+          # - vendored framework: GooleMobileAds.framework 
+          # - vendored library: libGooleMobileAds.a
+          # These might be used by another pod (e.g AppNexusSDK/GoogleAdapterThatDependsOnGooglePod)
+          podfile_item.libraries.each do |library|            
+            if result = Dir.glob("#{search_base}**/lib#{library}.a").first
+              result_path = result.gsub(search_base, "")
+
+              library_rel_path = rel_path(podfile_item.module_name, podfile_items)
+                                
+              result_path = result_path.split("/").drop(1).join("/")
+
+              destination_path = PodBuilder::basepath("Rome/#{library_rel_path}/#{result_path}")
+              FileUtils.mkdir_p(File.dirname(destination_path))
+              FileUtils.cp_r(library_path, destination_path)        
+            end
+          end
+        end
+      end
+    end
+
     def self.copy_dsyms(podfile_items)
       Dir.glob("#{Configuration.build_path}/dSYM/*iphoneos/**/*.dSYM") do |dsym_path|
-        framework_rel_path = framework_rel_path(dsym_path.gsub(File.extname(dsym_path), ""), podfile_items)
+        framework_rel_path = rel_path(dsym_path.gsub(File.extname(dsym_path), ""), podfile_items)
         
         destination_path = PodBuilder::basepath("dSYM/iphoneos/#{File.dirname(framework_rel_path)}") 
         FileUtils.mkdir_p(destination_path)
@@ -140,7 +203,7 @@ module PodBuilder
       end
 
       Dir.glob("#{Configuration.build_path}/dSYM/*iphonesimulator/**/*.dSYM") do |dsym_path|
-        framework_rel_path = framework_rel_path(dsym_path.gsub(File.extname(dsym_path), ""), podfile_items)
+        framework_rel_path = rel_path(dsym_path.gsub(File.extname(dsym_path), ""), podfile_items)
 
         destination_path = PodBuilder::basepath("dSYM/iphonesimulator/#{File.dirname(framework_rel_path)}") 
         FileUtils.mkdir_p(destination_path)

data/lib/pod_builder/podfile_item.rb

@@ -231,6 +231,12 @@ module PodBuilder
       @root_name != @name
     end
 
+    # @return [Bool] True if it's a development pod
+    #
+    def is_development_pod
+      @path != nil
+    end
+
     # @return [String] The podfile entry
     #
     def entry(include_version = true, include_pb_entry = true)

data/lib/pod_builder/podspec.rb

@@ -65,9 +65,15 @@ module PodBuilder
       podspecs = []
       podspec_items.each do |item|
         vendored_frameworks = item.vendored_frameworks.map { |x| vendored_framework_path(x) }.compact.uniq
+        vendored_libraries = Dir.glob(PodBuilder::basepath("Rome/#{item.module_name}/**/*.a")).map { |x| x.to_s.gsub(PodBuilder::basepath, "")[1..-1] }
         
         podspec = "  s.subspec '#{item.name.gsub("/", "_")}' do |p|\n"
-        podspec += "    p.vendored_frameworks = '#{vendored_frameworks.join("','")}'\n"
+        if vendored_frameworks.count > 0
+          podspec += "    p.vendored_frameworks = '#{vendored_frameworks.join("','")}'\n"
+        end
+        if vendored_libraries.count > 0
+          podspec += "    p.vendored_libraries = '#{vendored_libraries.join("','")}'\n"
+        end
         if item.frameworks.count > 0
           podspec += "    p.frameworks = '#{item.frameworks.join("', '")}'\n"
         end

data/lib/pod_builder/version.rb

@@ -1,4 +1,4 @@
 module PodBuilder
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end
-  
+  

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Tomas Camin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-24 00:00:00.000000000 Z
+date: 2019-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -287,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Prebuild CocoaPods pods