Merge pull request #26 from sepandhaghighi/dev

Version 2.6

.travis.yml

@@ -44,6 +44,6 @@ install:
   - python setup.py install
 
 script:
-  - python -m art test
+  - python -m art testcov
 after_success:
   - codecov

ArtList.ipynb

@@ -11,7 +11,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "### Version : 2.5"
+    "### Version : 2.6"
    ]
   },
   {

CHANGELOG.md

@@ -5,6 +5,35 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [2.6] - 2018-12-05
+### Added
+- 20 new fonts
+	1. xbrite
+	2. xbriteb
+	3. xbritei
+	4. xbritebi
+	5. xchartr
+	6. xchartri
+	7. xcour
+	8. xcourb
+	9. xcourbi
+	10. xcouri
+	11. xhelv
+	12. xhelvb
+	13. xhelvbi
+	14. xhelvi
+	15. xsans
+	16. xsansb
+	17. xsansbi
+	18. xsansi
+	19. xtimes
+	20. xttyb
+- CLI `testcov` flag
+### Changed
+- `requirements.txt` modified
+- `INSTALL.md` modified
+- CLI `test` flag modified
+
 ## [2.5] - 2018-12-02
 ### Added
 - 15 new fonts
@@ -575,7 +604,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - 1-Line art
 - CLI commands
 
-[Unreleased]: https://github.com/sepandhaghighi/art/compare/v2.5...HEAD
+[Unreleased]: https://github.com/sepandhaghighi/art/compare/v2.6...HEAD
+[2.6]: https://github.com/sepandhaghighi/art/compare/v2.5...v2.6
 [2.5]: https://github.com/sepandhaghighi/art/compare/v2.4...v2.5
 [2.4]: https://github.com/sepandhaghighi/art/compare/v2.3...v2.4
 [2.3]: https://github.com/sepandhaghighi/art/compare/v2.2...v2.3

INSTALL.md

@@ -1,20 +1,22 @@
 ## Installation		
 
 ### Source Code
-- Download [Version 2.5](https://github.com/sepandhaghighi/art/archive/v2.5.zip) or [Latest Source ](https://github.com/sepandhaghighi/art/archive/dev.zip)
-- `python3 setup.py install --upgrade` or `python setup.py install --upgrade` (Need root access)				
+- Download [Version 2.6](https://github.com/sepandhaghighi/art/archive/v2.6.zip) or [Latest Source ](https://github.com/sepandhaghighi/art/archive/dev.zip)
+- `python3 setup.py install` or `python setup.py install` (Need root access)				
 
 ### PyPI
 
 
 - Check [Python Packaging User Guide](https://packaging.python.org/installing/)     
-- `pip install art==2.5` or `pip3 install art==2.5` (Need root access)
+- `pip install art==2.6` or `pip3 install art==2.6` (Need root access)
+
+* Note :  On `--upgrade` error install latest version of `setuptools` : `pip install setuptools` and retry
 
 ### Conda
 
 - Check [Conda Managing Package](https://conda.io/docs/user-guide/tasks/manage-pkgs.html#installing-packages-from-anaconda-org)
-- `conda install -c sepandhaghighi art `
+- `conda install -c sepandhaghighi art ` (Need root access)
 
 ### Easy Install
 
-- Run `easy_install "art==2.5"` (Need root access)
+- Run `easy_install "art==2.6"` (Need root access)

README.md

@@ -12,7 +12,7 @@
 </a>
 <a href="https://badge.fury.io/py/art"><img src="https://badge.fury.io/py/art.svg" alt="PyPI version" height="18"></a>
 <a href="https://www.python.org/"><img src="https://img.shields.io/badge/built%20with-Python3-green.svg" alt="built with Python3" /></a>
-<a href="https://github.com/sepandhaghighi/art/blob/master/FontList.ipynb"><img src="https://img.shields.io/badge/Font List-250-blue.svg"></a>
+<a href="https://github.com/sepandhaghighi/art/blob/master/FontList.ipynb"><img src="https://img.shields.io/badge/Font List-270-blue.svg"></a>
 <a href="https://github.com/sepandhaghighi/art/blob/master/ArtList.ipynb"><img src="https://img.shields.io/badge/Art List-250-orange.svg"></a>
 <a href="https://t.me/artlib_bot" target="__blank"><img src="https://img.shields.io/badge/Telegram-Bot-red.svg"></a>
 <a href="https://anaconda.org/sepandhaghighi/art"><img src="https://anaconda.org/sepandhaghighi/art/badges/version.svg"></a>
@@ -61,7 +61,7 @@ Art is a Python lib for text converting to ASCII ART fancy. ;-)
 	</tr>
 	<tr>
 		<td align="center">Font Counter</td>
-		<td align="center">250</td>
+		<td align="center">270</td>
 	</tr>
 	<tr>
 		<td align="center">1-Line-Art Counter</td>
@@ -283,7 +283,7 @@ True
 			
 
 ### Typo-Tolerance			
-<a href="https://en.wikipedia.org/wiki/Levenshtein_distance">Levenshtein distance</a> used in this project. (>`Version 0.9`)
+<a href="https://en.wikipedia.org/wiki/Levenshtein_distance">Levenshtein distance</a> used in this project. (`Version` >0.9)
 
 ```pycon
 >>> Art=art("loveyou",number=1,text="test") # correct --> art("love_you",number=1,text="test") (distance < 3)
@@ -440,6 +440,7 @@ or send an email to [sepand@qpage.ir](mailto:sepand@qpage.ir "sepand@qpage.ir").
 
 1. [1 Line Art](http://1lineart.kulaone.com/#/)
 2. [Text To ASCII](http://patorjk.com/software/taag/#p=display&f=Blocks&t=ART)
+3. [ASCII Generator](http://www.network-science.de/ascii/)
 
 ## Donate to our project
 								

appveyor.yml

@@ -58,4 +58,4 @@ install:
   - "%PYTHON%/python.exe setup.py install"
 
 test_script:
-  - "%PYTHON%/python.exe -m art test"
+  - "%PYTHON%/python.exe -m art testcov"

art/__main__.py

@@ -10,7 +10,7 @@
 if __name__ == "__main__":
     args = sys.argv
     if len(args) > 1:
-        if args[1].upper() == "TEST":
+        if args[1].upper() == "TESTCOV":
             cov = coverage.Coverage()
             cov.start()
             error_flag = doctest.testfile(
@@ -22,6 +22,15 @@
             cov.report()
             cov.save()
             sys.exit(error_flag)
+        elif args[1].upper() == "TEST":
+            error_flag = doctest.testfile(
+                "test.py",
+                optionflags=doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS | doctest.IGNORE_EXCEPTION_DETAIL,
+                verbose=False)[0]
+            if error_flag == 0:
+                print("\nTest Passed")
+            else:
+                print("\nTest Failed")
         elif args[1].upper() in ["LIST", "ARTS"]:
             art_list()
         elif args[1].upper() == "FONTS":

art/art.py

@@ -5,7 +5,7 @@
 import sys
 import random
 
-version = "2.5"
+version = "2.6"
 
 
 description = '''ASCII art is also known as "computer text art".
@@ -214,7 +214,27 @@ class artError(Exception):
             "charact6": [charact6_dic, False],
             "characte": [characte_dic, False],
             "chartr": [chartr_dic, False],
-            "chartri": [chartri_dic, False]
+            "chartri": [chartri_dic, False],
+            "xbrite": [xbrite_dic, False],
+            "xbriteb": [xbriteb_dic, False],
+            "xbritebi": [xbritebi_dic, False],
+            "xbritei": [xbritei_dic, False],
+            "xchartr": [xchartr_dic, False],
+            "xchartri": [xchartri_dic, False],
+            "xcour": [xcour_dic, False],
+            "xcourb": [xcourb_dic, False],
+            "xcourbi": [xcourbi_dic, False],
+            "xcouri": [xcouri_dic, False],
+            "xhelv": [xhelv_dic, False],
+            "xhelvb": [xhelvb_dic, False],
+            "xhelvbi": [xhelvbi_dic, False],
+            "xhelvi": [xhelvi_dic, False],
+            "xsans": [xsans_dic, False],
+            "xsansb": [xsansb_dic, False],
+            "xsansbi": [xsansbi_dic, False],
+            "xsansi": [xsansi_dic, False],
+            "xtimes": [xtimes_dic, False],
+            "xttyb": [xttyb_dic, False]
             }
 font_counter = len(font_map)
 DEFAULT_FONT = "standard"