PierreMarchand20 · PierreMarchand20 · Dec 9, 2023 · Dec 2, 2023 · Dec 4, 2023
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -19,31 +19,28 @@ jobs:
 
     steps:
         - uses: actions/checkout@v3
-        - name: Set up Python
-          uses: actions/setup-python@v4
-          with:
-            python-version: "3.x"
-
+
         - name: Set up Python package
           run: |
-            python -m pip install --upgrade pip
-            python -m pip install .[test]
+            python3 -m pip install --upgrade pip
+            python3 -m pip install .[test]
 
         - name: Run regression tests
           run: |
-            pytest
+            set enable-bracketed-paste off
+            python3 -m pytest
 
         - name: Check module imports with isort
           run: |
-            python -m pip install isort
-            python -m isort . --check-only --diff
+            python3 -m pip install isort
+            python3 -m isort . --check-only --diff
         #   uses: isort/isort-action@master
 
         - name: Check formatting with black
           uses: psf/black@stable
 
         - name: Check building a binary wheel and a source tarball
           run: |
-            python -m pip install twine build --user
-            python -m build --sdist --wheel --outdir dist/ .
-            python -m twine check dist/*
+            python3 -m pip install twine build --user
+            python3 -m build --sdist --wheel --outdir dist/ .
+            python3 -m twine check dist/*
diff --git a/.gitignore b/.gitignore
@@ -62,3 +62,5 @@ venv.bak/
 
 # Others
 .DS_Store
+
+.vscode-server
diff --git a/asciinema_automation/cli.py b/asciinema_automation/cli.py
@@ -32,10 +32,10 @@ def cli(argv=None):
     )
     parser.add_argument(
         "-sd",
-        "--standart-deviation",
+        "--standard-deviation",
         type=int,
         default=60,
-        help="standart deviation for gaussian used to generate time between key strokes",
+        help="standard deviation for gaussian used to generate time between key strokes",
     )
     parser.add_argument(
         "-t",
@@ -70,7 +70,7 @@ def cli(argv=None):
     delay = args.delay
     wait = args.wait
     asciinema_arguments = args.asciinema_arguments
-    standart_deviation = args.standart_deviation
+    standard_deviation = args.standard_deviation
     loglevel = args.loglevel
     timeout = args.timeout
 
@@ -87,7 +87,7 @@ def cli(argv=None):
         asciinema_arguments,
         wait,
         delay,
-        standart_deviation,
+        standard_deviation,
         timeout,
     )
 

diff --git a/asciinema_automation/instruction.py b/asciinema_automation/instruction.py
@@ -62,18 +62,18 @@ def run(self, script):
         for send_character, receive_character in zip(
             self.send_value, self.receive_value
         ):
-            if script.standart_deviation is None:
+            if script.standard_deviation is None:
                 time.sleep(script.delay)
             else:
-                time.sleep(abs(random.gauss(script.delay, script.standart_deviation)))
+                time.sleep(abs(random.gauss(script.delay, script.standard_deviation)))
             script.process.send(str(send_character))
             script.process.expect(str(receive_character))
 
         # End instruction
-        if script.standart_deviation is None:
+        if script.standard_deviation is None:
             time.sleep(script.delay)
         else:
-            time.sleep(abs(random.gauss(script.delay, script.standart_deviation)))
+            time.sleep(abs(random.gauss(script.delay, script.standard_deviation)))
 
 
 class SendCharacterInstruction(Instruction):
@@ -129,10 +129,10 @@ def run(self, script):
         super().run(script)
         logger.debug("Send %s arrow %i times", self.send, self.num)
         for _ in range(self.num):
-            if script.standart_deviation is None:
+            if script.standard_deviation is None:
                 time.sleep(script.delay)
             else:
-                time.sleep(abs(random.gauss(script.delay, script.standart_deviation)))
+                time.sleep(abs(random.gauss(script.delay, script.standard_deviation)))
             if self.enter:
                 script.process.sendline(self.mapping[self.send])
             else:

diff --git a/asciinema_automation/script.py b/asciinema_automation/script.py
@@ -49,7 +49,7 @@ def __init__(
         asciinema_arguments: str,
         wait,
         delay,
-        standart_deviation,
+        standard_deviation,
         timeout,
     ):
         # Set members from arguments
@@ -58,7 +58,7 @@ def __init__(
         self.asciinema_arguments = asciinema_arguments
         self.delay = delay / 1000.0
         self.wait = wait / 1000.0
-        self.standart_deviation = standart_deviation / 1000.0
+        self.standard_deviation = standard_deviation / 1000.0
 
         # Default values for data members
         self.expected = "\n"

diff --git a/examples/backward_search.sh b/examples/backward_search.sh
@@ -14,7 +14,7 @@ rm my_first_file.txt
 #$ delay 500
 
 #$ send touch
-#$ expect second
+#$ expect second_file.txt
 
 #$ wait 1000
 

diff --git a/examples/hello_world.sh b/examples/hello_world.sh
@@ -1,4 +1,4 @@
-# delay instructions change the time (or mean of gaussian if standart deviation is given) between key strokes
+# delay instructions change the time (or mean of gaussian if standard deviation is given) between key strokes
 #$ delay 50
 
 echo "Hello world"

diff --git a/examples/history.sh b/examples/history.sh
@@ -11,7 +11,10 @@ rm my_first_file.txt
 
 #$ delay 800
 
-#$ sendarrow up 2
+#$ sendarrow up 1
+#$ expect rm my_first_file.txt
+
+#$ sendarrow up 1
 #$ expect touch my_second_file.txt
 
 #$ sendarrow up

diff --git a/examples/special_character.sh b/examples/special_character.sh
@@ -1,2 +1,4 @@
+
+#$ expect \$
 #$ sendcharacter #
 This is a test with URL (https://github.com)
diff --git a/tests/custom_rc_file_dumb_term b/tests/custom_rc_file_dumb_term
@@ -0,0 +1,6 @@
+export PS1="$ "
+export HOME=~
+export TERM=xterm
+export PATH=/usr/bin:/usr/local/bin/
+shopt -u checkwinsize
+set enable-bracketed-paste off
diff --git a/tests/custom_rc_file_xterm_term b/tests/custom_rc_file_xterm_term
@@ -0,0 +1,6 @@
+export PS1="$ "
+export HOME=~
+export TERM=xterm
+export PATH=/usr/bin:/usr/local/bin/
+shopt -u checkwinsize
+set enable-bracketed-paste off
diff --git a/tests/reference_output/asciinema_hello_world.cast b/tests/reference_output/asciinema_hello_world.cast
@@ -1,13 +1,12 @@
-[?2004h$ asciinema rec temp_test.cast \
-[?2004l[?2004h>     --overwrite \
-[?2004l[?2004h>     -c 'env -i PS1=$ bash --noprofile --norc' \
-[?2004l[?2004h>     -q
-[?2004l$echo "Hello World"
+$ asciinema rec temp_test.cast \
+>     --overwrite \
+>     -c 'env -i PS1=$ bash --noprofile --norc' \
+>     -q
+$echo "Hello World"
 Hello World
 $exit
-[?2004h$ asciinema play temp_test.cast
-[?2004l$echo "Hello World"
+$ asciinema play temp_test.cast
+$echo "Hello World"
 Hello World
 $exit
-[?2004h$ [?2004l
-exit
+$ exit
diff --git a/tests/reference_output/autocompletion.cast b/tests/reference_output/autocompletion.cast
@@ -1,6 +1,5 @@
-[?2004h$ mkdir my_folder_with_a_very_long_name
-[?2004l[?2004h$ cd my_folder_with_a_very_long_name/
-[?2004l[?2004h$ basename $PWD
-[?2004lmy_folder_with_a_very_long_name
-[?2004h$ [?2004l
-exit
+$ mkdir my_folder_with_a_very_long_name
+$ cd my_folder_with_a_very_long_name/
+$ basename $PWD
+my_folder_with_a_very_long_name
+$ exit
diff --git a/tests/reference_output/backward_search.cast b/tests/reference_output/backward_search.cast
@@ -1,8 +1,11 @@
-[?2004h$ touch my_first_file.txt
-[?2004l[?2004h$ touch my_second_file.txt
-[?2004l[?2004h$ rm my_first_file.txt
-[?2004l[?2004h$ (reverse-i-search)`': t': rm my_first_file.tx[7mt[27m(reverse-i-search)`to': [7mto[27much my_second_file.txt[1@u': [7mtou[27m[1@c': [7mtouc[27m[1@h': [7mtouch[27m[7mtouch[27m my_[1Pfirst[25P$ touch$ 
-[?2004l[?2004h$ ls my_first_file.txt
-[?2004lmy_first_file.txt
-[?2004h$ [?2004l
-exit
+$ touch my_first_file.txt
+$ touch my_second_file.txt
+$ rm my_first_file.txt
+$ 
+(reverse-i-search)`': t': rm my_first_file.txt
+(reverse-i-search)`to': touch my_second_file.txtu': touc': touch': touchtouch my_first
+$ touch
+$ 
+$ ls my_first_file.txt
+my_first_file.txt
+$ exit
diff --git a/tests/reference_output/change_structure.cast b/tests/reference_output/change_structure.cast
@@ -1,14 +1,13 @@
-[?2004h$ mkdir my_directory
-[?2004l[?2004h$ cd my_directory
-[?2004l[?2004h$ basename $PWD
-[?2004lmy_directory
-[?2004h$ touch my_textfile.txt
-[?2004l[?2004h$ ls
-[?2004lmy_textfile.txt
-[?2004h$ rm my_textfile.txt
-[?2004l[?2004h$ ls
-[?2004l[?2004h$ cd ..
-[?2004l[?2004h$ rm -r my_directory
-[?2004l[?2004h$ ls
-[?2004l[?2004h$ [?2004l
-exit
+$ mkdir my_directory
+$ cd my_directory
+$ basename $PWD
+my_directory
+$ touch my_textfile.txt
+$ ls
+my_textfile.txt
+$ rm my_textfile.txt
+$ ls
+$ cd ..
+$ rm -r my_directory
+$ ls
+$ exit
diff --git a/tests/reference_output/escaped_command.cast b/tests/reference_output/escaped_command.cast
@@ -1,6 +1,5 @@
-[?2004h$ echo "Very" \
-[?2004l[?2004h>     "long" \
-[?2004l[?2004h>     "command"
-[?2004lVery long command
-[?2004h$ [?2004l
-exit
+$ echo "Very" \
+>     "long" \
+>     "command"
+Very long command
+$ exit
diff --git a/tests/reference_output/hello_world.cast b/tests/reference_output/hello_world.cast
@@ -1,8 +1,7 @@
-[?2004h$ echo "Hello world"
-[?2004lHello world
-[?2004h$ echo "I have waited 1000ms"
-[?2004lI have waited 1000ms
-[?2004h$ echo "I am writing with a 10ms delay"
-[?2004lI am writing with a 10ms delay
-[?2004h$ [?2004l
-exit
+$ echo "Hello world"
+Hello world
+$ echo "I have waited 1000ms"
+I have waited 1000ms
+$ echo "I am writing with a 10ms delay"
+I am writing with a 10ms delay
+$ exit
diff --git a/tests/reference_output/history.cast b/tests/reference_output/history.cast
@@ -1,8 +1,9 @@
-[?2004h$ touch my_first_file.txt
-[?2004l[?2004h$ touch my_second_file.txt
-[?2004l[?2004h$ rm my_first_file.txt
-[?2004l[?2004h$ rm my_first_file.txt$ [4@touch my_second_file.txt$ touch my_[1Pfirst_file.txt
-[?2004l[?2004h$ ls
-[?2004lmy_first_file.txt  my_second_file.txt
-[?2004h$ [?2004l
-exit
+$ touch my_first_file.txt
+$ touch my_second_file.txt
+$ rm my_first_file.txt
+$ rm my_first_file.txt
+$ touch my_second_file.txt
+$ touch my_first_file.txt
+$ ls
+my_first_file.txt  my_second_file.txt
+$ exit
diff --git a/tests/reference_output/man_page.cast b/tests/reference_output/man_page.cast
@@ -1,31 +1,47 @@
-[?2004h$ man echo
-[?2004l[?1049h[22;0;0t[?1h=ECHO(1)                          User Commands                         ECHO(1)[m
-[m
-[1mNAME[0m[m
-       echo - display a line of text[m
-[m
-[1mSYNOPSIS[0m[m
-       [1mecho[0m [[4mSHORT-OPTION[24m]... [[4mSTRING[24m]...[m
-       [1mecho[0m [4mLONG-OPTION[24m[m
-[m
-[1mDESCRIPTION[0m[m
-       Echo the STRING(s) to standard output.[m
-[m
-       [1m-n[0m     do not output the trailing newline[m
-[m
-       [1m-e[0m     enable interpretation of backslash escapes[m
-[m
-       [1m-E[0m     disable interpretation of backslash escapes (default)[m
-[m
-       [1m--help[0m display this help and exit[m
-[m
-       [1m--version[0m[m
-              output version information and exit[m
-[m
-[7m Manual page echo(1) line 1 (press h for help or q to quit)[27m[K[K [KESCESC[K[[[KBB[K[7m Manual page echo(1) line 1 (press h for help or q to quit)[27m[K[K       If [1m-e[0m is in effect, the following sequences are recognized:[m
-[7m Manual page echo(1) line 2 (press h for help or q to quit)[27m[K[K [KESCESC[K[[[KBB[K[7m Manual page echo(1) line 2 (press h for help or q to quit)[27m[K[K[m
-[7m Manual page echo(1) line 3 (press h for help or q to quit)[27m[K[K [KESCESC[K[[[KBB[K[7m Manual page echo(1) line 3 (press h for help or q to quit)[27m[K[K       \\     backslash[m
-[7m Manual page echo(1) line 4 (press h for help or q to quit)[27m[K[K [KESCESC[K[[[KBB[K[7m Manual page echo(1) line 4 (press h for help or q to quit)[27m[K[K[m
-[7m Manual page echo(1) line 5 (press h for help or q to quit)[27m[K[K [KESCESC[K[[[KBB[K[7m Manual page echo(1) line 5 (press h for help or q to quit)[27m[K[K       \a     alert (BEL)[m
-[7m Manual page echo(1) line 6 (press h for help or q to quit)[27m[K[K[?1l>[?1049l[23;0;0t[?2004h$ [?2004l
-exit
+$ man echo
+=
+ECHO(1)                          User Commands                         ECHO(1)
+
+NAME
+       echo - display a line of text
+
+SYNOPSIS
+       echo [SHORT-OPTION]... [STRING]...
+       echo LONG-OPTION
+
+DESCRIPTION
+       Echo the STRING(s) to standard output.
+
+       -n     do not output the trailing newline
+
+       -e     enable interpretation of backslash escapes
+
+       -E     disable interpretation of backslash escapes (default)
+
+       --help display this help and exit
+
+       --version
+              output version information and exit
+
+ Manual page echo(1) line 1 (press h for help or q to quit)
+ ESCESC[[BB
+ Manual page echo(1) line 1 (press h for help or q to quit)
+       If -e is in effect, the following sequences are recognized:
+ Manual page echo(1) line 2 (press h for help or q to quit)
+ ESCESC[[BB
+ Manual page echo(1) line 2 (press h for help or q to quit)
+
+ Manual page echo(1) line 3 (press h for help or q to quit)
+ ESCESC[[BB
+ Manual page echo(1) line 3 (press h for help or q to quit)
+       \\     backslash
+ Manual page echo(1) line 4 (press h for help or q to quit)
+ ESCESC[[BB
+ Manual page echo(1) line 4 (press h for help or q to quit)
+
+ Manual page echo(1) line 5 (press h for help or q to quit)
+ ESCESC[[BB
+ Manual page echo(1) line 5 (press h for help or q to quit)
+       \a     alert (BEL)
+ Manual page echo(1) line 6 (press h for help or q to quit)
+>$ exit
diff --git a/tests/reference_output/special_character.cast b/tests/reference_output/special_character.cast
@@ -1,3 +1,2 @@
-[?2004h$ #This is a test with URL (https://github.com)
-[?2004l[?2004h$ [?2004l
-exit
+$ #This is a test with URL (https://github.com)
+$ exit
Original file line number	Diff line number	Diff line change
Expand Up		@@ -62,3 +62,5 @@ venv.bak/

		# Others
		.DS_Store

		.vscode-server