pod-builder 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e144495c0856e1ee8b9b63cf3ce66f3f34fc7d408970ec8786f49ed82a338685
-  data.tar.gz: 5c73c6d88a311aee634e5f50b77aeb438955164253be72e4fa4888fb6be06355
+  metadata.gz: e686529fa18b1c7110ca3d6aff4ed5637d930c49df6a89d065f3db842fbe267c
+  data.tar.gz: 90c3ba1c7879e7bbcd6a32ef5581027c3c0ce2f4ae3fd2371c35e42bb8123fb7
 SHA512:
-  metadata.gz: 88937db38c5ae2e8a3c30129b09dceb436c8468122ae6b691d6022b8f10da11055a1c83fba4b236b2ea3bb1c95764f2c0f217ddfab0abe3a61a5d675ac59edaa
-  data.tar.gz: 3d1bed1971282a7f82ad70179da2a114f634611920e6a8c691f145f9d17689d38e6fafed625c1c0f98e8da642bb6f4c63b49274b6606e173a0600ee133c41732
+  metadata.gz: 2e50247e73514004127e846bb9cfb24d663db691a64bba527ee77e580773fac9d0cce2ab517d6fc384cab6b4dd56a7bb69d1750f12b5a2d29fb118e168fce308
+  data.tar.gz: f8d701b9b1470804e712dadd39b77fb9e0f33301056a7ddfe00870c27275bd6907db12e7baed13afe3ad38f9377c2a255072785e67549c88c9839eb830052633

data/lib/pod_builder/podfile_item.rb

@@ -373,17 +373,45 @@ module PodBuilder
       return element
     end
 
-    def source_files_from(spec)
-      root_source_files = spec.root.attributes_hash.fetch("source_files", [])
-      if root_source_files.is_a? String 
-        root_source_files = root_source_files.split(",")
+    def source_files_from_string(source)
+      files = []
+      if source.is_a? String 
+        matches = source.match(/(.*)({(.),?(.)?})/)
+        if matches&.size == 5
+          source = matches[1] + matches[3]
+          if matches[4].length > 0
+            source += "," + matches[1] + matches[4]
+          end
+        end
+
+        return source.split(",")
+      else
+        return source
       end
-      source_files = spec.attributes_hash.fetch("source_files", [])
-      if source_files.is_a? String 
-        source_files = source_files.split(",")
+    end
+
+    def source_files_from(spec)
+      files = spec.root.attributes_hash.fetch("source_files", [])
+      root_source_files = source_files_from_string(files)
+
+      files = spec.attributes_hash.fetch("source_files", [])
+      source_files = source_files_from_string(files)
+
+      subspec_source_files = []
+      if spec.name == spec.root.name
+        default_podspecs = spec.attributes_hash.fetch("default_subspecs", [])
+        if default_podspecs.is_a? String 
+          default_podspecs = [default_podspecs]
+        end
+        default_podspecs.each do |subspec_name|
+          if subspec = spec.subspecs.detect { |x| x.name == "#{spec.root.name}/#{subspec_name}" }
+            files = subspec.attributes_hash.fetch("source_files", [])
+            subspec_source_files += source_files_from_string(files)
+          end
+        end
       end
 
-      return source_files + root_source_files
+      return source_files + root_source_files + subspec_source_files
     end
 
     def spec_and_dependencies(spec, all_specs)

data/lib/pod_builder/version.rb

@@ -1,4 +1,4 @@
 module PodBuilder
-  VERSION = "0.8.3"
+  VERSION = "0.8.4"
 end
   

metadata

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