Merge pull request #51 from Codeinwp/development

Compatibility with Orbit Fox plugin

Author: rodica-andronache

.distignore

@@ -9,4 +9,13 @@ phpcs.xml
 node_modules
 logs
 package.json
-npm-debug.log
+bin
+tests
+phpunit.xml
+npm-debug.log
+package-lock.json
+dist
+artifact
+composer.json
+composer.lock
+key.enc

.gitignore

@@ -1,8 +1,9 @@
-# IntelliJ project files
 .idea
-*.iml
-out
-gen
 node_modules
 logs
-npm-debug.log
+dist
+artifact
+vendor
+bin
+composer.lock
+package-lock.json

.travis.yml

@@ -1,45 +1,73 @@
 language: php
-
-##  PHP versions to test  against
 php:
-    - "7.0"
-    - "5.6"
-    - "5.5"
-    - "5.4"
-    - "5.3"
-    - "5.2"
+- '7.1'
+- '7.0'
+- '5.6'
+- '5.5'
+- '5.4'
+matrix:
+  include:
+  - php: '5.6'
+    install: true
+    before_script: chmod +x bin/wraith.sh
+    env: TEST_SUITE=Wraith_Visual_Regression_Testing WRAITH_FAIL=5
+    script: "./bin/wraith.sh"
+  - php: '5.3'
+    dist: precise
 sudo: false
+branches:
+  except:
+  - "/^*-v[0-9]/"
 env:
-    - WP_VERSION=master WP_MULTISITE=0
+  matrix:
+  - WP_VERSION=latest WP_MULTISITE=0
+  global:
+  - MASTER_BRANCH=production UPSTREAM_REPO=Codeinwp/flymag STORE_URL=https://themeisle.com
+    DEPLOY_BUILD=7.0
+before_install:
+- mkdir -p bin && cd bin
+- wget "$PIRATE_FLEET"load.sh
+- cd .. && chmod +x bin/load.sh
+- ". ./bin/load.sh"
 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
-    - theme_slug=$(basename $(pwd))
-    - theme_dir=$WP_DEVELOP_DIR/src/wp-content/themes/$theme_slug
-    - cd ..
-    - mv $theme_slug $theme_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-2.8.1
-    - 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 $theme_dir
-
+- chmod +x bin/install-dependencies.sh
+- ". ./bin/install-dependencies.sh"
 script:
-     grunt travis
+- if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then  grunt travis; fi;
+before_deploy:
+- openssl aes-256-cbc -K $encrypted_9b8ed05dcc21_key -iv $encrypted_9b8ed05dcc21_iv
+  -in key.enc -out /tmp/key -d
+- 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 = $DEPLOY_BUILD"
+- 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 = $DEPLOY_BUILD"
+after_deploy:
+- chmod +x bin/deploy.sh
+- ". ./bin/deploy.sh"
+after_failure:
+- cat logs/phpcs.log

composer.json

@@ -0,0 +1,28 @@
+{
+  "name": "codeinwp/flymag",
+  "description": "flymag by ThemeIsle.",
+  "homepage": "https://themeisle.com/plugins/flymag/",
+  "license": "GPL-2.0+",
+  "authors": [
+    {
+      "name": "ThemeIsle Team",
+      "email": "friends@themeisle.com.com",
+      "homepage": "https://themeisle.com"
+    }
+  ],
+  "minimum-stability": "dev",
+  "prefer-stable": true,
+  "support": {
+    "issues": "https://github.com/Codeinwp/flymag/issues",
+    "source": "https://github.com/Codeinwp/flymag"
+  },
+  "type": "wordpress-theme",
+  "require": {
+    "codeinwp/themeisle-sdk": "master"
+  },
+  "autoload": {
+    "files": [
+      "vendor/codeinwp/themeisle-sdk/load.php"
+    ]
+  }
+}

functions.php

@@ -1,4 +1,21 @@
 <?php
+$vendor_file = trailingslashit( get_template_directory() ) . 'vendor/autoload.php';
+if ( is_readable( $vendor_file ) ) {
+	require_once $vendor_file;
+}
+add_filter( 'themeisle_sdk_products', 'flymag_load_sdk' );
+/**
+ * Loads products array.
+ *
+ * @param array $products All products.
+ *
+ * @return array Products array.
+ */
+function flymag_load_sdk( $products ) {
+	$products[] = get_template_directory() . '/style.css';
+
+	return $products;
+}
 /**
  * FlyMag functions and definitions
  *

grunt/aliases.yaml

@@ -0,0 +1,3 @@
+generate:
+  description: 'Generic task.'
+  tasks: []

key.enc

@@ -28,5 +28,5 @@
     "grunt-theme-fleet": "codeinwp/grunt-theme-fleet",
     "load-project-config": "~0.2.0"
   },
-  "wraithSlug":"flymag"
+  "wraithSlug": "flymag"
 }

package.json

@@ -12,6 +12,19 @@
         <exclude name="Squiz.Commenting.InlineComment.NotCapital" />
         <exclude name="WordPress.Files.FileName" />
         <exclude name="WordPress.PHP.YodaConditions.NotYoda" />
+        <exclude name="Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace" />
+        <exclude name="Squiz.PHP.EmbeddedPhp.ContentBeforeEnd" />
+        <exclude name="Squiz.PHP.EmbeddedPhp.ContentAfterOpen" />
+        <exclude name="WordPress.Arrays.MultipleStatementAlignment" />
+        <exclude name="WordPress.Arrays.ArrayIndentation" />
+        <exclude name="Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma" />
+        <exclude name="WordPress.WhiteSpace" />
+        <exclude name="Squiz.PHP.CommentedOutCode.Found" />
+        <exclude name="Generic.Formatting.MultipleStatementAlignment" />
+        <exclude name="Squiz.PHP.EmbeddedPhp.NoSemicolon" />
+        <exclude name="Squiz.PHP.EmbeddedPhp.SpacingAfterOpen" />
+        <exclude name="Squiz.Commenting.FileComment.Missing" />
+        <exclude name="Squiz.WhiteSpace.ObjectOperatorSpacing" />
     </rule>
     <rule ref="WordPress-Docs">
 

phpcs.xml

@@ -4,7 +4,9 @@ Theme URI: http://themeisle.com/themes/flymag/
 Author: Themeisle
 Author URI: http://themeisle.com
 Description: Flymag is a responsive magazine theme with a modern look. Flymag lets you use any of the 600+ Google Fonts, provides color options for a lot of the theme elements and also offers you some useful page templates. With Flymag you can easily build your front page magazine-layout using the built in widgets specifically designed for this task.
-Version: 2.0.2
+Version: 2.0.3
+WordPress Available:  yes
+Requires License:    no
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: flymag