blinka-reporter 0.3.0 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fa8216d86cce40da5c4c423b473dcb6956302b017807ab383d93b94c32484fe
-  data.tar.gz: 1eabf2319cedab3b2378e087c66b36974fdc4dc0753ebd7cdb95f50300ac5df3
+  metadata.gz: 18126165bf1e12fccca242964c2086abcab1ad37f1ca6b089b5e02edcb0a64b5
+  data.tar.gz: fc47b4d956f56d7c7572e8fd11b4cd9d119d4e14929ac6f73ba35ee20a66abfd
 SHA512:
-  metadata.gz: 259de1e1edf5332fa682d95444a081d85cd2f55416ce183a92e4109822735ff594f70885cf3307d3045f8c7f9df73bc874a1ca7abb20523cd7e00980cbf3a6c5
-  data.tar.gz: b18f0a91507350ad8023894b7d237aab25a92683db6963c651d9267d316315a8f5233dcbc361355bd21e21530c181df4a318e7a1a3a353b5290d45bacaf817a4
+  metadata.gz: d362519ba45683ad4cddc22c9fbe7e2f5f72e4281ff5369bda0056789b90ae77d3ddf529728a7c5b305d55a633e719a297e6389c79e4f923138311be1777ce75
+  data.tar.gz: 34416bc8b028746deb93b11a684cfed331c0f7fcb0b0210cc216721faec0c41d99caf3b335a9750db3bc11c131850f04964372b50481a680a6cf1368ee7a1649

data/lib/blinka_client.rb

@@ -2,23 +2,18 @@ require 'mimemagic'
 require 'httparty'
 
 class BlinkaClient
+  DEFAULT_HOST = 'https://www.blinka.app'.freeze
+
+  include HTTParty
+
   class BlinkaConfig
-    attr_reader(
-      :tag,
-      :commit,
-      :host,
-      :repository,
-      :team_id,
-      :team_secret,
-      :jwt_token
-    )
+    attr_reader(:host, :repository, :team_id, :team_secret, :jwt_token)
+
     def initialize
-      @host = ENV.fetch('BLINKA_HOST', 'https://www.blinka.app')
+      @host = ENV.fetch('BLINKA_HOST', DEFAULT_HOST)
       @team_id = ENV.fetch('BLINKA_TEAM_ID', nil)
       @team_secret = ENV.fetch('BLINKA_TEAM_SECRET', nil)
       @repository = ENV.fetch('BLINKA_REPOSITORY', nil)
-      @tag = ENV.fetch('BLINKA_TAG', '')
-      @commit = ENV.fetch('BLINKA_COMMIT', `git rev-parse HEAD`.chomp)
 
       if @team_id.nil? || @team_secret.nil? || @repository.nil?
         raise(BlinkaError, <<~EOS)
@@ -32,7 +27,6 @@ class BlinkaClient
   end
 
   class BlinkaError < StandardError; end
-  include HTTParty
 
   def initialize
     @config = BlinkaConfig.new
@@ -40,12 +34,18 @@ class BlinkaClient
   end
 
   def report(filepath: './blinka_results.json')
-    unless File.exists?(filepath)
+    unless File.exist?(filepath)
       raise(
         BlinkaError,
         'Could not find blinka_results.json, did tests run with environment variable BLINKA_JSON=true set?'
       )
     end
+
+    if ENV.fetch('BLINKA_ALLOW_WEBMOCK_DISABLE', 'true') == 'true' &&
+         defined?(WebMock) && WebMock.respond_to?(:disable!)
+      WebMock.disable!
+    end
+
     self.authenticate
     data = JSON.parse(File.open(filepath).read)
 
@@ -65,13 +65,13 @@ class BlinkaClient
     body = {
       report: {
         repository: @config.repository,
-        tag: @config.tag,
-        commit: @config.commit,
+        tag: data['tag'],
+        commit: data['commit'],
         metadata: {
-          total_time: data.dig('total_time'),
-          nbr_tests: data.dig('nbr_tests'),
-          nbr_assertions: data.dig('nbr_assertions'),
-          seed: data.dig('seed')
+          total_time: data['total_time'],
+          nbr_tests: data['nbr_tests'],
+          nbr_assertions: data['nbr_assertions'],
+          seed: data['seed']
         }.compact,
         results: results
       }
@@ -88,12 +88,23 @@ class BlinkaClient
       )
     case response.code
     when 200
-      puts "Reported #{data.dig('nbr_tests')} tests of commit #{
-             @config.commit
-           }!"
+      puts "Reported #{data['nbr_tests']} tests of commit #{data['commit']}!"
     else
       raise(BlinkaError, "Could not report, got response code #{response.code}")
     end
+  rescue => error
+    raise(BlinkaError, <<-EOS)
+      BLINKA:
+        Failed to create report because of #{error.class} with message:
+        #{error.message}
+      EOS
+  ensure
+    WebMock.enable! if defined?(WebMock) && WebMock.respond_to?(:enable!)
+  end
+
+  def self.report(filepath: './blinka_results.json')
+    client = BlinkaClient.new
+    client.report(filepath: filepath)
   end
 
   def self.upload_image(filepath:)

