Merge pull request #1549 from kr/godep

Treat Go dependency tree as generated and vendored code
This commit is contained in:
Arfon Smith
2014-09-24 10:56:41 -05:00
3 changed files with 20 additions and 0 deletions

View File

@@ -63,6 +63,7 @@ module Linguist
generated_jni_header? || generated_jni_header? ||
composer_lock? || composer_lock? ||
node_modules? || node_modules? ||
godeps? ||
vcr_cassette? || vcr_cassette? ||
generated_by_zephir? generated_by_zephir?
end end
@@ -231,6 +232,14 @@ module Linguist
!!name.match(/node_modules\//) !!name.match(/node_modules\//)
end end
# Internal: Is the blob part of Godeps/,
# which are not meant for humans in pull requests.
#
# Returns true or false.
def godeps?
!!name.match(/Godeps\//)
end
# Internal: Is the blob a generated php composer lock file? # Internal: Is the blob a generated php composer lock file?
# #
# Returns true or false. # Returns true or false.

View File

@@ -33,6 +33,9 @@
# Erlang bundles # Erlang bundles
- ^rebar$ - ^rebar$
# Go dependencies
- Godeps/_workspace/
# Bootstrap minified css and js # Bootstrap minified css and js
- (^|/)bootstrap([^.]*)(\.min)?\.(js|css)$ - (^|/)bootstrap([^.]*)(\.min)?\.(js|css)$

View File

@@ -262,6 +262,10 @@ class TestBlob < Test::Unit::TestCase
assert Linguist::Generated.generated?("node_modules/grunt/lib/grunt.js", nil) assert Linguist::Generated.generated?("node_modules/grunt/lib/grunt.js", nil)
# Godep saved dependencies
assert blob("Godeps/Godeps.json").generated?
assert blob("Godeps/_workspace/src/github.com/kr/s3/sign.go").generated?
end end
def test_vendored def test_vendored
@@ -279,6 +283,10 @@ class TestBlob < Test::Unit::TestCase
assert blob("app/bower_components/custom/custom.js").vendored? assert blob("app/bower_components/custom/custom.js").vendored?
assert blob("vendor/assets/bower_components/custom/custom.js").vendored? assert blob("vendor/assets/bower_components/custom/custom.js").vendored?
# Go dependencies
assert !blob("Godeps/Godeps.json").vendored?
assert blob("Godeps/_workspace/src/github.com/kr/s3/sign.go").vendored?
# Rails vendor/ # Rails vendor/
assert blob("vendor/plugins/will_paginate/lib/will_paginate.rb").vendored? assert blob("vendor/plugins/will_paginate/lib/will_paginate.rb").vendored?