blinka-reporter 0.3.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d84bd0f016744a88e06403d6f01f730004bf3cfb31b36394174f1335c12cd103
-  data.tar.gz: 3ab3b1744b8be12c29227e080ed0a39e6039ff63e0e883063d21b5c80a212290
+  metadata.gz: 53d0803a1ef9055ba4f96126c073557f1c609fa7744cfeaecf05434bc43bc49a
+  data.tar.gz: b6474ced0df1e5021351f4e1cede83eb4102450750b832845d63d49d534b018d
 SHA512:
-  metadata.gz: cd1ee46a25fb0c799ae89054c6b835f11aea3883420320d5809160b2315ad1eb93640aea7588b1509fb744c79dc7fb6a5a35b3b47ba493cdc81b2bcb65ee671a
-  data.tar.gz: 97c433c7f79f60e8441376f47fcc9d937e2d1c02db93d67793655aed288d0367eea13d02fa1a7833ff6a299611e3c971f121d8b5169cc7d0f2dcf4b93e0cde73
+  metadata.gz: e158fe5fc61ed571aaea0d0ebd45050731c41db9b148db1e3524ad54e3d345f430892109039228bc338d79d0a79d98ecbfc9bd7e5420c341eebabfa7abd3458b
+  data.tar.gz: e0210373323a0b51bf37d01ddbe7ddf7fdef61c966884296ef52d5ad79faf5f832900b5357276365291e76f72db844c0045e6984fc728089aeea769cf2b5c01f

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 = BlinkaClient.find_commit
 
       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)
@@ -198,11 +192,4 @@ class BlinkaClient
       }
     }
   end
-
-  def self.find_commit
-    ENV.fetch(
-      'BLINKA_COMMIT',
-      ENV.fetch('HEROKU_TEST_RUN_COMMIT_VERSION', `git rev-parse HEAD`.chomp)
-    )
-  end
 end

data/lib/blinka_minitest.rb

@@ -44,7 +44,7 @@ class BlinkaMinitest
     elsif @test_result.skipped?
       :skip
     elsif @test_result.failure
-      :failed
+      :fail
     else
       :pass
     end

data/lib/blinka_reporter/version.rb

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

data/lib/minitest/blinka_plugin.rb

@@ -11,6 +11,7 @@ module Minitest
   def plugin_blinka_options(opts, options); end
 
   module BlinkaPlugin
+    REPORT_PATH = 'blinka_results.json'.freeze
     TAP_COMMENT_PAD = 8
     class Reporter < Minitest::StatisticsReporter
       attr_accessor :tests
@@ -26,32 +27,38 @@ module Minitest
       end
 
       def report
+        super
+
         tap_report if ENV['BLINKA_TAP']
-        json_report if ENV['BLINKA_JSON'] || ENV['BLINKA_REPORT']
+        if ENV['BLINKA_JSON'] || ENV['BLINKA_REPORT']
+          json_report(append: !ENV['BLINKA_APPEND'].nil?)
+        end
         BlinkaClient.new.report if ENV['BLINKA_REPORT']
       rescue BlinkaClient::BlinkaError => error
         puts(error)
-      ensure
-        super
       end
 
       private
 
-      def json_report
+      def json_report(append:)
         result = {
           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 }
         }
+        result = append_previous(result) if append
 
-        File.open('blinka_results.json', 'w+') do |file|
+        File.open(REPORT_PATH, 'w+') do |file|
           file.write(JSON.pretty_generate(result))
         end
+
         puts
-        puts('Test results written to `./blinka_results.json`')
+        puts("Test results written to `#{REPORT_PATH}`")
       end
 
       # Based on https://github.com/kern/minitest-reporters/blob/master/lib/minitest/reporters/progress_reporter.rb
@@ -83,6 +90,36 @@ 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
+
+      private
+
+      def parse_report
+        return unless File.exist?(REPORT_PATH)
+        JSON.parse(File.read(REPORT_PATH))
+      end
+
+      def append_previous(result)
+        previous = parse_report
+        return if previous.nil?
+        return if result[:commit] != previous['commit']
+        return if result[:tag] != previous['tag']
+
+        result[:total_time] += previous['total_time'] || 0
+        result[:nbr_tests] += previous['nbr_tests'] || 0
+        result[:nbr_assertions] += previous['nbr_assertions'] || 0
+        result[:results] += previous['results'] || []
+        result
+      end
     end
   end
 end

metadata

@@ -1,43 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: blinka-reporter
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.5.0
 platform: ruby
 authors:
 - David Wessman
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-24 00:00:00.000000000 Z
+date: 2022-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !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
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -116,12 +108,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 +135,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: []