slacker 1.0.10 → 1.0.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2VhYWRjODA5Yjc1MjhlMjkyYWViZGM0YzVhM2ZjODE4MDU3MDRiZA==
+    ZmQ1YzM5YjRiZTEwMWQ3YjZhZjRkNjRiMmNiZTZmNTJjMzZjZTMxZQ==
   data.tar.gz: !binary |-
-    ZWE5ZjUyYzRiNmQ5OTY0MDdlNWQ4Yzc3NDE4YmUwNjA2MmE0YTE3OA==
+    OTY5NWUzNjlkOGZkZTJlMzM2YWFlOGJhYWZlMWY5ZmJmZDZjZjViMQ==
 SHA512:
   metadata.gz: !binary |-
-    MDQyY2I0M2FiZjM2MDc5ODhlNTg1YjI3ZTE2ZDVlY2ZkNDE1YzI2ZGIzOTcz
-    NDY0Yzk0NWQwOWVlZDk5NDJjYzJjOTY1NjlmZTQ0ZTg4N2E4ZDc4YzVjM2Iy
-    ODlmOGZmYmY4YjNmNTU0YzhlMWQxNmY0YzUwMjZmYzRiMTVmMDQ=
+    Yzc3ZmNiNDZhNzYwZTZlZjQ4ODE2Zjg0NTFhMjI1NGVmM2FiYjViZTgwOTY4
+    Yzc3YjI1NjFjYzJkODk3ZjEyY2JlYWZjMDVjOWNhYzY3OGRjODYxODQ2Y2Rj
+    MDI0OTNhOGVmYTAwYjFkOGMzMjA3YzUxYjI2ODJhODU0ZDBiYjQ=
   data.tar.gz: !binary |-
-    ZDA5MmEyYjRmMTE0Njc1YjMxMTA3NWQ1YTdjN2Q1MWY1NTMxOWZkZDhmNWY3
-    YmYyZjU5NjcxMzczYzU0ZGUyMjg3OGM2NTA5MDgwNzgwZDZkZWJlMjBjYmRj
-    NjBhZTJlZGM4MGQ1YWJmMzNmYzI1MTU0N2E3ZTZlMGQwOTg1NjE=
+    MDIyNTg0OWE5NDY1YzhhNWIzYmY5MGNhY2U4NjE1YmZjMGRjMDYyZDNhMWI2
+    Nzg0N2NmNmM1YTMwMjEwNzYxOTkzYWZhZTM3YjU5MTZmOWFiY2FhNWE4ZWM1
+    YjMzY2MzNzQzOGYwMGIxMDJjZTBiYzM4YjA5NjIyNDczYTYzYmQ=

data/bin/slacker

@@ -2,7 +2,7 @@
 require 'bundler/setup'
 require 'slacker'
 require 'yaml'
-require 'slacker/command_line_formatter2'
+require 'slacker/command_line_formatter'
 
 def db_config_from_file(file_path)
   dbconfig = nil

data/lib/slacker/application.rb

@@ -191,7 +191,7 @@ EOF
         config.output_stream = @configuration.output_stream
         config.error_stream = @configuration.error_stream
 
-        config.add_formatter(Slacker::CommandLineFormatter2)
+        config.add_formatter(Slacker::CommandLineFormatter)
      end
     end
 

data/lib/slacker/command_line_formatter.rb

@@ -4,6 +4,7 @@ require 'rspec/core/formatters/progress_formatter'
 module Slacker
   class CommandLineFormatter < RSpec::Core::Formatters::ProgressFormatter
     include Slacker::Formatter
+    RSpec::Core::Formatters.register self, :example_passed, :example_failed
 
     def initialize(output)
       super(output)
@@ -11,46 +12,47 @@ module Slacker
       @passed_examples_count = 0
     end
 
-    def example_passed(example)
-      process_example_debug_output(example, false)
-      super(example)
+    def example_passed(notification)
+      super(notification)
+      process_example_debug_output(notification, false)
     end
 
-    def example_failed(example)
-      process_example_debug_output(example, true)
-      super(example)
+    def example_failed(notification)
+      super(notification)
+      process_example_debug_output(notification, true)
     end
 
 private
 
-    def process_example_debug_output(example, example_failed)
+    def process_example_debug_output(notification, example_failed)
       if example_failed
         @failed_examples_count += 1
-        debug_output(example, Slacker.configuration.expand_path('debug/failed_examples'), @failed_examples_count, example_failed)
+        debug_output(notification, Slacker.configuration.expand_path('debug/failed_examples'), @failed_examples_count, example_failed)
       else
         @passed_examples_count += 1
-        debug_output(example, Slacker.configuration.expand_path('debug/passed_examples'), @passed_examples_count, example_failed)
+        debug_output(notification, Slacker.configuration.expand_path('debug/passed_examples'), @passed_examples_count, example_failed)
       end
     end
 
-    def debug_output(example, out_folder, file_number, example_failed)
+    def debug_output(notification, out_folder, file_number, example_failed)
       # Write out the SQL
       File.open("#{out_folder}/example_#{'%03d' % file_number}.sql", 'w') do |out_file|
-        out_file.write(get_formatted_example_sql(example, example_failed))
+        out_file.write(get_formatted_example_sql(notification, example_failed))
       end
     end
 
-    def get_formatted_example_sql(example, example_failed)
+    def get_formatted_example_sql(notification, example_failed)
+      example = notification.example
       sql = <<EOF
 -- Example "#{example.metadata[:full_description]}"
 -- #{example.metadata[:location]}
--- Executed at #{example.metadata[:execution_result][:started_at]}
+-- Executed at #{example.execution_result.started_at}
 
 #{example.metadata[:sql]}
 
 --               SLACKER RESULTS
 -- *******************************************
-#{example_failed ? example_failure_text(example).split("\n").collect{|line| '-- ' + line}.join("\n") : '--              Example Passed OK'}
+#{example_failed ? example_failure_text(notification).split("\n").collect{|line| '-- ' + line}.join("\n") : '--              Example Passed OK'}
 -- *******************************************
 EOF
       sql.strip

data/lib/slacker/version.rb

@@ -1,3 +1,3 @@
 module Slacker
-  VERSION = "1.0.10"
+  VERSION = "1.0.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slacker
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Vassil Kovatchev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,7 +75,6 @@ files:
 - lib/slacker.rb
 - lib/slacker/application.rb
 - lib/slacker/command_line_formatter.rb
-- lib/slacker/command_line_formatter2.rb
 - lib/slacker/configuration.rb
 - lib/slacker/formatter.rb
 - lib/slacker/query_result_matcher.rb

data/lib/slacker/command_line_formatter2.rb

@@ -1,61 +0,0 @@
-require 'slacker/formatter'
-require 'rspec/core/formatters/progress_formatter'
-
-module Slacker
-  class CommandLineFormatter2 < RSpec::Core::Formatters::ProgressFormatter
-    include Slacker::Formatter
-    RSpec::Core::Formatters.register self, :example_passed, :example_failed
-
-    def initialize(output)
-      super(output)
-      @failed_examples_count = 0
-      @passed_examples_count = 0
-    end
-
-    def example_passed(notification)
-      super(notification)
-      process_example_debug_output(notification, false)
-    end
-
-    def example_failed(notification)
-      super(notification)
-      process_example_debug_output(notification, true)
-    end
-
-private
-
-    def process_example_debug_output(notification, example_failed)
-      if example_failed
-        @failed_examples_count += 1
-        debug_output(notification, Slacker.configuration.expand_path('debug/failed_examples'), @failed_examples_count, example_failed)
-      else
-        @passed_examples_count += 1
-        debug_output(notification, Slacker.configuration.expand_path('debug/passed_examples'), @passed_examples_count, example_failed)
-      end
-    end
-
-    def debug_output(notification, out_folder, file_number, example_failed)
-      # Write out the SQL
-      File.open("#{out_folder}/example_#{'%03d' % file_number}.sql", 'w') do |out_file|
-        out_file.write(get_formatted_example_sql(notification, example_failed))
-      end
-    end
-
-    def get_formatted_example_sql(notification, example_failed)
-      example = notification.example
-      sql = <<EOF
--- Example "#{example.metadata[:full_description]}"
--- #{example.metadata[:location]}
--- Executed at #{example.execution_result.started_at}
-
-#{example.metadata[:sql]}
-
---               SLACKER RESULTS
--- *******************************************
-#{example_failed ? example_failure_text(notification).split("\n").collect{|line| '-- ' + line}.join("\n") : '--              Example Passed OK'}
--- *******************************************
-EOF
-      sql.strip
-    end
-  end
-end