pod-builder 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9fb023de3a59b5da37e534937a7cdb9cc8d9af2774a2085227818c418cbf0de
-  data.tar.gz: f3edce26103792eec8c88afca3b7f1627a0944d27a063b1f272a20b16ac6108a
+  metadata.gz: d36d9f96e5add40dcfea2b813f2f2e7c7a8bf9dc92f66c18d9a9908b8b08acf9
+  data.tar.gz: 9277379ff44774e76b71ee3daa8763dcdf73733800561baa6c12ce4c98b9f649
 SHA512:
-  metadata.gz: a0c6616c2e103b282d66f3c209bfad1b606cbda83e6a7b978930cc09954838ed89bcedc67a2fc576aacaf3c7ffc0222303b9e94695b91adbd47f851f1ad917f7
-  data.tar.gz: 7932ef4ea77d4b5c7e55e27e3eb058ef282c05e0c7c1e44b0ab3f47967da7433a05dca6d1e920cc029e3343b00ae5451d52c5b8dcc69814c377da22c49f26442
+  metadata.gz: 49c7bfd632020dfb7d1ce681599652e4d5b7f4f44082a62b9440a6c5f45eccb571db1005f1b8d320aea8cdcc5ba4f9f571fe68c8cd7d824b8c681e22b01f4384
+  data.tar.gz: 97ade0e62f14c2128937b5abd4f734fd123ad82ab506d0992a7dd5ee28318596fb600d4781fd1c1e000743eef41ed30e0e1ff46d2ee528af7fefe60ea8282bc4

data/Example/Frameworks/PodBuilder.json

@@ -4,33 +4,15 @@
     "Google-Mobile-Ads-SDK": {
       "module_name": "GoogleMobileAds"
     },
-    "Firebase/Core": {
-      "module_name": "FirebaseCore"
-    },
-    "Firebase/Performance": {
-      "module_name": "FirebasePerformance"
-    },
-    "Firebase/RemoteConfig": {
-      "module_name": "FirebaseRemoteConfig"
-    }
   },
   "skip_licenses": [
 
   ],
   "skip_pods": [
-
+    "GoogleMaps"
   ],
   "force_prebuild_pods": [
-    "FirebaseAnalytics",
-    "FirebaseAnalyticsInterop",
-    "Firebase/Core", 
-    "Firebase/CoreOnly",
-    "FirebaseCoreDiagnosticsInterop",
-    "FirebasePerformance", 
-    "Firebase/Performance", 
-    "FirebaseRemoteConfig", 
-    "GoogleAppMeasurement", 
-    "GoogleToolboxForMac"
+    "Firebase"
   ],
   "build_settings": {
     "ENABLE_BITCODE": "NO",

data/lib/pod_builder/command/build.rb

@@ -82,10 +82,12 @@ module PodBuilder
           FileUtils.rm_f(PodBuilder::basepath("Podfile.lock"))
         end
 
+        cleanup_framework_folder(all_buildable_items)
+
         Licenses::write(licenses, all_buildable_items)
 
         GenerateLFS::call(nil)
-        Podspec::generate(analyzer)
+        Podspec::generate(all_buildable_items, analyzer)
 
         builded_pods = podfiles_items.flatten
         builded_pods_and_deps = add_dependencies(builded_pods, all_buildable_items).select { |x| !x.is_prebuilt }
@@ -294,6 +296,22 @@ module PodBuilder
 
         return pods_to_build
       end
+
+      def self.cleanup_framework_folder(buildable_items)
+        expected_frameworks = buildable_items.map { |x| "#{x.module_name}.framework" }
+        expected_frameworks += buildable_items.map { |x| x.vendored_items }.flatten.map { |x| x.split("/").last }
+        expected_frameworks.uniq!
+
+        existing_frameworks = Dir.glob("#{PodBuilder::basepath("Rome")}/*.framework")
+
+        existing_frameworks.each do |existing_framework|
+          existing_framework_name = File.basename(existing_framework)
+          if !expected_frameworks.include?(existing_framework_name)
+            puts "Cleanining up `#{existing_framework_name}`, no longer found among dependencies".blue
+            FileUtils.rm_rf(existing_framework)
+          end
+        end
+      end
     end
   end
 end

data/lib/pod_builder/command/install_sources.rb

@@ -47,11 +47,26 @@ module PodBuilder
 
         Dir.chdir(repo_dir)
         puts "Checking out #{spec.podspec_name}".yellow
-        raise "Failed cheking out #{spec.name}" if !system(spec.git_hard_checkout)
+        raise "Failed cheking out #{spec.name}" if !system(git_hard_checkout_cmd(spec))
 
         Dir.chdir(current_dir)
       end
 
+      def self.git_hard_checkout_cmd(spec)
+        prefix = "git fetch --all --tags --prune; git reset --hard"
+        if @tag
+          return "#{prefix} tags/#{spec.tag}"
+        end
+        if @commit
+          return "#{prefix} #{spec.commit}"
+        end
+        if @branch
+          return "#{prefix} origin/#{spec.branch}"
+        end
+  
+        return nil
+      end
+
       def self.rewrite_lldinit
         puts "Writing ~/.lldbinit-Xcode".yellow
 

data/lib/pod_builder/configuration.rb

@@ -14,6 +14,8 @@ module PodBuilder
         "module_name": "GoogleMobileAds"
       }
     }.freeze
