pseudo_cleaner 0.0.46 → 0.0.47

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTRiN2Y5Yzk0OTQ2Y2Y1YWNiNjMyOGJlYzFhNjBmOGNiNWMyMjVkZQ==
+    YzY4NTJmZTA2N2VmNDc2NWVhZjM3ZWZhYTBlNjc0ZWFlMGZiNGQ0Mg==
   data.tar.gz: !binary |-
-    ZjM5OTY4Yzk5ZDA1YmRjOTkxNmY1MmU1NGQ5MjJlNmQzMDU4NjI3MQ==
+    MGIyOGM2YjI3YmE5MDJjZDMxOGFiZTFmNTU1MTFlNTQ2Nzc2MmFhMg==
 SHA512:
   metadata.gz: !binary |-
-    MzRkYjQ0MTU4NzQyOWFjNzdlYWE3NjM2MDE1MDUwYTBjNDRhZDRiOWM4Y2E3
-    NTM4MThjZDBiMjg1ZGJkNGEzNDE0NzM0ZDljZmY5YzQ1NGNiZmU0NWI0ODk2
-    YWFkYjhmMmZlZmM4ZjRlYTE2Mjc3ZDA4OTcwZmEyMzUyMTA2OGM=
+    OWU5MmY1YjdjMDNjMWFkYjY1YTljMWNhYmI2YzU1NWM5OGMwYjE0ZjQxNDEx
+    YWYwZDBmODA2ZWUxM2EzNDNlMzE1NmNmYWUzM2M3OTVjMGY2YzlmYWU2ZmFh
+    YWQ1ODg5MzM2YWFmMjZhODkxZWVlMmI3NWZkMDdlZDg4OTkzNDg=
   data.tar.gz: !binary |-
-    ZDY5MWQ0NTc2ZDMxMTdkNmMxMjhmZjYyN2NiN2UxODliZDRiMWI3NDU0NTdk
-    MWNlNzUyOGJiNzJiNDE1ZDA5ZWU5NzY3M2FmMTZhOTcyNDlmYTVhOWI1YzFm
-    NTFjOWY3OTY5ZDUzYTBkMWM2ZDFlZGQ0NmY4YmFiYWQwZWE2MTk=
+    MmQ5NjEyZTlmYjEwMDVhYjI2MmJlMjdjZTExZmMzZjhiMzc1ZDMzMmFmM2Nj
+    MjYwMmJlODY2ZWZkY2QxNWM2NmRjODgyNGEyMDI0NmM0OGU5ZTZjMWRjNmRh
+    NWFkYTBkYjBiZWMwNTFjZTdkMzYxOGJjMDNjMWQ4YjM4YjhkYmE=

data/lib/pseudo_cleaner/configuration.rb

@@ -20,6 +20,7 @@ module PseudoCleaner
     attr_accessor :enable_full_data_dump_tag
     attr_accessor :disable_cornucopia_output
     attr_accessor :benchmark
+    attr_accessor :redis_track_reads
 
     def self.current_instance
       self.instance
@@ -37,6 +38,7 @@ module PseudoCleaner
       @enable_full_data_dump_tag   = true
       @disable_cornucopia_output   = false
       @benchmark                   = false
+      @redis_track_reads           = false
     end
 
     # Backwards comaptibility...

data/lib/pseudo_cleaner/redis_cleaner.rb

@@ -355,6 +355,7 @@ module PseudoCleaner
       clear_set :@initial_keys
       clear_set :@suite_altered_keys
       clear_set :@updated_keys
+      clear_set :@read_keys
       clear_list_array :@multi_commands
       set_value_bool :@in_multi, false
       set_value_bool :@in_redis_cleanup, false
@@ -478,6 +479,10 @@ module PseudoCleaner
           if response
             add_set_values :@updated_keys, *extract_keys(*args)
           end
+        elsif track_reads && READ_COMMANDS.include?(args[0])
+          extract_keys(*args).each do |value|
+            add_set_value :@read_keys, "\"#{value}\" - \"#{response}\""
+          end
         end
       end
     end
@@ -614,9 +619,10 @@ module PseudoCleaner
       time = Benchmark.measure do
         puts "  RedisCleaner(#{redis_name})" if PseudoCleaner::Configuration.instance.benchmark
 
