pseudo_cleaner 0.0.37 → 0.0.38

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTU3YzBmZmU2MGY1ZDY2YTM1M2M2YzcwNzRhY2U0ZTE0ZTVhNDc3Yw==
+    OTk2NTg5N2FhYmRiYjJmYzkyMzA5NGE1YjhmZTNlYTE4MjhlODk1OQ==
   data.tar.gz: !binary |-
-    MjE1N2Y2MGI1ZGFkYWExMjJiYzA0MDU1M2I4MTBkN2YyNDdmY2EyZg==
+    ZjgwZDExYmRhNWE5YjE5OTAyZTY3OGIzNjdkZjEwMTFkOGVlYTNlNA==
 SHA512:
   metadata.gz: !binary |-
-    MDZiNGQ3M2QxMDRlMTQyNGRjMDY2N2FiMmNmNGI3MWE3Mzk0MmNmODAyMmQw
-    MjA5ZjJmZGQ1N2YyYjc2Zjg5MDQyZGM5ZjdhYmIyNWM5Y2RjNmJjODUzNTdh
-    NjRlYzU3OTA1NDU2N2NiMDg5NzczMDc5ODZjZWUwZTlhOWFhZWM=
+    NWUwMDhlY2FjYzVjOWNiYjc4ZWEwMGY3NmU2YjA4MjRhMjg5MDkwNTkwNzFl
+    NWUyZjA2MjdhMTg1NDJhYjgwNGY0MDAxZGYwMDg1OWJjN2RmNDdkYmMyNTVl
+    OThiODEwYWZmZmFiM2MxZjBiY2RjYTQxYTAyMTVhZTVkMTczNjk=
   data.tar.gz: !binary |-
-    YzcxMTcxOWQ1NzMyMjUxN2YwODAwY2RjY2RjMDMwMzQ0NzkzMjE3MzM5MGIz
-    ZDA1ZDE2YjAzYTNiNzUwMjllMTkwYThmZGJjMTI3MzkxYjRjNzcxY2EzODk2
-    YzU2ZmM0MTI4MDcyNjExM2NmMjdhMmIwMzkzZTkwM2U1MmFmOTc=
+    ZjhjNjI1MmVmOTRjYWE1MTY1OTg2Y2EwZDg4Zjk5ZDRhZTk1ZDg2NWU4MDU2
+    NDhjZWFmY2JmNGRjZGQxN2Q5MTljYmVhMGRjYTNkNGFjZDI0MTAyMmMwMDZh
+    YjdlNGQ0NmI2NGFiNzQ1MDZlNTg5YWZhNjA2YjQxNTllNmQxODk=

data/lib/pseudo_cleaner/cucumber.rb

@@ -33,11 +33,24 @@ class CucumberHook
   end
 
   def start_test(scenario, strategy)
-    PseudoCleaner::MasterCleaner.start_example(scenario, strategy, "PseudoCleaner::start_test - #{report_name(scenario)}")
+    PseudoCleaner::MasterCleaner.start_example(scenario,
+                                               strategy,
+                                               description: "PseudoCleaner::start_test - #{report_name(scenario)}",
+                                               location:    test_location(scenario))
   end
 
   def end_test(scenario)
-    PseudoCleaner::MasterCleaner.end_example(scenario, "PseudoCleaner::end_test - #{report_name(scenario)}")
+    PseudoCleaner::MasterCleaner.end_example(scenario,
+                                             description: "PseudoCleaner::end_test - #{report_name (scenario)}",
+                                             location:    test_location(scenario))
+  end
+
+  def test_location(scenario)
+    if scenario.respond_to?(:feature)
+      "#{scenario.location.file}:#{scenario.location.line}"
+    elsif scenario.respond_to?(:scenario_outline)
+      "#{scenario.scenario_outline.instance_variable_get(:@example_sections)[0][0][0].file}:#{scenario.scenario_outline.instance_variable_get(:@example_sections)[0][0][0].line}"
+    end
   end
 
   def report_name(scenario)
@@ -60,11 +73,13 @@ class CucumberHook
   end
 
   def peek_data_inline(scenario)
-    PseudoCleaner::MasterCleaner.peek_data_inline("PseudoCleaner::peek_data - #{report_name(scenario)}")
+    PseudoCleaner::MasterCleaner.peek_data_inline(description: "PseudoCleaner::peek_data - #{report_name(scenario)}",
+                                                  location:    test_location(scenario))
   end
 
   def peek_data_new_test(scenario)
-    PseudoCleaner::MasterCleaner.peek_data_new_test("PseudoCleaner::peek_data - #{report_name(scenario)}")
+    PseudoCleaner::MasterCleaner.peek_data_new_test(description: "PseudoCleaner::peek_data - #{report_name(scenario)}",
+                                                    location:    test_location(scenario))
   end
 end
 

data/lib/pseudo_cleaner/master_cleaner.rb

@@ -32,16 +32,20 @@ module PseudoCleaner
         @@report_error = true
       end
 
-      def within_report_block(description, &block)
+      def within_report_block(options, &block)
         @@report_error = false
         @@report_table = nil
 
         if Object.const_defined?("Cornucopia", false) &&
             Cornucopia.const_defined?("Util", false) &&
             Cornucopia::Util.const_defined?("ReportBuilder", false)
-          Cornucopia::Util::ReportBuilder.current_report.within_test(description) do
-            Cornucopia::Util::ReportBuilder.current_report.within_section(description) do |report|
+          Cornucopia::Util::ReportBuilder.current_report.within_test(options[:description]) do
+            Cornucopia::Util::ReportBuilder.current_report.within_section(options[:description]) do |report|
               report.within_table do |report_table|
+                if options[:location]
+                  report_table.write_stats "location", options[:location]
+                end
+
                 @@report_table = report_table
 
                 block.yield
@@ -62,7 +66,7 @@ module PseudoCleaner
       def start_suite(description = nil)
         description ||= "PseudoCleaner::MasterCleaner.start_suite"
 
-        within_report_block(description) do
+        within_report_block(description: description) do
           if @@suite_cleaner
             @@suite_cleaner.reset_suite
           end
@@ -85,10 +89,10 @@ module PseudoCleaner
         end
       end
 
-      def start_example(example_class, strategy, description = nil)
-        description ||= "PseudoCleaner::MasterCleaner.start_example"
+      def start_example(example_class, strategy, options = {})
+        options[:description] ||= "PseudoCleaner::MasterCleaner.start_example"
 
-        within_report_block(description) do
+        within_report_block(options) do
           pseudo_cleaner_data                 = {}
           pseudo_cleaner_data[:test_strategy] = strategy
 
@@ -107,10 +111,10 @@ module PseudoCleaner
         end
       end
 
-      def end_example(example_class, description = nil)
-        description ||= "PseudoCleaner::MasterCleaner.end_example"
+      def end_example(example_class, options = {})
+        options[:description] ||= "PseudoCleaner::MasterCleaner.end_example"
 
-        within_report_block(description) do
+        within_report_block(options) do
           pseudo_cleaner_data = example_class.instance_variable_get(:@pseudo_cleaner_data)
 
           unless pseudo_cleaner_data[:test_strategy] == :none
@@ -131,7 +135,7 @@ module PseudoCleaner
       def end_suite(description = nil)
         description ||= "PseudoCleaner::MasterCleaner.end_suite"
 
-        within_report_block(description) do
+        within_report_block(description: description) do
           @@suite_cleaner.end test_strategy: :pseudo_delete if @@suite_cleaner
         end
       end
@@ -171,7 +175,7 @@ module PseudoCleaner
       def reset_database(description = nil)
         description ||= "PseudoCleaner::MasterCleaner.reset_database"
 
-        within_report_block(description) do
+        within_report_block(description: description) do
           PseudoCleaner::MasterCleaner.database_cleaner.clean_with(:truncation)
 
           PseudoCleaner::MasterCleaner.database_reset
@@ -340,18 +344,23 @@ module PseudoCleaner
         @@suite_cleaner.review_rows(&block)
       end
 
-      def peek_data_inline(description = nil)
+      def peek_data_inline(options = {})
         @@report_error = false
         @@report_table = nil
 
         if Object.const_defined?("Cornucopia", false) &&
             Cornucopia.const_defined?("Util", false) &&
             Cornucopia::Util.const_defined?("ReportBuilder", false)
-          Cornucopia::Util::ReportBuilder.current_report.within_section(description) do |report|
+          Cornucopia::Util::ReportBuilder.current_report.within_section(options[:description]) do |report|
             report.within_hidden_table do |outer_report_table|
               Cornucopia::Util::ReportTable.new(
                   nested_table:         outer_report_table,
                   suppress_blank_table: true) do |report_table|
