Adding missing files and do cleanup (#14)

* Fix broken version * Fix version * Add missing files' * Add missing files * Add confirmation to bump stable taggs * Update version bump logic * Fix travis CI * Update readme * Update readme * Update readme * Update readme * Update readme output * Add badge * Bump badges again * Bump version * Test fix * Fix array issue * More fixes * Bump BFAL version * Bump BFAL fo sho * Fix readme * Fix readme * Fix readme * Remove test code * Re-build * Re-build
MickeyKay · May 5, 2018 · 28690a1 · 28690a1
1 parent 5e2cbc0
commit 28690a1
Show file tree

Hide file tree

Showing 150 changed files with 28,341 additions and 53 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,2 @@
 node_modules/
-svn/
-vendor/
+svn/
diff --git a/.travis.yml b/.travis.yml
@@ -31,6 +31,7 @@ matrix:
     #   env: WP_TRAVISCI=phpcs
     - php: 5.3
       env: WP_VERSION=latest
+      dist: precise
 
 before_script:
   - export PATH="$HOME/.composer/vendor/bin:$PATH"

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -31,6 +31,12 @@ module.exports = function( grunt ) {
 							type:    'input',
 							message: 'What specific version would you like',
 							default: '<%= pkg.version %>'
+						},
+						{
+							config:  'updateStable',
+							type:    'confirm',
+							message: 'Bump stable version?',
+							default: false
 						}
 					]
 				}
