Merge pull request #415 from phalcon/2.0.x

2.0.2

Author: sergeyklay

README.md

@@ -2,28 +2,26 @@
 [![Total Downloads](https://img.shields.io/packagist/dt/phalcon/devtools.svg?style=flat-square)](https://packagist.org/packages/phalcon/devtools)
 [![Software License](https://img.shields.io/badge/license-BSD--3-brightgreen.svg?style=flat-square)](https://github.com/phalcon/phalcon-devtools/blob/master/docs/LICENSE.txt)
 
-Phalcon Devtools
-================
+# Phalcon Devtools
 
 ![Webtools](http://static.phalconphp.com/img/webtools.png)
 
-What's Phalcon?
----------------
+## What's Phalcon?
+
 Phalcon PHP is a web framework delivered as a C extension providing high performance and lower resource consumption.
 
-What are Devtools?
-------------------
+## What are Devtools?
+
 This tools provide you useful scripts to generate code helping to develop faster and easy applications that use
 with Phalcon framework.
 
-Requirements
-------------
+## Requirements
 
 * PHP >= 5.3.9
-* Phalcon >= 0.7.0
+* Phalcon >= 2.0.0
+
+## Installing via Composer
 
-Installing via Composer
-=======================
 Install composer in a common location or in your project:
 
 ```bash
@@ -63,8 +61,8 @@ ln -s ~/devtools/phalcon.php /usr/bin/phalcon
 chmod ugo+x /usr/bin/phalcon
 ```
 
-Installation via PEAR
-=====================
+## Installation via PEAR
+
 Phalcon Devtools can be installed using PEAR. Since the current version of Devtools
 is in beta state, you might need to update your PEAR config. You can execute following to check
 your current state:
@@ -103,8 +101,7 @@ ln -s ~/phalcon-devtools/phalcon.php /usr/bin/phalcon
 chmod ugo+x /usr/bin/phalcon
 ```
 
-Usage
-=====
+## Usage
 
 To get a list of available commands just execute following:
 
@@ -131,19 +128,42 @@ Available commands:
   webtools (alias of: create-webtools)
 ```
 
-Database adapter
-=====
-Should add 'adapter' parameter in your db config file (if you use not Mysql database). For PostgreSql will be
+## Update WebTools from old version
+
+Please remove manually directories:
+
+* `public/css/bootstrap`
+* `public/css/codemirror`
+* `public/js/bootstrap`
+* `public/img/bootstrap`
+* `public/js/codemirror`
+* `public/js/jquery`
+
+and files:
+
+* `public/webtools.config.php`
+* `public/webtools.php`
+
+and just run form your project root:
+
 ```bash
+$ phalcon webtools --action=enable
+```
+
+## Database adapter
+
+Should add 'adapter' parameter in your db config file (if you use not Mysql database). For PostgreSql will be
+
+```php
 $config = array(
-  "host" => "localhost",
-  "dbname" => "my_db_name",
+  "host"     => "localhost",
+  "dbname"   => "my_db_name",
   "username" => "my_db_user",
   "password" => "my_db_user_password",
-  "adapter" => "Postgresql",
- );
- ```
+  "adapter"  => "Postgresql",
+);
+```
+
+## License
 
-License
-=====
 Phalcon Developer Tools is open source software licensed under the New BSD License. See the docs/LICENSE.txt file for more.

composer.json

@@ -2,7 +2,7 @@
     "name": "phalcon/devtools",
     "type": "library",
     "description": "This tools provide you useful scripts to generate code helping to develop faster and easy applications that use with Phalcon framework.",
-    "keywords": ["framework", "phalcon"],
+    "keywords": ["framework", "phalcon", "devtools", "webtools"],
     "homepage": "http://phalconphp.com",
     "license": "BSD-3",
     "authors": [
@@ -12,7 +12,8 @@
         }
     ],
     "require": {
-        "php": ">=5.3.9"
+        "php": ">=5.3.9",
+        "ext-phalcon": "~2.0"
     },
     "autoload": {
         "psr-0" : {

ide/phpstorm/phalcon.sh

@@ -25,9 +25,9 @@ run_profile(){
 		. $HOME/.profile
 	elif [ -e $HOME/.bashrc ]; then
 		. $HOME/.bashrc
-	elif [ -e $HOME/.zshrc]; then
+	elif [ -e $HOME/.zshrc ]; then
 		. $HOME/.zshrc
-	elif [ -e $HOME/.config/fish/config.fish]; then
+	elif [ -e $HOME/.config/fish/config.fish ]; then
 		. $HOME/.config/fish/config.fish
 	fi
 }
@@ -48,5 +48,4 @@ else
 	else
 		echo "Error: Add environment variable PTOOLSPATH, unknown shell type"
 	fi
-	
 fi