Skip to content

Example clean ups and color change #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
StephenBrown2 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Example clean ups and color change #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c5f7fae
Clean up cli-examples.txt spacing and add wiki text for all examples
StephenBrown2 Jan 30, 2013
9917941
Change gitignore to ignore manager.dat
StephenBrown2 Jan 30, 2013
cacfee8
Change cli_command to a less obtuse color
StephenBrown2 Jan 30, 2013
56de081
Merge branch 'patch-1'
StephenBrown2 Jan 30, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
my-distrib.sh

manager.dat
152 changes: 100 additions & 52 deletions cli-examples.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
====== Tests of CLI Plugin ======

This page provides a set of test cases for the [[plugins:cli|CLI Plugin]] and also serves as an example of its use.
This page provides a set of test cases for the [[doku>plugin:cli|CLI Plugin]] and also serves as an example of its use. (([[https://raw.github.com/cpjobling/plugin-cli/master/cli-examples.txt]]))

===== Basic Shell Script =====

Wiki text:
<cli>
user@host:~/somedir $ ls
conf lang README screen.gif ui
info.txt manager.dat renderer.php syntax.php
user@host:~/somedir $ wc info.txt # count words in info.txt
55 108 1032 info.txt
user@host:~/somedir $
</cli>
<cli>
user@host:~/somedir $ ls
conf lang README screen.gif ui
info.txt manager.dat renderer.php syntax.php
user@host:~/somedir $ wc info.txt # count words in info.txt
55 108 1032 info.txt
user@host:~/somedir $
</cli>

Rendered result:

Expand All @@ -29,9 +29,20 @@ user@host:~/somedir $

===== Shell Script with Comments =====

Wiki text:

<cli comment="#">
user@host:~/somedir $ ls # List current directory
conf lang README screen.gif ui
info.txt manager.dat renderer.php syntax.php
user@host:~/somedir $
</cli>

Rendered result:

<cli comment="#">
user@host:~/somedir $ ls # List current directory
conf lang README screen,gif ui
conf lang README screen.gif ui
info.txt manager.dat renderer.php syntax.php
user@host:~/somedir $
</cli>
Expand All @@ -42,45 +53,45 @@ user@host:~/somedir $

This (default shell comment character):

<cli prompt="#">
root@host:~user/somedir # ls # List current directory
conf lang README screen,gif ui
info.txt manager.dat renderer.php syntax.php
root@host:~user/somedir #
</cli>
<cli prompt="#">
root@host:~user/somedir # ls # List current directory
conf lang README screen.gif ui
info.txt manager.dat renderer.php syntax.php
root@host:~user/somedir #
</cli>

renders as this:

<cli prompt="#">
root@host:~user/somedir # ls # List current directory
conf lang README screen,gif ui
conf lang README screen.gif ui
info.txt manager.dat renderer.php syntax.php
root@host:~user/somedir #
</cli>

This is also valid:

<cli prompt="# " comment="#">
root@host:~user/somedir # ls # List current directory
conf lang README screen,gif ui
info.txt manager.dat renderer.php syntax.php
root@host:~user/somedir #
</cli>
<cli prompt="# " comment="#">
root@host:~user/somedir # ls # List current directory
conf lang README screen.gif ui
info.txt manager.dat renderer.php syntax.php
root@host:~user/somedir #
</cli>

<cli prompt="# " comment="#">
root@host:~user/somedir # ls # List current directory
conf lang README screen,gif ui
conf lang README screen.gif ui
info.txt manager.dat renderer.php syntax.php
root@host:~user/somedir #
</cli>

Example with a continuation prompt:

<cli prompt="$ " continue="> " comment="#">
user@host:~/somedir $ ls \
> # List directory
file1 file2
</cli>
<cli prompt="$ " continue="> " comment="#">
user@host:~/somedir $ ls \
> # List directory
file1 file2
</cli>

<cli prompt="$ " continue="> " comment="#">
user@host:~/somedir $ ls \
Expand All @@ -91,9 +102,20 @@ file1 file2

===== Shell Script with Comments =====

Wiki text:

<cli prompt="$" comment="#">
user@host:~/somedir $ ls # List current directory
conf lang README screen.gif ui
info.txt manager.dat renderer.php syntax.php
user@host:~/somedir $
</cli>

Rendered result:

<cli prompt="$" comment="#">
user@host:~/somedir $ ls # List current directory
conf lang README screen,gif ui
conf lang README screen.gif ui
info.txt manager.dat renderer.php syntax.php
user@host:~/somedir $
</cli>
Expand All @@ -104,11 +126,11 @@ user@host:~/somedir $

Wiki text:

<cli prompt=">" comment="REM">
C:\Users\User>REM hello world!
C:\Users\User>echo 'hello world!'
'hello world!'
</cli>
<cli prompt=">" comment="REM">
C:\Users\User>REM hello world!
C:\Users\User>echo 'hello world!'
'hello world!'
</cli>

Rendered result:

Expand All @@ -121,6 +143,17 @@ C:\Users\User>echo 'hello world!'
===== Ruby irb =====

Simple minded implementation will not work for results as end of prompt is same as results marker!

Wiki text:

<cli prompt=">">
irb(main):001:0> 2+2
=> 4
irb(main):002:0>
</cli>

Rendered result:

<cli prompt=">">
irb(main):001:0> 2+2
=> 4
Expand All @@ -129,6 +162,20 @@ irb(main):002:0>

===== Python =====

Wiki text:

<cli prompt=">>>">
ActivePython 2.5.1.1 (ActiveState Software Inc.) based on
Python 2.5.1 (r251:54863, May 1 2007, 17:47:05) [MSC v.1310 32 bit (Intel)] on
win32
Type "help", "copyright", "credits" or "license" for more information.
>>> 2+2
4
>>>
</cli>

Rendered result:

<cli prompt=">>>">
ActivePython 2.5.1.1 (ActiveState Software Inc.) based on
Python 2.5.1 (r251:54863, May 1 2007, 17:47:05) [MSC v.1310 32 bit (Intel)] on
Expand All @@ -144,23 +191,24 @@ Type "help", "copyright", "credits" or "license" for more information.
===== Python + Windows Shell (Nested CLIs) =====

Wiki text:
<cli prompt=">">
C:\Users\Chris Jobling>python
<cli prompt=">>>">
ActivePython 2.5.1.1 (ActiveState Software Inc.) based on
Python 2.5.1 (r251:54863, May 1 2007, 17:47:05) [MSC v.1310 32 bit (Intel)] on
win32
Type "help", "copyright", "credits" or "license" for more information.
>>> 2+2
4
>>> ^Z

</cli>
C:\Users\Chris Jobling>
</cli>

<cli prompt=">">
C:\Users\Chris Jobling>python
<cli prompt=">>>">
ActivePython 2.5.1.1 (ActiveState Software Inc.) based on
Python 2.5.1 (r251:54863, May 1 2007, 17:47:05) [MSC v.1310 32 bit (Intel)] on
win32
Type "help", "copyright", "credits" or "license" for more information.
>>> 2+2
4
>>> ^Z

</cli>
C:\Users\Chris Jobling>
</cli>

Rendered result:
Wiki text:

<cli prompt=">">
C:\Users\Chris Jobling>python
<cli prompt=">">
Expand Down Expand Up @@ -199,9 +247,9 @@ Not sure to do about this as download progress marker uses same character as pro

<cli prompt="$" comment="#">
user@host:~/somedir $ ls # List current directory
conf lang README screen,gif ui
conf lang README screen.gif ui
info.txt manager.dat renderer.php syntax.php


user@host:~/somedir $ # I intended there to be two blank lines above!
</cli>
</cli>
4 changes: 2 additions & 2 deletions style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
}

.cli_command {
color: red;
color: darkslategrey;
}

// nested CLI
pre.cli pre.cli {
background-color: #F8F8F8;
}

/* end plugin:cli */
/* end plugin:cli */