+    DEFAULT_SKIP_PODS = ["GoogleMaps"]
+    DEFAULT_FORCE_PREBUILD_PODS = ["Firebase"]
     DEFAULT_BUILD_SYSTEM = "Legacy".freeze # either Latest (New build system) or Legacy (Standard build system)
     MIN_LFS_SIZE_KB = 256.freeze
     
@@ -51,8 +53,8 @@ module PodBuilder
     @base_path = "Frameworks" # Not nice. This value is used only for initial initization. Once config is loaded it will be an absolute path. FIXME
     @spec_overrides = DEFAULT_SPEC_OVERRIDE
     @skip_licenses = []
-    @skip_pods = []
-    @force_prebuild_pods = []
+    @skip_pods = DEFAULT_SKIP_PODS
+    @force_prebuild_pods = DEFAULT_FORCE_PREBUILD_PODS
     @license_filename = "Pods-acknowledgements"
     @subspecs_to_split = []
     @development_pods_paths = []

data/lib/pod_builder/licenses.rb

@@ -10,10 +10,14 @@
         dict = CFPropertyList.native_types(plist.value)  
         current_licenses = dict["PreferenceSpecifiers"]
       
-        licenses_header = current_licenses.shift
-        raise "Unexpected license found in header" if licenses_header.has_key?("License")
-        license_footer = current_licenses.pop
-        raise "Unexpected license found in footer" if license_footer.has_key?("License")
+        if current_licenses.count > 0 
+          licenses_header = current_licenses.shift
+          raise "Unexpected license found in header" if licenses_header.has_key?("License")
+        end
+        if current_licenses.count > 0 
+          license_footer = current_licenses.pop
+          raise "Unexpected license found in footer" if license_footer.has_key?("License")
+        end
       end
 
       if licenses.count > 0
@@ -33,7 +37,7 @@
       licenses.select! { |x| all_buildable_items.map(&:root_name).include?(x["Title"]) } # Remove items that are no longer included
 
       license_dict = {}
-      license_dict["PreferenceSpecifiers"] = [licenses_header, licenses, license_footer].flatten
+      license_dict["PreferenceSpecifiers"] = [licenses_header, licenses, license_footer].compact.flatten
       license_dict["StringsTable"] = "Acknowledgements"
       license_dict["Title"] = license_dict["StringsTable"]
 
@@ -41,7 +45,9 @@
       plist.value = CFPropertyList.guess(license_dict)
       plist.save(license_file_path, CFPropertyList::List::FORMAT_BINARY)
 
-      write_markdown(license_file_path)
+      if licenses.count > 0
+        write_markdown(license_file_path)
+      end
     end
     
     private 
@@ -50,6 +56,7 @@
       plist = CFPropertyList::List.new(:file => plist_path)
       dict = CFPropertyList.native_types(plist.value)  
       licenses = dict["PreferenceSpecifiers"]
+
       header = licenses.shift
 
       markdown = []

data/lib/pod_builder/podfile.rb

@@ -147,20 +147,28 @@ module PodBuilder
       prebuilt_lines = ["# Autogenerated by PodBuilder (https://github.com/Subito-it/PodBuilder)\n", "# Any change to this file should be done on #{rel_path}\n", "\n"]
       podfile_content.each_line do |line|
         stripped_line = strip_line(line)
+        if exclude_lines.include?(stripped_line)
+          next
+        end
 
         if pod_name = pod_definition_in(line, true)
           if podfile_item = all_buildable_items.detect { |x| x.name == pod_name }
             if Podspec.include?(podfile_item.name)