data/lib/blinka_minitest.rb

@@ -1,5 +1,4 @@
 class BlinkaMinitest
-  attr_reader(:test_result)
   def initialize(test_result)
     @test_result = test_result
   end
@@ -8,14 +7,19 @@ class BlinkaMinitest
     @path ||= source_location.first.gsub(Dir.getwd, '').delete_prefix('/')
   end
 
+  def line
+    @line ||= source_location.last
+  end
+
   # Handle broken API in Minitest between 5.10 and 5.11
   # https://github.com/minitest-reporters/minitest-reporters/blob/e9092460b5a5cf5ca9eb375428217cbb2a7f6dbb/lib/minitest/reporters/default_reporter.rb#L159
   def source_location
-    if test_result.respond_to?(:klass)
-      test_result.source_location
-    else
-      test_result.method(test_result.name).source_location
-    end
+    @source_location ||=
+      if @test_result.respond_to?(:klass)
+        @test_result.source_location
+      else
+        @test_result.method(@test_result.name).source_location
+      end
   end
 
   def kind
@@ -24,47 +28,34 @@ class BlinkaMinitest
   end
 
   def message
-    failure = test_result.failure
+    failure = @test_result.failure
     return unless failure
     "#{failure.error.class}: #{failure.error.message}"
   end
 
   def backtrace
-    return unless test_result.failure
-    Minitest.filter_backtrace(test_result.failure.backtrace)
+    return unless @test_result.failure
+    Minitest.filter_backtrace(@test_result.failure.backtrace)
   end
 
   def result
-    if test_result.error?
+    if @test_result.error?
       :error
-    elsif test_result.skipped?
+    elsif @test_result.skipped?
       :skip
-    elsif test_result.failure
+    elsif @test_result.failure
       :failed
     else
       :pass
     end
   end
 
-  def line
-    current_backtrace = backtrace
-    return if current_backtrace.nil?
-
-    row =
-      current_backtrace
-        .map { |row| row.split(':')[0..1] }
-        .detect { |row| row[0] == path }
-
-    return if row.nil?
-    row[1].to_i
-  end
-
   def time
-    test_result.time
+    @test_result.time
   end
 
   def name
-    test_result.name
+    @test_result.name
   end
 
   def image

data/lib/blinka_reporter/version.rb

@@ -0,0 +1,3 @@
+module BlinkaReporter
+  VERSION = '0.3.5'.freeze
+end

data/lib/minitest/blinka_plugin.rb

@@ -1,6 +1,7 @@
 require 'minitest'
 require 'json'
 require 'blinka_minitest'
+require 'blinka_client'
 
 module Minitest
   def self.plugin_blinka_init(options)
@@ -25,10 +26,13 @@ module Minitest
       end
 
       def report
-        tap_report unless ENV['BLINKA_TAP'].nil?
-        json_report unless ENV['BLINKA_JSON'].nil?
-
         super
+
+        tap_report if ENV['BLINKA_TAP']
+        json_report if ENV['BLINKA_JSON'] || ENV['BLINKA_REPORT']
+        BlinkaClient.new.report if ENV['BLINKA_REPORT']
+      rescue BlinkaClient::BlinkaError => error
+        puts(error)
       end
 
       private
@@ -38,6 +42,8 @@ module Minitest
           total_time: total_time,
           nbr_tests: count,
           nbr_assertions: assertions,
+          commit: find_commit,
+          tag: ENV.fetch('BLINKA_TAG', ''),
           seed: options[:seed],
           results:
             tests.map { |test_result| BlinkaMinitest.new(test_result).report }
@@ -79,6 +85,16 @@ module Minitest
       def print_padded_comment(line)
         puts "##{' ' * TAP_COMMENT_PAD + line}"
       end
+
+      def find_commit
+        ENV.fetch(
+          'BLINKA_COMMIT',
+          ENV.fetch(
+            'HEROKU_TEST_RUN_COMMIT_VERSION',
+            `git rev-parse HEAD`.chomp
+          )
+        )
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blinka-reporter
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.5
 platform: ruby
 authors:
 - David Wessman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-08 00:00:00.000000000 Z
+date: 2021-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.11'
 description: Use to format test results from Minitest to use with Blinka.
 email: david@wessman.co
 executables: []
@@ -102,11 +116,17 @@ extra_rdoc_files: []
 files:
 - lib/blinka_client.rb
 - lib/blinka_minitest.rb
+- lib/blinka_reporter/version.rb
 - lib/minitest/blinka_plugin.rb
 homepage: https://github.com/davidwessman/blinka_reporter
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: https://github.com/davidwessman/blinka_reporter
+  bug_tracker_uri: https://github.com/davidwessman/blinka_reporter/issues
+  documentation_uri: https://github.com/davidwessman/blinka_reporter
+  changelog_uri: https://github.com/davidwessman/blinka_reporter/main/CHANGELOG.md
+  source_code_uri: https://github.com/davidwessman/blinka_reporter
 post_install_message: 
 rdoc_options: []
 require_paths: