ruby formatting under powershell/BOSH.Sysprep

Author: aramprice

modules/BOSH.Sysprep/print_conflicted_from_audit_csv.rb

@@ -26,7 +26,7 @@ def uniq()
       values = x.split(',')
       keys = values[0..5].join('').downcase
       setting_value = values[6]
-      keys+setting_value
+      keys + setting_value
     end
 
     AuditFile.new(header, uniqed)
@@ -63,13 +63,13 @@ def merge(a, b)
   policy_target + ',' + subcategory
 end
 
-dups = grouped.keys.select {|k| grouped[k].size > 1}
+dups = grouped.keys.select { |k| grouped[k].size > 1 }
 
-if(dups.nil?)
+if dups.nil?
   puts "found 0 conflicts"
 else
   puts "found #{dups.size} conflicts"
-  dups.each {|x| puts x}
+  dups.each { |x| puts x }
 end
 
 merged_file = "audit-merged.csv"

modules/BOSH.Sysprep/print_conflicted_keys_from_inf_txt.rb

@@ -25,20 +25,20 @@ def self.from_string_array(sections)
     end
   end
 
-  def uniq()
+  def uniq
     trim_contents = contents.map { |x| x.strip }
-    Inf.new(name, trim_contents.uniq {|text| text.split('=')[0].downcase + text.split('=')[1..-1].join('')})
+    Inf.new(name, trim_contents.uniq { |text| text.split('=')[0].downcase + text.split('=')[1..-1].join('') })
   end
 
-  def sort()
+  def sort
     Inf.new(name, contents.sort)
   end
 
-  def size()
+  def size
     @contents.size
   end
 
-  def summary()
+  def summary
     "section: #{@name} size: #{size}"
   end
 end
@@ -55,16 +55,16 @@ def convert_to_utf8(name)
 end
 
 def merge(a, b)
-  a_no_comment = a.split("\r\n").reject {|x| x.strip.gsub(/^;.*/,'').empty?}.join("\r\n").strip
-  b_no_comment = b.split("\r\n").reject {|x| x.strip.gsub(/^;.*/,'').empty?}.join("\r\n").strip
+  a_no_comment = a.split("\r\n").reject { |x| x.strip.gsub(/^;.*/, '').empty? }.join("\r\n").strip
+  b_no_comment = b.split("\r\n").reject { |x| x.strip.gsub(/^;.*/, '').empty? }.join("\r\n").strip
 
   a_normalize_equals = a_no_comment.gsub(' = ', '=').gsub(" =\r\n", "=\r\n")
   b_normalize_equals = b_no_comment.gsub(' = ', '=').gsub(" =\r\n", "=\r\n")
 
   a_infs = Infs.from_string(a_normalize_equals)
   b_infs = Infs.from_string(b_normalize_equals)
 
-  (a_infs + b_infs).group_by {|x| x.name}.map {|section_name,infs| Inf.new(section_name, infs.map{|x| x.contents}.flatten)}
+  (a_infs + b_infs).group_by { |x| x.name }.map { |section_name, infs| Inf.new(section_name, infs.map { |x| x.contents }.flatten) }
 end
 
 a_contents = convert_to_utf8('GptTmpl-ms-baseline.inf')
@@ -92,17 +92,17 @@ def merge(a, b)
   elements = section.contents
   title = section.name
 
-  grouped = elements.group_by {|x| x.split("=")[0]}
-  dups = grouped.keys.select {|k| grouped[k].size > 1}
+  grouped = elements.group_by { |x| x.split("=")[0] }
+  dups = grouped.keys.select { |k| grouped[k].size > 1 }
 
-  if(dups.nil?)
+  if dups.nil?
     puts "found 0 conflicts in section #{title}"
   else
     puts "found #{dups.size} conflicts in section #{title}"
-    dups.each {|x| puts x}
+    dups.each { |x| puts x }
   end
 end
 
 new_file = 'GptTmpl-merged.inf'
-File.write new_file, sorted.map{|section| section.name + "\n" + section.contents.join("\n")}.join("\n")
+File.write new_file, sorted.map { |section| section.name + "\n" + section.contents.join("\n") }.join("\n")
 puts "merged files with uniques removed outputted to #{new_file}"

modules/BOSH.Sysprep/print_conflicted_registry_keys_from_pol_txt.rb

@@ -6,8 +6,8 @@ def convert_to_utf8(name)
 end
 
 def merge(a, b)
-  a_no_comment = a.split("\r\n").reject {|x| x[0] == ';' }.join("\r\n").strip
-  b_no_comment = b.split("\r\n").reject {|x| x[0] == ';' }.join("\r\n").strip
+  a_no_comment = a.split("\r\n").reject { |x| x[0] == ';' }.join("\r\n").strip
+  b_no_comment = b.split("\r\n").reject { |x| x[0] == ';' }.join("\r\n").strip
   a_no_comment.strip + "\r\n\r\n" + b_no_comment.strip
 end
 
@@ -27,14 +27,14 @@ def merge(a, b)
 end
 puts "after uniq: #{after_uniq.size}"
 
-library = after_uniq.group_by {|x| x.split("\r\n")[1..2].join('\\')}
-dups = library.keys.select {|k| library[k].size > 1}
+library = after_uniq.group_by { |x| x.split("\r\n")[1..2].join('\\') }
+dups = library.keys.select { |k| library[k].size > 1 }
 
-if(dups.nil?)
- puts "found 0 conflicts"
+if dups.nil?
+  puts "found 0 conflicts"
 else
- puts "found #{dups.size} conflicts"
- dups.each {|x| puts x}
+  puts "found #{dups.size} conflicts"
+  dups.each { |x| puts x }
 end
 
 merged_file = "registry-merged.txt"