pygments-shell-console 0.0.6__tar.gz → 0.1__tar.gz

{pygments_shell_console-0.0.6 → pygments_shell_console-0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pygments-shell-console
-Version: 0.0.6
+Version: 0.1
 Requires-Dist: pygments
 Description-Content-Type: text/markdown
 

pygments_shell_console-0.1/examples/git_lg.example

@@ -0,0 +1,3 @@
+joapuiib@FP:~/01_introduccio (main) $ git lg
+* c9fc6c8 - (2 minutes ago) Added another line to README.md - Joan Puigcerver (HEAD -> main)
+* 8e70293 - (3 days ago) Added README.md - Joan Puigcerver

pygments_shell_console-0.1/examples/git_log.example

@@ -0,0 +1,12 @@
+joapuiib@FP:~/01_introduccio (main) $ git log
+commit c9fc6c856c2d52744b85a6f8d92feac496e60bd6 (HEAD -> main, tag: v1)
+Author: Joan Puigcerver <j.puigcerveribanez@edu.gva.es>
+Date:   Mon Oct 16 11:43:20 2023 +0200
+
+    Added another line to README.md
+
+commit 8e702933d5dbec9ee71100a1599ae4491085e1aa (tag: v2)
+Author: Joan Puigcerver <j.puigcerveribanez@edu.gva.es>
+Date:   Fri Oct 13 16:06:59 2023 +0200
+
+    Added Readme.md

pygments_shell_console-0.1/examples/git_show.example

@@ -0,0 +1,16 @@
+joapuiib@FP:~/01_introduccio (main) $ git show 8e70293
+commit 8e702933d5dbec9ee71100a1599ae4491085e1aa (HEAD -> main)
+Author: Joan Puigcerver Ibáñez <j.puigcerveribanez@edu.gva.es>
+Date:   Fri Oct 13 16:06:59 2023 +0200
+
+    Added README.md
+
+diff --git a/README.md b/README.md
+new file mode 100644
+index 0000000..6d747b3
+--- /dev/null
++++ b/README.md
+@@ -0,0 +1,2 @@
++# 01 - Introducció a Git
++Estem aprenent a utilitzar Git!
+-Deletion

{pygments_shell_console-0.0.6 → pygments_shell_console-0.1}/git_lexer.py

@@ -2,7 +2,7 @@
 
 from pygments.lexer import Lexer
 from pygments.lexer import RegexLexer, ExtendedRegexLexer, include, bygroups, \
-    default, using, line_re, do_insertions
+    default, using, line_re, do_insertions, inherit
 from pygments.token import Token, Punctuation, Whitespace, \
     Text, Comment, Operator, Keyword, Name, String, Number, Generic
 from pygments.lexers.diff import DiffLexer
@@ -32,7 +32,7 @@ STANDARD_TYPES.update({
     Token.Git.Refs.Branch: 'git-b',
 })
 
-class GitLogLexer(Lexer):
+class GitPrettyLogLexer(Lexer):
     name = "Git"
     aliases = ["git"]
     filenames = ['*.git']
@@ -54,10 +54,10 @@ class GitLogLexer(Lexer):
       r'( +)',                      # 12. Space
       r'(-)',                       # 13. Commit separator
       r'( +)',                      # 14. Space
-      r'([0-9A-Za-zÀ-ÖØ-öø-ÿ ]+)',  # 15. Author
-      r'( +)',                      # 16. Space
-      r'((\([\w ->,:]+\))?)',       # 17. Refs
-      r'$', # End
+      r'([0-9A-Za-zÀ-ÖØ-öø-ÿ ]*[0-9A-Za-zÀ-ÖØ-öø-ÿ]+)',  # 15. Author
+      r'( *)',                      # 16. Space
+      r'((\([\w ->,:]+\))?)',         # 17. Refs
+      r'\n', # End
     ]
 
     # Combine the regex patterns into a single pattern
@@ -142,11 +142,10 @@ class GitStatusLexer(RegexLexer):
         ],
     }
 
-class GitShowLexer(RegexLexer):
+class GitLogLexer(RegexLexer):
     tokens = {
         'root': [
             (r'^\n', Whitespace),
-            (r'^diff .*\n', using(DiffLexer), 'diff'),
             (r'^(commit [0-9a-f]+)', Token.Git.Show.Header, 'header'),
             (r'^.*\n', Generic.Output),
         ],
@@ -160,6 +159,15 @@ class GitShowLexer(RegexLexer):
             (r'[\w/_-]+', Token.Git.Refs.Branch),
             (r'\n', Whitespace, '#pop'),
         ],
+    }
+
+
+class GitShowLexer(GitLogLexer):
+    tokens = {
+        'root': [
+            (r'^diff .*\n', using(DiffLexer), 'diff'),
+            inherit
+        ],
         'diff': [
             (r'^.*\n', using(DiffLexer)),
         ],

{pygments_shell_console-0.0.6 → pygments_shell_console-0.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pygments-shell-console" # change this to a package name for your plugin
-version = "0.0.6"
+version = "0.1"
 dependencies = ["pygments"]
 readme = "README.md"
 

{pygments_shell_console-0.0.6 → pygments_shell_console-0.1}/shellconsole_lexer.py

@@ -8,7 +8,7 @@ from pygments.token import Token, Punctuation, Whitespace, \
 from pygments.lexers.diff import DiffLexer
 from pygments.lexers.shell import BashLexer
 from pygments.lexers.diff import DiffLexer
-from git_lexer import GitLogLexer, GitStatusLexer, GitShowLexer
+from git_lexer import GitLogLexer, GitPrettyLogLexer, GitStatusLexer, GitShowLexer
 from pygments.token import STANDARD_TYPES
 
 import re
@@ -75,7 +75,8 @@ class ShellConsoleLexer(Lexer):
     def get_tokens_unprocessed(self, text):
         innerlexer = self._innerLexerCls(**self.options)
         difflexer = DiffLexer()
-        gitloglexer = GitLogLexer()
+        git_log_lexer = GitLogLexer()
+        git_pretty_log_lexer = GitPrettyLogLexer()
         gitstatuslexer = GitStatusLexer()
         gitshowlexer = GitShowLexer()
 
@@ -154,8 +155,10 @@ class ShellConsoleLexer(Lexer):
             else:
                 if 'diff' in curcode:
                     custom_lexer = difflexer
-                elif curcode.startswith('git lg'):
-                    custom_lexer = gitloglexer
+                elif curcode.startswith('git lg') or curcode.startswith('git log --graph'):
+                    custom_lexer = git_pretty_log_lexer
+                elif curcode.startswith('git log'):
+                    custom_lexer = git_log_lexer
                 elif curcode.startswith('git status'):
                     custom_lexer = gitstatuslexer
                 elif curcode.startswith('git show'):

pygments_shell_console-0.1/test/test_git_log.py

@@ -0,0 +1,64 @@
+import pytest
+from pygments.token import Token
+from shellconsole_lexer import ShellConsoleLexer
+from git_lexer import GitStatusLexer
+
+def test_git_show():
+    lexer = ShellConsoleLexer()
+    text = (
+        "user@host:~/directory (main) $ git show\n"
+        "commit c9fc6c856c2d52744b85a6f8d92feac496e60bd6 (HEAD -> main, tag: v1)\n"
+        "Author: Author <author@localhost>\n"
+        "Date:   Mon Oct 16 11:43:20 2023 +0200\n"
+        "\n"
+        "    Added another line to README.md\n"
+        "\n"
+        "commit 8e702933d5dbec9ee71100a1599ae4491085e1aa\n"
+        "Author: Author <author@localhost>\n"
+        "Date:   Fri Oct 13 16:06:59 2023 +0200\n"
+        "\n"
+        "    Added README.md\n"
+)
+
+    tokens = list(lexer.get_tokens(text))
+
+    assert tokens == [
+            (Token.Generic.Prompt.UserHost, "user@host"),
+            (Token.Generic.Prompt, ":"),
+            (Token.Generic.Prompt.Directory, "~/directory"),
+            (Token.Text.Whitespace, " "),
+            (Token.Generic.Prompt.GitBranch, "(main)"),
+            (Token.Text.Whitespace, " "),
+            (Token.Generic.Prompt, "$"),
+            (Token.Text.Whitespace, " "),
+            (Token.Text, "git"),
+            (Token.Text.Whitespace, " "),
+            (Token.Text, "show"),
+            (Token.Text.Whitespace, "\n"),
+            # First commit
+            (Token.Git.Show.Header, "commit c9fc6c856c2d52744b85a6f8d92feac496e60bd6"),
+            (Token.Text.Whitespace, " "),
+            (Token.Git.Show.Header, "("),
+            (Token.Git.Refs.Head, "HEAD"),
+            (Token.Text.Whitespace, " "),
+            (Token.Git.Show.Header, "->"),
+            (Token.Text.Whitespace, " "),
+            (Token.Git.Refs.Branch, "main"),
+            (Token.Git.Show.Header, ","),
+            (Token.Text.Whitespace, " "),
+            (Token.Git.Refs.Tag, "tag: v1"),
+            (Token.Git.Show.Header, ")"),
+            (Token.Text.Whitespace, "\n"),
+            (Token.Generic.Output, "Author: Author <author@localhost>\n"),
+            (Token.Generic.Output, "Date:   Mon Oct 16 11:43:20 2023 +0200\n"),
+            (Token.Text.Whitespace, "\n"),
+            (Token.Generic.Output, "    Added another line to README.md\n"),
+            (Token.Text.Whitespace, "\n"),
+            # Second commit
+            (Token.Git.Show.Header, "commit 8e702933d5dbec9ee71100a1599ae4491085e1aa"),
+            (Token.Text.Whitespace, "\n"),
+            (Token.Generic.Output, "Author: Author <author@localhost>\n"),
+            (Token.Generic.Output, "Date:   Fri Oct 13 16:06:59 2023 +0200\n"),
+            (Token.Text.Whitespace, "\n"),
+            (Token.Generic.Output, "    Added README.md\n"),
+    ]

pygments_shell_console-0.0.6/test/test_git_log.py → pygments_shell_console-0.1/test/test_git_pretty_log.py

@@ -1,7 +1,7 @@
 import pytest
 from pygments.token import Token
 from shellconsole_lexer import ShellConsoleLexer
-from git_lexer import GitLogLexer
+from git_lexer import GitPrettyLogLexer
 
 def test_full_git_log():
     lexer = ShellConsoleLexer()
@@ -163,3 +163,60 @@ def test_git_log_with_other_command():
             (Token.Literal.String.Single, "'Hello, world!'"),
             (Token.Text.Whitespace, "\n"),
     ]
+
+def test_simple_git_log():
+    lexer = ShellConsoleLexer()
+    text = (
+        "user@host:~/directory (main) $ git lg\n"
+        "* f853946 - (7 minutes ago) README: Afegits autors - Mar (main)\n"
+        "* 0fb88ef - (29 minutes ago) 1. Primer commit - Joan Puigcerver"
+    )
+
+    tokens = list(lexer.get_tokens(text))
+
+    assert tokens == [
+            (Token.Generic.Prompt.UserHost, "user@host"),
+            (Token.Generic.Prompt, ":"),
+            (Token.Generic.Prompt.Directory, "~/directory"),
+            (Token.Text.Whitespace, " "),
+            (Token.Generic.Prompt.GitBranch, "(main)"),
+            (Token.Text.Whitespace, " "),
+            (Token.Generic.Prompt, "$"),
+            (Token.Text.Whitespace, " "),
+            (Token.Text, "git"),
+            (Token.Text.Whitespace, " "),
+            (Token.Text, "lg"),
+            (Token.Text.Whitespace, "\n"),
+            # First commit
+            (Token.Generic.Output, "*",),
+            (Token.Text.Whitespace, " "),
+            (Token.Git.CommitHash, "f853946"),
+            (Token.Text.Whitespace, " "),
+            (Token.Generic.Output, "-"),
+            (Token.Text.Whitespace, " "),
+            (Token.Git.CommitDate, "(7 minutes ago)"),
+            (Token.Text.Whitespace, " "),
+            (Token.Git.CommitMessage, "README: Afegits autors"),
+            (Token.Text.Whitespace, " "),
+            (Token.Generic.Output, "-"),
+            (Token.Text.Whitespace, " "),
+            (Token.Git.CommitAuthor, "Mar"),
+            (Token.Text.Whitespace, " "),
+            (Token.Git.Refs, "(main)"),
+            (Token.Text.Whitespace, "\n"),
+            # Second commit
+            (Token.Generic.Output, "*"),
+            (Token.Text.Whitespace, " "),
+            (Token.Git.CommitHash, "0fb88ef"),
+            (Token.Text.Whitespace, " "),
+            (Token.Generic.Output, "-"),
+            (Token.Text.Whitespace, " "),
+            (Token.Git.CommitDate, "(29 minutes ago)"),
+            (Token.Text.Whitespace, " "),
+            (Token.Git.CommitMessage, "1. Primer commit"),
+            (Token.Text.Whitespace, " "),
+            (Token.Generic.Output, "-"),
+            (Token.Text.Whitespace, " "),
+            (Token.Git.CommitAuthor, "Joan Puigcerver"),
+            (Token.Text.Whitespace, "\n"),
+    ]