Switch TravisLint to use travis gem

The `travis-lint` gem is deprecated in favor of `travis`.

Change-Id: I66f76739d780b90dad3426759ab45946eab14237
Reviewed-on: http://gerrit.causes.com/45347
Tested-by: jenkins <jenkins@brigade.com>
Reviewed-by: Shane da Silva <shane.dasilva@brigade.com>

Author: sds

CHANGELOG.md

@@ -4,6 +4,8 @@
 
 * Change `HardTabs`, `MergeConflicts`, and `PryBinding` pre-commit hooks to
   be `quiet` by default
+* Switch `TravisLint` pre-commit hook from deprecated `travis-lint` gem to
+  `travis` gem
 
 ## 0.20.0
 

config/default.yml

@@ -218,8 +218,8 @@ PreCommit:
 
   TravisLint:
     description: 'Checking Travis CI configuration'
-    required_executable: 'travis-lint'
-    install_command: 'gem install travis-lint'
+    required_executable: 'travis'
+    install_command: 'gem install travis'
     include: '.travis.yml'
 
   YamlSyntax:

lib/overcommit/hook/pre_commit/travis_lint.rb

@@ -2,10 +2,10 @@ module Overcommit::Hook::PreCommit
   # Runs `travis-lint` against any modified Travis CI files.
   class TravisLint < Base
     def run
-      result = execute([executable] + applicable_files)
+      result = execute([executable, 'lint'] + applicable_files)
       return :pass if result.success?
 
-      [:fail, result.stdout.strip]
+      [:fail, (result.stdout + result.stderr).strip]
     end
   end
 end

overcommit.gemspec

@@ -30,5 +30,5 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'image_optim', '~> 0.18.0'
   s.add_development_dependency 'rspec', '~> 3.0'
-  s.add_development_dependency 'travis-lint', '~> 2.0'
+  s.add_development_dependency 'travis', '~> 1.7'
 end

spec/overcommit/hook/pre_commit/travis_lint_spec.rb

@@ -24,6 +24,7 @@
       result = double('result')
       result.stub(:success?).and_return(false)
       result.stub(:stdout).and_return('Some error message')
+      result.stub(:stderr).and_return('')
       subject.stub(:execute).and_return(result)
     end