Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to licensee 6 #2690

Merged
merged 5 commits into from
Nov 10, 2015
Merged

Upgrade to licensee 6 #2690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8b01e3d
Upgrade to licensee 6.0.0b1
bkeepers Oct 16, 2015
9d865ec
license of factor grammar is now detected properly
bkeepers Oct 16, 2015
317219e
Merge branch 'master' into licensee-6
arfon Oct 21, 2015
9327268
Merge branch 'master' into licensee-6
arfon Oct 23, 2015
d081f68
Merge branch 'master' into licensee-6
arfon Nov 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion github-linguist.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ Gem::Specification.new do |s|
s.add_development_dependency 'rake'
s.add_development_dependency 'yajl-ruby'
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
5 changes: 2 additions & 3 deletions test/test_grammars.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ class TestGrammars < Minitest::Test

# This grammar has a nonstandard but acceptable license.
"vendor/grammars/gap-tmbundle",
"vendor/grammars/factor",

# These grammars have no license but have been grandfathered in. New grammars
# must have a license that allows redistribution.
Expand Down Expand Up @@ -81,7 +80,7 @@ def test_local_scopes_are_in_sync
end

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) }
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."
Expand Down Expand Up @@ -132,7 +131,7 @@ def submodule_licenses
# Given the path to a submodule, return its SPDX-compliant license key
def submodule_license(submodule)
# 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

# We know a license file exists, but Licensee wasn't able to detect the license,
Expand Down