blinka-reporter 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9db36c14f19ef2d7697dc175f050648686bb3364a9af178253d19ecc7af25c2b
-  data.tar.gz: f4988109d5c1df6c708fd595970c59d3aec179a4fce8b170792a07492061ccb0
+  metadata.gz: ad98fd45f2147f5fd55ca1d55c6f672feacbe41ac3b76b192ac6080992901107
+  data.tar.gz: 36abc057b50457b372f1edea9d1e6fadb3088ccf6e9f21db2da2be10d804bfb4
 SHA512:
-  metadata.gz: 5e79caca1a875bf579bde5dc0c306e7ec56265d15a41b86b6a0b0df61c1161eee24774d8f3063893b32d8034b25c1b89e9fe0aae45f0a9fedcca9b423a6086b2
-  data.tar.gz: cde67e49366ddcfdf564478664fae6cb1e6445a7bcc2c9a3782a0f651d30b70c1274b29c22b51d98fde4907c3ea7f93e7bf7a3702e1670a06ba8185b3cbfae3c
+  metadata.gz: 65e2258b6777627483a15f3b1b1d3a8abf3ad5b8f0d88b71f1b32c9745d22cbc6da165864074e00338bb0479c352305ca8841cc242936c4b1bd7a6cc42e43af8
+  data.tar.gz: a5bd248c55c5a164970326fe24a8277ea6b869ad9fab6f9fecab786166c9dc5e982521f2fea5ba9c18408a7023ff3cc39a41af83c67f56996205713e6fc567bf

data/lib/blinka_client.rb

@@ -1,29 +1,23 @@
-require 'mimemagic'
 require 'httparty'
 
 class BlinkaClient
   DEFAULT_HOST = 'https://www.blinka.app'.freeze
+  SUPPORTED_MIME_TYPES = {
+    jpg: 'image/jpeg',
+    jpeg: 'image/jpeg',
+    png: 'image/png'
+  }
 
   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', 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)
@@ -75,13 +69,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
       }
@@ -98,9 +92,7 @@ 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
@@ -124,7 +116,9 @@ class BlinkaClient
 
     file = File.open(filepath)
     filename = File.basename(filepath)
-    content_type = MimeMagic.by_magic(file).type
+    extension = File.extname(filepath).delete('.').to_sym
+    content_type = SUPPORTED_MIME_TYPES[extension]
+    return if content_type.nil?
 
     presigned_post =
       BlinkaClient.presign_image(filename: filename, content_type: content_type)

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
-      :failed
+    elsif @test_result.failure
+      :fail
     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.4.0'.freeze
+end

data/lib/minitest/blinka_plugin.rb

@@ -26,13 +26,13 @@ module Minitest
       end
 
       def report
+        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)
-      ensure
-        super
       end
 
       private
@@ -42,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 }
@@ -83,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.2
+  version: 0.4.0
 platform: ruby
 authors:
 - David Wessman
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-12 00:00:00.000000000 Z
+date: 2021-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.18.1
-- !ruby/object:Gem::Dependency
-  name: mimemagic
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -116,12 +102,18 @@ 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: {}
-post_install_message: 
+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:
 - lib
@@ -137,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.7
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Format tests for Blinka
 test_files: []