diff --git a/Gemfile b/Gemfile index d990deba..9dc1b4dc 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,3 @@ source 'https://rubygems.org' gemspec :name => "github-linguist" gem 'byebug' if RUBY_VERSION >= '2.0' -gem 'licensor', :path => "../licensor" diff --git a/github-linguist.gemspec b/github-linguist.gemspec index dacc8c1f..f0d13d9f 100644 --- a/github-linguist.gemspec +++ b/github-linguist.gemspec @@ -25,6 +25,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', '6.0.0' + s.add_development_dependency 'licensed' end diff --git a/script/licensor b/script/licensor index 94309a3d..0cbd802e 100755 --- a/script/licensor +++ b/script/licensor @@ -3,9 +3,9 @@ # TODO: push these changes to licensor gem require "bundler/setup" -require "licensor/cli" +require "licensed/cli" -module Licensor +module Licensed module Source class Filesystem attr_reader :type @@ -22,7 +22,7 @@ module Licensor def dependencies Dir.glob(@glob).map do |directory| puts "caching #{directory}" - Licensor::Dependency.new(directory, { + Licensed::Dependency.new(directory, { "type" => type, "name" => File.basename(directory) }) @@ -32,12 +32,12 @@ module Licensor end end -source = Licensor::Source::Filesystem.new("vendor/grammars/*/", type: "grammar") -config = Licensor::Configuration.new +source = Licensed::Source::Filesystem.new("vendor/grammars/*/", type: "grammar") +config = Licensed::Configuration.new config.sources << source if ARGV[0] == "verify" - Licensor::Command::Verify.new(config).run + Licensed::Command::Verify.new(config).run else - Licensor::Command::Cache.new(config).run(force: true) + Licensed::Command::Cache.new(config).run(force: true) end