pod-builder 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cd79078e29962f8d13a9a306462aaa99a0a0bfccc86cf401bba8fe0f39547bf
-  data.tar.gz: 211898086a3b86013c16c3281e9170adac80fd95165c081076424b74cecea63d
+  metadata.gz: 0dcdd8172ce23bbc1288b3414b9c2967de43a999a90cd825c14c58899e00d168
+  data.tar.gz: c0a812e95bbaf9c5c40dfa9385358f14726ca2f85ea028c339f12e820ac8d754
 SHA512:
-  metadata.gz: 95b42aaef813c53f251a1fc80b9321302b6d8d64bcd90be2ff5215a32e252f041aaa60f774228f296a27d356a5a0022f29522e6a1d7dbb4508991195237111fb
-  data.tar.gz: 4375249f5461a9da244c828e8d2b1fa2e04c7e5ccc49c0d177c5a2ea4b72ad7259e573e52ecaa57af58ec1b5745b2618badfa10ab5252b55b4fc960db3744a57
+  metadata.gz: 7434e06a402a7700b8b4ecaa58587ada1743a65d542b0eb9427a2b316f569a7715be3776f1ee1ceab122fadbedd5135b10cc31878b9207db14e713f8def464eb
+  data.tar.gz: 975bc31a12bc5f699f6ac90965c9a171f85ed9a092ef7227c8d1d1a7f538bd09794450b744a4eed7fb8877ae4ec4cfd7c6728547a7ad0c13152287eb1c583378

data/lib/pod_builder/podfile.rb

@@ -267,8 +267,7 @@ module PodBuilder
         return
       end
 
-      lines = File.read(podfile_path).split("\n")
-      lines.each do |line|
+      File.read(podfile_path).each_line do |line|
         stripped_line = strip_line(line)
         unless !stripped_line.start_with?("#")
           next

data/lib/pod_builder/podfile_item.rb

@@ -121,25 +121,21 @@ module PodBuilder
         @is_external = false
       end    
 
-      @vendored_items = recursive_vendored_items(spec)
+      @vendored_items = recursive_vendored_items(spec, all_specs)
 
       @frameworks = []
-      @frameworks += extract_array(spec, "framework")
-      @frameworks += extract_array(spec, "frameworks")
-      @frameworks += extract_array(spec.root, "framework")
-      @frameworks += extract_array(spec.root, "frameworks")
-
       @weak_frameworks = []
-      @weak_frameworks += extract_array(spec, "weak_frameworks")
-      @weak_frameworks += extract_array(spec, "weak_frameworks")
-      @weak_frameworks += extract_array(spec.root, "weak_frameworks")
-      @weak_frameworks += extract_array(spec.root, "weak_frameworks")
-
       @libraries = []
-      @libraries += extract_array(spec, "library")
-      @libraries += extract_array(spec, "libraries")
-      @libraries += extract_array(spec.root, "library")
-      @libraries += extract_array(spec.root, "libraries")
+      spec_and_dependencies(spec, all_specs).each do |spec|
+        @frameworks += extract_array(spec, "framework")
+        @frameworks += extract_array(spec, "frameworks")
+        
+        @weak_frameworks += extract_array(spec, "weak_framework")
+        @weak_frameworks += extract_array(spec, "weak_frameworks")  
+
+        @libraries += extract_array(spec, "library")
+        @libraries += extract_array(spec, "libraries")  
+      end
 
       @version = spec.root.version.version
       @available_versions = spec.respond_to?(:spec_source) ? spec.spec_source.versions(@root_name)&.map(&:to_s) : [@version]
@@ -327,34 +323,24 @@ module PodBuilder
 
     private
 
-    def recursive_vendored_items(spec)
+    def recursive_vendored_items(spec, all_specs)
       items = []
 
-      items += [spec.root.attributes_hash["vendored_frameworks"]]
-      items += [spec.root.attributes_hash["vendored_framework"]]
-      items += [spec.root.attributes_hash["vendored_libraries"]]
-      items += [spec.root.attributes_hash["vendored_library"]]
-
-      items += [spec.attributes_hash["vendored_frameworks"]]
-      items += [spec.attributes_hash["vendored_framework"]]
-      items += [spec.attributes_hash["vendored_libraries"]]
-      items += [spec.attributes_hash["vendored_library"]]
-
       supported_platforms = spec.available_platforms.flatten.map(&:name).map(&:to_s)
 
-      items += supported_platforms.map { |x| spec.root.attributes_hash.fetch(x, {})["vendored_frameworks"] }
-      items += supported_platforms.map { |x| spec.root.attributes_hash.fetch(x, {})["vendored_framework"] }
-      items += supported_platforms.map { |x| spec.root.attributes_hash.fetch(x, {})["vendored_libraries"] }
-      items += supported_platforms.map { |x| spec.root.attributes_hash.fetch(x, {})["vendored_library"] }
+      spec_and_dependencies(spec, all_specs).each do |spec|
+        items += [spec.attributes_hash["vendored_frameworks"]]
+        items += [spec.attributes_hash["vendored_framework"]]
+        items += [spec.attributes_hash["vendored_libraries"]]
+        items += [spec.attributes_hash["vendored_library"]]  
 
-      items += supported_platforms.map { |x| spec.attributes_hash.fetch(x, {})["vendored_frameworks"] }
-      items += supported_platforms.map { |x| spec.attributes_hash.fetch(x, {})["vendored_framework"] }
-      items += supported_platforms.map { |x| spec.attributes_hash.fetch(x, {})["vendored_libraries"] }
-      items += supported_platforms.map { |x| spec.attributes_hash.fetch(x, {})["vendored_library"] }
-
-      items = items.flatten.compact
+        items += supported_platforms.map { |x| spec.attributes_hash.fetch(x, {})["vendored_frameworks"] }
+        items += supported_platforms.map { |x| spec.attributes_hash.fetch(x, {})["vendored_framework"] }
+        items += supported_platforms.map { |x| spec.attributes_hash.fetch(x, {})["vendored_libraries"] }
+        items += supported_platforms.map { |x| spec.attributes_hash.fetch(x, {})["vendored_library"] }  
+      end
 
-      return items.flatten
+      return items.flatten.uniq.compact
     end
 
     def extract_array(spec, key)
@@ -378,5 +364,12 @@ module PodBuilder
 
       return source_files + root_source_files
     end
+
+    def spec_and_dependencies(spec, all_specs)
+      specs = all_specs.select { |x| spec.dependencies.map(&:name).include?(x.name) }
+      specs += [spec, spec.root] 
+      
+      return specs.compact.uniq
+    end
   end
 end

data/lib/pod_builder/version.rb

@@ -1,4 +1,4 @@
 module PodBuilder
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Tomas Camin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-13 00:00:00.000000000 Z
+date: 2019-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler