testmetrics_rspec 1.0.0 → 1.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +1 -1
  3. data/lib/testmetrics_rspec/rspec2.rb +13 -3
  4. data/lib/testmetrics_rspec/rspec3.rb +14 -4
  5. data/testmetrics_rspec.gemspec +1 -2
  6. metadata +2 -3
  7. data/lib/testmetrics_rspec/version.rb +0 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a03b098d96ca6099897c735c5b4b9eec71089ff6f7d6f261a7aff728b838557d
4
- data.tar.gz: 1aa00b791ed33c8106228da7ffc72937a25d3c88825dc3289eb8f75c7accf50c
3
+ metadata.gz: cb87ffb6200cb3155db8922ec1e0b13b53ee7b56206771524bdcfe34e6ac9eae
4
+ data.tar.gz: 6daf32f3b36d2ac5b7efdfc2c707f2a2ea590d0fd463c0f2b995f9b819aac9da
5
5
  SHA512:
6
- metadata.gz: 352b85462001c1826f476950dfc5be7ccee14b61d83856f766ef660c1e276853d87ab94115702609c013a7072c2cb68719f7d6c05f6e89be486d395745058e27
7
- data.tar.gz: 148e2c62497a7d03cfb61a8df67b6a05fc92f6e66d2be31fda0ef843e44463e5f1dc88a8c6e5b38fe7a3deeda67515be04968e290598ca6457576e5be040fcef
6
+ metadata.gz: 2bae0f0b5ec46a3454ad87e4a83d0c70ba29283ab6494c14ce5160a765b8273f439539f9f2c314fb8c1459cf567256f21f2403094de38b77b8295ed397deb9f0
7
+ data.tar.gz: 01e0609b13afefd8840615c948b46efccb359850a662139c445a7f598b188d4ccf1df70637ee7cd80d84fe701834909f04922070b43fcbfe3cb5304347b03c06
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- testmetrics_rspec (0.2.0)
4
+ testmetrics_rspec (1.0.1)
5
5
  faraday (>= 0.9.0)
6
6
 
7
7
  GEM
data/lib/testmetrics_rspec/rspec2.rb CHANGED
@@ -48,10 +48,20 @@ class TestmetricsRspec < RSpec::Core::Formatters::BaseFormatter
48
48
  end
49
49
  end
50
50
 
51
- BRANCH_VARS = ["TRAVIS_BRANCH", "CIRCLE_BRANCH", "CI_COMMIT_REF_NAME", "BRANCH_NAME"]
51
+ BRANCH_VARS = ["TRAVIS_EVENT_TYPE", "CIRCLE_BRANCH", "CI_COMMIT_REF_NAME", "BRANCH_NAME"]
52
52
  def git_branch
53
- correct_var = BRANCH_VARS.find do |var| ENV[var] != nil end
54
- correct_var.nil? ? "Unknown" : ENV[correct_var]
53
+ correct_var = BRANCH_VARS.find do |var| ENV[var] != nil && ENV[var] != "" end
54
+
55
+ if correct_var == "TRAVIS_EVENT_TYPE"
56
+ case ENV[correct_var]
57
+ when "push"
58
+ ENV["TRAVIS_BRANCH"]
59
+ when "pull_request"
60
+ ENV["TRAVIS_PULL_REQUEST_BRANCH"]
61
+ end
62
+ else
63
+ correct_var.nil? ? "Unknown" : ENV[correct_var]
64
+ end
55
65
  end
56
66
 
57
67
  SHA_VARS = ["TRAVIS_COMMIT", "CIRCLE_SHA1", "CI_COMMIT_SHA", "REVISION"]
data/lib/testmetrics_rspec/rspec3.rb CHANGED
@@ -46,15 +46,25 @@ class TestmetricsRspec < RSpec::Core::Formatters::BaseFormatter
46
46
  TestmetricsRspec::Persist.call(@results)
47
47
  end
48
48
 
49
- BRANCH_VARS = ["TRAVIS_BRANCH", "CIRCLE_BRANCH", "CI_COMMIT_REF_NAME", "BRANCH_NAME"]
49
+ BRANCH_VARS = ["TRAVIS_EVENT_TYPE", "CIRCLE_BRANCH", "CI_COMMIT_REF_NAME", "BRANCH_NAME"]
50
50
  def git_branch
51
- correct_var = BRANCH_VARS.find do |var| ENV[var] != nil end
52
- correct_var.nil? ? "Unknown" : ENV[correct_var]
51
+ correct_var = BRANCH_VARS.find do |var| ENV[var] != nil && ENV[var] != "" end
52
+
53
+ if correct_var == "TRAVIS_EVENT_TYPE"
54
+ case ENV[correct_var]
55
+ when "push"
56
+ ENV["TRAVIS_BRANCH"]
57
+ when "pull_request"
58
+ ENV["TRAVIS_PULL_REQUEST_BRANCH"]
59
+ end
60
+ else
61
+ correct_var.nil? ? "Unknown" : ENV[correct_var]
62
+ end
53
63
  end
54
64
 
55
65
  SHA_VARS = ["TRAVIS_COMMIT", "CIRCLE_SHA1", "CI_COMMIT_SHA", "REVISION"]
56
66
  def git_sha
57
- correct_var = SHA_VARS.find do |var| ENV[var] != nil end
67
+ correct_var = SHA_VARS.find do |var| ENV[var] != nil && ENV[var] != "" end
58
68
  correct_var.nil? ? "Unknown" : ENV[correct_var]
59
69
  end
60
70
 
data/testmetrics_rspec.gemspec CHANGED
@@ -1,10 +1,9 @@
1
-
2
1
  lib = File.expand_path("../lib", __FILE__)
3
2
  $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4
3
 
5
4
  Gem::Specification.new do |spec|
6
5
  spec.name = "testmetrics_rspec"
7
- spec.version = "1.0.0"
6
+ spec.version = "1.0.1"
8
7
  spec.authors = ["Devon Estes"]
9
8
  spec.email = ["devon.c.estes@gmail.com"]
10
9
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: testmetrics_rspec
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0
4
+ version: 1.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Devon Estes
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2019-01-03 00:00:00.000000000 Z
11
+ date: 2019-01-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -90,7 +90,6 @@ files:
90
90
  - lib/testmetrics_rspec/persist.rb
91
91
  - lib/testmetrics_rspec/rspec2.rb
92
92
  - lib/testmetrics_rspec/rspec3.rb
93
- - lib/testmetrics_rspec/version.rb
94
93
  - testmetrics_rspec.gemspec
95
94
  homepage: https://testmetrics.app
96
95
  licenses: []
data/lib/testmetrics_rspec/version.rb DELETED
@@ -1,2 +0,0 @@
1
- VERSION =
2
- end