blinka-reporter 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d5dac4b2e59cda85f61acde510a71b5f735d5584ab3aba859a6a01b1af73664
-  data.tar.gz: 3d2ad1ee927ef0d09d8585c067ece1975799705f0ce964ed094f3f19cd7cfe7e
+  metadata.gz: 0e38a0d8af21650a7cfb551b735e8431b5b41ac746d370a894d506cd3a73e619
+  data.tar.gz: 43476fae029f71235e2cca909385a14a4b9ea85b712dc0182c26c4bd91471752
 SHA512:
-  metadata.gz: 9f6ed24e9caaf3c740064eaaa229717a24a52d41d2bcdf02650e5f3b151dd04beedc72950411a4a813aebc445e7a6316f991d9c9a42d5283b5378009752f8c13
-  data.tar.gz: 6364c8edf5577d79ae45ac4bf1afaff97faa68d39aa41e2bf3d888c122b90d38cd9108e4a615bfe8fc2ca67332255fb3da63efea34da8b247978d931861e2b65
+  metadata.gz: 1c5ab57ba4038477fd56fffb5f8628cee862b973db2b5bb9aa828dd5edb5f75c7a32209b625f262fbce4463c86df11927a0dd818a3c163dde7c48c2c87edb203
+  data.tar.gz: a63ce0796100d73fb7fd48689f7a799b84a321a39e92487e207b123bce30970f66c30b5679a72975aab84fdf99b583e5c8ebf25f8d5f4e03b04b0d4ee97a4c31

data/.github/workflows/main.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.6", "2.7", "3.0", "3.1"]
+        ruby: ["2.7", "3.0", "3.1", "3.2"]
 
     steps:
       - name: Checkout code

data/.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx lint-staged

data/CHANGELOG.md

@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.8.0] - 2023-03-04
+
+- Removes support for reporting to Blinka, removing the need for httparty.
+- Makes `Capybara.save_path` relative to the current working directory for images
+
+## [0.7.2] - 2023-02-19
+
+- Adds support for `BLINKA_APPEND=true` to append to existing JSON-files.
+
 ## [0.7.1] - 2023-02-19
 
 - Handles empty test results.

data/README.md

@@ -16,7 +16,7 @@ gem install blinka-reporter
 or add to your Gemfile
 
 ```ruby
-gem 'blinka-reporter', '~> 0.7.0'
+gem 'blinka-reporter', '~> 0.7.2'
 ```
 
 ## Which ruby testing frameworks are supported?
