Merge pull request #27 from wojsmol/tov2

Move command over to new v2 structure

Author: schlessera

circle.yml .circleci/config.ymlcircle.yml renamed to .circleci/config.yml

@@ -4,26 +4,31 @@ jobs:
     working_directory: ~/wp-cli/package-tests
     parallelism: 1
     docker:
-    - image: circleci/php:7.1
-    - image: circleci/mysql:5.6
+    - image: circleci/php:7.1-cli
+      environment:
+          MYSQL_HOST: 127.0.0.1
+    - image: circleci/mysql:5.7
+      environment:
+          MYSQL_USER: wp_cli_test
+          MYSQL_PASSWORD: password1
+          MYSQL_DATABASE: wp_cli_test
     steps:
     - checkout
     - run: |
         sudo sh -c "printf '\ndeb http://ftp.us.debian.org/debian sid main\n' >> /etc/apt/sources.list"
         sudo apt-get update
         sudo docker-php-ext-install mysqli
-        sudo apt-get install mysql-client-5.7
+        sudo apt-get install -y mysql-client-5.7
     - run: |
         echo -e "memory_limit = 1024M" | sudo tee /usr/local/etc/php/php.ini > /dev/null
     - run: |
-        composer require wp-cli/wp-cli:dev-master
         composer install
-        bash bin/install-package-tests.sh
+        composer prepare-tests
     - run: |
         echo 'export PATH=$HOME/wp-cli/package-tests/vendor/bin:$PATH' >> $BASH_ENV
         source $BASH_ENV
     - run: |
         composer validate
-        WP_VERSION=latest bash bin/test.sh
+        WP_VERSION=latest composer behat
         rm -rf '/tmp/wp-cli-test core-download-cache'
-        WP_VERSION=trunk bash bin/test.sh
+        WP_VERSION=trunk composer behat

bin/install-package-tests.sh

@@ -1,7 +1,7 @@
 {
     "name": "wp-cli/dist-archive-command",
-    "description": "Create a distribution .zip or .tar.gz based on a plugin or theme's .distignore file.",
     "type": "wp-cli-package",
+    "description": "Create a distribution .zip or .tar.gz based on a plugin or theme's .distignore file.",
     "homepage": "https://runcommand.io/wp/dist-archive/",
     "license": "MIT",
     "authors": [
@@ -11,20 +11,41 @@
             "homepage": "https://runcommand.io"
         }
     ],
-    "minimum-stability": "dev",
-    "autoload": {
-        "psr-4": {
-            "": "src/"
-        },
-        "files": [ "dist-archive-command.php" ]
+    "require": {
+        "php": ">=5.4",
+        "wp-cli/wp-cli": "^2"
     },
-    "require": {},
     "require-dev": {
-        "behat/behat": "~2.5"
+        "behat/behat": "~2.5",
+        "wp-cli/wp-cli-tests": "^2",
+        "wp-cli/scaffold-command": "^2",
+        "wp-cli/extension-command": "^2"
     },
     "extra": {
         "commands": [
             "dist-archive"
         ]
+    },
+    "autoload": {
+        "psr-4": {
+            "": "src/"
+        },
+        "files": [
+            "dist-archive-command.php"
+        ]
+    },
+    "minimum-stability": "dev",
+    "scripts": {
+        "behat": "run-behat-tests",
+        "lint": "run-linter-tests",
+        "phpcs": "run-phpcs-tests",
+        "phpunit": "run-php-unit-tests",
+        "prepare-tests": "install-package-tests",
+        "test": [
+            "@lint",
+            "@phpcs",
+            "@phpunit",
+            "@behat"
+        ]
     }
 }