Merge pull request #47 from php-http/puli_phar

Add puli.phar, remove cli dependency, closes #41
php-http · Jan 15, 2016 · 9f1f47e · 9f1f47e
2 parents 4d0fcc3 + 9ccaca9
commit 9f1f47e
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
 .puli/
+bin/*
+!bin/puli.phar
 build/
 vendor/
 composer.lock

diff --git a/.travis.yml b/.travis.yml
@@ -21,6 +21,8 @@ branches:
         - /^analysis-.*$/
 
 matrix:
+    allow_failures:
+        - php: hhvm
     fast_finish: true
     include:
         - php: 5.5

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,23 @@
 # Change Log
 
 
+## 0.7.0 - 2016-01-15
+
+### Added
+
+- Temporary puli.phar (Beta 10) executable
+
+### Changed
+
+- Updated HTTPlug dependencies
+- Updated Puli dependencies
+- Local configuration to make tests passing
+
+### Removed
+
+- Puli CLI dependency
+
+
 ## 0.6.4 - 2016-01-07
 
 ### Fixed

diff --git a/README.md b/README.md
@@ -9,6 +9,13 @@
 
 **Finds installed HTTPlug implementations and PSR-7 message factories.**
 
+> **Note for 0.7.x releases**
+>
+> Puli binary is added to this repository until [puli/issues#165](https://github.com/puli/issues/issues/165) is resolved.
+>
+> However, if you have puli globally installed, it will be used.
+> Make sure that your puli binary is at least beta10
+
 
 ## Install
 

diff --git a/bin/puli.phar b/bin/puli.phar
diff --git a/composer.json b/composer.json
@@ -12,9 +12,7 @@
     ],
     "require": {
         "php": "^5.4|7.*",
-        "puli/composer-plugin": "1.0.0-beta9",
-        "puli/discovery": "1.0.0-beta9",
-        "puli/cli": "~1.0.0-beta10"
+        "puli/composer-plugin": "1.0.0-beta9"
     },
     "require-dev": {
         "php-http/httplug": "^1.0",
@@ -36,14 +34,20 @@
         }
     },
     "scripts": {
-        "test": "vendor/bin/phpspec run",
-        "test-ci": "vendor/bin/phpspec run -c phpspec.yml.ci"
+        "test": "bin/phpspec run",
+        "test-ci": "bin/phpspec run -c phpspec.yml.ci"
     },
+    "bin": [
+        "bin/puli.phar"
+    ],
     "extra": {
         "branch-alias": {
-            "dev-master": "0.7-dev"
+            "dev-master": "0.8-dev"
         }
     },
+    "config": {
+        "bin-dir": "bin"
+    },
     "prefer-stable": true,
-    "minimum-stability": "dev"
+    "minimum-stability": "beta"
 }