Merge branch 'gh-pages' into clear-bsd

_licenses/wtfpl.txt

@@ -1,6 +1,6 @@
 ---
 layout: license
-title: Do What the F*** You Want to Public License
+title: "Do What The F*ck You Want To Public License"
 category: WTFPL
 permalink: /licenses/wtfpl/
 hidden: true
@@ -10,21 +10,23 @@ description: The easiest licence out there. It gives the user permissions to do
 
 how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file.
 
-required:
+required: []
-  - nothing
 
 permitted:
-  - everything
+  - commercial-use
+  - modifications
+  - distribution
+  - sublicense
+  - private-use
 
-forbidden:
+forbidden: []
-  - nothing
 
 ---
 
             DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
                     Version 2, December 2004
 
- Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+ Copyright (C) 2004 [fullname] <[email]>
 
  Everyone is permitted to copy and distribute verbatim or modified
  copies of this license document, and changing it is allowed as long

spec/license_spec.rb

@@ -1,5 +1,13 @@
 require 'spec_helper'
 
+# List of licenses that need not be OSI approved
+LICENSE_WHITELIST = %w[
+  unlicense
+  cc0-1.0
+  wtfpl
+]
+
+
 licenses.each do |license|
   describe "The #{license["title"]} license" do
     it "should have a title" do
@@ -23,10 +31,11 @@ licenses.each do |license|
         end
 
         # CC0 and Unlicense are not OSI approved, but that's okay
-        unless license["id"] == "unlicense" || license["id"] == "cc0-1.0"
+        unless LICENSE_WHITELIST.include? license["id"]
           it "should be OSI approved" do
             spdx = find_spdx(license["id"])
-            expect(spdx[1]["osiApproved"]).to eql(true)
+            approved = spdx[1]["osiApproved"]
+            expect(approved).to eql(true)
           end
         end
       end