-        synchronize_test_values do |test_values|
-          if test_values && !test_values.empty?
+        synchronize_test_values do |test_values, read_values|
+          if (test_values && !test_values.empty?) || (read_values && !read_values.empty?)
             report_dirty_values "values altered before the test started", test_values
+            report_dirty_values "values read before the test started", read_values if track_reads
 
             test_values.each do |value|
               redis.del value unless set_includes?(:@initial_keys, value)
@@ -625,6 +631,7 @@ module PseudoCleaner
         end
 
         clear_set :@updated_keys
+        clear_set :@read_keys
       end
 
       puts "  RedisCleaner(#{redis_name}) time: #{time}" if PseudoCleaner::Configuration.instance.benchmark
@@ -634,12 +641,13 @@ module PseudoCleaner
       time = Benchmark.measure do
         puts "  RedisCleaner(#{redis_name})" if PseudoCleaner::Configuration.instance.benchmark
 
-        synchronize_test_values do |updated_values|
-          if updated_values && !updated_values.empty?
+        synchronize_test_values do |updated_values, read_values|
+          if (updated_values && !updated_values.empty?) || (read_values && !read_values.empty?)
             report_keys = []
 
             if @options[:output_diagnostics]
               report_dirty_values "updated values", updated_values
+              report_dirty_values "read values", read_values if track_reads
             end
 
             updated_values.each do |value|
@@ -656,6 +664,7 @@ module PseudoCleaner
         end
 
         clear_set :@updated_keys
+        clear_set :@read_keys
       end
 
       puts "  RedisCleaner(#{redis_name}) time: #{time}" if PseudoCleaner::Configuration.instance.benchmark
@@ -708,7 +717,7 @@ module PseudoCleaner
       time = Benchmark.measure do
         puts "  RedisCleaner(#{redis_name})" if PseudoCleaner::Configuration.instance.benchmark
 
-        synchronize_test_values do |updated_values|
+        synchronize_test_values do |updated_values, read_values|
           if updated_values && !updated_values.empty?
             updated_values.each do |updated_value|
               unless ignore_key(updated_value)
@@ -726,18 +735,37 @@ module PseudoCleaner
       time = Benchmark.measure do
         puts "  RedisCleaner(#{redis_name})" if PseudoCleaner::Configuration.instance.benchmark
 
-        synchronize_test_values do |updated_values|
-          if updated_values && !updated_values.empty?
+        synchronize_test_values do |updated_values, read_values|
+          if (updated_values && !updated_values.empty?) || (read_values && !read_values.empty?)
             output_values = false
 
+            updated_values = updated_values.select { |value| !ignore_key(value) }
+            read_values    = read_values.select { |value| !ignore_key(value) }
             if PseudoCleaner::MasterCleaner.report_table
               Cornucopia::Util::ReportTable.new(nested_table:         PseudoCleaner::MasterCleaner.report_table,
                                                 nested_table_label:   redis_name,
                                                 suppress_blank_table: true) do |report_table|
                 updated_values.each_with_index do |updated_value, index|
+                  updated_value, read_value = split_read_values(updated_value)
                   unless ignore_key(updated_value)
                     output_values = true
                     report_table.write_stats index.to_s, report_record(updated_value)
+                    report_table.write_stats "", read_value if read_value
+                  end
+                end
+              end
+
+              if track_reads
+                Cornucopia::Util::ReportTable.new(nested_table:         PseudoCleaner::MasterCleaner.report_table,
+                                                  nested_table_label:   "#{redis_name} - reads",
+                                                  suppress_blank_table: true) do |report_table|
+                  read_values.each_with_index do |updated_value, index|
+                    updated_value, read_value = split_read_values(updated_value)
+                    unless ignore_key(updated_value)
+                      output_values = true
+                      report_table.write_stats index.to_s, report_record(updated_value)
+                      report_table.write_stats "", read_value if read_value
+                    end
                   end
                 end
               end
@@ -745,9 +773,24 @@ module PseudoCleaner
               PseudoCleaner::Logger.write("  #{redis_name}")
 
               updated_values.each_with_index do |updated_value, index|
+                updated_value, read_value = split_read_values(updated_value)
                 unless ignore_key(updated_value)
                   output_values = true
                   PseudoCleaner::Logger.write("    #{index}: #{report_record(updated_value)}")
+                  PseudoCleaner::Logger.write("       #{read_value}") if read_value
+                end
+              end
+
+              if track_reads
+                PseudoCleaner::Logger.write("  #{redis_name} - reads")
+
+                read_values.each_with_index do |updated_value, index|
+                  updated_value, read_value = split_read_values(updated_value)
+                  unless ignore_key(updated_value)
+                    output_values = true
+                    PseudoCleaner::Logger.write("    #{index}: #{report_record(updated_value)}")
+                    PseudoCleaner::Logger.write("       #{read_value}") if read_value
+                  end
                 end
               end
             end
@@ -789,6 +832,8 @@ module PseudoCleaner
               NIL_FAIL_COMMANDS.include?(args[0]) ||
               NUM_CHANGED_COMMANDS.include?(args[0])
             add_set_values :@updated_keys, *extract_keys(*args)
+          elsif track_reads && READ_COMMANDS.include?(args[0])
+            add_set_values :@read_keys, *extract_keys(*args)
           end
         end
 
@@ -797,11 +842,12 @@ module PseudoCleaner
       end
 
       updated_values = get_set(:@updated_keys).dup
+      read_values    = get_set(:@read_keys).dup
 
       set_value_bool :@in_redis_cleanup, true
 
       begin
-        block.yield updated_values
+        block.yield updated_values, read_values
       ensure
         set_value_bool :@in_redis_cleanup, false
       end
@@ -812,6 +858,7 @@ module PseudoCleaner
       clear_set :@initial_keys, redis_keys
       clear_set :@suite_altered_keys
       clear_set :@updated_keys
+      clear_set :@read_keys
       clear_list_array :@multi_commands
       set_value_bool :@in_multi, false
       set_value_bool :@in_redis_cleanup, false
@@ -862,7 +909,18 @@ module PseudoCleaner
       key_hash
     end
 
+    def split_read_values(key)
+      if key =~ /\".*\" - \".*\"/
+        vals = key.split("\" - \"")
+        [vals[0][1..-1], vals[1..-1].join("\" - \"")[0..-2]]
+      else
+        [key, nil]
+      end
+    end
+
     def report_dirty_values message, test_values
+      test_values = test_values.select { |value| !ignore_key(split_read_values(value)[0]) }
+
       if test_values && !test_values.empty?
         output_values = false
 
@@ -872,18 +930,22 @@ module PseudoCleaner
                                             suppress_blank_table: true) do |report_table|
             report_table.write_stats "action", message
             test_values.each_with_index do |key_name, index|
+              key_name, read_value = split_read_values(key_name)
               unless ignore_key(key_name)
                 output_values = true
                 report_table.write_stats index, report_record(key_name)
+                report_table.write_stats("", read_value) if read_value
               end
             end
           end
         else
           test_values.each do |key_name|
+            key_name, read_value = split_read_values(key_name)
             unless ignore_key(key_name)
               PseudoCleaner::Logger.write("********* RedisCleaner - #{message}".red.on_light_white) unless output_values
               output_values = true
               PseudoCleaner::Logger.write("  #{key_name}: #{report_record(key_name)}".red.on_light_white)
+              PseudoCleaner::Logger.write("     #{read_value}".red.on_light_white) if read_value
             end
           end
         end
@@ -959,5 +1021,13 @@ module PseudoCleaner
 
       set
     end
+
+    def track_reads=(value)
+      @track_reads = value
+    end
+
+    def track_reads
+      @track_reads ||= PseudoCleaner::Configuration.instance.redis_track_reads
+    end
   end
 end

data/lib/pseudo_cleaner/version.rb

@@ -1,3 +1,3 @@
 module PseudoCleaner
-  VERSION = "0.0.46"
+  VERSION = "0.0.47"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pseudo_cleaner
 version: !ruby/object:Gem::Version
-  version: 0.0.46
+  version: 0.0.47
 platform: ruby
 authors:
 - RealNobody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize