testmetrics_rspec 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a03b098d96ca6099897c735c5b4b9eec71089ff6f7d6f261a7aff728b838557d
-  data.tar.gz: 1aa00b791ed33c8106228da7ffc72937a25d3c88825dc3289eb8f75c7accf50c
+  metadata.gz: cb87ffb6200cb3155db8922ec1e0b13b53ee7b56206771524bdcfe34e6ac9eae
+  data.tar.gz: 6daf32f3b36d2ac5b7efdfc2c707f2a2ea590d0fd463c0f2b995f9b819aac9da
 SHA512:
-  metadata.gz: 352b85462001c1826f476950dfc5be7ccee14b61d83856f766ef660c1e276853d87ab94115702609c013a7072c2cb68719f7d6c05f6e89be486d395745058e27
-  data.tar.gz: 148e2c62497a7d03cfb61a8df67b6a05fc92f6e66d2be31fda0ef843e44463e5f1dc88a8c6e5b38fe7a3deeda67515be04968e290598ca6457576e5be040fcef
+  metadata.gz: 2bae0f0b5ec46a3454ad87e4a83d0c70ba29283ab6494c14ce5160a765b8273f439539f9f2c314fb8c1459cf567256f21f2403094de38b77b8295ed397deb9f0
+  data.tar.gz: 01e0609b13afefd8840615c948b46efccb359850a662139c445a7f598b188d4ccf1df70637ee7cd80d84fe701834909f04922070b43fcbfe3cb5304347b03c06

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    testmetrics_rspec (0.2.0)
+    testmetrics_rspec (1.0.1)
       faraday (>= 0.9.0)
 
 GEM

data/lib/testmetrics_rspec/rspec2.rb

@@ -48,10 +48,20 @@ class TestmetricsRspec < RSpec::Core::Formatters::BaseFormatter
     end
   end
 
-  BRANCH_VARS = ["TRAVIS_BRANCH", "CIRCLE_BRANCH", "CI_COMMIT_REF_NAME", "BRANCH_NAME"]
+  BRANCH_VARS = ["TRAVIS_EVENT_TYPE", "CIRCLE_BRANCH", "CI_COMMIT_REF_NAME", "BRANCH_NAME"]
   def git_branch
-    correct_var = BRANCH_VARS.find do |var| ENV[var] != nil end
-    correct_var.nil? ? "Unknown" : ENV[correct_var]
+    correct_var = BRANCH_VARS.find do |var| ENV[var] != nil && ENV[var] != "" end
+
+    if correct_var == "TRAVIS_EVENT_TYPE"
+      case ENV[correct_var]
+      when "push"
+        ENV["TRAVIS_BRANCH"]
+      when "pull_request"
+        ENV["TRAVIS_PULL_REQUEST_BRANCH"]
+      end
+    else
+      correct_var.nil? ? "Unknown" : ENV[correct_var]
+    end
   end
 
   SHA_VARS = ["TRAVIS_COMMIT", "CIRCLE_SHA1", "CI_COMMIT_SHA", "REVISION"]

data/lib/testmetrics_rspec/rspec3.rb

@@ -46,15 +46,25 @@ class TestmetricsRspec < RSpec::Core::Formatters::BaseFormatter
     TestmetricsRspec::Persist.call(@results)
   end
 
-  BRANCH_VARS = ["TRAVIS_BRANCH", "CIRCLE_BRANCH", "CI_COMMIT_REF_NAME", "BRANCH_NAME"]
+  BRANCH_VARS = ["TRAVIS_EVENT_TYPE", "CIRCLE_BRANCH", "CI_COMMIT_REF_NAME", "BRANCH_NAME"]
   def git_branch
-    correct_var = BRANCH_VARS.find do |var| ENV[var] != nil end
-    correct_var.nil? ? "Unknown" : ENV[correct_var]
+    correct_var = BRANCH_VARS.find do |var| ENV[var] != nil && ENV[var] != "" end
+
+    if correct_var == "TRAVIS_EVENT_TYPE"
+      case ENV[correct_var]
+      when "push"
+        ENV["TRAVIS_BRANCH"]
+      when "pull_request"
+        ENV["TRAVIS_PULL_REQUEST_BRANCH"]
+      end
+    else
+      correct_var.nil? ? "Unknown" : ENV[correct_var]
+    end
   end
 
   SHA_VARS = ["TRAVIS_COMMIT", "CIRCLE_SHA1", "CI_COMMIT_SHA", "REVISION"]
   def git_sha
-    correct_var = SHA_VARS.find do |var| ENV[var] != nil end
+    correct_var = SHA_VARS.find do |var| ENV[var] != nil && ENV[var] != "" end
     correct_var.nil? ? "Unknown" : ENV[correct_var]
   end
 

data/testmetrics_rspec.gemspec

@@ -1,10 +1,9 @@
-
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "testmetrics_rspec"
-  spec.version       = "1.0.0"
+  spec.version       = "1.0.1"
   spec.authors       = ["Devon Estes"]
   spec.email         = ["devon.c.estes@gmail.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: testmetrics_rspec
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Devon Estes
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-03 00:00:00.000000000 Z
+date: 2019-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,7 +90,6 @@ files:
 - lib/testmetrics_rspec/persist.rb
 - lib/testmetrics_rspec/rspec2.rb
 - lib/testmetrics_rspec/rspec3.rb
-- lib/testmetrics_rspec/version.rb
 - testmetrics_rspec.gemspec
 homepage: https://testmetrics.app
 licenses: []

data/lib/testmetrics_rspec/version.rb

@@ -1,2 +0,0 @@
-  VERSION =
-end