v1.2.2 - Merge pull request #5 from JoryHogeveen/dev

v1.2.2

Author: JoryHogeveen

.codeclimate.yml

@@ -16,6 +16,9 @@ engines:
     config:
       standard: "Wordpress-Extra"
     checks:
+      # Disable: Class file names should be based on the class name with "class-" prepended.
+      WordPress Files FileName InvalidClassFileName:
+        enabled: false
       # Disable: Member variable "" is not in valid snake_case format
       WordPress NamingConventions ValidVariableName MemberNotSnakeCase:
         enabled: false
@@ -58,6 +61,9 @@ engines:
       # Disable: Expected 1 space after closing brace; newline found
       Squiz ControlStructures ControlSignature SpaceAfterCloseBrace:
         enabled: false
+      # Disable: Opening brace should be on the same line as the declaration for class
+      Generic Classes OpeningBraceSameLine BraceOnNewLine:
+        enabled: false
       # Disable: There must be exactly one blank line before the tags in a doc comment
       Generic Commenting DocComment SpacingBeforeTags:
         enabled: false

.travis.yml

@@ -16,7 +16,7 @@ env:
 #    - WP_VERSION=bleeding-maintenance WP_MULTISITE=0
     - WP_VERSION=latest WP_MULTISITE=0
     - WP_VERSION=latest WP_MULTISITE=1
-    
+
 #    - WP_VERSION=latest WP_MULTISITE=0
 #    - WP_VERSION=latest WP_MULTISITE=1
 #    - WP_VERSION=3.7 WP_MULTISITE=0
@@ -43,14 +43,34 @@ matrix:
       env: WP_VERSION=latest WP_MULTISITE=0
     - php: 5.2
       env: WP_VERSION=3.7 WP_MULTISITE=0
-    
+
+
+## Cache composer bits
+cache:
+  apt: true
+  directories:
+    - vendor
+    - $HOME/.composer/cache
+
 before_script:
-  # Install composer packages before trying to activate themes or plugins
-  # - composer install
+  - if [[ $TRAVIS_PHP_VERSION != 'hhvm' && $TRAVIS_PHP_VERSION != 'nightly' ]]; then
+      phpenv config-rm xdebug.ini;
+    fi
+
+# Install composer packages before trying to activate themes or plugins
+  - if [[ $TRAVIS_PHP_VERSION != 5.2 ]]; then
+      composer self-update;
+      composer install --no-interaction --prefer-source;
+    fi
 
 #  - git clone https://github.com/Seravo/wordpress-test-template wp-tests
   - bash bin/install-wp-tests.sh test root '' localhost $WP_VERSION
 
 script:
-  - phpunit
-#  - cd tests/spec && bundle exec rspec test.rb
+# Use phpunit from composer
+  - if [[ $TRAVIS_PHP_VERSION != 5.2 ]]; then
+      vendor/bin/phpunit;
+    else
+      phpunit;
+    fi
+#  - cd tests/spec && bundle exec rspec test.rb

README.md

@@ -21,7 +21,18 @@ I've built this plugin for the Genesis Framework, though it will work with any t
 #### `genesis_widget_column_classes`
 Allows you to change the available column classes
 
-**Parameters:** `array` (default column classes)
+**Parameters:** `array` Default column classes.  
+**Return:** `array` Array of column classes.  
+
+#### `genesis_widget_column_classes_capability`
+Change the capability required to modify column classes.  
+Since  1.2.2  
+
+**Default:** `edit_theme_options`  
+**Parameters:** `string` The default capability.  
+**Return:** `string` The new capability.  
+
+You can use these filters inside your theme functions.php file or in a plugin.
 
 ## Installation
 

