pod-builder 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e94c0d3d359f8e25592e0e2fc5619de65e2c2c6f75ff8a95de695bb174030179
-  data.tar.gz: 0bbf0619eaaca7ada50417db5bafa2d635b8e18fa11a933587c89bdfc23c8aa1
+  metadata.gz: 7c838f4cbe15befbbc68c928298ba6ab8ad7d803d77e713002ef7e8e45dcafb9
+  data.tar.gz: c169f713fa235f50ca35243d94fa5ad339463d91373189c85e2394e123fb64a1
 SHA512:
-  metadata.gz: 5a3f90940b9b043e04735bd9179f91a0463247377d4594c380c6d20f5779d33912994c2576e449de690ad20322fc5bf90310e0c5b8e50d84489075570ab240e6
-  data.tar.gz: d2aa68b62b551ba9bc3a54fa8be33b3deac722aa14ce3953ea39edd9aa4cd1703f6957664e5c9b353a4696322c923140ae1075ed171d3b37f944978fea90be85
+  metadata.gz: 35ebe02dfc9e38663ff3d624d9e8fafc1e41ea05046c17f970822d29bc0697296e2c076a7af139273280d13c99bfb1071ef835dc87f42bfc3e8a9e0972e436a0
+  data.tar.gz: b15bf45df512b4dc5c6ca730530077f339626c6b01e5f8d58253839fa7bdb6a5bc4c93bd1468c88fa94cd809dae938455e584e896e5a1a0680791a8ef3bc1c7f

data/.vscode/launch.json

@@ -138,7 +138,7 @@
             "args": [
                 "switch",
                 "-p",
-                "SBTUITestTunnel",                
+                "AFNetworking",                
             ]
         },
         {

data/lib/pod_builder/command/build.rb

@@ -14,6 +14,7 @@ module PodBuilder
           return false
         end
 
+        Podfile.sanity_check()
         check_not_building_subspecs(argument_pods)
 
         install_update_repo = options.fetch(:update_repos, true)
@@ -27,22 +28,15 @@ module PodBuilder
           argument_pods = buildable_items.map(&:root_name)
         end
 
-        argument_pods.select! { |x| buildable_items.map(&:root_name).include?(x) }
+        argument_pods.select! { |x| all_buildable_items.map(&:root_name).include?(x) }
         argument_pods.uniq!
 
-        unless argument_pods.count > 0 
-          puts "\n\nNo pods to build found, `#{ARGV.join(" ")}` is/are prebuilt\n".yellow
-          puts "\n\n🎉 done!\n".green
-
-          return true
-        end
-
         Podfile.restore_podfile_clean(all_buildable_items)
 
         restore_file_error = Podfile.restore_file_sanity_check
   
         check_splitted_subspecs_are_static(all_buildable_items, options)
-        check_pods_exists(argument_pods, buildable_items)
+        check_pods_exists(argument_pods, all_buildable_items)
 
         pods_to_build = buildable_items.select { |x| argument_pods.include?(x.root_name) }
         pods_to_build += other_subspecs(pods_to_build, buildable_items)
@@ -93,7 +87,7 @@ module PodBuilder
 
         builded_pods = podfiles_items.flatten
         builded_pods_and_deps = add_dependencies(builded_pods, all_buildable_items).select { |x| !x.is_prebuilt }
-        Podfile::write_restorable(builded_pods_and_deps, all_buildable_items, analyzer)     
+        Podfile::write_restorable(builded_pods_and_deps + prebuilt_items, all_buildable_items, analyzer)     
         if !options.has_key?(:skip_prebuild_update)   
           Podfile::write_prebuilt(all_buildable_items, analyzer)
         end

data/lib/pod_builder/podfile.rb

@@ -138,12 +138,10 @@ module PodBuilder
 
       podbuilder_podfile_path = PodBuilder::basepath("Podfile")
       rel_path = Pathname.new(podbuilder_podfile_path).relative_path_from(Pathname.new(PodBuilder::project_path)).to_s
-    
-      frameworks_base_path = PodBuilder::basepath("Rome")
-    
+        
       podfile_content = File.read(podbuilder_podfile_path)
 
-      exclude_lines = Podfile::PODBUILDER_LOCK_ACTION.map { |x| Podfile.strip_line(x) }
+      exclude_lines = Podfile::PODBUILDER_LOCK_ACTION.map { |x| strip_line(x) }
 
       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|
@@ -152,7 +150,9 @@ module PodBuilder
         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)
