pod-builder 2.0.0.beta.23 → 2.0.0.beta.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16bb73e4ce3559e587cb45b0b80e7e92b1b904a016a09ef8769bdc5f36bd3c3b
-  data.tar.gz: 1b7990f9999ff210171bc012d2ae3d72b96b2cce7fd273906ed97351dcf74694
+  metadata.gz: 58d6868b29d7c33745475969ec3efc788d50e046e4507105a015dd7897eef2a2
+  data.tar.gz: fc638de64c1f6df8946d33a84a3f0dcf82b821c62c0bcc14c98c346f3f07b423
 SHA512:
-  metadata.gz: 7344c45e940ba2d2ff9b9c4cef8ca43fc49e07151b17124fceb1cccad2ce7cfaafcfe20e6de71cd58792db839a4c28ea61c9928eb5511b429deda37166df0824
-  data.tar.gz: 92b7caed18491251d38ed4f90325b968e3fb5d6dced12b98d34a96522904472231f61a31e471c3ed095863a8d489074de6ef053bcdfeb5a865a103dcf635e349
+  metadata.gz: 82ffb0bcbd8ea3cbd79a0bb8d0cbcca8d51799ea419c87afdd53e2832b96564f445956adccfcf79ddb1d5f4f88d2cf05a41a7e106c913f9933cf05559aa523e0
+  data.tar.gz: 9b59baa40cd02c07ee6a46e84f1f20becbd4588c4076056ec323e807ddafc0d53d928465a16c98ab91988aff8ea757c8892bce4dd3c184f7022edd72e2d25847

data/lib/pod_builder/command/init.rb

@@ -45,7 +45,9 @@ module PodBuilder
         podfile_content = Podfile.update_project_entries(podfile_content, Init.method(:podfile_path_transform))
         podfile_content = Podfile.update_require_entries(podfile_content, Init.method(:podfile_path_transform))
 
-        podfile_content = Podfile.prepare_for_react_native(podfile_content)
+        if podfile_content.include?("/node_modules/react-native/")
+          podfile_content = Podfile.prepare_for_react_native(podfile_content)
+        end
 
         File.write(prebuilt_podfile_path, podfile_content)
 

data/lib/pod_builder/core.rb

@@ -19,6 +19,10 @@ module PodBuilder
   @@xcodeproj_path = nil
   @@xcodeworkspace_path = nil
 
+  def self.git_rootpath
+    return `git rev-parse --show-toplevel`.strip()
+  end
+
   def self.safe_rm_rf(path)
     unless File.exist?(path)
       return
@@ -34,8 +38,8 @@ module PodBuilder
 
     Dir.chdir(path)
 
-    h = `git rev-parse --show-toplevel`.strip()
-    raise "\n\nNo git repository found in '#{path}', can't delete files!\n".red if h.empty? && !path.start_with?(Configuration.build_base_path)
+    rootpath = git_rootpath()
+    raise "\n\nNo git repository found in '#{path}', can't delete files!\n".red if rootpath.empty? && !path.start_with?(Configuration.build_base_path)
 
     FileUtils.rm_rf(path)
 
@@ -45,6 +49,12 @@ module PodBuilder
       Dir.chdir(basepath)
     end
   end
+
+  def self.gitignoredfiles
+    Dir.chdir(git_rootpath) do
+      return `git status --ignored -s | grep "^\!\!" | cut -c4-`.strip().split("\n")
+    end
+  end
   
   def self.basepath(child = "")
     if child.nil?
@@ -205,8 +215,8 @@ module PodBuilder
   private 
   
   def self.home
-    h = `git rev-parse --show-toplevel`.strip()
-    raise "\n\nNo git repository found in current folder `#{Dir.pwd}`!\n".red if h.empty?
-    return h
+    rootpath = git_rootpath
+    raise "\n\nNo git repository found in current folder `#{Dir.pwd}`!\n".red if rootpath.empty?
+    return rootpath
   end
 end

data/lib/pod_builder/install.rb

@@ -180,12 +180,14 @@ module PodBuilder
 
       podfile_content = File.read(podfile_path)
 
+      gitignored_files = PodBuilder::gitignoredfiles
+
       # Replace prebuilt entries in Podfile for Pods that have no changes in source code which will avoid rebuilding them
       items = podfile_items.group_by { |t| t.root_name }.map { |k, v| v.first } # Return one podfile_item per root_name
       items.each do |item|
         podspec_path = item.prebuilt_podspec_path
         if last_build_folder_hash = build_folder_hash_in_prebuilt_info_file(item)
-          if last_build_folder_hash == build_folder_hash(item)
+          if last_build_folder_hash == build_folder_hash(item, gitignored_files)
             puts "No changes detected to '#{item.root_name}', will skip rebuild".blue
             podfile_items.select { |t| t.root_name == item.root_name }.each do |replace_item|
               replace_regex = "pod '#{Regexp.quote(replace_item.name)}', .*"
@@ -265,6 +267,8 @@ module PodBuilder
     end
 
     def self.add_prebuilt_info_file(podfile_items)
+      gitignored_files = PodBuilder::gitignoredfiles
+
       swift_version = PodBuilder::system_swift_version
 
       root_names = podfile_items.reject(&:is_prebuilt).map(&:root_name).uniq
@@ -297,7 +301,7 @@ module PodBuilder
         data['specs'] = (specs.map(&:name) + subspec_self_deps).uniq
         data['is_static'] = podfile_item.is_static
         data['original_compile_path'] = Pathname.new(Configuration.build_path).realpath.to_s
-        data['build_folder_hash'] = build_folder_hash(podfile_item)
+        data['build_folder_hash'] = build_folder_hash(podfile_item, gitignored_files)
 
         File.write(podbuilder_file, JSON.pretty_generate(data))
       end
@@ -322,18 +326,36 @@ module PodBuilder
       end
     end
 
-    def self.build_folder_hash(podfile_item)
+    def self.build_folder_hash(podfile_item, exclude_files)
       if podfile_item.is_development_pod
         if Pathname.new(podfile_item.path).absolute?
           item_path = podfile_item.path
         else 
           item_path = PodBuilder::basepath(podfile_item.path)
         end
+
+        rootpath = PodBuilder::git_rootpath
+        file_hashes = []
+        Dir.glob("#{item_path}/**/*", File::FNM_DOTMATCH) do |path|
+          unless File.file?(path)
+            next
+          end
+          
+          path = File.expand_path(path)
+          rel_path = path.gsub(rootpath, "")[1..]
+          unless exclude_files.include?(rel_path)
+            file_hashes.push(Digest::MD5.hexdigest(File.read(path)))
+          else
+            puts path
+          end
+        end
+
+        return Digest::MD5.hexdigest(file_hashes.join)
       else
+        # Pod folder might be under .gitignore
         item_path = "#{Configuration.build_path}/Pods/#{podfile_item.root_name}"
+        return `find '#{item_path}' -type f -print0 | sort -z | xargs -0 shasum | shasum | cut -d' ' -f1`.strip()
       end
-
-      return `find '#{item_path}' -type f -print0 | sort -z | xargs -0 shasum | shasum | cut -d' ' -f1`.strip()
     end
     
     def self.podfile_path_transform(path)

data/lib/pod_builder/version.rb

@@ -1,4 +1,4 @@
 module PodBuilder
-  VERSION = "2.0.0.beta.23"
+  VERSION = "2.0.0.beta.24"
 end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.23
+  version: 2.0.0.beta.24
 platform: ruby
 authors:
 - Tomas Camin