esr-rim 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdd17c24fa16f44fb9d746f559792de236d441f42a9a49174a87edfcea479395
-  data.tar.gz: e789260532bade62c2bc64dbc88eae3ed532f32c7989858bfa50a7931ebeef5f
+  metadata.gz: 07a1fbbfaea777a59dea664a3458cd05a8a875f9169f94cec9afe05c1bf7b146
+  data.tar.gz: 7cac49fee86369ee27616c2baff6a2fe3f5f8d07f90f12c7d4b7dce1dd58814b
 SHA512:
-  metadata.gz: f9e463d07bea078b84c3c36a5c18248996fe7e9bcd74a9482790c1173ce0b2b9abd65eb6c14abdb31b4a218dcef54b149c9827de21da15bac9703ac84fb37365
-  data.tar.gz: b073b89e8afd986decc656f00ad3b8d8431317548d6c9bdfc9df16f6bf9cceaa7bbed093497ed5fe5c2d3a8fd9b084c29ec8a551a5a5a6b64d76c9a1ec60578e
+  metadata.gz: 8c7bac0172d50bade9adca66d71919d7e28c2f1b4395ed0f9b51b3bea915976a2aa4eb942f19a0aa12a7bec9b74689615ebfe67903355bc1ec70c7f3a681cc8b
+  data.tar.gz: 233832de324ee2ac314ce6e495dc2accbdb1777ea893af6b87001c27bc1d8bd843eca9faa4bba442645914014d1df3f7d6b73d09e75639528e2ef217a0695adb

data/CHANGELOG

@@ -134,4 +134,8 @@
 
 # 1.4.2
 
-* Fixed temporary-folder-generation on Windows, which could e.g. break the dirty check
+* Fixed temporary-folder-generation on Windows, which could e.g. break the dirty check
+
+# 1.4.3
+
+* Fixed ignore-filter which could break if temporary files are created and deleted in parallel processes

data/lib/rim/dirty_check.rb

@@ -61,8 +61,15 @@ class DirtyCheck
       files.delete("..")
       # ignore the info file itself
       files.delete(RimInfo::InfoFileName)
-      # ignores defined by user
-      files -= FileHelper.find_matching_files(dir, false, mi.ignores)
+      # ignore all other files
+      # (note: in esr-rim <= 1.42 this was realized by Dir::glob, but this breaks if "dir" is
+      # changed during the check, e.g. by parallel unittest builds
+      # fnIgn is calculated like find_matching_files did it before to avoid problems
+      dirpath = Pathname.new(dir)
+      fnIgn = FileHelper.normalize_patterns(mi.ignores).map do |m|
+        Pathname.new(File.join(dir, m)).relative_path_from(dirpath).to_s
+      end
+      files.delete_if { |f| fnIgn.any?{|m| File.fnmatch(m, f, File::FNM_PATHNAME)} }
       # order of files makes a difference
       # sort to eliminate platform specific glob behavior
       files.sort!

data/lib/rim/file_helper.rb

@@ -40,8 +40,6 @@ class FileHelper
     FileUtils.mkdir_p(dir)
   end
   
-private
-  
   def self.normalize_patterns(patterns = [])
     if patterns.is_a?(String)
       return patterns.split(",").each do |p|

data/lib/rim/version.rb

@@ -2,7 +2,7 @@ module RIM
 
 module Version
 
-Version = "1.4.2"
+Version = "1.4.3"
 
 end
 

data/test/sync_helper_test.rb

@@ -171,7 +171,7 @@ class SyncHelperTest < Minitest::Test
     cut.sync
     RIM::git_session(@ws_dir) do |s|
       s.execute("git rebase rim/testbr")
-      out = s.execute("git show --name-only")
+      out = s.execute("git show")
       assert out.include?("readme.txt")
       assert out.include?("Readme.txt")
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esr-rim
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - ESR Labs AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-22 00:00:00.000000000 Z
+date: 2019-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: subcommand