blinka-reporter 0.2.0 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e4c4ccf6dd86400f02f520904fe168fcfe7530db71966b818844a0295369a50
-  data.tar.gz: 34ef6d0a3c4ff1a1b8bd2c9f1fb62f139db83179c1665113ff2297c589f29547
+  metadata.gz: 76add87e3b4c07e52d38ace7ea5c8359b0eb2dc636165ffdf753fb3d475ed119
+  data.tar.gz: 5322abc35807213e72c59876ab0b33d5aaa8312bc8d56daf4203d34737666f5d
 SHA512:
-  metadata.gz: 564f1f7b0088fcb2465e9a950e22cf1cfd2d7e6c8d4cbcc35cfb8392e4f7896587bf1a7432f42028474f39037b49d17adc29416b7e431f29bb22079c2e556b2f
-  data.tar.gz: 3ad6f5d44f1851e4cbba08e601270939b1922f92cf47a5d722a9b299fa0d304ceb10afd70c669986075304b16cd11897b2faddc0540618e25ef5214faf2868fa
+  metadata.gz: bff827a035306476db6c83740fa95fb6a620c9475e012ef7d48b9d6feac766fc47f31e91c63bb9ecca57bddb2064c3951b97393d5206d4937b44e62078518a5d
+  data.tar.gz: 6e1432283c7f061f44448b67cd4af16be906b4baf38cda9947ea6b9d4af1d4e4a1ebaf96b7231685afbfffc9d10ee6042103921f8c01dcf04b0b8f1db3a256b2

data/lib/blinka_client.rb

@@ -2,6 +2,10 @@ require 'mimemagic'
 require 'httparty'
 
 class BlinkaClient
+  DEFAULT_HOST = 'https://www.blinka.app'.freeze
+
+  include HTTParty
+
   class BlinkaConfig
     attr_reader(
       :tag,
@@ -12,18 +16,27 @@ class BlinkaClient
       :team_secret,
       :jwt_token
     )
+
     def initialize
-      @host = ENV.fetch('BLINKA_HOST', 'https://blinkblink.herokuapp.com')
-      @team_id = ENV.fetch('BLINKA_TEAM_ID')
-      @team_secret = ENV.fetch('BLINKA_TEAM_SECRET')
-      @repository = ENV.fetch('BLINKA_REPOSITORY')
+      @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)
+      @commit = BlinkaClient.find_commit
+
+      if @team_id.nil? || @team_secret.nil? || @repository.nil?
+        raise(BlinkaError, <<~EOS)
+          Missing configuration, make sure to set required environment variables:
+          - BLINKA_TEAM_ID
+          - BLINKA_TEAM_SECRET
+          - BLINKA_REPOSITORY
+          EOS
+      end
     end
   end
 
   class BlinkaError < StandardError; end
-  include HTTParty
 
   def initialize
     @config = BlinkaConfig.new
@@ -31,6 +44,18 @@ class BlinkaClient
   end
 
   def report(filepath: './blinka_results.json')
+    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)
 
@@ -79,6 +104,19 @@ class BlinkaClient
     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:)
@@ -160,4 +198,11 @@ 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/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,15 +26,18 @@ module Minitest
       end
 
       def report
-        tap_report unless ENV['BLINKA_TAP'].nil?
-        blinka_report
-
+        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
 
-      def blinka_report
+      def json_report
         result = {
           total_time: total_time,
           nbr_tests: count,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blinka-reporter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.3
 platform: ruby
 authors:
 - David Wessman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-07 00:00:00.000000000 Z
+date: 2021-02-13 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: []