Merge pull request #1965 from github/combine-gems

Merge github-linguist-grammars into github-linguist

Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 gemspec :name => "github-linguist"
-gemspec :name => "github-linguist-grammars"
 gem 'byebug' if RUBY_VERSION >= '2.0'

README.md

@@ -114,4 +114,9 @@ lib/linguist.rb
 
 Please check out our [contributing guidelines](CONTRIBUTING.md).
 
-##
+## License
+
+The language grammars included in this gem are covered by their repositories'
+respective licenses. `grammars.yml` specifies the repository for each grammar.
+
+All other files are covered by the MIT license, see `LICENSE`.

Rakefile

@@ -40,18 +40,14 @@ task :samples do
 end
 
 task :build_gem => :samples do
+  rm_rf "grammars"
+  sh "script/convert-grammars"
   languages = YAML.load_file("lib/linguist/languages.yml")
   File.write("lib/linguist/languages.json", Yajl.dump(languages))
   `gem build github-linguist.gemspec`
   File.delete("lib/linguist/languages.json")
 end
 
-task :build_grammars_gem do
-  rm_rf "grammars"
-  sh "script/convert-grammars"
-  sh "gem", "build", "github-linguist-grammars.gemspec"
-end
-
 namespace :benchmark do
   benchmark_path = "benchmark/results"
 

github-linguist-grammars.gemspec

@@ -1,14 +0,0 @@
-require File.expand_path('../lib/linguist/version', __FILE__)
-
-Gem::Specification.new do |s|
-  s.name    = 'github-linguist-grammars'
-  s.version = Linguist::VERSION
-  s.summary = "Language grammars for use with github-linguist"
-
-  s.authors  = "GitHub"
-  s.homepage = "https://github.com/github/linguist"
-
-  s.files = ['lib/linguist/grammars.rb'] + Dir['grammars/*']
-
-  s.add_development_dependency 'plist', '~>3.1'
-end

github-linguist.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/github/linguist"
   s.license  = "MIT"
 
-  s.files = Dir['lib/**/*'] - ['lib/linguist/grammars.rb'] + ['LICENSE']
+  s.files = Dir['lib/**/*'] + Dir['grammars/*'] + ['LICENSE']
   s.executables = ['linguist', 'git-linguist']
 
   s.add_dependency 'charlock_holmes', '~> 0.7.3'
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'minitest', '>= 5.0'
   s.add_development_dependency 'mocha'
+  s.add_development_dependency 'plist', '~>3.1'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'yajl-ruby'

lib/linguist.rb

@@ -1,5 +1,6 @@
 require 'linguist/blob_helper'
 require 'linguist/generated'
+require 'linguist/grammars'
 require 'linguist/heuristics'
 require 'linguist/language'
 require 'linguist/repository'

lib/linguist/grammars.rb

@@ -1,6 +1,3 @@
-# Note: This file is included in the github-linguist-grammars gem, not the
-# github-linguist gem.
-
 module Linguist
   module Grammars
     # Get the path to the directory containing the language grammar JSON files.