rspec-buildkite 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a13c43c0cd2a422336df5a96156ea82150e565d5ee6884811eb184eae860bf37
-  data.tar.gz: f59368d071f26d1eb94aae5d1dbb3bfa92a9524a2d6a157ae853c2eac054e981
+  metadata.gz: a43becdaaf39c19db34533f388d73738d983eda1e834c8dddacb22b42329cded
+  data.tar.gz: 0b5503027025f2c3e1fcb19ccc54c5a2bba839ee56baaa008f98f1490920bb84
 SHA512:
-  metadata.gz: 3f9584918aedfd8a622dd108b56db43a32add0092af4b2650d55f06de54b2943c42cf96053bf9b2c050de435d76f6c96b8c78e39cfd9ac8e28863897d6c84f5b
-  data.tar.gz: 47564c8f5c724d8f3a5452333dc5bc529fadb021da90e495a15832d66b8c71884892d4f1410701347d31767bfa4b3b37ae92425a6bf8a388978c6f9bb5b8e95e
+  metadata.gz: 10eebedf3562ee3bf7715a6a6777fab65b02488729f6f3309aa7be7e8713845daa3c16f2c60278c9b5474fb424fb834dd9b90adf916f7aa691344103af9847a8
+  data.tar.gz: b2737efe40e99e9c1902ba848f36e4c697b4f06cd5a0cc391bde99019d3ab2e0397cd4907a576230f531854f6a2ec48353125d377d5127c4d7a184251fdad289

data/README.md

@@ -38,6 +38,22 @@ Add it to your `.rspec` alongside your favorite formatter:
 
 Now run your specs on Buildkite!
 
+### Docker & Docker Compose
+
+If you run your RSpec builds inside Docker or Docker Compose then you'll need to make sure some environment variables are progpagated into the running containers. If you're using [the docker-compose-buildkite-plugin][dcbp] you can pass the environment using [plugin configuration][dcbp-env]. Or you can add them to the [environment section][dc-env] in your `docker-compose.yml`, or supply [env arguments][d-env] to your docker command.
+
+The following environment variables are required:
+
+- `BUILDKITE`
+- `BUILDKITE_BUILD_URL`
+- `BUILDKITE_JOB_ID`
+- `BUILDKITE_AGENT_ACCESS_TOKEN`
+
+  [dcbp]: https://github.com/buildkite-plugins/docker-compose-buildkite-plugin
+  [dcbp-env]: https://github.com/buildkite-plugins/docker-compose-buildkite-plugin#environment
+  [dc-env]: https://docs.docker.com/compose/environment-variables/
+  [d-env]: https://docs.docker.com/engine/reference/run/#env-environment-variables
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/rspec/buildkite/annotation_formatter.rb

@@ -56,11 +56,19 @@ module RSpec::Buildkite
       job_url = "#{build_url}##{job_id}"
 
       %{<details>\n} <<
-      %{<summary>#{notification.description.encode(:xml => :text)}</summary>\n\n} <<
-      %{<code><pre class="term">#{Recolorizer.recolorize(notification.colorized_message_lines.join("\n").encode(:xml => :text))}</pre></code>\n\n} <<
-      %{in <a href=#{job_url.encode(:xml => :attr)}>Job ##{job_id.encode(:xml => :text)}</a>\n} <<
+      %{<summary>#{notification.description.encode(:xml => :text)}</summary>\n} <<
+      %{<pre class="term">#{Recolorizer.recolorize(notification.colorized_message_lines.join("\n").encode(:xml => :text))}</pre>\n} <<
+      format_rerun(notification) <<
+      %{<p>in <a href=#{job_url.encode(:xml => :attr)}>Job ##{job_id.encode(:xml => :text)}</a></p>\n} <<
       %{</details>} <<
       %{\n\n\n}
     end
+
+    def format_rerun(notification)
+      %{<pre class="term">} <<
+      %{<span class="term-fg31">rspec #{notification.example.location_rerun_argument.encode(:xml => :text)}</span>} <<
+      %{ <span class="term-fg36"># #{notification.example.full_description.encode(:xml => :text)}</span>} <<
+      %{</pre>\n}
+    end
   end
 end

data/lib/rspec/buildkite/recolorizer.rb

@@ -49,52 +49,5 @@ module RSpec::Buildkite
         end
       end << ("</span>" * level)
     end
-    # Re-color an ANSI-colorized string using terminal CSS classes:
-    # https://github.com/buildkite/terminal/blob/05a77905c468b9150cac41298fdb8a0735024d42/style.go#L34
-    def recolorize(string)
-      level = 0
-      string.gsub(/\e\[(\d+(?:;\d+)*)m/) do
-        "".tap do |buffer|
-          codes = $1.split(";").map(&:to_i)
-
-          classes = []
-          while code = codes.shift
-            case code
-            when 0
-              classes.clear
-              buffer << ("</span>" * level)
-              level = 0
-            when 1..5, 9, 30..37
-              classes << "term-fg#{code}"
-            when 38
-              if codes[0] == 5
-                codes.shift
-                if codes[0]
-                  classes << "term-fgx#{codes.shift}"
-                end
-              end
-            when 40..47
-              classes << "term-bg#{code}"
-            when 48
-              if codes[0] == 5
-                codes.shift
-                if codes[0]
-                  classes << "term-bgx#{codes.shift}"
-                end
-              end
-            when 90..97
-              classes << "term-fgi#{code}"
-            when 100..107
-              classes << "term-bgi#{code}"
-            end
-          end
-
-          if classes.any?
-            level += 1
-            buffer << %{<span class=#{classes.map { |klass| klass }.join(" ").encode(:xml => :attr)}>}
-          end
-        end
-      end << ("</span>" * level)
-    end
   end
 end

data/lib/rspec/buildkite/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module Buildkite
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-buildkite
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Samuel Cochran
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDKDCCAhCgAwIBAgIBBTANBgkqhkiG9w0BAQUFADA6MQ0wCwYDVQQDDARzajI2
+  MIIDKDCCAhCgAwIBAgIBBjANBgkqhkiG9w0BAQsFADA6MQ0wCwYDVQQDDARzajI2
   MRQwEgYKCZImiZPyLGQBGRYEc2oyNjETMBEGCgmSJomT8ixkARkWA2NvbTAeFw0x
-  NzA3MzEwNTQ3MDVaFw0xODA3MzEwNTQ3MDVaMDoxDTALBgNVBAMMBHNqMjYxFDAS
+  ODA4MTYwNTE4NDBaFw0xOTA4MTYwNTE4NDBaMDoxDTALBgNVBAMMBHNqMjYxFDAS
   BgoJkiaJk/IsZAEZFgRzajI2MRMwEQYKCZImiZPyLGQBGRYDY29tMIIBIjANBgkq
   hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsr60Eo/ttCk8GMTMFiPr3GoYMIMFvLak
   xSmTk9YGCB6UiEePB4THSSA5w6IPyeaCF/nWkDp3/BAam0eZMWG1IzYQB23TqIM0
@@ -21,14 +21,14 @@ cert_chain:
   4O/FL2ChjL2CPCpLZW55ShYyrzphWJwLOJe+FJ/ZBl6YXwrzQM9HKnt4titSNvyU
   KzE3L63A3PZvExzLrN9u09kuWLLJfXB2sGOlw3n9t72rJiuBr3/OQQIDAQABozkw
   NzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU99dfRjEKFyczTeIz
-  m3ZsDWrNC80wDQYJKoZIhvcNAQEFBQADggEBADGiXpvK754s0zTFx3y31ZRDdvAI
-  lA209JIjUlDyr9ptCRadihyfF2l9/hb+hLemiPEYppzG6vEK1TIyzbAR36yOJ8CX
-  4vPkCXLuwHhs6UIRbwN+IEy41nsIlBxmjLYei8h3t/G2Vm2oOaLdbjDXS+Srl9U8
-  shsE8ft81PxSQfzEL7Mr9cC9XvWbHW+SyTpfGm8rAtaqZkNeke4U8a0di4oz2EfA
-  P4lSfmXxsd1C71ckIp0cyXkPhyTtpyS/5hq9HhuUNzEHkSDe36/Rd1xYKV5JxMC2
-  YAttWFUs06lor2q1wwncPaMtUtbWwW35+1IV6xhs2rFY6DD/I6ZkK3GnHdY=
+  m3ZsDWrNC80wDQYJKoZIhvcNAQELBQADggEBAEwUQFizoyvm/1/iX8i/+oK6hr5m
+  wd7ZEzIV32JRyaqkPFeWjBylRXZyoXsE2u1H9ofIw8b/5/M+uMIfR8jlJSuulGB7
+  rs3ixWpkwRW8Knz2A5zufM3uPypwDYbEUbTdhzqY9hCzCz4moHu2E5f5bz7zrp+g
+  kpFjMoo851LRGr5vEQMZ/U+Paq8ROLzAiOa72mNxIFzvnGcSDyBVixdewi7HoZWD
+  ccrr0sGoLnfK6DappOwH1I5uPvQohOATNmmU0MSSWOeiggLlEWmUYE7CvzoMc8R6
+  DlumKi5y9wE+XnxtyLbe6GlT3AkVGnhwPdwq2QBFLEWkTVogdCYomBCKfjY=
   -----END CERTIFICATE-----
-date: 2018-05-26 00:00:00.000000000 Z
+date: 2018-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: RSpec formatter creating Buildkite annotations for failures

metadata.gz.sig

@@ -1,2 +1,2 @@
-��5�u���kv�r`�:��1�������j�IZ�DS�n���U����K��ь,2a@�2u-�>^�
-�
+.��>�D^`�_yay�u2u�ܯ��0��
+��r�H{(��ц��
)��-���k�m�� �U|<O������~�kҲp��?�E�k�KG�����̃���s(*���/*�z�%gWކR��hX�9g���q�G�X>����k+��&��=���"�>9�׋R9�J|����h�.k�>+�B�bX���U��֐^@�_Z�PJ���GF.�܆����i�E�EUVu��y�l���ʠ�����b'j�֤�H-� j