-              if podfile_item.is_prebuilt == false
-                line = "#{line.detect_indentation}#{podfile_item.prebuilt_entry}\n"
+              if podfile_item.vendored_framework_path.nil?
+                marker = podfile_item.prebuilt_marker()
+
+                podfile_item_dependency_items = all_buildable_items.select { |x| podfile_item.dependency_names.include?(x.name) && x.vendored_framework_path.nil? == false }
+                prebuilt_lines += podfile_item_dependency_items.map { |x| "#{line.detect_indentation}#{x.prebuilt_entry(include_pb_entry = false)}#{marker}\n" }.uniq
+              else 
+                prebuilt_lines.push("#{line.detect_indentation}#{podfile_item.prebuilt_entry}\n")
               end
+
+              next
             end
           end
         end
 
-        if !exclude_lines.include?(stripped_line)
-          prebuilt_lines.push(line)
-        end
+        prebuilt_lines.push(line)
       end
 
       project_podfile_path = PodBuilder::project_path("Podfile")

data/lib/pod_builder/podfile_item.rb

@@ -278,12 +278,12 @@ module PodBuilder
           swift_version = data["swift_version"]
           is_static = data["is_static"] || false
         
-          e += " # pb<#{name}> is<#{is_static}>"
+          e += "#{prebuilt_marker()} is<#{is_static}>"
           if swift_version
             e += " sv<#{swift_version}>"
           end
         else
-          e += " # pb<#{name}>"
+          e += prebuilt_marker()
         end
       end
 
@@ -314,12 +314,16 @@ module PodBuilder
       end
 
       if include_pb_entry && !is_prebuilt
-        entry += " # pb<#{name}>"
+        entry += prebuilt_marker()
       end
 
       return entry
     end
 
+    def prebuilt_marker
+      return " # pb<#{name}>"
+    end
+
     def has_subspec(named)
       unless !is_subspec
         return false
@@ -332,20 +336,27 @@ module PodBuilder
       return root_name == named.split("/").first
     end
 
-    def git_hard_checkout
-      prefix = "git fetch --all --tags --prune; git reset --hard"
-      if @tag
-        return "#{prefix} tags/#{@tag}"
-      end
-      if @commit
-        return "#{prefix} #{@commit}"
-      end
-      if @branch
-        return "#{prefix} origin/#{@branch}"
+    def vendored_framework_path
+      if File.exist?(PodBuilder::basepath(vendored_subspec_framework_path))
+        return vendored_subspec_framework_path
+      elsif File.exist?(PodBuilder::basepath(vendored_spec_framework_path))
+        return vendored_spec_framework_path
       end
-
+      
       return nil
     end
+    
+    def vendored_subspec_framework_path
+      return "Rome/#{prebuilt_rel_path}"
+    end
+    
+    def vendored_spec_framework_path
+      return "Rome/#{module_name}.framework"
+    end
+
+    def self.vendored_name_framework_path(name)
+      return "Rome/#{name}"
+    end
 
     private
 
@@ -421,9 +432,15 @@ module PodBuilder
 
     def spec_and_dependencies(spec, all_specs)
       specs = all_specs.select { |x| spec.dependencies.map(&:name).include?(x.name) }
+      specs += all_specs.select { |x| spec.default_subspecs.include?(x.name.split("/").last) }
       specs += [spec, spec.root] 
+
+      all_remaining_specs = all_specs.reject { |x| specs.map(&:name).include?(x.name) } 
+      if all_remaining_specs.count < all_specs.count
+        specs += specs.map { |x| spec_and_dependencies(x, all_remaining_specs) }
+      end
       
-      return specs.compact.uniq
+      return specs.flatten.compact.uniq
     end
   end
 end

data/lib/pod_builder/podspec.rb

@@ -31,12 +31,10 @@ module PodBuilder
     end
     private_constant :PodspecItem
     
-    def self.generate(analyzer)  
+    def self.generate(all_buildable_items, analyzer)  
       puts "Generating PodBuilder's local podspec".yellow
-      
-      buildable_items = Podfile.podfile_items_at(PodBuilder::basepath("Podfile")).sort_by { |x| x.name }
-            
-      podspec_items = podspec_items_from(buildable_items)
+                  
+      podspec_items = podspec_items_from(all_buildable_items)
 
       platform = analyzer.instance_variable_get("@result").targets.first.platform
       generate_podspec_from(podspec_items, platform)
@@ -66,8 +64,8 @@ module PodBuilder
     def self.generate_podspec_from(podspec_items, platform)
       podspecs = []
       podspec_items.each do |item|
-        vendored_frameworks = item.vendored_frameworks.map { |x| vendored_framework_path(x) }.compact
-        vendored_frameworks += item.vendored_items.select { |x| File.exist?(PodBuilder::basepath(vendored_name_framework_path(x))) }.map { |x| "Rome/#{x}" }
+        vendored_frameworks = item.vendored_frameworks.map { |x| x.vendored_framework_path }.compact
+        vendored_frameworks += item.vendored_items.map { |x| File.basename(x) }.select { |x| File.exist?(PodBuilder::basepath(PodfileItem::vendored_name_framework_path(x))) }.map { |x| "Rome/#{x}" }
         vendored_frameworks.uniq!
         vendored_libraries = Dir.glob(PodBuilder::basepath("Rome/#{item.module_name}/**/*.a")).map { |x| x.to_s.gsub(PodBuilder::basepath, "")[1..-1] }
         
@@ -114,8 +112,8 @@ module PodBuilder
       podspec_items = []
 
       buildable_items.each do |pod|
-        spec_exists = File.exist?(PodBuilder::basepath(vendored_spec_framework_path(pod))) 
-        subspec_exists = File.exist?(PodBuilder::basepath(vendored_subspec_framework_path(pod)))
+        spec_exists = File.exist?(PodBuilder::basepath(pod.vendored_spec_framework_path))
+        subspec_exists = File.exist?(PodBuilder::basepath(pod.vendored_subspec_framework_path))
         
         unless spec_exists || subspec_exists
           puts "Skipping `#{pod.name}`, not prebuilt".blue
@@ -138,10 +136,10 @@ module PodBuilder
         podspec_item.libraries = podspec_item.vendored_frameworks.map { |x| x.libraries }.flatten.uniq.sort
         
         static_vendored_frameworks = podspec_item.vendored_frameworks.select { |x| x.is_static }
-        
-        podspec_item.resources = static_vendored_frameworks.map { |x| vendored_framework_path(x).nil? ? nil : "#{vendored_framework_path(x)}/*.{nib,bundle,xcasset,strings,png,jpg,tif,tiff,otf,ttf,ttc,plist,json,caf,wav,p12,momd}" }.compact.flatten.uniq
-        podspec_item.exclude_files = static_vendored_frameworks.map { |x| vendored_framework_path(x).nil? ? nil : "#{vendored_framework_path(x)}/Info.plist" }.compact.flatten.uniq
-        podspec_item.exclude_files += podspec_item.vendored_frameworks.map { |x| vendored_framework_path(x).nil? ? nil : "#{vendored_framework_path(x)}/#{Configuration.framework_plist_filename}" }.compact.flatten.uniq.sort
+
+        podspec_item.resources = static_vendored_frameworks.map { |x| x.vendored_framework_path.nil? ? nil : "#{x.vendored_framework_path}/*.{nib,bundle,xcasset,strings,png,jpg,tif,tiff,otf,ttf,ttc,plist,json,caf,wav,p12,momd}" }.compact.flatten.uniq
+        podspec_item.exclude_files = static_vendored_frameworks.map { |x| x.vendored_framework_path.nil? ? nil : "#{x.vendored_framework_path}/Info.plist" }.compact.flatten.uniq
+        podspec_item.exclude_files += podspec_item.vendored_frameworks.map { |x| x.vendored_framework_path.nil? ? nil : "#{x.vendored_framework_path}/#{Configuration.framework_plist_filename}" }.compact.flatten.uniq.sort
 
         # Merge xcconfigs
         if !pod.xcconfig.empty?
@@ -166,27 +164,5 @@ module PodBuilder
 
       return podspec_items
     end
-    
-    def self.vendored_framework_path(pod)
-      if File.exist?(PodBuilder::basepath(vendored_subspec_framework_path(pod)))
-        return vendored_subspec_framework_path(pod)
-      elsif File.exist?(PodBuilder::basepath(vendored_spec_framework_path(pod)))
-        return vendored_spec_framework_path(pod)
-      end
-      
-      return nil
-    end
-    
-    def self.vendored_subspec_framework_path(pod)
-      return "Rome/#{pod.prebuilt_rel_path}"
-    end
-    
-    def self.vendored_spec_framework_path(pod)
-      return "Rome/#{pod.module_name}.framework"
-    end
-
-    def self.vendored_name_framework_path(name)
-      return "Rome/#{name}"
-    end
   end
 end

data/lib/pod_builder/version.rb

@@ -1,4 +1,4 @@
 module PodBuilder
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Tomas Camin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-05 00:00:00.000000000 Z
+date: 2019-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler