Merge pull request #271 from ninp0/master

pwn_diff_csv_files_w_column_exclude Driver - #more_bugfixes in producing actual diff CSV file

Author: ninp0

README.md

@@ -37,7 +37,7 @@ $ rvm use ruby-3.2.2@pwn
 $ rvm list gemsets
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.4.686]:001 >>> PWN.help
+pwn[v0.4.688]:001 >>> PWN.help
 ```
 
 [![Installing the pwn Security Automation Framework](https://raw.githubusercontent.com/0dayInc/pwn/master/documentation/pwn_install.png)](https://youtu.be/G7iLUY4FzsI)
@@ -52,7 +52,7 @@ $ rvm use ruby-3.2.2@pwn
 $ gem uninstall --all --executables pwn
 $ gem install --verbose pwn
 $ pwn
-pwn[v0.4.686]:001 >>> PWN.help
+pwn[v0.4.688]:001 >>> PWN.help
 ```
 
 

bin/pwn_diff_csv_files_w_column_exclude

@@ -126,7 +126,8 @@ def csv_diff(opts = {})
   # Write diff with redacted columns (to find differences we care about)
   CSV.open(diff_path, 'w', col_sep: ',', quote_char: '"', force_quotes: true) do |csv|
     larger_csv.each do |line_arr|
-      csv.puts line_arr if smaller_csv.select { |sc| sc == line_arr }.empty?
+      line = line_arr.join(',')
+      csv.puts line_arr if smaller_csv.select { |sc| sc.join(',') == line }.empty?
     end
   end
   diff_csv = CSV.open(
@@ -138,17 +139,12 @@ def csv_diff(opts = {})
   ).read
 
   # Write diff again with all columns.
-  csv_headers_orig = larger_csv_orig.first
   CSV.open(diff_path, 'w', col_sep: ',', quote_char: '"', force_quotes: true) do |csv|
-    if no_headers
-      larger_csv_orig.each_with_index do |line_arr, index|
-        csv.puts line_arr if diff_csv.select { |dc| dc == larger_csv[index] }.any?
-      end
-    else
-      csv.puts csv_headers_orig
-      larger_csv_orig[1..-1].each_with_index do |line_arr, index|
-        csv.puts line_arr if diff_csv.select { |dc| dc == larger_csv[index] }.any?
-      end
+    csv.puts larger_csv_orig.first unless no_headers
+    larger_csv_orig.each_with_index do |line_arr, index|
+      # Use larger_csv instead of orig to compare column redaction to diff_csv
+      line = larger_csv[index].join(',')
+      csv.puts line_arr if diff_csv.select { |dc| dc.join(',') == line }.any?
     end
   end
 end

lib/pwn/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PWN
-  VERSION = '0.4.686'
+  VERSION = '0.4.688'
 end