Skip to content

Commit a026bab

Browse files
VaasuDevanSVaasuDevanS
authored
Merge pull request #24 from druhi/druhi/octopus
Druhi/octopus
2 parents 21649ff + c1a5674 commit a026bab

File tree

5 files changed

+127
-4
lines changed

5 files changed

+127
-4
lines changed

‎README.md‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -477,6 +477,24 @@ pdoc -d google cowsay -o docs
477477
(| | )
478478
/'\_ _/`\
479479
\___)=(___/
480+
____________
481+
| Hi! I am octopus |
482+
============
483+
. . .
484+
. ^ .
485+
. ^ ^ ^ .
486+
. ^ ^ ^ .
487+
. ^ .
488+
. . .
489+
_ _ _ _ _ _ _| |_ _ _ _ _ _
490+
/ _ _ _ _ _ _| o|o |_ _ _ _ _ _ \
491+
/ / _ _ _ _ _| | |_ _ _ _ \ \
492+
/ / / _ _ _ / /| |\ \ _ _ _ \ \ \
493+
/ / / / / / | | \ \ \ \ \ \
494+
/ / / / / / | | \ \ \ \ \ \
495+
/_/ / / / / | | \ \ \ \ \_\
496+
| /__/ /_/ |_| \_\ \__\ |
497+
| / | \ |
480498

481499
```
482500

@@ -530,4 +548,23 @@ $ cowsay Hello World --character tux
530548
/'\_ _/`\
531549
\___)=(___/
532550

551+
$ cowsay Hello World --character octopus
552+
___________
553+
| Hello World |
554+
===========
555+
. . .
556+
. ^ .
557+
. ^ ^ ^ .
558+
. ^ ^ ^ .
559+
. ^ .
560+
. . .
561+
_ _ _ _ _ _ _| |_ _ _ _ _ _
562+
/ _ _ _ _ _ _| o|o |_ _ _ _ _ _ \
563+
/ / _ _ _ _ _| | |_ _ _ _ \ \
564+
/ / / _ _ _ / /| |\ \ _ _ _ \ \ \
565+
/ / / / / / | | \ \ \ \ \ \
566+
/ / / / / / | | \ \ \ \ \ \
567+
/_/ / / / / | | \ \ \ \ \_\
568+
| /__/ /_/ |_| \_\ \__\ |
569+
| / | \ |
533570
```

‎cowsay/__init__.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,5 @@
2727
turkey,
2828
turtle,
2929
tux,
30+
octopus,
3031
)

‎cowsay/characters.py‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,5 +381,21 @@
381381
/'\_ _/`\
382382
\___)=(___/
383383
''',
384-
385-
}
384+
"octopus": r'''
385+
. . .
386+
. ^ .
387+
. ^ ^ ^ .
388+
. ^ ^ ^ .
389+
. ^ .
390+
. . .
391+
_ _ _ _ _ _ _| |_ _ _ _ _ _
392+
/ _ _ _ _ _ _| o|o |_ _ _ _ _ _ \
393+
/ / _ _ _ _ _| | |_ _ _ _ \ \
394+
/ / / _ _ _ / /| |\ \ _ _ _ \ \ \
395+
/ / / / / / | | \ \ \ \ \ \
396+
/ / / / / / | | \ \ \ \ \ \
397+
/_/ / / / / | | \ \ \ \ \_\
398+
| /__/ /_/ |_| \_\ \__\ |
399+
| / | \ |
400+
''',
401+
}

‎cowsay/test.py‎

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
turkey,
2424
turtle,
2525
tux,
26+
octopus,
2627
)
2728

2829
LOREM = """Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam
@@ -571,7 +572,32 @@
571572
&*******************************&
572573
&*****************************&
573574
"""
574-
575+
OCTOPUS_SOLUTION = r"""
576+
_________________________________________________
577+
/ \
578+
| Lorem ipsum dolor sit amet, consetetur sadipscing |
579+
| elitr, sed diamnonumy eirmod tempor invidunt ut |
580+
| labore et dolore magna aliquyam erat,sed diam vol |
581+
| uptua. At vero eos et accusam et justo duo dolore |
582+
| s et ea rebum. |
583+
\ /
584+
=================================================
585+
. . .
586+
. ^ .
587+
. ^ ^ ^ .
588+
. ^ ^ ^ .
589+
. ^ .
590+
. . .
591+
_ _ _ _ _ _ _| |_ _ _ _ _ _
592+
/ _ _ _ _ _ _| o|o |_ _ _ _ _ _ \
593+
/ / _ _ _ _ _| | |_ _ _ _ \ \
594+
/ / / _ _ _ / /| |\ \ _ _ _ \ \ \
595+
/ / / / / / | | \ \ \ \ \ \
596+
/ / / / / / | | \ \ \ \ \ \
597+
/_/ / / / / | | \ \ \ \ \_\
598+
| /__/ /_/ |_| \_\ \__\ |
599+
| / | \ |
600+
"""
575601

576602
def capture_output(function, arguments):
577603
captured_output = io.StringIO()
@@ -709,7 +735,12 @@ def test_tux(self):
709735
output = delete_empty_lines(output)
710736
solution = delete_empty_lines(TUX_SOLUTION)
711737
assert output == solution
712-
738+
739+
def test_octopus(self):
740+
output = capture_output(octopus, (LOREM))
741+
output = delete_empty_lines(output)
742+
solution = delete_empty_lines(OCTOPUS_SOLUTION)
743+
assert output == solution
713744

714745
if __name__ == "__main__":
715746
unittest.main()

‎docs/cowsay.html‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -544,6 +544,24 @@ <h1 id="more-characters">More characters</h1>
544544
<span class="go"> (| | )</span>
545545
<span class="go"> /&#39;\_ _/`\</span>
546546
<span class="go"> \___)=(___/</span>
547+
<span class="go"> ____________</span>
548+
<span class="go">| Hi! I am octopus |</span>
549+
<span class="go"> ===========</span>
550+
<span class="go"> . . . </span>
551+
<span class="go"> . ^ . </span>
552+
<span class="go"> . ^ ^ ^ . </span>
553+
<span class="go"> . ^ ^ ^ . </span>
554+
<span class="go"> . ^ . </span>
555+
<span class="go"> . . . </span>
556+
<span class="go"> _ _ _ _ _ _ _| |_ _ _ _ _ _ </span>
557+
<span class="go"> / _ _ _ _ _ _| o|o |_ _ _ _ _ _ \ </span>
558+
<span class="go"> / / _ _ _ _ _| | |_ _ _ _ \ \ </span>
559+
<span class="go"> / / / _ _ _ / /| |\ \ _ _ _ \ \ \ </span>
560+
<span class="go"> / / / / / / | | \ \ \ \ \ \ </span>
561+
<span class="go"> / / / / / / | | \ \ \ \ \ \ </span>
562+
<span class="go">/_/ / / / / | | \ \ \ \ \_\</span>
563+
<span class="go"> | /__/ /_/ |_| \_\ \__\ | </span>
564+
<span class="go"> | / | \ | </span>
547565
</code></pre></div>
548566

549567
<h1 id="command-line-usage">Command Line Usage</h1>
@@ -595,6 +613,26 @@ <h1 id="command-line-usage">Command Line Usage</h1>
595613
<span class="go"> (| | )</span>
596614
<span class="go"> /&#39;\_ _/`\</span>
597615
<span class="go"> \___)=(___/</span>
616+
617+
<span class="gp">$ </span>cowsay Hello World --character octopus
618+
<span class="go"> ___________</span>
619+
<span class="go">| Hello World |</span>
620+
<span class="go"> ===========</span>
621+
<span class="go"> . . . </span>
622+
<span class="go"> . ^ . </span>
623+
<span class="go"> . ^ ^ ^ . </span>
624+
<span class="go"> . ^ ^ ^ . </span>
625+
<span class="go"> . ^ . </span>
626+
<span class="go"> . . . </span>
627+
<span class="go"> _ _ _ _ _ _ _| |_ _ _ _ _ _ </span>
628+
<span class="go"> / _ _ _ _ _ _| o|o |_ _ _ _ _ _ \ </span>
629+
<span class="go"> / / _ _ _ _ _| | |_ _ _ _ \ \ </span>
630+
<span class="go"> / / / _ _ _ / /| |\ \ _ _ _ \ \ \ </span>
631+
<span class="go"> / / / / / / | | \ \ \ \ \ \ </span>
632+
<span class="go"> / / / / / / | | \ \ \ \ \ \ </span>
633+
<span class="go">/_/ / / / / | | \ \ \ \ \_\</span>
634+
<span class="go"> | /__/ /_/ |_| \_\ \__\ | </span>
635+
<span class="go"> | / | \ | </span>
598636
</code></pre></div>
599637

600638
<h1 id="change-log">Change Log</h1>

0 commit comments

Comments
 (0)