Merge pull request #39 from Codeinwp/development

Fixed wrong image regex. 
Fixed image compression.
Added wraith.

Author: selul

.distignore

@@ -1,16 +1,19 @@
-.git
-.distignore
-.gitignore
-.travis.yml
-.jshintrc
-Gruntfile.js
-grunt
-phpcs.xml
-node_modules
-logs
-package.json
-npm-debug.log
-.codeclimate.yml
-.csslintrc
-.eslintignore
-.eslintrc
+.git
+.distignore
+.gitignore
+.travis.yml
+.jshintrc
+Gruntfile.js
+grunt
+phpcs.xml
+node_modules
+logs
+package.json
+bin
+tests
+phpunit.xml
+npm-debug.log
+dist
+artifact
+composer.json
+composer.lock

.gitignore

@@ -1,3 +1,7 @@
-.idea
-node_modules
-logs
+.idea
+node_modules
+logs
+dist
+artifact
+vendor
+composer.lock

.travis.yml

@@ -1,47 +1,63 @@
-language: php
-
-##  PHP versions to test  against
-php:
-    - "7.0"
-    - "5.6"
-    - "5.5"
-    - "5.4"
-    - "5.3"
-    - "5.2"
-sudo: false
-env:
-    - WP_VERSION=master WP_MULTISITE=0
-install:
-  - . $HOME/.nvm/nvm.sh
-  - nvm install stable
-  - nvm use stable
-  - npm install
-  - npm install grunt-cli -g
-before_script:
-    ## Install the wordpress latest version
-    - export WP_DEVELOP_DIR=/tmp/wordpress/
-    - mkdir -p $WP_DEVELOP_DIR
-    - git clone --depth=1 --branch="$WP_VERSION" git://develop.git.wordpress.org/ $WP_DEVELOP_DIR
-    - plugin_slug=$(basename $(pwd))
-    - plugin_dir=$WP_DEVELOP_DIR/src/wp-content/plugins/$plugin_slug
-    - cd ..
-    - mv $plugin_slug $plugin_dir
-    - cd $WP_DEVELOP_DIR
-    - cp wp-tests-config-sample.php wp-tests-config.php
-    - sed -i "s/youremptytestdbnamehere/wordpress_test/" wp-tests-config.php
-    - sed -i "s/yourusernamehere/root/" wp-tests-config.php
-    - sed -i "s/yourpasswordhere//" wp-tests-config.php
-    - mysql -e 'CREATE DATABASE wordpress_test;' -uroot
-
-     ## install PHPCS and Wordpress standards
-    - pear install pear/PHP_CodeSniffer
-    - mkdir wordpress-coding-standards && curl -L https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/archive/master.tar.gz | tar xz --strip-components=1 -C wordpress-coding-standards
-    - phpenv rehash
-    - phpcs --config-set installed_paths $WP_DEVELOP_DIR/wordpress-coding-standards
-    - phpenv rehash
-    - cd $plugin_dir
-addons:
-    code_climate:
-        repo_token: c63bb0fd56cca4099244e34c7ed09620d4ed89116436f3bd642af45cae4d86c6
-script:
-     grunt travis
+language: php
+php:
+    - "7.0"
+    - "5.6"
+    - "5.5"
+    - "5.4"
+    - "5.3"
+    - "5.2"
+matrix:
+  include:
+  - php: "5.6"
+    before_install: chmod +x bin/wraith.sh
+    install: true
+    before_script:
+    env: TEST_SUITE=Wraith_Visual_Regression_Testing WRAITH_FAIL=5
+    script:  ./bin/wraith.sh
+sudo: false
+branches:
+  except:
+  - "/^*-v[0-9]/"
+env:
+  matrix:
+  - WP_VERSION=latest WP_MULTISITE=0
+  global:
+  - MASTER_BRANCH=production UPSTREAM_REPO=Codeinwp/feedzy-rss-feeds STORE_URL=https://themeisle.com
+install:
+- chmod +x bin/install-dependencies.sh
+- ". ./bin/install-dependencies.sh"
+script:
+- if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then  grunt travis; fi;
+before_deploy:
+- chmod +x bin/prepare-deploy.sh
+- ". ./bin/prepare-deploy.sh"
+deploy:
+- provider: s3
+  access_key_id: "$AWS_ACCESS_KEY"
+  secret_access_key: "$AWS_SECRET_KEY"
+  bucket: "$AWS_BUCKET"
+  skip_cleanup: true
+  acl: public_read
+  overwrite: true
+  local-dir: artifact/
+  upload-dir: "$AWS_PRODUCTS_FOLDER/$THEMEISLE_REPO/latest"
+  on:
+    branch: "$MASTER_BRANCH"
+    repo: "$UPSTREAM_REPO"
+    condition: $TRAVIS_PHP_VERSION = "7.0"
+- provider: s3
+  access_key_id: "$AWS_ACCESS_KEY"
+  secret_access_key: "$AWS_SECRET_KEY"
+  bucket: "$AWS_BUCKET"
+  skip_cleanup: true
+  acl: public_read
+  overwrite: true
+  local-dir: artifact/
+  upload-dir: "$AWS_PRODUCTS_FOLDER/$THEMEISLE_REPO/$THEMEISLE_VERSION"
+  on:
+    repo: "$UPSTREAM_REPO"
+    branch: "$MASTER_BRANCH"
+    condition: $TRAVIS_PHP_VERSION = "7.0"
+after_deploy:
+- chmod +x bin/deploy.sh
+- ". ./bin/deploy.sh"

bin/deploy.sh

@@ -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  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;

bin/install-dependencies.sh

@@ -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
+
+          # 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;