-              line = "#{line.detect_indentation}#{podfile_item.prebuilt_entry}\n"
+              if podfile_item.is_prebuilt == false
+                line = "#{line.detect_indentation}#{podfile_item.prebuilt_entry}\n"
+              end
             end
           end
         end
@@ -259,6 +259,26 @@ module PodBuilder
       return error
     end
 
+    def self.sanity_check
+      podfile_path = PodBuilder::basepath("Podfile")
+      unless File.exist?(podfile_path)
+        return
+      end
+
+      lines = File.read(podfile_path).split("\n")
+      lines.each do |line|
+        stripped_line = strip_line(line)
+        unless !stripped_line.start_with?("#")
+          next
+        end
+
+        if stripped_line.match(/(pod')(.*?)(')/) != nil
+          starting_def_found = stripped_line.start_with?("def") && (line.match("\s*def\s") != nil)
+          raise "Unsupported single line def/pod. `def` and `pod` shouldn't be on the same line, please modify the following line:\n#{line}" if starting_def_found
+        end
+      end
+    end
+
     private
 
     def self.indentation_from_file(path)
@@ -337,7 +357,7 @@ module PodBuilder
       marker_found = false
       podfile_lines = []
       podfile_content.each_line do |line|
-        stripped_line = Podfile::strip_line(line)
+        stripped_line = strip_line(line)
 
         podfile_lines.push(line)
         if stripped_line.start_with?("#{marker}do|")

data/lib/pod_builder/podfile_item.rb

@@ -82,9 +82,9 @@ module PodBuilder
     #
     attr_accessor :libraries
 
-    # @return [Bool] Returns true if the source_files key is present
+    # @return [String] source_files
     #
-    attr_accessor :has_source_files_key
+    attr_accessor :source_files
 
     # Initialize a new instance
     #
@@ -152,7 +152,10 @@ module PodBuilder
       @is_static = spec.root.attributes_hash["static_framework"] || false
       @xcconfig = spec.root.attributes_hash["xcconfig"] || {}
 
-      @has_source_files_key = spec.root.attributes_hash.has_key?("source_files") || spec.attributes_hash.has_key?("source_files")
+      @source_files = spec.root.attributes_hash.fetch("source_files", [])
+      if @source_files.is_a? String 
+        @source_files = @source_files.split(",")
+      end
       
       @build_configuration = spec.root.attributes_hash.dig("pod_target_xcconfig", "prebuild_configuration") || "release"
       @build_configuration.downcase!
@@ -216,13 +219,16 @@ module PodBuilder
         return true
       end
 
-      # checking if there's a vendored_item matching the module name is a pretty good guess for a prebuilt pod.
-      # Still suboptimal, maybe it should be more appropriate to use FileAccessor and check that no source code is provided (no *.{m,mm,c,cpp,swift, etc})
-      if vendored_items.map { |x| File.basename(x) }.include?("#{@module_name}.framework")
-        return true
-      else
-        return !@has_source_files_key && @vendored_items.count > 0
-      end
+      # Podspecs aren't always properly written (source_file key is often used instead of header_files)
+      # Therefore it can become tricky to understand which pods are already precompiled by boxing a .framework or .a
+      vendored_items_paths = vendored_items.map { |x| File.basename(x) }
+      embedded_as_vendored = vendored_items_paths.include?("#{@module_name}.framework")
+      embedded_as_static_lib = vendored_items_paths.any? { |x| x.match(/#{module_name}.*\\.a/) != nil }
+      
+      only_headers = @source_files.include?("*.h")
+      no_sources = (@source_files.count == 0 || only_headers) && @vendored_items.count > 0
+
+      return embedded_as_static_lib || embedded_as_vendored || only_headers || no_sources
     end
 
     # @return [Bool] True if it's a subspec

data/lib/pod_builder/podspec.rb

@@ -56,7 +56,7 @@ module PodBuilder
 
       # (_.*) will include prebuild podnames like s.subspec 'Podname_Subspec' do |p|
       subspec_regex = "s.subspec '#{pod_name}(_.*)?' do |p|" 
-      return podspec_content.match(/#{subspec_regex}/)
+      return (podspec_content.match(/#{subspec_regex}/) != nil)
     end
     
     private

data/lib/pod_builder/version.rb

@@ -1,4 +1,4 @@
 module PodBuilder
-  VERSION = "0.2.9"
+  VERSION = "0.3.0"
 end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Tomas Camin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-23 00:00:00.000000000 Z
+date: 2018-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler