buildkite-test_collector 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09f0da65683acfa44ac43a124494f3c9d5d8e3067abf0b28a3aa979a6413489d'
-  data.tar.gz: e7791580735083001493204451c79eae2e58ad5d51250f9c6535ca26bd8b169f
+  metadata.gz: 0b48c795c760f5a77634bc30024c344925036c3b4f935848caf6dcaf861b1692
+  data.tar.gz: 263e4faa13017fa5f8e1465dc76f245e05b3f26f703e933c87cb547b17e5dfbd
 SHA512:
-  metadata.gz: 3937ba2cfed151fb5c62af03b0a4925d6a4f36be0a95432c39a6f6e5974198e6e9c44fa5f7138086415ffac7b4907f082f067ee33b9bac7cb32a2ccfad50647d
-  data.tar.gz: bd956bc8de0375dcc657a7ed5f9a4256f0ba7b81de62dbc61ecb80ec2392eb6e9c57b298122f649659d16010189809a19dc4eb1f62e3c04626eb24917d53090c
+  metadata.gz: feaa2ec084069d17991bf5fda126b6b6d01fee4a807e4295bd644a02ccf30a02e9f1c0e912e2441347aee48f36bdae7eaa46ea4fe86075ac60e0b88424199aee
+  data.tar.gz: 7c31eafe74aa8cba48e74537940968c0b322b8939b33fa1cee2fdfb05600aa5ef9fc6192fb3b3c972bf4286edc3180cd375240eac2b6be8be08a4466bbed5567

data/CHANGELOG.md

@@ -1,20 +1,31 @@
 # CHANGELOG
 
+## v2.3.2
+
+- Add support for Codeship #198 - @swebb
+- Restore compatibility with older Ruby versions #201 - @gchan
+- Report Ruby version to Test Analytics #203 - @gchan
+
 ## v2.3.1
+
 - Log standard error raised during upload #195 - @nprizal
 
 ## v2.3.0
+
 - Stop sending execution id and safeguard SecureRandom.uuid #192 - @niceking
 - Rescue from StandardError when sending upload request #191 - @niceking
 - Fix nil pointer #188 - @ChrisBr
 
 ## v2.2.0
+
 - Gzip payload of request to Upload API #183 - @niceking
 
 ## v2.1.0
+
 - Major change: deprecates websocket connection in favour of sending HTTP requests to the Upload API. In future, websocket support will be completely removed from Buildkite and only version 2.1+ of this gem will continue to work.
 
 ## v2.1.0.pre
+
 - Minitest plugin to use HTTP Upload API instead of websocket connection to send test data #178 #179 - @niceking
 
 ## v2.0.0.pre
@@ -32,6 +43,7 @@
 - Update collector argument in the Analytics::API payload #170 - @KatieWright26
 
 ## v1.4.1
+
 - Add in support to create file with trace data #167
 
 ## v1.3.1

data/Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    buildkite-test_collector (2.3.1)
+    buildkite-test_collector (2.3.2)
       activesupport (>= 4.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4.3)
+    activesupport (7.0.7.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     concurrent-ruby (1.2.2)
     diff-lcs (1.4.4)
-    i18n (1.13.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    minitest (5.18.0)
+    minitest (5.19.0)
     rake (13.0.6)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)

data/README.md

@@ -7,7 +7,7 @@ Official [Buildkite Test Analytics](https://buildkite.com/test-analytics) collec
 
 ⚒ **Supported test frameworks:** RSpec, Minitest, and [more coming soon](https://github.com/buildkite/test-collector-ruby/issues?q=is%3Aissue+is%3Aopen+label%3A%22test+frameworks%22).
 
-📦 **Supported CI systems:** Buildkite, GitHub Actions, CircleCI, and others via the `BUILDKITE_ANALYTICS_*` environment variables.
+📦 **Supported CI systems:** Buildkite, GitHub Actions, CircleCI, Codeship, and others via the `BUILDKITE_ANALYTICS_*` environment variables.
 
 ## 👉 Installing
 

data/buildkite.yaml

@@ -1,8 +1,41 @@
 steps:
-  - label: ":rspec: Tests"
+  - label: ":rspec: Tests :ruby: 3.3-rc"
     command:
       - "bundle"
       - "bundle exec rake"
     plugins:
       - docker#v3.7.0:
-          image: 445615400570.dkr.ecr.us-east-1.amazonaws.com/ecr-public/docker/library/ruby:3.1.4
+          image: "445615400570.dkr.ecr.us-east-1.amazonaws.com/ecr-public/docker/library/ruby:3.3-rc"
+    soft_fail: true
+
+  - label: ":rspec: Tests :ruby: {{matrix}}"
+    command:
+      - "bundle"
+      - "bundle exec rake"
+    plugins:
+      - docker#v3.7.0:
+          image: "445615400570.dkr.ecr.us-east-1.amazonaws.com/ecr-public/docker/library/ruby:{{matrix}}"
+    matrix:
+      - "latest"
+      - "3.2"
+      - "3.1"
+      - "3.0"
+      - "2.7"
+
+  - group: ":rspec: Legacy Ruby :ruby:"
+    steps:
+      - label: ":rspec: Tests :ruby: {{matrix}}"
+        command:
+          - "gem install bundler:2.3.25"
+          - "bundle"
+          - "bundle exec rake"
+        plugins:
+          - docker#v3.7.0:
+              # Images for older Ruby versions aren't available on AWS ECR
+              # so fall back to Docker Hub
+              image: "ruby:{{matrix}}"
+        matrix:
+          - "2.6"
+          - "2.5"
+          - "2.4"
+          - "2.3"

data/lib/buildkite/test_collector/ci.rb

@@ -17,6 +17,7 @@ class Buildkite::TestCollector::CI
     return buildkite if ENV["BUILDKITE_BUILD_ID"]
     return github_actions if ENV["GITHUB_RUN_NUMBER"]
     return circleci if ENV["CIRCLE_BUILD_NUM"]
+    return codeship if ENV["CI_NAME"] == "codeship"
     return generic if ENV["CI"]
 
     {
@@ -36,9 +37,10 @@ class Buildkite::TestCollector::CI
       "message" => ENV["BUILDKITE_ANALYTICS_MESSAGE"],
       "execution_name_prefix" => ENV["BUILDKITE_ANALYTICS_EXECUTION_NAME_PREFIX"],
       "execution_name_suffix" => ENV["BUILDKITE_ANALYTICS_EXECUTION_NAME_SUFFIX"],
+      "language_version" => RUBY_VERSION,
       "version" => Buildkite::TestCollector::VERSION,
       "collector" => "ruby-#{Buildkite::TestCollector::NAME}",
-    }.compact
+    }.select { |_, value| !value.nil? }
   end
 
   def generic
@@ -82,4 +84,16 @@ class Buildkite::TestCollector::CI
       "number" => ENV["CIRCLE_BUILD_NUM"],
     }
   end
+
+  def codeship
+    {
+      "CI" => "codeship",
+      "key" => "#{ENV["CI_BUILD_ID"]}",
+      "url" => ENV["CI_PULL_REQUEST"],
+      "branch" => ENV["CI_BRANCH"],
+      "commit_sha" => ENV["CI_COMMIT_ID"],
+      "number" => nil,
+      "message" => ENV["CI_COMMIT_MESSAGE"],
+    }
+  end
 end

data/lib/buildkite/test_collector/minitest_plugin/trace.rb

@@ -38,7 +38,7 @@ module Buildkite::TestCollector::MinitestPlugin
         failure_reason: failure_reason,
         failure_expanded: failure_expanded,
         history: history,
-      ).with_indifferent_access.compact
+      ).with_indifferent_access.select { |_, value| !value.nil? }
     end
 
     private
@@ -50,7 +50,7 @@ module Buildkite::TestCollector::MinitestPlugin
     end
 
     def file_name
-      @file_name ||= File.join('./', source_location[0].delete_prefix(project_dir))
+      @file_name ||= File.join('./', source_location[0].sub(/\A#{project_dir}/, ""))
     end
 
     def line_number
@@ -74,7 +74,7 @@ module Buildkite::TestCollector::MinitestPlugin
         # remove the first line of message from the first failure
         # to avoid duplicate line in Test Analytics UI
         messages = strip_invalid_utf8_chars(failure.message).split("\n")
-        messages = messages[1..] if index.zero?
+        messages = messages[1..-1] if index.zero?
 
         {
           expanded: messages,

data/lib/buildkite/test_collector/rspec_plugin/trace.rb

@@ -32,7 +32,7 @@ module Buildkite::TestCollector::RSpecPlugin
         failure_reason: failure_reason,
         failure_expanded: failure_expanded,
         history: history,
-      ).with_indifferent_access.compact
+      ).with_indifferent_access.select { |_, value| !value.nil? }
     end
 
     private

data/lib/buildkite/test_collector/version.rb

@@ -2,7 +2,7 @@
 
 module Buildkite
   module TestCollector
-    VERSION = "2.3.1"
+    VERSION = "2.3.2"
     NAME = "buildkite-test_collector"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildkite-test_collector
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Buildkite
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-02 00:00:00.000000000 Z
+date: 2023-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport