Skip to content

Commit

Permalink
Merge pull request #13 from sepandhaghighi/dev
Browse files Browse the repository at this point in the history
Version 1.6
  • Loading branch information
sepandhaghighi authored Jul 10, 2018
2 parents f26a68b + 8b21191 commit b13284e
Show file tree
Hide file tree
Showing 11 changed files with 265 additions and 18 deletions.
92 changes: 91 additions & 1 deletion ArtList.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"### Version : 1.5"
"### Version : 1.6"
]
},
{
Expand Down Expand Up @@ -48,6 +48,9 @@
"5\n",
"ᕙ༼ ,,இܫஇ,, ༽ᕗ \n",
"******************************\n",
"AK-47\n",
"︻┳デ═— \n",
"******************************\n",
"airplane1\n",
" ‛¯¯٭٭¯¯(▫▫)¯¯٭٭¯¯’ \n",
"******************************\n",
Expand Down Expand Up @@ -75,12 +78,18 @@
"bagel\n",
"nln >_< nln \n",
"******************************\n",
"barbell\n",
"▐━━━━━▌ \n",
"******************************\n",
"bear\n",
"ʕ•ᴥ•ʔ \n",
"******************************\n",
"bee\n",
"¸.·´¯`·¸¸.·´¯`·.¸.-<\\^}0=: \n",
"******************************\n",
"being draged\n",
"╰(◣﹏◢)╯ \n",
"******************************\n",
"big eyes\n",
"⺌∅‿∅⺌ \n",
"******************************\n",
Expand Down Expand Up @@ -165,6 +174,9 @@
"dagger\n",
"cxxx|;:;:;:;:;:;:;:;> \n",
"******************************\n",
"dancee\n",
"♪┏(°.°)┛┗(°.°)┓┗(°.°)┛┏(°.°)┓ ♪ \n",
"******************************\n",
"decorate\n",
"▂▃▅▇█▓▒░۩۞۩ ۩۞۩░▒▓█▇▅▃▂ \n",
"******************************\n",
Expand All @@ -174,12 +186,24 @@
"dog\n",
"ˁ˚ᴥ˚ˀ \n",
"******************************\n",
"domino\n",
"[: :|:::] \n",
"******************************\n",
"dummy\n",
"<-|-'_'-|-> \n",
"******************************\n",
"eaten apple\n",
"[===]-' \n",
"******************************\n",
"elephant\n",
"°j°m \n",
"******************************\n",
"epic gun\n",
"︻┳デ═— \n",
"******************************\n",
"eric\n",
">--) ) ) )*> \n",
"******************************\n",
"eye closed\n",
" (╯_╰) \n",
"******************************\n",
Expand All @@ -189,6 +213,9 @@
"face\n",
"•|龴◡龴|• \n",
"******************************\n",
"faydre\n",
"(U) [^_^] (U) \n",
"******************************\n",
"finger1\n",
"╭∩╮(Ο_Ο)╭∩╮ \n",
"******************************\n",
Expand Down Expand Up @@ -255,18 +282,27 @@
"heart2\n",
"\n",
"******************************\n",
"hell yeah\n",
"(òÓ,)_\\,,/ \n",
"******************************\n",
"help\n",
"٩(͡๏̯͡๏)۶ \n",
"******************************\n",
"homer\n",
"(_8(|) \n",
"******************************\n",
"honeycute\n",
"❤◦.¸¸. ◦✿ \n",
"******************************\n",
"house\n",
"__̴ı̴̴̡̡̡ ̡͌l̡̡̡ ̡͌l̡*̡̡ ̴̡ı̴̴̡ ̡̡͡|̲̲̲͡͡͡ ̲▫̲͡ ̲̲̲͡͡π̲̲͡͡ ̲̲͡▫̲̲͡͡ ̲|̡̡̡ ̡ ̴̡ı̴̡̡ ̡͌l̡̡̡̡.___ \n",
"******************************\n",
"hug me\n",
"(っ◕‿◕)っ \n",
"******************************\n",
"huhu\n",
"█▬█ █▄█ █▬█ █▄█ \n",
"******************************\n",
"human\n",
"•͡˘㇁•͡˘ \n",
"******************************\n",
Expand All @@ -276,6 +312,12 @@
"inlove\n",
"(✿ ♥‿♥) \n",
"******************************\n",
"jokeranonimous\n",
"╭∩╮ (òÓ,) ╭∩╮ \n",
"******************************\n",
"jokeranonimous2\n",
"╭∩╮(ô¿ô)╭∩╮ \n",
"******************************\n",
"killer\n",
"(⌐■_■)--︻╦╤─ - - - (╥﹏╥) \n",
"******************************\n",
Expand All @@ -297,18 +339,30 @@
"kokain\n",
" ̿ ̿' ̿'\\̵͇̿̿\\з=(•̪●)=ε/̵͇̿̿/'̿''̿ ̿ \n",
"******************************\n",
"kyubey\n",
"/人 ⌒ ‿‿ ⌒ 人\ \n",
"******************************\n",
"kyubey2\n",
"/人 ◕‿‿◕ 人\ \n",
"******************************\n",
"linqan\n",
":Q___ \n",
"******************************\n",
"looking face\n",
"ô¿ô \n",
"******************************\n",
"love\n",
"ⓛⓞⓥⓔ \n",
"******************************\n",
"love in my eye\n",
"(♥_♥) \n",
"******************************\n",
"love you\n",
"»-(¯`·.·´¯)-><-(¯`·.·´¯)-« \n",
"******************************\n",
"love2\n",
" ~♡ⓛⓞⓥⓔ♡~ \n",
"******************************\n",
"mango\n",
") _ _ __/°°¬ \n",
"******************************\n",
Expand Down Expand Up @@ -336,6 +390,9 @@
"mouse\n",
"----{,_,\"> \n",
"******************************\n",
"mtmtika\n",
":o + :p = 69 \n",
"******************************\n",
"nathan\n",
"♪└( ̄◇ ̄)┐♪└( ̄◇ ̄)┐♪└( ̄◇ ̄)┐♪ \n",
"******************************\n",
Expand All @@ -348,6 +405,9 @@
"nose\n",
"\\˚ㄥ˚\\ \n",
"******************************\n",
"nose2\n",
"|'L'| \n",
"******************************\n",
"old lady boobs\n",
"|\\o/\\o/| \n",
"******************************\n",
Expand Down Expand Up @@ -378,9 +438,15 @@
"pistols2\n",
"̿' ̿'\\̵͇̿̿\\з=(◕_◕)=ε/̵͇̿̿/'̿'̿ ̿ \n",
"******************************\n",
"possessed\n",
"<>_<> \n",
"******************************\n",
"professor\n",
"\"\"\"⌐(ಠ۾ಠ)¬\"\"\" \n",
"******************************\n",
"puls\n",
"––•–√\\/––√\\/––•–– \n",
"******************************\n",
"rak\n",
"/⦿L⦿\\ \n",
"******************************\n",
Expand All @@ -405,6 +471,9 @@
"rocket\n",
"∙∙∙∙∙·▫▫ᵒᴼᵒ▫ₒₒ▫ᵒᴼᵒ▫ₒₒ▫ᵒᴼᵒ☼)===> \n",
"******************************\n",
"roke\n",
"_\\m/ \n",
"******************************\n",
"rope\n",
"╚(▲_▲)╝ \n",
"******************************\n",
Expand All @@ -426,18 +495,30 @@
"scissors\n",
"\n",
"******************************\n",
"sex symbol\n",
"◢♂◣◥♀◤◢♂◣◥♀◤ \n",
"******************************\n",
"singing\n",
"d(^o^)b¸¸♬·¯·♩¸¸♪·¯·♫¸¸ \n",
"******************************\n",
"sky free\n",
"ѧѦ ѧ ︵͡︵ ̢ ̱ ̧̱ι̵̱̊ι̶̨̱ ̶̱ ︵ Ѧѧ ︵͡ ︵ ѧ Ѧ ̵̗̊o̵̖ ︵ ѦѦ ѧ \n",
"******************************\n",
"sleeping\n",
"(-.-)Zzz... \n",
"******************************\n",
"sleeping baby\n",
"[{-_-}] ZZZzz zz z... \n",
"******************************\n",
"smug bastard\n",
"(‾⌣‾) \n",
"******************************\n",
"snail\n",
"'-'_@_ \n",
"******************************\n",
"sniper rifle\n",
"︻デ┳═ー \n",
"******************************\n",
"sniperstars\n",
"✯╾━╤デ╦︻✯ \n",
"******************************\n",
Expand All @@ -459,6 +540,9 @@
"stars2\n",
"⋆ ✢ ✣ ✤ ✥ ✦ ✧ ✩ ✪ ✫ ✬ ✭ ✮ ✯ ✰ ★ \n",
"******************************\n",
"superman\n",
"-^mOm^- \n",
"******************************\n",
"sword1\n",
"(===||:::::::::::::::> \n",
"******************************\n",
Expand All @@ -477,6 +561,9 @@
"teddy\n",
"ˁ(⦿ᴥ⦿)ˀ \n",
"******************************\n",
"tie-fighter\n",
"|—O—| \n",
"******************************\n",
"tron\n",
"(\\/)(;,,;)(\\/) \n",
"******************************\n",
Expand Down Expand Up @@ -510,6 +597,9 @@
"worm\n",
"_/\\__/\\__0> \n",
"******************************\n",
"worm2\n",
"~ \n",
"******************************\n",
"yolo\n",
"Yᵒᵘ Oᶰˡʸ Lᶤᵛᵉ Oᶰᶜᵉ \n",
"******************************\n",
Expand Down
37 changes: 36 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,40 @@ 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]
## [1.6] - 2018-07-10
### Added
- 30 new 1-line art
1. sexy symbol
2. barbell
3. sniper rifle
4. being draged
5. possessed
6. jokeranonimous
7. epic gun
8. love
9. love2
10. eric
11. puls
12. sky free
13. smug bastard
14. tie-fighter
15. kyubey
16. dancee
17. mtmtika
18. ak-47
19. eaten apple
20. huhu
21. faydre
22. domino
23. honeycute
24. superman
25. worm2
26. jokeranonimous2
27. kyubey2
28. nose2
29. hell yeah
30. roke

