KevinMidboe/linguist
1
0
Fork 0
mirror of https://github.com/KevinMidboe/linguist.git synced 2025-10-29 17:50:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2690 from github/licensee-6

Browse Source 
Upgrade to licensee 6
This commit is contained in:
Arfon Smith
2015-11-10 09:41:09 +00:00
parent 34abe5b983 d081f687b0
commit fd5da9cb15
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
github-linguist.gemspec
View File

@@ -24,6 +24,6 @@ Gem::Specification.new do |s|
s.add_development_dependency 'rake' s.add_development_dependency 'rake'
s.add_development_dependency 'yajl-ruby' s.add_development_dependency 'yajl-ruby'
s.add_development_dependency 'color-proximity', '~> 0.2.1' s.add_development_dependency 'color-proximity', '~> 0.2.1'
s.add_development_dependency 'licensee', '~> 4.7.4' s.add_development_dependency 'licensee', '6.0.0b1'
end end

5
test/test_grammars.rb
View File

@@ -9,7 +9,6 @@ class TestGrammars < Minitest::Test
# This grammar has a nonstandard but acceptable license. # This grammar has a nonstandard but acceptable license.
"vendor/grammars/gap-tmbundle", "vendor/grammars/gap-tmbundle",
"vendor/grammars/factor",
# These grammars have no license but have been grandfathered in. New grammars # These grammars have no license but have been grandfathered in. New grammars
# must have a license that allows redistribution. # must have a license that allows redistribution.
@@ -81,7 +80,7 @@ class TestGrammars < Minitest::Test
end end
def test_submodules_have_recognized_licenses def test_submodules_have_recognized_licenses
unrecognized = submodule_licenses.select { |k,v| v.nil? && Licensee::Project.new(k).license_file } unrecognized = submodule_licenses.select { |k,v| v.nil? && Licensee::FSProject.new(k).license_file }
unrecognized.reject! { |k,v| PROJECT_WHITELIST.include?(k) } unrecognized.reject! { |k,v| PROJECT_WHITELIST.include?(k) }
message = "The following submodules have unrecognized licenses:\n* #{unrecognized.keys.join("\n* ")}\n" message = "The following submodules have unrecognized licenses:\n* #{unrecognized.keys.join("\n* ")}\n"
message << "Please ensure that the project's LICENSE file contains the full text of the license." message << "Please ensure that the project's LICENSE file contains the full text of the license."
@@ -132,7 +131,7 @@ class TestGrammars < Minitest::Test
# Given the path to a submodule, return its SPDX-compliant license key # Given the path to a submodule, return its SPDX-compliant license key
def submodule_license(submodule) def submodule_license(submodule)
# Prefer Licensee to detect a submodule's license # Prefer Licensee to detect a submodule's license
project = Licensee::Project.new(submodule) project = Licensee::FSProject.new(submodule)
return project.license.key if project.license return project.license.key if project.license
# We know a license file exists, but Licensee wasn't able to detect the license, # We know a license file exists, but Licensee wasn't able to detect the license,