Skip to content
This repository has been archived by the owner on Mar 14, 2021. It is now read-only.

Commit

Permalink
[AUTO][skip ci] Updating changelog for v1.2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
selul committed May 8, 2017
1 parent 6f53bc3 commit 3cae0ad
Show file tree
Hide file tree
Showing 40 changed files with 6,348 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@

### v1.2.2 - 2017-05-08
**Changes:**
- Update version

### v1.2.1 - 2017-05-08
**Changes:**
- Update version
Expand Down
Binary file modified artifact/pirate-forms.zip
Binary file not shown.
4 changes: 4 additions & 0 deletions dist/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@

### v1.2.2 - 2017-05-08
**Changes:**
- Update version

### v1.2.1 - 2017-05-08
**Changes:**
- Update version
Expand Down
Binary file added dist/artifact/pirate-forms.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion dist/css/front.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Version: 1.2.1
Version: 1.2.2
*/
.pirate_forms_wrap .form_field_wrap {
margin-bottom: 20px;
Expand Down
80 changes: 80 additions & 0 deletions dist/dist/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@

### v1.2.2 - 2017-05-08
**Changes:**
- Update version

### v1.2.1 - 2017-05-08
**Changes:**
- Update version

### 1.2.0 - 06/04/2017
**Changes:**
- Update readme.txt

### 1.2.0 - 06/04/2017
**Changes:**
- Improved description

### 1.2.0 - 19/01/2017
**Changes:**
- Fixed security error for file field.
- Added dashboard widget.

### 1.1.3 - 11/01/2017
**Changes:**
- Update readme.txt

### 1.1.3 - 20/12/2016
**Changes:**
- Sync with wp.org

### 1.1.2 - 20/12/2016
**Changes:**
- Added upsell for custom emails plugin
- Fixed text domains errors
- Added travis and grunt

### 1.1.1 - 19/12/2016
**Changes:**
- Update changelog

### 1.1.0 - 19/12/2016
**Changes:**
- Escape form fields

### 1.0.18 - 07/11/2016
**Changes:**
- Fixed php strict standards error
- Update tags
- Tested up to WordPress 4.6

### 1.0.17 - 25/07/2016
**Changes:**
- Development

### 1.0.16 - 13/07/2016
**Changes:**
- Fixed IP issue when using web server behind a reverse proxy
- Fixed W3C compatibility issues
- Remove pcf=1#contact from url when theme is different then Zerif
- Removed blacklist option and made it default set to true
- Display site key and secret key fields only if recaptcha option is selected
- New attachment option
- New thank you URL option
- New option to make the nonce optional

### 1.0.16 - 20/06/2016
**Changes:**
- #89 textarea field not saving

### 1.0.15 - 10/06/2016
**Changes:**
- Update screenshots
- Added a clearfix after the Pirate Forms widget to avoid messed layout
- Update compatible WordPress version number

### 1.0.14 - 23/05/2016
**Changes:**
- Reorganize backend content
- Fixed issue with checkbox not saving
### 1.0.13 - 12/05/2016 Changes: pirate-forms Update readme.txt ### 1.0.13 - 05/05/2016 Changes: pirate-forms Update readme.txt pirate-forms Merge pull request #63 from mariusghitulescu/patch-1 Update readme.txt pirate-forms Update readme.txt pirate-forms Update readme.txt ### 1.0.13 - 01/04/2016 Changes: pirate-forms fix issue with multiple forms on same page fix for https://github.com/Codeinwp/pirate-forms/issues/59 pirate-forms Merge pull request #60 from selu91/development fix issue with multiple forms on same page ### 1.0.12 - 21/03/2016 Changes: pirate-forms Option to change recaptcha language ### 1.0.11 - 14/03/2016 Changes: pirate-forms Fixed #55 Recaptcha too down ### 1.0.9 - 10/03/2016 Changes: pirate-forms Fixed layout issues #52 pirate-forms Update readme.txt with == Changelog == section #51 ### 1.0.8 - 09/03/2016 Changes: pirate-forms Update readme.txt pirate-forms Update translations files pirate-forms #42, translation issues fixed
Expand Down
71 changes: 71 additions & 0 deletions dist/dist/bin/deploy.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
#!/bin/bash

# We run this just one time, for a first job from the buid and just at once after_deploy hook.
if ! [ $AFTER_DEPLOY_RUN ] && [ "$TRAVIS_PHP_VERSION" == "7.0" ]; then

# Flag the run in order to not be trigged again on the next after_deploy.
export AFTER_DEPLOY_RUN=1;
echo " Started deploy script. ";

# Setup git username and email.

git config user.name "selul"
git config user.email ${GITHUB_EMAIL}
git fetch

# Check if we already have a tag with this version.
if ! git rev-parse "v$THEMEISLE_VERSION" >/dev/null 2>&1
then

# Send changelog changes to git.
git checkout $MASTER_BRANCH
git add -v .

# We use [skip ci] in message to prevent this commit to trigger the build.
git commit -a -m "[AUTO][skip ci] Updating changelog for v"$THEMEISLE_VERSION
git push --quiet "https://${GITHUB_TOKEN}@github.com/$UPSTREAM_REPO.git" HEAD:$MASTER_BRANCH

# Tag the new release.
git tag -a "v$THEMEISLE_VERSION" -m "[AUTO] Release of $THEMEISLE_VERSION ";
git push --quiet "https://${GITHUB_TOKEN}@github.com/$UPSTREAM_REPO.git" --tags ;
sleep 5;

# Sends the api call for creating the release.
# We use this as the travis release provider does not offer any way
# to set the body of the release.
API_JSON='{"tag_name": "v'$THEMEISLE_VERSION'","target_commitish": "'$MASTER_BRANCH'","name": "v'$THEMEISLE_VERSION'","body": "'$CHANGES'","draft": false,"prerelease": false}';
curl -s --data "$API_JSON" "https://api.github.com/repos/$UPSTREAM_REPO/releases?access_token="$GITHUB_TOKEN > /dev/null;
fi
# Send update to the store
STORE_JSON='{"version": "'$THEMEISLE_VERSION'","id": "'$THEMEISLE_ID'","body": "'$CHANGES'"}';
curl -s -H "Content-Type: application/json" -H "x-themeisle-auth: $THEMEISLE_AUTH" --data "$STORE_JSON" "$STORE_URL/wp-json/ti-endpoint/v1/update_changelog_new/" > /dev/null

# Send data to demo server.
grunt sftp

# Upload to Wordpress SVN
if [ ! -z "$WPORG_PASS" ]; then

svn co -q "http://svn.wp-plugins.org/$THEMEISLE_REPO" svn

# Copy new content to svn trunk.
rsync -r -p --delete --exclude=".*" dist/* svn/trunk

# Create new SVN tag.
mkdir -p svn/tags/$THEMEISLE_VERSION
rsync -r -p dist/* svn/tags/$THEMEISLE_VERSION
# Add new files to SVN
svn stat svn | grep '^?' | awk '{print $2}' | xargs -I x svn add x@
# Remove deleted files from SVN
svn stat svn | grep '^!' | awk '{print $2}' | xargs -I x svn rm --force x@

svn stat svn

# Commit to SVN
svn commit svn --no-auth-cache -m "Release v$THEMEISLE_VERSION" --username $WPORG_USER --password $WPORG_PASS
# Remove svn dir.
rm -fR svn

fi

fi;
40 changes: 40 additions & 0 deletions dist/dist/bin/install-dependencies.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#!/bin/bash

# We run this on PR or on push to MASTER_BRANCH.
if [ "$TRAVIS_PULL_REQUEST" != "false" ] || ( [ "$TRAVIS_EVENT_TYPE" == "push" ] && [ "$TRAVIS_REPO_SLUG" == "$UPSTREAM_REPO" ] && [ "$TRAVIS_BRANCH" == "$MASTER_BRANCH" ] && [ "$TRAVIS_PHP_VERSION" == "7.0" ] ) ; then

. $HOME/.nvm/nvm.sh
nvm install stable
nvm use stable

npm install
npm install grunt-cli -g

phpenv local 5.6

composer selfupdate 1.0.0 --no-interaction
composer install --no-interaction
phpenv local --unset

fi;
# We dont install PHPCS if is not a PR.
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then

# Install PHPCS.
pear install pear/PHP_CodeSniffer-2.8.1

# Install WPCS standards.
git clone -b master --depth 1 https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards.git $HOME/wordpress-coding-standards
phpenv rehash
phpcs --config-set installed_paths $HOME/wordpress-coding-standards
phpenv rehash

# Install wordpress for testing.
bash bin/install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION
export PATH="$HOME/.composer/vendor/bin:$PATH"

# Use phpunit 5.7 as WP dont support 6.
if [[ ${TRAVIS_PHP_VERSION:0:2} == "7." ]]; then
composer global require "phpunit/phpunit=5.7.*" ;
fi;
fi;
127 changes: 127 additions & 0 deletions dist/dist/bin/install-wp-tests.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
#!/usr/bin/env bash


if [ $# -lt 3 ]; then
echo "usage: $0 <db-name> <db-user> <db-pass> [db-host] [wp-version] [force download]"
exit 1
fi

DB_NAME=$1
DB_USER=$2
DB_PASS=$3
DB_HOST=${4-localhost}
WP_VERSION=${5-latest}
FORCE=${6-false}

WP_TESTS_DIR=${WP_TESTS_DIR-/tmp/wordpress-tests-lib}
WP_CORE_DIR=${WP_CORE_DIR-/tmp/wordpress/}

download() {
if [ `which curl` ]; then
curl -s "$1" > "$2";
elif [ `which wget` ]; then
wget -nv -O "$2" "$1"
fi
}

if [[ $WP_VERSION =~ [0-9]+\.[0-9]+(\.[0-9]+)? ]]; then
WP_TESTS_TAG="tags/$WP_VERSION"
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() {
if [ $FORCE == 'true' ]; then
rm -Rf $WP_CORE_DIR
fi

if [ -d $WP_CORE_DIR ]; then
return;
fi

mkdir -p $WP_CORE_DIR

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://raw.github.com/markoheijnen/wp-mysqli/master/db.php $WP_CORE_DIR/wp-content/db.php
}

install_test_suite() {
if [ $FORCE == 'true' ]; then
rm -Rf $WP_TESTS_DIR
fi

# portable in-place argument for both GNU sed and Mac OSX sed
if [[ $(uname -s) == 'Darwin' ]]; then
local ioption='-i .bak'
else
local ioption='-i'
fi

# set up testing suite if it doesn't yet exist
if [ ! -d $WP_TESTS_DIR ]; then
# 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 co --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
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

}

install_db() {
# parse DB_HOST for port or socket references
local PARTS=(${DB_HOST//\:/ })
local DB_HOSTNAME=${PARTS[0]};
local DB_SOCK_OR_PORT=${PARTS[1]};
local EXTRA=""

if ! [ -z $DB_HOSTNAME ] ; then
if [ $(echo $DB_SOCK_OR_PORT | grep -e '^[0-9]\{1,\}$') ]; then
EXTRA=" --host=$DB_HOSTNAME --port=$DB_SOCK_OR_PORT --protocol=tcp"
elif ! [ -z $DB_SOCK_OR_PORT ] ; then
EXTRA=" --socket=$DB_SOCK_OR_PORT"
elif ! [ -z $DB_HOSTNAME ] ; then
EXTRA=" --host=$DB_HOSTNAME --protocol=tcp"
fi
fi

# create database
mysqladmin create $DB_NAME --user="$DB_USER" --password="$DB_PASS"$EXTRA
}

install_wp
install_test_suite
install_db
46 changes: 46 additions & 0 deletions dist/dist/bin/prepare-deploy.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
#!/bin/bash

#We make sure we run this just at one before_deploy hook.
if ! [ $BEFORE_DEPLOY_RUN ] && [ "$TRAVIS_PHP_VERSION" == "7.0" ]; then

echo " Preparing deploy. ";

# Flag the run.
export BEFORE_DEPLOY_RUN=1;

# Parse the name of the repo.
export THEMEISLE_REPO=$(node -pe "require('./package.json').name")

# Parse the version of the product.

export THEMEISLE_VERSION=$(node -pe "require('./package.json').version")

# Parse product category.
export THEMEISLE_CATEGORY=$(node -pe "require('./package.json').category")

export DEMO_THEMEISLE_PATH="/sites/demo.themeisle.com/wp-content/$THEMEISLE_CATEGORY/$THEMEISLE_REPO";

# Build changelog based on commit message description.
CHANGELOG="\n ### v$THEMEISLE_VERSION - "$(date +'%Y-%m-%d')" \n **Changes:** \n";

# Remove first line from the commit as is it used as commit title.
NORMALIZED_MESSAGE=$(sed "1d" <<< "$TRAVIS_COMMIT_MESSAGE");

# Save changes list in a sepparately variable as we use it in the release body.
export CHANGES="";
while read -r line; do
if ! [ -z $line ]; then
line=$(echo "${line//[$'\r\n']}");
export CHANGES=$CHANGES'- '$line'\n';
fi;
done <<< "$NORMALIZED_MESSAGE"

# Concat changes and changelog title and prepend to the changelog file.

CHANGELOG="$CHANGELOG $CHANGES";
echo -e "$CHANGELOG $(cat CHANGELOG.md)" > CHANGELOG.md

# Run the prepare deployment action

grunt deploy
fi;
Loading

0 comments on commit 3cae0ad

Please sign in to comment.