codeclimate_batch 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc244d7d57a094efd8de9ed59d16f027554a8c4c
-  data.tar.gz: c2c26ae7c6c1be89ae6723e8463791cb3d2477a2
+  metadata.gz: d9bd2ea876f2dc38e3f3236a50545ff2054467a1
+  data.tar.gz: 0316022ebf6aaeb982e95285b35e878336ec6bc5
 SHA512:
-  metadata.gz: 621e69d58907012ef43b4b45ccb67aedfc7a3b894a28719f57400bdf363000360dd6f054fc22cb08f90b4dd164e594545f42a47779f135605f50cae4800b50bb
-  data.tar.gz: 12443cc98868c12a1ced64510ffb4c9f3fbffd7070ef2d45f6cdbfa0ec9d21abe1bf1134491e9d5556a09776ed7bd2f6d68107ffbb96cfaa78dbe6cfb82a6db0
+  metadata.gz: 9de5d913945f7e318104d0ecc59e85ff975acebad95a76bf98be376a5bd98faf90e0a529b1930d7e162e2cce037d52c580a43013e3e39f050db53ad2a59b71e7
+  data.tar.gz: 69f0663700c12c072694a3d4de242f6b691b8b14ec2dd18c6c6eef769f14b8d7ca037b62383f7c9140db315bdbf18799fb4765c5adbfce525b32149c8a92ad04

data/lib/codeclimate_batch.rb

@@ -2,9 +2,11 @@ require 'json'
 
 module CodeclimateBatch
   class << self
-    # code climate only accepts reports from master but records coverage on all PRs -> wasted time
+    # Start TestReporter with appropriate settings.
+    # Note that Code Climate only accepts reports from the default branch (usually master, but can be changed)
+    # but records coverage on all PRs -> wasted time
     def start
-      return if ENV['TRAVIS'] && (ENV['TRAVIS_BRANCH'] != 'master' || ENV['TRAVIS_PULL_REQUEST'].to_i != 0)
+      return if travis? && (outside_default_branch? || pull_request?)
       ENV['CODECLIMATE_TO_FILE'] = '1' # write results to file since we need to combine them before sending
       gem 'codeclimate-test-reporter', '>= 0.4.8' # get CODECLIMATE_TO_FILE support and avoid deprecations
       require 'codeclimate-test-reporter'
@@ -23,6 +25,27 @@ module CodeclimateBatch
 
     private
 
+    # Return the default branch. Most of the time it's master, but can be overridden
+    # by setting DEFAULT_BRANCH in the environment.
+    def default_branch
+      ENV['DEFAULT_BRANCH'] || 'master'
+    end
+
+    # Check if we are running on Travis CI.
+    def travis?
+      ENV['TRAVIS']
+    end
+
+    # Check if our Travis build is running on the default branch.
+    def outside_default_branch?
+      default_branch != ENV['TRAVIS_BRANCH']
+    end
+
+    # Check if running a pull request.
+    def pull_request?
+      ENV['TRAVIS_PULL_REQUEST'].to_i != 0
+    end
+
     def load(file)
       JSON.load(File.read(file))
     end

data/lib/codeclimate_batch/version.rb

@@ -1,3 +1,3 @@
 module CodeclimateBatch
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codeclimate_batch
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -55,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Report a batch of codeclimate results by merging and from multiple servers