minitest-reporters-ws 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2ZiN2JhNzMyOWE1NWE1OTc2YjdhOWZlZDIyZTkyYTQwNDY1ZGZlNQ==
+    YzQxNTg3OTI5OTgzY2FmNTk2ODk5ZjEyYmQ1ZjI2ZGIyNzU0MDhkZA==
   data.tar.gz: !binary |-
-    YWFlMWRmZmRmNTAyMjE5MDQ1ZjUzZjNkYjcxOTUyY2QyMmY2ZTIxNA==
+    YTIwNzVjMDJmZjViMjljZGYwNTIzNDllODM4Yjg0NjBlNTAwMDM2NA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDJiMDcyNTRmMWJjNWEwN2U5ZjdiNTNiNjg4ODg0MmZmNDk2MzkyOTdhMzYx
-    NGM0N2RjM2MzOWIzZGZkNjA1MTNlYmMyNTRkODI3MWYxMjAxNjk1ZWY5ZjY5
-    M2JiYWMxZDg4ZWI4Njc2MzZkZTlmYTViZGE2YWViMjlmZmFkZmI=
+    N2VlYThjOTA2MTdkZmE2ZDBhNTEzODg3Nzk4MTExYTZhZGU3NTQzMGQ0Mzgz
+    NzlmZWI1YzYwN2JhMTBmMGM0MWM0MWJjMDIzOGY4YWVlNjIyNmNlODY1OGZh
+    MGI4YmMxZjcyYTljYTJjMjUwOGYxNzBmOGIxYTgyN2I2MTJiYjQ=
   data.tar.gz: !binary |-
-    MmZmMzY5MzZlYmZjNDcyMGI3MDZlZWExYmQwMTI0YmNiNjU2YTVjMWI4OTk5
-    NmQ5MGQ1YjE5NDE5MDAzZGZiM2RiYWE2Y2UwNDFjMjAwN2E4MTFhNzQ2YzVi
-    ODhkZjRlYzQwOTc1OGIxZDIxZGRhZDI4MzgwMDg5Yzk3OTJlYzI=
+    OGEwYjgyZjZiYzMyZTNkMjM1OGYyZmUyYzU0MmI0MmY5ZDg2YjE3MThiMzky
+    MzJmYTU3NWY3OTFlNmEwNDI2MmJkM2U0YmM5M2ZkMzI3NzBjZmRhM2YyZTdm
+    OGU0NDZiYmNkNDU4YmQ2MzI0MWMwNDg0ZjVmMGJjN2Q4MjAzNTE=

data/README.md

@@ -4,6 +4,8 @@ Minitest::Reporters::Ws
 The Minitest Formatter is working, but I need to work with the
 sinatra app to change the formatting of the results.
 
+> If you want to use it with Zeus, check out that branch
+
 ### Minitest Websocket Reporter
 
 > ala https://github.com/RyanScottLewis/rspec-web

data/lib/minitest/reporters/ws/client.rb

@@ -9,16 +9,21 @@ module Minitest::Reporters::Ws
     def initialize(opts = {})
       init_config(opts.delete(:yml), opts.delete(:config), opts.delete(:env))
       init_socket
-      identify
+    rescue => ex
+      puts ex.message
     end
 
     def identify
       data = { receiver: "server", method: "identify", arguments: ["rspec"] }
       @socket.send(data.to_json) if connected?
+    #rescue => ex
+    #  puts ex.message
     end
 
     def send_msg(data)
       @socket.send(data.to_json) if connected?
+    #rescue => ex
+    #  puts ex.message
     end
 
     def close
@@ -26,6 +31,8 @@ module Minitest::Reporters::Ws
       data = { receiver: "server", method: "disconnect", arguments: ["rspec"] }
       @socket.send(data.to_json) if connected?
       @socket.close if connected?
+    #rescue => ex
+    #  puts ex.message
     end
 
     def connected?
@@ -38,9 +45,9 @@ module Minitest::Reporters::Ws
       @timestamp = Time.now.to_i
       @socket = begin
         WebSocket.new("ws://localhost:10081")
-      rescue => ex
-        puts ex.message
-        nil
+      #rescue => ex
+      #  puts ex.message
+      #  nil
       end
     end
 

data/lib/minitest/reporters/ws/formatting.rb

@@ -12,7 +12,6 @@ module Minitest::Reporters::Ws
     end
 
     def print_info(e)
-      #puts 'fdsa'
       e.message.each_line { |line|  print_with_info_padding(line) }
 
       trace = filter_backtrace(e.backtrace)

data/lib/minitest/reporters/ws/messages.rb

@@ -10,24 +10,24 @@ module Minitest::Reporters::Ws
     end
 
     def start_new_iteration(test_count = 420)
