travis-lint 1.7.0 → 1.8.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c90e5a5967d9959dbb6679288e5268f47b9cb9b5
+  data.tar.gz: 25d78a63add59c86018b58d2394ba23613656875
+SHA512:
+  metadata.gz: 6eed0e5956ff097a76f34fb935612c33101ca3f8f2afe993f62307946f427c7d36eabb824eff32930301dab16234158c1b201c3c6c3271b7fcbe1f79994ce34a
+  data.tar.gz: 834b2b41ffd8f1e23d36bca9a864d8e3b0733959f6edeb1cbc2c98327094da3c0af74653606512b41eb13549203662e8cff770636e092098629fc627de6b3126

data/.travis.yml

@@ -2,13 +2,19 @@ language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
+  - 2.0.0
   - jruby-18mode
   - jruby-19mode
-  - rbx-18mode
-  - rbx-19mode
+  - rbx
   - jruby-head
   - ruby-head
   - 1.8.7
+matrix:
+  allow_failures:
+    - rvm: jruby-head
+    - rvm: ruby-head
+before_install:
+  - 'ruby -e ''puts RUBY_VERSION'' | grep ^1\.8 && gem update --system 2.1.11 || true'
 script: bundle exec rspec -c spec
 notifications:
   irc: "irc.freenode.org#travis"

data/Gemfile

@@ -2,3 +2,6 @@ source "http://rubygems.org"
 
 gemspec
 
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+end

data/README.md

@@ -1,8 +1,7 @@
 # What is travis-lint
 
 `travis-lint` is a tool that checks your `.travis.yml` file for possible issues, deprecations and so on.  
-Supporting the gem, there used to be an online version of this tool at [lint.travis-ci.org](http://lint.travis-ci.org),
-although it is currently down due to a security issue with the YAML parser. See [issue #17](https://github.com/travis-ci/travis-lint/issues/17) for updates.
+Supporting the gem, there's also an online version of this tool at [lint.travis-ci.org](http://lint.travis-ci.org).
 
 [![Continuous Integration status](https://secure.travis-ci.org/travis-ci/travis-lint.png)](http://travis-ci.org/travis-ci/travis-lint)
 
@@ -34,6 +33,6 @@ Once you are done with your changes, push a branch and submit a pull request.
 
 ## License & Copyright
 
-Copyright 2012 (c) Travis CI Development Team.
+Copyright 2014 (c) Travis CI Development Team.
 
 Released under the MIT license.

data/lib/travis/lint/linter.rb

@@ -51,15 +51,15 @@ module Travis
         hsh[:rvm].is_a?(Array) && hsh[:rvm].include?("jruby")
       end
 
-      validator_for :ruby, :rvm, "Prefer rbx-18mode RVM alias to rbx" do |hsh|
-        hsh[:rvm].is_a?(Array) && hsh[:rvm].include?("rbx")
+      validator_for :ruby, :rvm, "rbx-18mode RVM alias is no longer provide. Please use one of rbx, rbx-X, rbx-X.Y, or rbx-X.Y.Z depending on your desired version" do |hsh|
+        hsh[:rvm].is_a?(Array) && hsh[:rvm].include?("rbx-18mode")
       end
 
-      validator_for :ruby, :rvm, "rbx-2.0 RVM alias is no longer provided. Please use rbx-18mode or rbx-19mode instead." do |hsh|
-        hsh[:rvm].is_a?(Array) && hsh[:rvm].include?("rbx-2.0")
+      validator_for :ruby, :rvm, "rbx-19mode RVM alias is no longer provide. Please use one of rbx, rbx-X, rbx-X.Y, or rbx-X.Y.Z depending on your desired version" do |hsh|
+        hsh[:rvm].is_a?(Array) && hsh[:rvm].include?("rbx-19mode")
       end
 
-      validator_for :ruby, :rvm, "rbx-2.0.0pre RVM alias is no longer provided. Please use rbx-18mode or rbx-19mode instead." do |hsh|
+      validator_for :ruby, :rvm, "rbx-2.0.0pre RVM alias is no longer provided. Please use one of rbx, rbx-X, rbx-X.Y, or rbx-X.Y.Z depending on your desired version" do |hsh|
         hsh[:rvm].is_a?(Array) && hsh[:rvm].include?("rbx-2.0.0pre")
       end
 
@@ -82,12 +82,12 @@ module Travis
       end
 
 
-      KNOWN_RUBY_VERSIONS = %w(1.8.7 ruby-1.8.7 1.9.2 ruby-1.9.2 1.9.3 ruby-1.9.3 2.0.0 ruby-2.0.0 ruby-head jruby jruby-18mode jruby-19mode rbx rbx-18mode rbx-19mode jruby-head ree ree-1.8.7)
+      KNOWN_RUBY_VERSIONS = %w(1.8.7 ruby-1.8.7 1.9.2 ruby-1.9.2 1.9.3 ruby-1.9.3 2.0.0 ruby-2.0.0 2.1.0 ruby-2.1.0 2.1.1 ruby-2.1.1 ruby-head jruby jruby-18mode jruby-19mode rbx rbx-18mode rbx-19mode jruby-head ree ree-1.8.7 2.1.0-preview2 ruby-2.1.0-preview2 2.1.0-preview1 ruby-2.1.0-preview1 ree-1.8.7-2011.12)
       KNOWN_NODE_VERSIONS = %w(0.6 0.8 0.9 0.10 0.11)
-      KNOWN_PHP_VERSIONS  = %w(5.2 5.3 5.3.3 5.4 5.5)
+      KNOWN_PHP_VERSIONS  = %w(5.2 5.3 5.3.3 5.4 5.5 5.6 hhvm)
 
-      KNOWN_PYTHON_VERSIONS  = %w(2.5 2.6 2.7 3.2 3.3 pypy)
-      KNOWN_PERL_VERSIONS    = %w(5.10 5.12 5.14 5.16)
+      KNOWN_PYTHON_VERSIONS  = %w(2.6 2.7 3.2 3.3 pypy)
+      KNOWN_PERL_VERSIONS    = %w(5.8 5.10 5.12 5.14 5.16 5.18 5.19)
 
 
       #
@@ -124,11 +124,25 @@ module Travis
       end
 
       validator_for :all, :matrix, "Allowed matrix failures must contain a list of hashes." do |hash|
-        if hash[:matrix] and hash[:matrix][:allow_failures]
+        if hash[:matrix] && hash[:matrix].is_a?(Hash) && hash[:matrix][:allow_failures]
           !hash[:matrix][:allow_failures].any?{|failure| failure.is_a?(Hash)}
         end
       end
 
+      validator_for :all, :matrix, "Matrix includes must be a list of hashes." do |hash|
+        if hash[:matrix] && hash[:matrix].is_a?(Hash) && hash[:matrix][:include]
+          !hash[:matrix][:include].any?{|failure| failure.is_a?(Hash)}
+        end
+      end
+
+      validator_for :all, :matrix, "Matrix must be a hash." do |hash|
+        !(hash[:matrix].nil? || hash[:matrix].is_a?(Hash))
+      end
+
+      validator_for :all, :language, "Language must be valid" do |hash|
+        hash.has_key?(:language) && validators_for_language(hash[:language]).empty?
+      end
+
       protected
 
       def self.known_ruby_versions?(ary)

data/lib/travis/lint/runner.rb

@@ -1,5 +1,5 @@
 require "pathname"
-require "yaml"
+require "safe_yaml"
 
 require "travis/lint/linter"
 
@@ -16,6 +16,8 @@ module Travis
           end
         end
 
+        @quiet = !!ENV['QUIET']
+
         @travis_yml_file_paths = []
         argv.each do |arg|
           @travis_yml_file_paths << Pathname.new(arg).expand_path
@@ -30,17 +32,20 @@ module Travis
           check_that_travis_yml_file_is_valid_yaml!(travis_yml_file_path)
 
           if (issues = Linter.validate(self.parsed_travis_yml(travis_yml_file_path))).empty?
-            puts "Hooray, #{travis_yml_file_path} seems to be solid!"
+            unless @quiet
+              puts "Hooray, #{travis_yml_file_path} seems to be solid!\n"
+            end
           else
             errors = true
-            puts "#{travis_yml_file_path} has issues:"
+            $stderr.puts "#{travis_yml_file_path} has issues:"
             issues.each do |issue|
-              puts "  Found an issue with the `#{issue[:key]}:` key:\n    #{issue[:issue]}"
+              $stderr.puts "  Found an issue with the `#{issue[:key]}:` key:\n    #{issue[:issue]}"
             end
+            $stderr.puts
           end
-          puts
         end
         exit(1) if errors
+        exit(0)
       end
 
       protected
@@ -53,14 +58,14 @@ module Travis
 
       def check_that_travis_yml_file_is_valid_yaml!(travis_yml_file_path)
         begin
-          YAML.load_file(travis_yml_file_path)
-        rescue ArgumentError, Psych::SyntaxError
-          quit "#{travis_yml_file_path} is not a valid YAML file and thus will be ignored by Travis CI."
+          YAML.load_file travis_yml_file_path, :safe => true
+        rescue ArgumentError, Psych::SyntaxError => e
+          quit "#{travis_yml_file_path} is not a valid YAML file and thus will be ignored by Travis CI.\nError message: #{e.message}"
         end
       end
 
       def parsed_travis_yml(travis_yml_file_path)
-        YAML.load_file(travis_yml_file_path)
+        YAML.load_file travis_yml_file_path, :safe => true
       end
 
       def show_help
@@ -74,9 +79,7 @@ Usage:
       end
 
       def quit(message, status = 1)
-        puts message
-        puts
-
+        $stderr.puts message
         exit(status)
       end
     end

data/lib/travis/lint/version.rb

@@ -1,6 +1,6 @@
 module Travis
   module Lint
-    VERSION = "1.7.0"
+    VERSION = "1.8.0"
     Version = VERSION
   end
 end

data/spec/files/contains_exploit.yml

@@ -0,0 +1,4 @@
+--- !ruby/object
+table:
+  :backdoor: !ruby/hash:ExploitableClassBuilder
+    "foo; end; raise %(I'm in yr system!); def bar": "baz"

data/spec/files/invalid_language_key.yml

@@ -0,0 +1,17 @@
+language: foo
+rvm:
+  - 1.9.3
+  - jruby-19mode
+  - rbx
+gemfile:
+  - Gemfile
+  - gemfiles/eventmachine-pre
+notifications:
+  recipients:
+    - recepient@example.com
+branches:
+  only:
+    - master
+    - 0.9.x-stable
+    - 0.8.x-stable
+    - 0.7.x-stable

data/spec/files/no_language_key.yml

@@ -1,7 +1,7 @@
 rvm:
   - 1.9.3
   - jruby-19mode
-  - rbx-19mode
+  - rbx
 gemfile:
   - Gemfile
   - gemfiles/eventmachine-pre

data/spec/files/uses_jruby_instead_of_jruby_in_specific_mode.yml

@@ -1,4 +1,4 @@
 language: ruby
 rvm:
   - jruby
-  - rbx-2.0.0pre
+  - rbx-2.0.0

data/spec/travis_lint_runner_spec.rb

@@ -1,27 +1,100 @@
 require "spec_helper"
 require "stringio"
 
-def capture_stdout
-  $stdout = StringIO.new
-  yield
-ensure
-  $stdout = STDOUT
+def capture
+  status = nil
+  $stdout = out = StringIO.new
+  $stderr = err = StringIO.new
+
+  begin
+    yield
+  rescue SystemExit => e
+    status = e.status
+  ensure
+    $stdout = STDOUT
+    $stderr = STDERR
+  end
+
+  err.rewind
+  out.rewind
+  return out.read || '', err.read || '', status
+end
+
+class ExploitableClassBuilder
+  def []=(key, value)
+    Class.new.class_eval <<-EOS
+      def #{key}
+        #{value}
+      end
+    EOS
+  end
 end
 
 describe "A .travis.yml" do
   context "with issues" do
     it "run should exit with non-zero exit status" do
-      status = 0
+      _, _, status = capture do
+        Travis::Lint::Runner.new(["spec/files/uses_unsupported_perl.yml"]).run
+      end
+
+      status.should_not == 0
+    end
+
+    it "run should report errors to $stderr" do
+      _, err, _ = capture do
+        Travis::Lint::Runner.new(["spec/files/uses_unsupported_perl.yml"]).run
+      end
+
+      err.chomp.should =~ /Found an issue with the `perl:` key:/
+    end
+
+    it "run should not report errors to $stdout" do
+      out, _, _ = capture do
+        Travis::Lint::Runner.new(["spec/files/uses_unsupported_perl.yml"]).run
+      end
 
-      begin
-        capture_stdout do
-          Travis::Lint::Runner.new(["spec/files/uses_unsupported_perl.yml"]).run()
+      out.chomp.should == ''
+    end
+  end
+
+  context "without issues" do
+    it "run should exit with zero exit status" do
+      _, _, status = capture do
+        Travis::Lint::Runner.new([".travis.yml"]).run
+      end
+
+      status.should == 0
+    end
+
+    it "run should report success to $stdout" do
+      out, _, _ = capture do
+        Travis::Lint::Runner.new([".travis.yml"]).run
+      end
+
+      out.chomp.should =~ /Hooray.*\.travis\.yml seems to be solid!/
+    end
+
+    context "with $QUIET set" do
+      before { ENV['QUIET'] = '1' }
+      after { ENV['QUIET'] = nil }
+
+      it "run should be silent" do
+        out, _, _ = capture do
+          Travis::Lint::Runner.new([".travis.yml"]).run
         end
-      rescue SystemExit => e
-        status = e.status
+
+        out.chomp.should == ''
       end
+    end
+  end
 
-      status.should_not == 0
+  context "with an exploit" do
+    it "loads safely" do
+      expect {
+        capture {
+          Travis::Lint::Runner.new(["spec/files/contains_exploit.yml"]).run
+        }
+      }.to_not raise_error
     end
   end
 end

data/spec/travis_lint_spec.rb

@@ -13,16 +13,16 @@ describe "A .travis.yml" do
     { :key => :rvm, :issue => "Prefer jruby-18mode RVM alias to jruby" }
   end
 
-  let(:prefer_rbx18mode_over_rbx) do
-    { :key => :rvm, :issue => "Prefer rbx-18mode RVM alias to rbx" }
+  let(:rbx18mode_is_no_longer_provided) do
+    { :key => :rvm, :issue => "rbx-18mode RVM alias is no longer provide. Please use one of rbx, rbx-X, rbx-X.Y, or rbx-X.Y.Z depending on your desired version" }
   end
 
-  let(:rbx20_is_no_longer_provided) do
-    { :key => :rvm, :issue => "rbx-2.0 RVM alias is no longer provided. Please use rbx-18mode or rbx-19mode instead." }
+  let(:rbx19mode_is_no_longer_provided) do
+    { :key => :rvm, :issue => "rbx-19mode RVM alias is no longer provide. Please use one of rbx, rbx-X, rbx-X.Y, or rbx-X.Y.Z depending on your desired version" }
   end
 
   let(:rbx200pre_is_no_longer_provided) do
-    { :key => :rvm, :issue => "rbx-2.0.0pre RVM alias is no longer provided. Please use rbx-18mode or rbx-19mode instead." }
+    { :key => :rvm, :issue => "rbx-2.0.0pre RVM alias is no longer provided. Please use one of rbx, rbx-X, rbx-X.Y, or rbx-X.Y.Z depending on your desired version" }
   end
 
   let(:otp_release_key_is_required) do
@@ -34,7 +34,7 @@ describe "A .travis.yml" do
   def content_of_sample_file(name)
     path = Pathname.new(File.join("spec", "files", name)).expand_path
 
-    YAML.load_file(path.to_s)
+    YAML.load_file path.to_s, :safe => true
   end
 
   context "that is blank" do
@@ -45,6 +45,12 @@ describe "A .travis.yml" do
     end
   end
 
+  context "with invalid language" do
+    it "is invalid" do
+      Travis::Lint::Linter.valid?(content_of_sample_file("invalid_language_key.yml")).should be_false
+    end
+  end
+
   context "using String keys" do
     it "is validates as with Symbol keys" do
       Travis::Lint::Linter.validate({ "language" => "ruby" }).should include(rvm_key_is_recommended)
@@ -70,34 +76,34 @@ describe "A .travis.yml" do
       end
     end
 
-    context "and uses rbx instead of rbx-18mode" do
+    context "and uses rbx-18mode" do
       let(:travis_yml) do
-        { :language => "ruby", :rvm => ["rbx", "1.9.3"] }
+        { :language => "ruby", :rvm => ["rbx-18mode", "1.9.3"] }
       end
 
       it "is invalid" do
-        Travis::Lint::Linter.validate(travis_yml).should include(prefer_rbx18mode_over_rbx)
+        Travis::Lint::Linter.validate(travis_yml).should include(rbx18mode_is_no_longer_provided)
       end
     end
 
-    context "and uses rbx-2.0 instead of rbx-18mode" do
+    context "and uses rbx-19mode" do
       let(:travis_yml) do
-        { :language => "ruby", :rvm => ["rbx-2.0", "1.9.3"] }
+        { :language => "ruby", :rvm => ["rbx-19mode", "1.9.3"] }
       end
 
       it "is invalid" do
-        Travis::Lint::Linter.validate(travis_yml).should include(rbx20_is_no_longer_provided)
-        Travis::Lint::Linter.valid?(content_of_sample_file("uses_old_rbx_aliases.yml")).should be_false
+        Travis::Lint::Linter.validate(travis_yml).should include(rbx19mode_is_no_longer_provided)
       end
     end
 
-    context "and uses rbx-2.0.0pre instead of rbx-18mode" do
+    context "and uses rbx-2.0.0pre" do
       let(:travis_yml) do
         { :language => "ruby", :rvm => ["rbx-2.0.0pre", "1.9.3"] }
       end
 
       it "is invalid" do
         Travis::Lint::Linter.validate(travis_yml).should include(rbx200pre_is_no_longer_provided)
+        Travis::Lint::Linter.valid?(content_of_sample_file("uses_old_rbx_aliases.yml")).should be_false
       end
     end
 
@@ -205,6 +211,19 @@ describe "A .travis.yml" do
   end
 
   context "with a build matrix" do
+    let(:invalid_array_matrix) {
+      {:matrix => ['foo', 'bar', 'baz']}
+    }
+
+    let(:build_matrix_is_not_hash) {
+      {:key => :matrix, :issue => "Matrix must be a hash."}
+    }
+
+    it "is invalid unless the build matrix is a hash" do
+      Travis::Lint::Linter.valid?(invalid_array_matrix).should eq(false)
+      Travis::Lint::Linter.validate(invalid_array_matrix).should include(build_matrix_is_not_hash)
+    end
+
     let(:build_matrix_is_not_list_of_hashes) {
       {:key => :matrix, :issue => "Allowed matrix failures must contain a list of hashes."}
     }
@@ -226,5 +245,31 @@ describe "A .travis.yml" do
         Travis::Lint::Linter.valid?(valid_matrix).should == true
       end
     end
+    context "with include" do
+      let(:include_is_a_hash) {
+        {:matrix => {:include => {"jdk"=> 'openjdk6', 'script' => 'mvn dostuff'}}}
+      }
+
+      let(:include_is_an_array_of_arrays) {
+        {:matrix => {:include => [[{"jdk"=> 'openjdk6', 'script' => 'mvn dostuff'}]]}}
+      }
+
+      let(:valid_matrix) {
+        {:matrix => {:include => [{"jdk"=> 'openjdk6', 'script' => 'mvn dostuff'}]}}
+      }
+
+      let(:include_is_not_list_of_hashes) {
+        {:key => :matrix, :issue => "Matrix includes must be a list of hashes."}
+      }
+      it "is invalid when the include is not a list of hashes" do
+        Travis::Lint::Linter.validate(include_is_a_hash).should include(include_is_not_list_of_hashes)
+        Travis::Lint::Linter.valid?(include_is_a_hash).should == false
+        Travis::Lint::Linter.validate(include_is_an_array_of_arrays).should include(include_is_not_list_of_hashes)
+        Travis::Lint::Linter.valid?(include_is_an_array_of_arrays).should == false
+      end
+      it "is valid when allowed include is a list of hashes" do
+        Travis::Lint::Linter.valid?(valid_matrix).should == true
+      end
+    end
   end
 end

data/travis-lint.gemspec

@@ -16,7 +16,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency("hashr", "~> 0.0.22")
+  s.add_dependency "hashr", "~> 0.0.22"
+  s.add_dependency "safe_yaml", '~> 0.9.0'
 
-  s.add_development_dependency("rspec", "~> 2.8")
+  s.add_development_dependency "rspec", "~> 2.8"
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis-lint
 version: !ruby/object:Gem::Version
-  version: 1.7.0
-  prerelease: 
+  version: 1.8.0
 platform: ruby
 authors:
 - Michael S. Klishin
@@ -10,38 +9,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.22
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.22
+- !ruby/object:Gem::Dependency
+  name: safe_yaml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
 description: travis-lint is a tool that check your .travis.yml for possible issues,
@@ -54,9 +63,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -67,6 +76,8 @@ files:
 - lib/travis/lint/runner.rb
 - lib/travis/lint/validator.rb
 - lib/travis/lint/version.rb
+- spec/files/contains_exploit.yml
+- spec/files/invalid_language_key.yml
 - spec/files/no_language_key.yml
 - spec/files/no_rvm_key.yml
 - spec/files/uses_jruby_instead_of_jruby_in_specific_mode.yml
@@ -83,29 +94,30 @@ files:
 - travis-lint.gemspec
 homepage: http://github.com/travis-ci
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Checks your .travis.yml for possible issues, deprecations and so on
 test_files:
+- spec/files/contains_exploit.yml
+- spec/files/invalid_language_key.yml
 - spec/files/no_language_key.yml
 - spec/files/no_rvm_key.yml
 - spec/files/uses_jruby_instead_of_jruby_in_specific_mode.yml