+                # redundant, but I like it because it is consistent.
+                if options[:location]
+                  report_table.write_stats "location", options[:location]
+                end
+
                 @@report_table = report_table
 
                 peek_values
@@ -361,16 +370,16 @@ module PseudoCleaner
 
           @@report_table = nil
         else
-          PseudoCleaner::Logger.write(description)
+          PseudoCleaner::Logger.write(options[:description])
 
           peek_values
         end
       end
 
-      def peek_data_new_test(description = nil)
-        description ||= "PseudoCleaner::MasterCleaner.peek_data"
+      def peek_data_new_test(options = {})
+        options[:description] ||= "PseudoCleaner::MasterCleaner.peek_data"
 
-        within_report_block(description) do
+        within_report_block(options) do
           peek_values
         end
       end

data/lib/pseudo_cleaner/redis_cleaner.rb

@@ -241,7 +241,9 @@ module PseudoCleaner
           @multi_commands = []
         elsif ["exec", "pipelined"].include?(args[0])
           begin
-            raise "exec response does not match sent commands" unless response.length == @multi_commands.length
+            if (!response && @multi_commands.length > 0) || (response && response.length != @multi_commands.length)
+              raise "exec response does not match sent commands.\n  response: #{response}\n commands: #{@multi_commands}"
+            end
 
             response.each_with_index do |command_response, index|
               process_command(command_response, *(@multi_commands[index]))
@@ -389,7 +391,7 @@ module PseudoCleaner
           updated_values.each do |value|
             if initial_keys.include?(value)
               report_keys << value
-              @suite_altered_keys << value
+              @suite_altered_keys << value unless ignore_key(value)
             else
               redis.del(value)
             end
@@ -448,20 +450,20 @@ module PseudoCleaner
             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 do |updated_value|
+              updated_values.each_with_index do |updated_value, index|
                 unless ignore_key(updated_value)
                   output_values = true
-                  report_table.write_stats updated_value, report_record(updated_value)
+                  report_table.write_stats index.to_s, report_record(updated_value)
                 end
               end
             end
           else
             PseudoCleaner::Logger.write("  #{redis_name}")
 
-            updated_values.each do |updated_value|
+            updated_values.each_with_index do |updated_value, index|
               unless ignore_key(updated_value)
                 output_values = true
-                PseudoCleaner::Logger.write("    #{updated_value}: #{report_record(updated_value)}")
+                PseudoCleaner::Logger.write("    #{index}: #{report_record(updated_value)}")
               end
             end
           end

data/lib/pseudo_cleaner/rspec.rb

@@ -48,7 +48,10 @@ RSpec.configure do |config|
     new_strategy ||= :transaction
 
     report_name = test_example.full_description
-    PseudoCleaner::MasterCleaner.start_example(test_example, new_strategy, "PseudoCleaner::start_test - #{report_name}")
+    PseudoCleaner::MasterCleaner.start_example(test_example,
+                                               new_strategy,
+                                               description: "PseudoCleaner::start_test - #{report_name}",
+                                               location:    test_example.location)
   end
 
   config.after(:each) do |example|
@@ -61,26 +64,32 @@ RSpec.configure do |config|
       if (test_example.exception)
         if PseudoCleaner::Configuration.instance.enable_full_data_dump_tag ||
             PseudoCleaner::Configuration.instance.peek_data_on_error
-          PseudoCleaner::MasterCleaner.peek_data_inline("PseudoCleaner::peek_data - #{report_name}")
+          PseudoCleaner::MasterCleaner.peek_data_inline(description: "PseudoCleaner::peek_data - #{report_name}",
+                                                        location:    test_example.location)
         end
       else
         if PseudoCleaner::Configuration.instance.enable_full_data_dump_tag ||
             PseudoCleaner::Configuration.instance.peek_data_not_on_error
-          PseudoCleaner::MasterCleaner.peek_data_new_test("PseudoCleaner::peek_data - #{report_name}")
+          PseudoCleaner::MasterCleaner.peek_data_new_test(description: "PseudoCleaner::peek_data - #{report_name}",
+                                                          location:    test_example.location)
         end
       end
     else
       if (test_example.exception)
         if PseudoCleaner::Configuration.instance.peek_data_on_error
-          PseudoCleaner::MasterCleaner.peek_data_inline("PseudoCleaner::peek_data - #{report_name}")
+          PseudoCleaner::MasterCleaner.peek_data_inline(description: "PseudoCleaner::peek_data - #{report_name}",
+                                                        location:    test_example.location)
         end
       else
         if PseudoCleaner::Configuration.instance.peek_data_not_on_error
-          PseudoCleaner::MasterCleaner.peek_data_new_test("PseudoCleaner::peek_data - #{report_name}")
+          PseudoCleaner::MasterCleaner.peek_data_new_test(description: "PseudoCleaner::peek_data - #{report_name}",
+                                                          location:    test_example.location)
         end
       end
     end
 
-    PseudoCleaner::MasterCleaner.end_example(test_example, "PseudoCleaner::end_test - #{report_name}")
+    PseudoCleaner::MasterCleaner.end_example(test_example,
+                                             description: "PseudoCleaner::end_test - #{report_name}",
+                                             location:    test_example.location)
   end
 end

data/lib/pseudo_cleaner/spinach.rb

@@ -38,7 +38,9 @@ Spinach.hooks.around_scenario do |scenario_data, step_definitions, &block|
                 else
                   :pseudo_delete
                 end
-  PseudoCleaner::MasterCleaner.start_example(scenario_data, strategy, "PseudoCleaner::start_test - #{report_name}")
+  PseudoCleaner::MasterCleaner.start_example(scenario_data,
+                                             strategy,
+                                             description: "PseudoCleaner::start_test - #{report_name}")
 
   begin
     block.call
@@ -47,27 +49,28 @@ Spinach.hooks.around_scenario do |scenario_data, step_definitions, &block|
       if PseudoCleaner::SpinachErrorHandler.exception
         if PseudoCleaner::Configuration.instance.enable_full_data_dump_tag ||
             PseudoCleaner::Configuration.instance.peek_data_on_error
-          PseudoCleaner::MasterCleaner.peek_data_inline("PseudoCleaner::peek_data - #{report_name}")
+          PseudoCleaner::MasterCleaner.peek_data_inline(description: "PseudoCleaner::peek_data - #{report_name}")
         end
       else
         if PseudoCleaner::Configuration.instance.enable_full_data_dump_tag ||
             PseudoCleaner::Configuration.instance.peek_data_not_on_error
-          PseudoCleaner::MasterCleaner.peek_data_new_test("PseudoCleaner::peek_data - #{report_name}")
+          PseudoCleaner::MasterCleaner.peek_data_new_test(description: "PseudoCleaner::peek_data - #{report_name}")
         end
       end
     else
       if PseudoCleaner::SpinachErrorHandler.exception
         if PseudoCleaner::Configuration.instance.peek_data_on_error
-          PseudoCleaner::MasterCleaner.peek_data_inline("PseudoCleaner::peek_data - #{report_name}")
+          PseudoCleaner::MasterCleaner.peek_data_inline(description: "PseudoCleaner::peek_data - #{report_name}")
         end
       else
         if PseudoCleaner::Configuration.instance.peek_data_not_on_error
-          PseudoCleaner::MasterCleaner.peek_data_new_test("PseudoCleaner::peek_data - #{report_name}")
+          PseudoCleaner::MasterCleaner.peek_data_new_test(description: "PseudoCleaner::peek_data - #{report_name}")
         end
       end
     end
 
-    PseudoCleaner::MasterCleaner.end_example(scenario_data, "PseudoCleaner::end_test - #{report_name}")
+    PseudoCleaner::MasterCleaner.end_example(scenario_data,
+                                             description: "PseudoCleaner::end_test - #{report_name}")
     PseudoCleaner::SpinachErrorHandler.exception = nil
   end
 end

data/lib/pseudo_cleaner/table_cleaner.rb

@@ -736,8 +736,8 @@ module PseudoCleaner
         else
           PseudoCleaner::Logger.write("  #{peek_name}")
 
-          row_data.each do |updated_value|
-            PseudoCleaner::Logger.write("    #{updated_value}")
+          row_data.each_with_index do |updated_value, index|
+            PseudoCleaner::Logger.write("    #{index}: #{updated_value}")
           end
         end
 

data/lib/pseudo_cleaner/version.rb

@@ -1,3 +1,3 @@
 module PseudoCleaner
-  VERSION = "0.0.37"
+  VERSION = "0.0.38"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pseudo_cleaner
 version: !ruby/object:Gem::Version
-  version: 0.0.37
+  version: 0.0.38
 platform: ruby
 authors:
 - RealNobody