-      @client.send_msg(messages[:start_new_iteration].merge arguments: [@timestamp, test_count])
+      client.send_msg(messages[:start_new_iteration].merge arguments: [@timestamp, test_count])
     end
 
     def add_to_passing(test)
-      @client.send_msg(prep_result(test, :add_to_passing))
+      client.send_msg(prep_result(test, :add_to_passing))
     end
 
     def add_to_pending(test)
-      @client.send_msg(prep_result(test, :add_to_pending))
+      client.send_msg(prep_result(test, :add_to_pending))
     end
 
     def add_to_failing(test)
-      @client.send_msg(prep_result(test, :add_to_failing))
+      client.send_msg(prep_result(test, :add_to_failing))
     end
 
     def add_to_erring(test)
       # for now, treating erring the same as failing
-      @client.send_msg(prep_result(test, :add_to_erring))
+      client.send_msg(prep_result(test, :add_to_erring))
     end
 
     private

data/lib/minitest/reporters/ws/reporter.rb

@@ -17,35 +17,39 @@ module Minitest::Reporters::Ws
     attr_accessor :timestamp
     attr_accessor :client
     attr_accessor :metadata
+    attr_accessor :test_count
 
     # MUTEX on MiniTest::ReporterRunner?
 
     def initialize(opts = {})
+
+      @config = conf = ::Minitest::Reporters::Ws::Client::DEFAULT_CONFIG
       @emoji = EMOJI.merge(opts.fetch(:emoji, {}))
 
       init_counts
       init_suite_counts
-      init_client
-      set_timestamp
     end
 
     def init_client
-      conf = ::Minitest::Reporters::Ws::Client::DEFAULT_CONFIG
-      find_or_create_client(conf)
+      client
+      #find_or_create_client(conf)
     end
 
     # MINITEST HOOKS
 
     def before_suites(suite, type)
+      init_client
+      set_timestamp
       set_metadata
-      start_new_iteration(metadata[:test_count])
       init_suite_counts
-      @client.identify
+      client.identify
+      total_tests = metadata[:test_count]
+      start_new_iteration(total_tests) if total_tests > 0
     end
 
     def after_suites(suites, type)
       print_after_suites
-      @client.close
+      client.close
     end
 
     def before_suite(suite)
@@ -60,11 +64,7 @@ module Minitest::Reporters::Ws
     end
 
     def before_test(suite,test)
-      #FIX_FOR_ZEUS!! (which seems to want to run tests twice)
-      #  on the second run,
-      #    these are still nil,
-      #    for some reason
-      #  oh i wish i knew why!
+      # need to move towards using metadata[:test_count], etc
       @test_count ||= 0
       @suite_test_count ||= 0
     end
@@ -100,30 +100,41 @@ module Minitest::Reporters::Ws
       add_to_erring(to_metadata(runner, test_runner))
     end
 
+    attr_accessor(:client)
+    def client
+      # when running in zeus, client becomes nil?
+      @client ||= ::Minitest::Reporters::Ws::Client.new(config: @config)
+    end
+
+    #def find_or_create_client
+      #client = ::Minitest::Reporters::Ws::Client.new(config: config)
+          #set_global_client(::Minitest::Reporters::Ws::Client.new(config: config))
+      # if global_client? && global_client
+      #  global_client
+      #else
+      #  set_global_client(::Minitest::Reporters::Ws::Client.new(config: config))
+      #end
+    #end
+
     # wanted this to be defined as a module accessor,
     #   so zeus will create the initial client
     #   when it initially loads up the minitest_helper
     # then subsequent test runs will use the same client
 
-    def global_client
-      ::Minitest::Reporters::Ws.class_variable_get("@@client")
-    end
-
-    def global_client=(c)
-      ::Minitest::Reporters::Ws.class_variable_set("@@client", c) unless global_client?
-    end
-
-    def global_client?
-      ::Minitest::Reporters::Ws.class_variable_defined?("@@client")
-    end
-
-    def find_or_create_client(config = {})
-      @client = if global_client?
-        global_client
-      else
-        ::Minitest::Reporters::Ws::Client.new(config: config)
-      end
-    end
+    # but... did the opposite of what i thought,
+    #   there are still a few issues with zeus
+
+    #def global_client
+    #  ::Minitest::Reporters::Ws.class_variable_get("@@client")
+    #end
+    #
+    #def set_global_client(c)
+    #  ::Minitest::Reporters::Ws.class_variable_set("@@client", c)
+    #end
+    #
+    #def global_client?
+    #  ::Minitest::Reporters::Ws.class_variable_defined?("@@client")
+    #end
 
     private
 

data/minitest-reporters-ws.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name = "minitest-reporters-ws"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.name          = "minitest-reporters-ws"
   s.authors       = ["David Conner"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-reporters-ws
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - David Conner