Try to help GitHub recognize the MIT licenseindirect/license

It seems like GitHub can't tell what license this is, despite explicitly
naming it inside the file. These changes make our license file closer to
other license files that GitHub does successfully recognize as MIT.
Hopefully it'll work.

4 files changed, 25 insertions, 26 deletions

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000000..52b5c2132f
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,22 @@
+The MIT License
+
+Portions copyright (c) 2010-2019 André Arko
+Portions copyright (c) 2009 Engine Yard
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/LICENSE.md b/LICENSE.md
deleted file mode 100644
index e356f59f94..0000000000
--- a/LICENSE.md
+++ /dev/null
@@ -1,23 +0,0 @@
-Portions copyright (c) 2010 Andre Arko  
-Portions copyright (c) 2009 Engine Yard
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/bundler.gemspec b/bundler.gemspec
index d58b1d3d0c..e76b3d0b5d 100644
--- a/bundler.gemspec
+++ b/bundler.gemspec
@@ -51,8 +51,8 @@ Gem::Specification.new do |s|
   # we don't check in man pages, but we need to ship them because
   # we use them to generate the long-form help for each command.
   s.files += Dir.glob("man/**/*")
-  # Include the CHANGELOG.md, LICENSE.md, README.md manually
-  s.files += %w[CHANGELOG.md LICENSE.md README.md]
+  # Include the CHANGELOG.md, LICENSE, README.md manually
+  s.files += %w[CHANGELOG.md LICENSE README.md]
   # include the gemspec itself because warbler breaks w/o it
   s.files += %w[bundler.gemspec]
 
diff --git a/spec/quality_spec.rb b/spec/quality_spec.rb
index 3ddc775fae..5c5426d8dd 100644
--- a/spec/quality_spec.rb
+++ b/spec/quality_spec.rb
@@ -241,7 +241,7 @@ RSpec.describe "The library itself" do
   it "ships the correct set of files" do
     Dir.chdir(root) do
       git_list = IO.popen("git ls-files -z", &:read).split("\x0").select {|f| f.match(%r{^(lib|exe)/}) }
-      git_list += %w[CHANGELOG.md LICENSE.md README.md bundler.gemspec]
+      git_list += %w[CHANGELOG.md LICENSE README.md bundler.gemspec]
       git_list += Dir.glob("man/**/*")
 
       gem_list = Gem::Specification.load(gemspec.to_s).files