@@ -48,11 +48,6 @@ Make sure [rspec_junit_formatter](https://github.com/sj26/rspec_junit_formatter)
 bundle exec rspec --formatter RspecJunitFormatter --out ./rspec.xml
 ```
 
-## How to send report to Blinka?
-
-1. Output your test results as described [above](#how-to-generate-test-report-in-the-right-format).
-1. `bundle exec blinka_reporter --path {./blinka_results.json,./rspec.xml} --blinka --team-id <BLINKA_TEAM_ID> --team-secret <BLINKA_TEAM_SECRET> --repository davidwessman/blinka_reporter`
-
 ## How can I send report in Github Action?
 
 Add a step to your Github Action Workflow after running tests:
@@ -60,36 +55,47 @@ Add a step to your Github Action Workflow after running tests:
 ```yaml
 - name: Minitest
   env:
-    BLINKA_JSON: true
+    BLINKA_PATH: ./results.json
   run: bundle exec rake test
 
-- name: Report minitest to Blinka
+// Add a tag to be able to separate multiple jobs, e.g. "ruby-${{ matrix.ruby }}".
+// This is optional.
+- name: Export Blinka-metadata
+  if: always()
   run: |
-    bundle exec blinka_reporter \
-      --path ./blinka_results.json \
-      --blinka \
-      --commit ${{ github.event.pull_request.head.sha || github.sha }} \
-      --repository davidwessman/blinka_reporter \
-      --team-id ${{ secrets.BLINKA_TEAM_ID }} \
-      --team-secret ${{ secrets.BLINKA_TEAM_SECRET }}
+    echo "ruby gem" > ./blinka_tag
+
+// Archive all files required by Blinka, json, the tag and any images.
+// Blinka will automatically fetch the results when the Github Action Workflow is finished.
+- name: Archive results for Blinka
+  if: always()
+  uses: actions/upload-artifact@v3
+  with:
+    name: blinka-${{ strategy.job-index }}
+    path: |
+      ./results.json
+      ./blinka_tag
 ```
 
 ```yaml
 - name: Rspec
   run: bundle exec rspec --formatter RspecJunitFormatter --out ./rspec.xml
-- name: Report minitest to Blinka
+
+- name: Export Blinka-metadata
+  if: always()
   run: |
-    bundle exec blinka_reporter \
-      --path ./rspec.xml \
-      --blinka \
-      --commit ${{ github.event.pull_request.head.sha || github.sha }} \
-      --repository davidwessman/blinka_reporter \
-      --team-id ${{ secrets.BLINKA_TEAM_ID }} \
-      --team-secret ${{ secrets.BLINKA_TEAM_SECRET }}
+    echo "ruby gem" > ./blinka_tag
+
+- name: Archive results for Blinka
+  if: always()
+  uses: actions/upload-artifact@v3
+  with:
+    name: blinka-${{ strategy.job-index }}
+    path: |
+      ./rspec.xml
+      ./blinka_tag
 ```
 
-`--tag` is optional and can be used to separate different reports, for example when using a build matrix.
-
 ## How to make multiple test runs into one report?
 
 For example when running tests in parallel you might need to run system tests separately.
@@ -104,19 +110,36 @@ Output the test results to different paths with `BLINKA_PATH`.
 
 - name: Tests
   env:
-    BLINKA_JSON: ./tests.json
+    BLINKA_PATH: ./tests.json
   run: bundle exec rails test
 
-- name: Report to Blinka
-  run: |
-    bundle exec blinka_reporter \
-      --path ./system_tests.json \
-      --path ./tests.json \
-      --blinka \
-      --commit ${{ github.event.pull_request.head.sha || github.sha }} \
-      --repository davidwessman/blinka_reporter \
-      --team-id ${{ secrets.BLINKA_TEAM_ID }} \
-      --team-secret ${{ secrets.BLINKA_TEAM_SECRET }}
+- name: Archive results for Blinka
+  if: always()
+  uses: actions/upload-artifact@v3
+  with:
+    name: blinka-${{ strategy.job-index }}
+    path: |
+      ./tests.json
+      ./system_tests.json
+      ./blinka_tag
+```
+
+## How can I run multiple test runs to one file?
+
+For Minitest this can be done by setting `BLINKA_APPEND=true`, make sure to clean the `BLINKA_PATH` file before running the tests.
+
+```yaml
+- name: Tests 1
+  env:
+    BLINKA_PATH: ./tests.json
+    BLINKA_APPEND: true
+  run: bundle exec rails test:system
+
+- name: Tests 2
+  env:
+    BLINKA_PATH: ./tests.json
+    BLINKA_APPEND: true
+  run: bundle exec rails test
 ```
 
 ## How can I report tests in TAP-format?

data/blinka_reporter.gemspec

@@ -1,41 +1,39 @@
-require_relative 'lib/blinka_reporter/version'
+require_relative "lib/blinka_reporter/version"
 
 Gem::Specification.new do |gem|
-  gem.authors = ['David Wessman']
+  gem.authors = ["David Wessman"]
   gem.description =
-    'Use to format test results from Minitest to use with Blinka.'
-  gem.email = 'david@wessman.co'
-  gem.homepage = 'https://github.com/davidwessman/blinka_reporter'
-  gem.license = 'MIT'
-  gem.summary = 'Format tests for Blinka'
+    "Use to format test results from Minitest to use with Blinka."
+  gem.email = "david@wessman.co"
+  gem.homepage = "https://github.com/davidwessman/blinka_reporter"
+  gem.license = "MIT"
+  gem.summary = "Format tests for Blinka"
 
   gem.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',
-    'rubygems_mfa_required' => 'true'
+    "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",
+    "rubygems_mfa_required" => "true"
   }
 
   gem.files =
-    Dir.chdir(File.expand_path('..', __FILE__)) do
-      `git ls-files -z`
-        .split("\x0")
+    Dir.chdir(File.expand_path("..", __FILE__)) do
+      `git ls-files -z`.split("\x0")
         .reject { |f| f.match(%r{^(test|spec|features)/}) }
     end
-  gem.name = 'blinka-reporter'
+  gem.name = "blinka-reporter"
   gem.version = BlinkaReporter::VERSION
-  gem.executables = ['blinka_reporter']
-  gem.require_path = ['lib']
+  gem.executables = ["blinka_reporter"]
+  gem.require_path = ["lib"]
 
-  gem.add_dependency('httparty', '~> 0.18')
-  gem.add_dependency('ox', '~> 2')
-  gem.add_development_dependency('dotenv', '~> 2.8.0')
-  gem.add_development_dependency('minitest', '~> 5.0')
-  gem.add_development_dependency('mocha', '~> 2.0')
-  gem.add_development_dependency('rake', '~> 13')
-  gem.add_development_dependency('webmock', '~> 3.11')
+  gem.add_dependency("ox", "~> 2")
+  gem.add_development_dependency("dotenv", "~> 2.8.0")
+  gem.add_development_dependency("minitest", "~> 5.0")
+  gem.add_development_dependency("mocha", "~> 2.0")
+  gem.add_development_dependency("rake", "~> 13")
+  gem.add_development_dependency("syntax_tree", "~> 6.0")
 end

data/lib/blinka_reporter/cli.rb

@@ -1,10 +1,10 @@
-require 'blinka_reporter/client'
-require 'blinka_reporter/version'
+require "blinka_reporter/client"
+require "blinka_reporter/version"
 
 module BlinkaReporter
   class Cli
     def self.run(argv)
-      if (argv.index('--help') || -1) >= 0
+      if (argv.index("--help") || -1) >= 0
         puts(<<~EOS)
           blinka_reporter version #{BlinkaReporter::VERSION}
 
@@ -14,46 +14,17 @@ module BlinkaReporter
             - ./rspec.xml from https://github.com/sj26/rspec_junit_formatter
 
           --tap: Flag for outputting test results in TAP-protocol, helpful on Heroku CI
-          --blinka: Flag for reporting test results to blinka.app, requires also supplying:
-            - --team-id
-            - --team-secret
-            - --repository
-            - --commit
-          --team-id <team-id>: Blinka team id, only used with --blinka
-          --team-secret <team-secret>: Blinka team secret, only used with --blinka
-          --commit <commit>: The commit hash to report
-          --tag <tag>: The tag for the run, for example to separate a test matrix
-          --repository <repository>: The Github repository
-          --host <host>: Override Blink host to send report
-
         EOS
         return 0
       end
 
-      tap = (argv.index('--tap') || -1) >= 0
-
-      paths = argv_value_for(argv, '--path')
+      tap = (argv.index("--tap") || -1) >= 0
 
-      blinka = (argv.index('--blinka') || -1) >= 0
-      commit = argv_value_for(argv, '--commit')&.first
-      repository = argv_value_for(argv, '--repository')&.first
-      tag = argv_value_for(argv, '--tag')&.first
-      team_id = argv_value_for(argv, '--team-id')&.first
-      team_secret = argv_value_for(argv, '--team-secret')&.first
-      host = argv_value_for(argv, '--host')&.first
+      paths = argv_value_for(argv, "--path")
 
       client = BlinkaReporter::Client.new
       data = client.parse(paths: paths)
-      config =
-        BlinkaReporter::Config.new(
-          tag: tag,
-          commit: commit,
-          team_id: team_id,
-          team_secret: team_secret,
-          repository: repository,
-          host: host
-        )
-      client.report(data: data, config: config, tap: tap, blinka: blinka)
+      client.report(data: data, tap: tap)
     end
 
     def self.argv_value_for(argv, option_name)

data/lib/blinka_reporter/client.rb

@@ -1,15 +1,13 @@
-require 'httparty'
-require 'ox'
+require "ox"
+require "json"
 
-require 'blinka_reporter/blinka'
-require 'blinka_reporter/config'
-require 'blinka_reporter/error'
-require 'blinka_reporter/tap'
+require "blinka_reporter/error"
+require "blinka_reporter/tap"
 
 module BlinkaReporter
   class Client
     def parse(paths: nil)
-      paths ||= ['./blinka_results.json']
+      paths ||= ["./blinka_results.json"]
       paths = Array(paths)
       paths.each do |path|
         unless File.exist?(path)
@@ -22,9 +20,9 @@ module BlinkaReporter
 
       merge_results(
         paths.map do |path|
-          if path.end_with?('.xml')
+          if path.end_with?(".xml")
             parse_xml(path: path)
-          elsif path.end_with?('.json')
+          elsif path.end_with?(".json")
             parse_json(path: path)
           else
             raise(
@@ -36,9 +34,8 @@ module BlinkaReporter
       )
     end
 
-    def report(data:, blinka: false, tap: false, config: nil)
+    def report(data:, tap: false)
       BlinkaReporter::Tap.report(data) if tap
-      BlinkaReporter::Blinka.report(config: config, data: data) if blinka
       0
     end
 
@@ -62,12 +59,12 @@ module BlinkaReporter
     def parse_xml(path:)
       data = Ox.load_file(path, { symbolize_keys: true, skip: :skip_none })
       test_suite = data.root
-      unless test_suite.name == 'testsuite'
+      unless test_suite.name == "testsuite"
         raise("Root element is not <testsuite>, instead #{test_suite.name}")
       end
 
-      properties = test_suite.nodes.select { |node| node.name == 'properties' }
-      test_cases = test_suite.nodes.select { |node| node.name == 'testcase' }
+      properties = test_suite.nodes.select { |node| node.name == "properties" }
+      test_cases = test_suite.nodes.select { |node| node.name == "testcase" }
       {
         nbr_tests: Integer(test_suite.tests || 0),
         total_time: Float(test_suite.time),
@@ -79,7 +76,7 @@ module BlinkaReporter
     def xml_seed(ox_properties)
       ox_properties.each do |property|
         property.nodes.each do |node|
-          return node.attributes[:value] if node.attributes[:name] == 'seed'
+          return node.attributes[:value] if node.attributes[:name] == "seed"
         end
       end
       nil
@@ -89,18 +86,18 @@ module BlinkaReporter
     def xml_test_cases(test_cases)
       test_cases.map do |test_case|
         result = {
-          kind: Array(test_case.attributes[:classname]&.split('.'))[1],
+          kind: Array(test_case.attributes[:classname]&.split("."))[1],
           name: test_case.attributes[:name],
-          path: test_case.attributes[:file]&.delete_prefix('./'),
+          path: test_case.attributes[:file]&.delete_prefix("./"),
           time: Float(test_case.attributes[:time] || 0)
         }
         if test_case.nodes.any?
-          skipped = test_case.nodes.any? { |node| node.name == 'skipped' }
-          result[:result] = 'skip' if skipped
+          skipped = test_case.nodes.any? { |node| node.name == "skipped" }
+          result[:result] = "skip" if skipped
           failure =
-            test_case.nodes.select { |node| node.name == 'failure' }.first
+            test_case.nodes.select { |node| node.name == "failure" }.first
           if failure
-            result[:result] = 'fail'
+            result[:result] = "fail"
 
             # Needs to be double quotation marks to work properly
             result[:backtrace] = failure.text.split("\n")
@@ -108,7 +105,7 @@ module BlinkaReporter
             result[:message] = failure.attributes[:message]
           end
         else
-          result[:result] = 'pass'
+          result[:result] = "pass"
         end
         result
       end

data/lib/blinka_reporter/error.rb

@@ -1,3 +1,4 @@
 module BlinkaReporter
-  class Error < StandardError; end
+  class Error < StandardError
+  end
 end

data/lib/blinka_reporter/minitest_adapter.rb

@@ -5,7 +5,7 @@ module BlinkaReporter
     end
 
     def path
-      @path ||= source_location.first.gsub(Dir.getwd, '').delete_prefix('/')
+      @path ||= source_location.first.gsub(Dir.getwd, "").delete_prefix("/")
     end
 
     def line
@@ -24,8 +24,8 @@ module BlinkaReporter
     end
 
     def kind
-      parts = self.path.gsub('test/', '').split('/')
-      parts.length > 1 ? parts.first : 'general'
+      parts = self.path.gsub("test/", "").split("/")
+      parts.length > 1 ? parts.first : "general"
     end
 
     def message
@@ -60,14 +60,17 @@ module BlinkaReporter
     end
 
     def image
-      return unless kind == 'system'
+      return unless kind == "system"
 
       image_path =
         if defined?(Capybara) && Capybara.respond_to?(:save_path) &&
              Capybara.save_path.present?
-          "#{Capybara.save_path}/failures_#{name}.png"
+          "#{Capybara.save_path}/failures_#{name}.png".gsub(
+            Dir.getwd,
+            ""
+          ).delete_prefix("/")
         else
-          "./tmp/screenshots/failures_#{name}.png"
+          "tmp/screenshots/failures_#{name}.png"
         end
 
       return unless File.exist?(image_path)

data/lib/blinka_reporter/tap.rb

@@ -23,22 +23,22 @@ module BlinkaReporter
     def test_results(results)
       report = []
       results.each_with_index do |test, index|
-        test_str = "#{test[:path]} - #{test[:name].tr('#', '_')}"
+        test_str = "#{test[:path]} - #{test[:name].tr("#", "_")}"
         result = test[:result]
-        if result == 'pass'
+        if result == "pass"
           report << "ok #{index + 1} - #{test_str}"
-        elsif result == 'skip'
+        elsif result == "skip"
           report << "ok #{index + 1} # skip: #{test_str}"
-        elsif result == 'fail'
+        elsif result == "fail"
           report << "not ok #{index + 1} - failed: #{test_str}"
           test[:message].split('\n') do |line|
-            report << "##{' ' * TAP_COMMENT_PAD + line}"
+            report << "##{" " * TAP_COMMENT_PAD + line}"
           end
-          report << '#'
+          report << "#"
           Array(test[:backtrace]).each do |line|
-            report << "##{' ' * TAP_COMMENT_PAD + line}"
+            report << "##{" " * TAP_COMMENT_PAD + line}"
           end
-          report << ''
+          report << ""
         end
       end
       report.join("\n")

data/lib/blinka_reporter/version.rb

@@ -1,3 +1,3 @@
 module BlinkaReporter
-  VERSION = '0.7.1'.freeze
+  VERSION = "0.8.0".freeze
 end

data/lib/blinka_reporter.rb

@@ -1,4 +1,5 @@
-require 'blinka_reporter/version'
-require 'blinka_reporter/cli'
+require "blinka_reporter/version"
+require "blinka_reporter/cli"
 
-module BlinkaReporter; end
+module BlinkaReporter
+end

data/lib/minitest/blinka_plugin.rb

@@ -1,14 +1,15 @@
-require 'minitest'
-require 'json'
-require 'blinka_reporter/minitest_adapter'
-require 'blinka_reporter/client'
+require "minitest"
+require "json"
+require "blinka_reporter/minitest_adapter"
+require "blinka_reporter/client"
 
 module Minitest
   def self.plugin_blinka_init(options)
     reporter.reporters << BlinkaPlugin::Reporter.new(options[:io], options)
   end
 
-  def plugin_blinka_options(opts, options); end
+  def plugin_blinka_options(opts, options)
+  end
 
   module BlinkaPlugin
     class Reporter < Minitest::StatisticsReporter
@@ -31,8 +32,8 @@ module Minitest
       private
 
       def json_report
-        report_path = ENV['BLINKA_PATH']
-        return if report_path.nil? || report_path.eql?('')
+        report_path = ENV["BLINKA_PATH"]
+        return if report_path.nil? || report_path.eql?("")
 
         result = {
           total_time: total_time,
@@ -42,10 +43,20 @@ module Minitest
           results:
             tests&.map do |test_result|
               BlinkaReporter::MinitestAdapter.new(test_result).report
-            end
+            end || []
         }
 
-        File.open(report_path, 'w+') do |file|
+        if ENV["BLINKA_APPEND"] == "true" && File.exist?(report_path)
+          existing =
+            JSON.parse(File.open(report_path).read, symbolize_names: true)
+          result[:results] = existing[:results] + result[:results]
+          result[:nbr_tests] = existing[:nbr_tests] + result[:nbr_tests]
+          result[:nbr_assertions] = existing[:nbr_assertions] +
+            result[:nbr_assertions]
+          result[:total_time] = existing[:total_time] + result[:total_time]
+        end
+
+        File.open(report_path, "w+") do |file|
           file.write(JSON.pretty_generate(result))
         end
 

data/package.json

@@ -4,19 +4,21 @@
   "author": "David Wessman <david@wessman.co>",
   "license": "MIT",
   "devDependencies": {
-    "@prettier/plugin-ruby": "^3.2.2",
     "husky": "^8.0.3",
-    "lint-staged": "^13.1.2"
-  },
-  "scripts": {
-    "pretty": "./node_modules/.bin/prettier --write ."
+    "lint-staged": "^13.1.2",
+    "prettier": "^2.8.4"
   },
   "husky": {
     "hooks": {
       "pre-commit": "lint-staged"
     }
   },
+  "scripts": {
+    "pretty": "./node_modules/.bin/prettier --write . && stree write './**/*.rb'",
+    "prepare": "husky install"
+  },
   "lint-staged": {
-    "*.{md,rb,json,yml,gemspec}": "./node_modules/.bin/prettier --write"
+    "*.{rb,gemspec}": "stree write",
+    "*.{js,css,md,json,yml}": "./node_modules/.bin/prettier --write"
   }
 }

data/yarn.lock

@@ -2,13 +2,6 @@
 # yarn lockfile v1
 
 
-"@prettier/plugin-ruby@^3.2.2":
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/@prettier/plugin-ruby/-/plugin-ruby-3.2.2.tgz#43c9d85349032f74d34c4f57e6a77487d5c5bdc1"
-  integrity sha512-Vc7jVE39Fgswl517ET4kPtpnoRWE6XTi1Sivd84rZyomYnHYUmvUsEeoOf6tVhzTuIXE5XVQB1YCG2hulrwR3Q==
-  dependencies:
-    prettier ">=2.3.0"
-
 aggregate-error@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
@@ -335,10 +328,10 @@ pidtree@^0.6.0:
   resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.6.0.tgz#90ad7b6d42d5841e69e0a2419ef38f8883aa057c"
   integrity sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==
 
-prettier@>=2.3.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.4.1.tgz#671e11c89c14a4cfc876ce564106c4a6726c9f5c"
-  integrity sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==
+prettier@^2.8.4:
+  version "2.8.4"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.4.tgz#34dd2595629bfbb79d344ac4a91ff948694463c3"
+  integrity sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==
 
 restore-cursor@^3.1.0:
   version "3.1.0"

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: blinka-reporter
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - David Wessman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-19 00:00:00.000000000 Z
+date: 2023-03-04 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'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: ox
   requirement: !ruby/object:Gem::Requirement
@@ -95,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '13'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: syntax_tree
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '6.0'
 description: Use to format test results from Minitest to use with Blinka.
 email: david@wessman.co
 executables:
@@ -119,6 +105,7 @@ files:
 - ".github/release.yml"
 - ".github/workflows/main.yml"
 - ".gitignore"
+- ".husky/pre-commit"
 - ".ruby-version"
 - CHANGELOG.md
 - Gemfile
@@ -129,10 +116,8 @@ files:
 - bin/setup
 - blinka_reporter.gemspec
 - lib/blinka_reporter.rb
-- lib/blinka_reporter/blinka.rb
 - lib/blinka_reporter/cli.rb
 - lib/blinka_reporter/client.rb
-- lib/blinka_reporter/config.rb
 - lib/blinka_reporter/error.rb
 - lib/blinka_reporter/minitest_adapter.rb
 - lib/blinka_reporter/tap.rb

data/lib/blinka_reporter/blinka.rb

@@ -1,172 +0,0 @@
-require 'httparty'
-require 'blinka_reporter/error'
-
-module BlinkaReporter
-  class Blinka
-    SUPPORTED_MIME_TYPES = {
-      jpg: 'image/jpeg',
-      jpeg: 'image/jpeg',
-      png: 'image/png'
-    }
-
-    include HTTParty
-
-    def self.report(data:, config:)
-      Blinka.new(data: data, config: config).report
-    end
-
-    def initialize(data:, config:)
-      @data = data
-      @config = config
-      self.class.base_uri("#{@config.host}/api/v1")
-    end
-
-    def report
-      if ENV.fetch('BLINKA_ALLOW_WEBMOCK_DISABLE', 'true') == 'true' &&
-           defined?(WebMock) && WebMock.respond_to?(:disable!)
-        WebMock.disable!
-      end
-
-      @config.validate_blinka
-      self.authenticate
-
-      results =
-        @data
-          .fetch(:results, [])
-          .map do |result|
-            if !result[:image].nil?
-              result[:image] = Blinka.upload_image(filepath: result[:image])
-              result
-            else
-              result
-            end
-          end
-
-      body = {
-        report: {
-          repository: @config.repository,
-          tag: @config.tag,
-          commit: @config.commit,
-          metadata: {
-            total_time: @data[:total_time],
-            nbr_tests: @data[:nbr_tests],
-            nbr_assertions: @data[:nbr_assertions],
-            seed: @data[:seed]
-          }.compact,
-          results: results
-        }
-      }
-
-      response =
-        self.class.post(
-          '/report',
-          body: body.to_json,
-          headers: {
-            'Content-Type' => 'application/json',
-            'Authorization' => "Bearer #{@jwt_token}"
-          }
-        )
-      case response.code
-      when 200
-        puts "Reported #{@data[:nbr_tests]} tests of commit #{@config.commit}!"
-      else
-        raise(
-          BlinkaReporter::Error,
-          "Could not report, got response code #{response.code}"
-        )
-      end
-    rescue => error
-      raise(BlinkaReporter::Error, <<-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 authenticate
-      response =
-        self.class.post(
-          '/authentication',
-          body: {
-            token_id: @config.team_id,
-            token_secret: @config.team_secret
-          }.to_json,
-          headers: { 'Content-Type' => 'application/json' }
-        )
-      case response.code
-      when 200
-        @jwt_token = JSON.parse(response.body).dig('auth_token')
-      else
-        raise(
-          BlinkaReporter::Error,
-          "Could not authenticate to API #{response.code}"
-        )
-      end
-    end
-
-    def self.upload_image(filepath:)
-      return unless File.exist?(filepath)
-
-      file = File.open(filepath)
-      filename = File.basename(filepath)
-      extension = File.extname(filepath).delete('.').to_sym
-      content_type = SUPPORTED_MIME_TYPES[extension]
-      return if content_type.nil?
-
-      presigned_post =
-        Blinka.presign_image(filename: filename, content_type: content_type)
-      Blinka.upload_to_storage(presigned_post: presigned_post, file: file)
-
-      puts "Uploaded: #{filename}"
-      Blinka.to_shrine_object(
-        presigned_post: presigned_post,
-        file: file,
-        filename: filename
-      )
-    end
-
-    def self.presign_image(filename:, content_type:)
-      response =
-        self.get(
-          '/presign',
-          body: { filename: filename, content_type: content_type }
-        )
-
-      case response.code
-      when 200
-        JSON.parse(response.body)
-      else
-        raise(BlinkaReporter::Error, 'Could not presign file')
-      end
-    end
-
-    def self.upload_to_storage(presigned_post:, file:)
-      url = URI.parse(presigned_post.fetch('url'))
-
-      body = presigned_post['fields'].merge({ 'file' => file.read })
-      response = HTTParty.post(url, multipart: true, body: body)
-
-      case response.code
-      when 204
-        true
-      else
-        raise(BlinkaReporter::Error, 'Could not upload file to storage')
-      end
-    end
-
-    def self.to_shrine_object(presigned_post:, file:, filename:)
-      storage, idx = presigned_post.dig('fields', 'key').split('/')
-      {
-        "id": idx,
-        "storage": storage,
-        "metadata": {
-          "size": file.size,
-          "filename": filename,
-          "mime_type": presigned_post.dig('fields', 'Content-Type')
-        }
-      }
-    end
-  end
-end

data/lib/blinka_reporter/config.rb

@@ -1,37 +0,0 @@
-require 'blinka_reporter/error'
-
-module BlinkaReporter
-  class Config
-    attr_reader(:commit, :host, :repository, :tag, :team_id, :team_secret)
-    DEFAULT_HOST = 'https://www.blinka.app'
-
-    def initialize(
-      tag:,
-      commit:,
-      repository:,
-      host: nil,
-      team_id:,
-      team_secret:
-    )
-      @commit = commit || find_commit
-      @host = host || DEFAULT_HOST
-      @repository = repository
-      @tag = tag
-      @team_id = team_id
-      @team_secret = team_secret
-    end
-
-    def validate_blinka
-      required = [@team_id, @team_secret, @repository]
-      if required.include?(nil) || required.include?('')
-        raise(BlinkaReporter::Error, <<~EOS)
-          Missing configuration, make sure to set --team-id, --team-secret, --repository
-        EOS
-      end
-    end
-
-    def find_commit
-      ENV.fetch('HEROKU_TEST_RUN_COMMIT_VERSION', `git rev-parse HEAD`.chomp)
-    end
-  end
-end