## [1.5] - 2018-06-18
### Added
- 30 new 1-line art
Expand Down Expand Up @@ -295,7 +329,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/v1.5...HEAD
[Unreleased]: https://github.com/sepandhaghighi/art/compare/v1.6...HEAD
[1.6]: https://github.com/sepandhaghighi/art/compare/v1.5...v1.6
[1.5]: https://github.com/sepandhaghighi/art/compare/v1.4...v1.5
[1.4]: https://github.com/sepandhaghighi/art/compare/v1.3...v1.4
[1.3]: https://github.com/sepandhaghighi/art/compare/v1.2...v1.3
Expand Down
2 changes: 1 addition & 1 deletion FontList.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"### Version : 1.5"
"### Version : 1.6"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion INSTALL.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## Installation

### Source Code
- Download [Version 1.5](https://github.com/sepandhaghighi/art/archive/v1.5.zip) or [Latest Source ](https://github.com/sepandhaghighi/art/archive/dev.zip)
- Download [Version 1.6](https://github.com/sepandhaghighi/art/archive/v1.6.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)

### PyPI
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<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-120-blue.svg"></a>
<a href="https://github.com/sepandhaghighi/art/blob/master/ArtList.ipynb"><img src="https://img.shields.io/badge/Art List-160-orange.svg"></a>
<a href="https://github.com/sepandhaghighi/art/blob/master/ArtList.ipynb"><img src="https://img.shields.io/badge/Art List-190-orange.svg"></a>
<a href="https://t.me/artlib_bot" target="__blank"><img src="https://img.shields.io/badge/Telegram-Bot-red.svg"></a>
</div>

Expand Down Expand Up @@ -75,7 +75,7 @@ Art is a Python lib for text converting to ASCII ART fancy. ;-)
</tr>
<tr>
<td align="center">1-Line-Art Counter</td>
<td align="center">160</td>
<td align="center">190</td>
</tr>
</table>
</html>
Expand Down Expand Up @@ -264,7 +264,7 @@ True
<table>
<tr>
<td align="center">Function</td>
<td align="center">Normal</td>
<td align="center">Normal Output</td>
<td align="center">Error</td>
</tr>
<tr>
Expand Down
4 changes: 2 additions & 2 deletions art/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
cov.stop()
cov.report()
cov.save()
elif args[1].upper() in ["LIST","ARTS"]:
elif args[1].upper() in ["LIST", "ARTS"]:
art_list()
elif args[1].upper() == "FONTS":
font_list()
Expand Down Expand Up @@ -63,7 +63,7 @@
tsave(args[2], font=args[3])
else:
tsave(args[2])
elif args[1].upper() in ["SHAPE","ART"]:
elif args[1].upper() in ["SHAPE", "ART"]:
try:
aprint(args[2])
except artError as e:
Expand Down
2 changes: 1 addition & 1 deletion art/art.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import sys
import random

version = "1.5"
version = "1.6"


description = '''ASCII art is also known as "computer text art".
Expand Down
Loading

0 comments on commit b13284e

Please sign in to comment.