bin/install-wp-tests.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 if [ $# -lt 3 ]; then
-	echo "usage: $0 <db-name> <db-user> <db-pass> [db-host] [wp-version]"
+	echo "usage: $0 <db-name> <db-user> <db-pass> [db-host] [wp-version] [force download] [skip-database-creation]"
 	exit 1
 fi
 
@@ -10,56 +10,102 @@ DB_USER=$2
 DB_PASS=$3
 DB_HOST=${4-localhost}
 WP_VERSION=${5-latest}
+FORCE=${6-false}
+SKIP_DB_CREATE=${7-false}
 
 WP_TESTS_DIR=${WP_TESTS_DIR-/tmp/wordpress-tests-lib}
 WP_CORE_DIR=${WP_CORE_DIR-/tmp/wordpress/}
 
+# Placeholder for download agent
+# @todo replace back to wget everywhere in this file
 download() {
+
     if [ `which curl` ]; then
         curl -s "$1" > "$2";
-    elif [ `which wget` ]; then
+	elif [ `which wget` ]; then
         wget -nv -O "$2" "$1"
-    fi
+	fi
+
 }
 
+# Detect version tag
+# Format: N.N.N
 if [[ $WP_VERSION =~ [0-9]+\.[0-9]+(\.[0-9]+)? ]]; then
 	WP_TESTS_TAG="tags/$WP_VERSION"
+elif [[ $WP_VERSION == 'nightly' || $WP_VERSION == 'trunk' ]]; then
+	WP_TESTS_TAG="trunk"
 else
 	# http serves a single offer, whereas https serves multiple. we only want one
 	download http://api.wordpress.org/core/version-check/1.7/ /tmp/wp-latest.json
 	grep '[0-9]+\.[0-9]+(\.[0-9]+)?' /tmp/wp-latest.json
 	LATEST_VERSION=$(grep -o '"version":"[^"]*' /tmp/wp-latest.json | sed 's/"version":"//')
+
 	if [[ -z "$LATEST_VERSION" ]]; then
 		echo "Latest WordPress version could not be found"
 		exit 1
 	fi
+
 	WP_TESTS_TAG="tags/$LATEST_VERSION"
 fi
 
+if [[ $WP_TESTS_TAG == *"beta"* ]]
+then
+	WP_TESTS_TAG="trunk"
+fi
+
 set -ex
 
 install_wp() {
 
+	echo "Installing WordPress for Unit Tests"
+
+	if [[ $FORCE == 'true' || -z TRAVIS_JOB_ID ]]; then
+		echo "Removing existing core WordPress directory"
+
+		rm -Rf $WP_CORE_DIR
+	fi
+
 	if [ -d $WP_CORE_DIR ]; then
 		return;
 	fi
 
+	echo "Downloading WordPress"
+
 	mkdir -p $WP_CORE_DIR
 
-	if [ $WP_VERSION == 'latest' ]; then
-		local ARCHIVE_NAME='latest'
+	if [[ $WP_VERSION == 'nightly' || $WP_VERSION == 'trunk' ]]; then
+		mkdir -p /tmp/wordpress-nightly
+		download https://wordpress.org/nightly-builds/wordpress-latest.zip  /tmp/wordpress-nightly/wordpress-nightly.zip
+		unzip -q /tmp/wordpress-nightly/wordpress-nightly.zip -d /tmp/wordpress-nightly/
+		mv /tmp/wordpress-nightly/wordpress/* $WP_CORE_DIR
 	else
-		local ARCHIVE_NAME="wordpress-$WP_VERSION"
-	fi
+		if [ $WP_VERSION == 'latest' ]; then
+			local ARCHIVE_NAME='latest'
+		else
+			local ARCHIVE_NAME="wordpress-$WP_VERSION"
+		fi
 
-	download https://wordpress.org/${ARCHIVE_NAME}.tar.gz  /tmp/wordpress.tar.gz
-	tar --strip-components=1 -zxmf /tmp/wordpress.tar.gz -C $WP_CORE_DIR
+		download https://wordpress.org/${ARCHIVE_NAME}.tar.gz  /tmp/wordpress.tar.gz
+		tar --strip-components=1 -zxmf /tmp/wordpress.tar.gz -C $WP_CORE_DIR
+	fi
 
 	download https://raw.github.com/markoheijnen/wp-mysqli/master/db.php $WP_CORE_DIR/wp-content/db.php
+
+	echo "WordPress installed"
+
 }
 
 install_test_suite() {
-	# portable in-place argument for both GNU sed and Mac OSX sed
+
+	echo "Installing Tests Suite for Unit Tests"
+
+	if [[ $FORCE == 'true' || -z TRAVIS_JOB_ID ]]; then
+		echo "Removing existing Tests Suite directory"
+
+		rm -Rf $WP_TESTS_DIR
+	fi
+
+	# portable in-place argument for both GNU sed and Mac OS X sed
 	if [[ $(uname -s) == 'Darwin' ]]; then
 		local ioption='-i .bak'
 	else
@@ -68,25 +114,39 @@ install_test_suite() {
 
 	# set up testing suite if it doesn't yet exist
 	if [ ! -d $WP_TESTS_DIR ]; then
+		echo "Downloading Tests Suite"
+
 		# set up testing suite
 		mkdir -p $WP_TESTS_DIR
-		svn co --quiet https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/includes/ $WP_TESTS_DIR/includes
+		svn export --quiet https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/includes $WP_TESTS_DIR/includes
+		svn export --quiet https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/data $WP_TESTS_DIR/data
 	fi
 
 	cd $WP_TESTS_DIR
 
 	if [ ! -f wp-tests-config.php ]; then
 		download https://develop.svn.wordpress.org/${WP_TESTS_TAG}/wp-tests-config-sample.php "$WP_TESTS_DIR"/wp-tests-config.php
-		sed $ioption "s:dirname( __FILE__ ) . '/src/':'$WP_CORE_DIR':" "$WP_TESTS_DIR"/wp-tests-config.php
+		# remove all forward slashes in the end
+		WP_CORE_DIR=$(echo $WP_CORE_DIR | sed "s:/\+$::")
+		sed $ioption "s:dirname( __FILE__ ) . '/src/':'$WP_CORE_DIR/':" "$WP_TESTS_DIR"/wp-tests-config.php
 		sed $ioption "s/youremptytestdbnamehere/$DB_NAME/" "$WP_TESTS_DIR"/wp-tests-config.php
 		sed $ioption "s/yourusernamehere/$DB_USER/" "$WP_TESTS_DIR"/wp-tests-config.php
 		sed $ioption "s/yourpasswordhere/$DB_PASS/" "$WP_TESTS_DIR"/wp-tests-config.php
 		sed $ioption "s|localhost|${DB_HOST}|" "$WP_TESTS_DIR"/wp-tests-config.php
 	fi
 
+	echo "Tests Suite installed"
+
 }
 
 install_db() {
+
+	if [ ${SKIP_DB_CREATE} = "true" ]; then
+		return 0
+	fi
+
+	echo "Setting up Database for Unit Tests"
+
 	# parse DB_HOST for port or socket references
 	local PARTS=(${DB_HOST//\:/ })
 	local DB_HOSTNAME=${PARTS[0]};
@@ -103,8 +163,20 @@ install_db() {
 		fi
 	fi
 
+	if [[ $FORCE == 'true' || -z TRAVIS_JOB_ID ]]; then
+		echo "Removing existing Database"
+
+		# drop database
+		mysql --user="$DB_USER" --password="$DB_PASS"$EXTRA -e "DROP DATABASE IF EXISTS $DB_NAME"
+	fi
+
+	echo "Creating Database"
+
 	# create database
 	mysqladmin create $DB_NAME --user="$DB_USER" --password="$DB_PASS"$EXTRA
+
+	echo "Database set up"
+
 }
 
 install_wp

composer.json

@@ -0,0 +1,29 @@
+{
+	"name": "JoryHogeveen/genesis-widget-column-classes",
+	"type": "wordpress-plugin",
+	"description": "Adds Genesis (old bootstrap) column classes to widgets.",
+	"keywords": [],
+	"homepage": "https://github.com/JoryHogeveen/genesis-widget-column-classes/",
+	"license": "GPL-2.0+",
+	"authors": [
+		{
+			"name": "Jory Hogeveen",
+			"email": "[email protected]",
+			"homepage": "https://www.keraweb.nl/",
+			"role": "Owner"
+		}
+	],
+	"require": {
+		"composer/installers": "1.2.*",
+		"php": ">=5.2.4"
+	},
+	"require-dev": {
+		"phpmd/phpmd": "@stable",
+		"phpunit/phpunit": "4.8.*",
+		"mockery/mockery": "0.9.*",
+		"squizlabs/php_codesniffer": "2.*"
+	},
+	"extra": {
+		"installer-name": "genesis-widget-column-classes"
+	}
+}