@@ -42,7 +48,7 @@ module.exports = function( grunt ) {
    				overwrite: true,
     			replacements: [
 	    			{
-	    				  "version": "1.0.0",
+	    				"version": "1.0.0",
 	    				from: /("version":\s*).*,\n/g,
 	    				to: '$1"<%= newVersion %>",\n'
 	    			}
@@ -53,8 +59,10 @@ module.exports = function( grunt ) {
    				overwrite: true,
     			replacements: [
 	    			{
-	    				from: /(Stable tag:\s*).*\n/g,
-	    				to: '$1<%= newVersion %>\n'
+	    				from: /(Stable tag:\s*)(.*)(\n)/g,
+	    				to: function(matchedText, index, fullText, regexMatches) {
+	    					return grunt.config('updateStable') ? regexMatches[0] + grunt.config('newVersion') + regexMatches[2]: matchedText;
+	    				}
 	    			}
     			]
 			},
@@ -83,6 +91,17 @@ module.exports = function( grunt ) {
 	    		files: {
 	    			'readme.md': 'readme.txt'
 	    		},
+	    		options: {
+		    		post_convert: function(text) {
+		    			var prefix = [
+		    				'[![Build Status](https://travis-ci.org/MickeyKay/better-font-awesome.svg?branch=master)](https://travis-ci.org/MickeyKay/better-font-awesome)',
+		    				'[![Downloads](https://img.shields.io/wordpress/plugin/dt/better-font-awesome.svg)](https://wordpress.org/plugins/better-font-awesome/)',
+		    				'[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)'
+		    			].join(' ');
+
+						return [prefix,text].join('\n\n');
+		    		}
+		    	}
 	    	},
 	    },
 		copy: {

diff --git a/README.md b/README.md
@@ -1,19 +1,19 @@
+[![Build Status](https://travis-ci.org/MickeyKay/better-font-awesome.svg?branch=master)](https://travis-ci.org/MickeyKay/better-font-awesome) [![Downloads](https://img.shields.io/wordpress/plugin/dt/better-font-awesome.svg)](https://wordpress.org/plugins/better-font-awesome/) [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
+
 # Better Font Awesome #
-**Contributors:** [McGuive7](https://profiles.wordpress.org/McGuive7)
-**Tags:** better, font, awesome, icon, icons, bootstrap, fontstrap, cdn, shortcode
-**Donate link:** http://mickeykay.me
-**Requires at least:** 3.0
-**Tested up to:** 4.9
-**Stable tag:** 2.0.0-beta
-**License:** GPLv2+
-**License URI:** http://www.gnu.org/licenses/gpl-2.0.html
+**Contributors:** [McGuive7](https://profiles.wordpress.org/McGuive7)  
+**Tags:** better, font, awesome, icon, icons, bootstrap, fontstrap, cdn, shortcode  
+**Donate link:** https://mickeykay.me  
+**Requires at least:** 3.0  
+**Tested up to:** 4.9  
+**Stable tag:** 1.7.1  
+**License:** GPLv2+  
+**License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
 
-The Better Font Awesome plugin for WordPress. Shortcodes, HTML, TinyMCE, various Font Awesome versions, backwards compatibility, CDN speeds, and more. Now support Font Awesome 5!
+**Now supports Font Awesome 5+!** The Better Font Awesome plugin for WordPress. Shortcodes, HTML, TinyMCE, various Font Awesome versions, backwards compatibility, CDN speeds, and more.
 
 ## Description ##
 
-[![Build Status](https://travis-ci.org/MickeyKay/better-font-awesome.svg?branch=master)](https://travis-ci.org/MickeyKay/better-font-awesome)
-
 **Do you find this plugin helpful? Please consider [leaving a 5-star review](https://wordpress.org/support/view/plugin-reviews/better-font-awesome).**
 
 Better Font Awesome allows you to automatically integrate the latest available version of [Font Awesome](http://fontawesome.io/) into your WordPress project, along with accompanying CSS, shortcodes, and TinyMCE icon shortcode generator.
@@ -113,6 +113,7 @@ Better Font Awesome does it's best to load after any existing Font Awesome CSS,
 
 ### 2.0.0 ###
 * Add support for Font Awesome 5
+* Add upgrade logic to map legacy icons to current versions
 
 ### 1.7.1 ###
 * Fix functionality to hide/show admin notices.
@@ -243,6 +244,7 @@ Better Font Awesome does it's best to load after any existing Font Awesome CSS,
 
 ### 2.0.0 ###
 * Add support for Font Awesome 5
+* Add upgrade logic to map legacy icons to current versions
 
 ### 1.7.1 ###
 * Fix functionality to hide/show admin notices.

diff --git a/better-font-awesome.php b/better-font-awesome.php
@@ -12,7 +12,7 @@
  * Plugin Name:       Better Font Awesome
  * Plugin URI:        http://wordpress.org/plugins/better-font-awesome
  * Description:       The ultimate Font Awesome icon plugin for WordPress.
- * Version:           2.0.0-beta
+ * Version:           2.0.0-beta2
  * Author:            Mickey Kay
  * Author URI:        [email protected]
  * License:           GPLv2+

diff --git a/composer.json b/composer.json
@@ -3,6 +3,6 @@
 	"description": "Better Font Awesome",
 	"license": "GPL-2.0",
 	"require": {
-		"mickey-kay/better-font-awesome-library": "2.0.0-beta"
+		"mickey-kay/better-font-awesome-library": "2.0.0-beta2"
 	}
 }
diff --git a/composer.lock b/composer.lock
diff --git a/languages/better-font-awesome.pot b/languages/better-font-awesome.pot
@@ -2,10 +2,10 @@
 # This file is distributed under the GPLv2+.
 msgid ""
 msgstr ""
-"Project-Id-Version: Better Font Awesome 2.0.0-beta\n"
+"Project-Id-Version: Better Font Awesome 2.0.0-beta2\n"
 "Report-Msgid-Bugs-To: "
 "https://wordpress.org/support/plugin/better-font-awesome\n"
-"POT-Creation-Date: 2018-04-09 02:15:11+00:00\n"
+"POT-Creation-Date: 2018-05-05 19:52:12+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,6 +21,7 @@ msgstr ""
 #: better-font-awesome.php:237 svn/tags/1.7.0/better-font-awesome.php:237
 #: svn/tags/1.7.1/better-font-awesome.php:237
 #: svn/tags/2.0.0-beta/better-font-awesome.php:237
+#: svn/tags/2.0.0-beta1/better-font-awesome.php:237
 #: svn/trunk/better-font-awesome.php:237
 msgid ""
 "It appears that Better Font Awesome is missing it's <a "
@@ -69,6 +70,7 @@ msgstr ""
 #: svn/tags/1.7.0/better-font-awesome.php:238
 #: svn/tags/1.7.1/better-font-awesome.php:238
 #: svn/tags/2.0.0-beta/better-font-awesome.php:238
+#: svn/tags/2.0.0-beta1/better-font-awesome.php:238
 #: svn/trunk/better-font-awesome.php:238
 msgid "Back to the plugins page &rarr;"
 msgstr ""
@@ -91,6 +93,7 @@ msgstr ""
 #: svn/tags/1.7.0/better-font-awesome.php:350
 #: svn/tags/1.7.1/better-font-awesome.php:350
 #: svn/tags/2.0.0-beta/better-font-awesome.php:350
+#: svn/tags/2.0.0-beta1/better-font-awesome.php:350
 #: svn/trunk/better-font-awesome.php:350
 msgid "Save Settings"
 msgstr ""
@@ -124,6 +127,7 @@ msgstr ""
 #: svn/tags/1.7.0/better-font-awesome.php:381
 #: svn/tags/1.7.1/better-font-awesome.php:381
 #: svn/tags/2.0.0-beta/better-font-awesome.php:381
+#: svn/tags/2.0.0-beta1/better-font-awesome.php:381
 #: svn/trunk/better-font-awesome.php:381
 msgid "Version"
 msgstr ""
@@ -166,6 +170,7 @@ msgstr ""
 #: svn/tags/1.7.0/better-font-awesome.php:390
 #: svn/tags/1.7.1/better-font-awesome.php:390
 #: svn/tags/2.0.0-beta/better-font-awesome.php:390
+#: svn/tags/2.0.0-beta1/better-font-awesome.php:390
 #: svn/trunk/better-font-awesome.php:390
 msgid "Use minified CSS"
 msgstr ""
@@ -208,6 +213,7 @@ msgstr ""
 #: svn/tags/1.7.0/better-font-awesome.php:396
 #: svn/tags/1.7.1/better-font-awesome.php:396
 #: svn/tags/2.0.0-beta/better-font-awesome.php:396
+#: svn/tags/2.0.0-beta1/better-font-awesome.php:396
 #: svn/trunk/better-font-awesome.php:396
 msgid ""
 "Whether to include the minified version of the CSS (checked), or the "
@@ -243,6 +249,7 @@ msgstr ""
 #: svn/tags/1.7.0/better-font-awesome.php:402
 #: svn/tags/1.7.1/better-font-awesome.php:402
 #: svn/tags/2.0.0-beta/better-font-awesome.php:402
+#: svn/tags/2.0.0-beta1/better-font-awesome.php:402
 #: svn/trunk/better-font-awesome.php:402
 msgid "Remove existing Font Awesome"
 msgstr ""
@@ -276,6 +283,7 @@ msgstr ""
 #: svn/tags/1.7.0/better-font-awesome.php:408
 #: svn/tags/1.7.1/better-font-awesome.php:408
 #: svn/tags/2.0.0-beta/better-font-awesome.php:408
+#: svn/tags/2.0.0-beta1/better-font-awesome.php:408
 #: svn/trunk/better-font-awesome.php:408
 msgid ""
 "Attempt to remove Font Awesome CSS and shortcodes added by other plugins "
@@ -303,6 +311,7 @@ msgstr ""
 #: svn/tags/1.7.0/better-font-awesome.php:414
 #: svn/tags/1.7.1/better-font-awesome.php:414
 #: svn/tags/2.0.0-beta/better-font-awesome.php:414
+#: svn/tags/2.0.0-beta1/better-font-awesome.php:414
 #: svn/trunk/better-font-awesome.php:414
 msgid "Hide admin notices"
 msgstr ""
@@ -328,6 +337,7 @@ msgstr ""
 #: svn/tags/1.7.0/better-font-awesome.php:420
 #: svn/tags/1.7.1/better-font-awesome.php:420
 #: svn/tags/2.0.0-beta/better-font-awesome.php:420
+#: svn/tags/2.0.0-beta1/better-font-awesome.php:420
 #: svn/trunk/better-font-awesome.php:420
 msgid ""
 "Hide the default admin warnings that are shown when API and CDN errors "
@@ -400,6 +410,8 @@ msgstr ""
 #: svn/tags/1.7.1/better-font-awesome.php:519
 #: svn/tags/2.0.0-beta/better-font-awesome.php:493
 #: svn/tags/2.0.0-beta/better-font-awesome.php:519
+#: svn/tags/2.0.0-beta1/better-font-awesome.php:493
+#: svn/tags/2.0.0-beta1/better-font-awesome.php:519
 #: svn/trunk/better-font-awesome.php:493 svn/trunk/better-font-awesome.php:519
 msgid "Always Latest"
 msgstr ""
@@ -433,6 +445,7 @@ msgstr ""
 #: svn/tags/1.7.0/better-font-awesome.php:553
 #: svn/tags/1.7.1/better-font-awesome.php:553
 #: svn/tags/2.0.0-beta/better-font-awesome.php:553
+#: svn/tags/2.0.0-beta1/better-font-awesome.php:553
 #: svn/trunk/better-font-awesome.php:553
 msgid ""
 "Version selection is currently unavailable. The attempt to reach the "
@@ -468,6 +481,7 @@ msgstr ""
 #: svn/tags/1.7.0/better-font-awesome.php:560
 #: svn/tags/1.7.1/better-font-awesome.php:560
 #: svn/tags/2.0.0-beta/better-font-awesome.php:560
+#: svn/tags/2.0.0-beta1/better-font-awesome.php:560
 #: svn/trunk/better-font-awesome.php:560
 msgid "Font Awesome will still render using version: %s"
 msgstr ""
@@ -531,9 +545,11 @@ msgstr ""
 #: svn/tags/1.7.1/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1107
 #: svn/tags/2.0.0-beta/better-font-awesome.php:567
 #: svn/tags/2.0.0-beta/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1312
+#: svn/tags/2.0.0-beta1/better-font-awesome.php:567
+#: svn/tags/2.0.0-beta1/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1312
 #: svn/trunk/better-font-awesome.php:567
-#: svn/trunk/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1312
-#: vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1312
+#: svn/trunk/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1313
+#: vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1313
 msgid ""
 "This may be the result of a temporary server or connectivity issue which "
 "will resolve shortly. However if the problem persists please file a support "
@@ -555,6 +571,7 @@ msgstr ""
 #: svn/tags/1.7.0/better-font-awesome.php:614
 #: svn/tags/1.7.1/better-font-awesome.php:614
 #: svn/tags/2.0.0-beta/better-font-awesome.php:614
+#: svn/tags/2.0.0-beta1/better-font-awesome.php:614
 #: svn/trunk/better-font-awesome.php:614
 msgid ""
 "<h3>Usage</h3>\n"
@@ -1187,8 +1204,9 @@ msgstr ""
 #: svn/tags/1.7.0/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1077
 #: svn/tags/1.7.1/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1077
 #: svn/tags/2.0.0-beta/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1282
-#: svn/trunk/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1282
-#: vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1282
+#: svn/tags/2.0.0-beta1/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1282
+#: svn/trunk/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1283
+#: vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1283
 msgid "API Error"
 msgstr ""
 
@@ -1222,8 +1240,9 @@ msgstr ""
 #: svn/tags/1.7.0/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1079
 #: svn/tags/1.7.1/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1079
 #: svn/tags/2.0.0-beta/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1284
-#: svn/trunk/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1284
-#: vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1284
+#: svn/tags/2.0.0-beta1/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1284
+#: svn/trunk/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1285
+#: vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1285
 msgid ""
 "The attempt to reach the jsDelivr API server failed with the following "
 "error: %s"
@@ -1259,8 +1278,9 @@ msgstr ""
 #: svn/tags/1.7.0/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1089
 #: svn/tags/1.7.1/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1089
 #: svn/tags/2.0.0-beta/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1294
-#: svn/trunk/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1294
-#: vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1294
+#: svn/tags/2.0.0-beta1/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1294
+#: svn/trunk/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1295
+#: vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1295
 msgid "Remote CSS Error"
 msgstr ""
 
@@ -1294,8 +1314,9 @@ msgstr ""
 #: svn/tags/1.7.0/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1091
 #: svn/tags/1.7.1/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1091
 #: svn/tags/2.0.0-beta/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1296
-#: svn/trunk/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1296
-#: vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1296
+#: svn/tags/2.0.0-beta1/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1296
+#: svn/trunk/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1297
+#: vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1297
 msgid ""
 "The attempt to fetch the remote Font Awesome stylesheet failed with the "
 "following error: %s %s The embedded fallback Font Awesome will be used "
@@ -1332,8 +1353,9 @@ msgstr ""
 #: svn/tags/1.7.0/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1105
 #: svn/tags/1.7.1/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1105
 #: svn/tags/2.0.0-beta/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1310
-#: svn/trunk/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1310
-#: vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1310
+#: svn/tags/2.0.0-beta1/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1310
+#: svn/trunk/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1311
+#: vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1311
 msgid "Solution"
 msgstr ""
 
@@ -1367,6 +1389,8 @@ msgstr ""
 #: svn/tags/1.7.1/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:491
 #: svn/tags/2.0.0-beta/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:524
 #: svn/tags/2.0.0-beta/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:590
+#: svn/tags/2.0.0-beta1/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:524
+#: svn/tags/2.0.0-beta1/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:590
 #: svn/trunk/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:524
 #: svn/trunk/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:590
 #: vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:524
@@ -1403,8 +1427,9 @@ msgstr ""
 #: svn/tags/1.7.0/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1101
 #: svn/tags/1.7.1/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1101
 #: svn/tags/2.0.0-beta/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1306
-#: svn/trunk/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1306
-#: vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1306
+#: svn/tags/2.0.0-beta1/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1306
+#: svn/trunk/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1307
+#: vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1307
 msgid ""
 "<b>Don't worry! Better Font Awesome will still render using the included "
 "fallback version:</b> "
@@ -1426,8 +1451,9 @@ msgstr ""
 #: svn/tags/1.7.0/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1051
 #: svn/tags/1.7.1/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1051
 #: svn/tags/2.0.0-beta/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1256
-#: svn/trunk/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1256
-#: vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1256
+#: svn/tags/2.0.0-beta1/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1256
+#: svn/trunk/vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1257
+#: vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php:1257
 msgid "Insert Icon"
 msgstr ""