From d5678beac0433d48fac44ad98157c92763272948 Mon Sep 17 00:00:00 2001 From: Devin Hillenius Date: Thu, 25 Oct 2018 14:04:31 +0200 Subject: [PATCH 1/6] Add documentation --- .gitignore | 2 + docs/Makefile | 20 ++++ docs/_static/_images/favicon.ico | Bin 0 -> 15086 bytes docs/_static/_images/logo.svg | 18 ++++ docs/_static/style.css | 4 + docs/_templates/layout.html | 4 + docs/conf.py | 180 +++++++++++++++++++++++++++++++ docs/index.rst | 20 ++++ docs/install.rst | 35 ++++++ docs/sphinx/seed_data | 1 + docs/usage.rst | 32 ++++++ 11 files changed, 316 insertions(+) create mode 100644 .gitignore create mode 100644 docs/Makefile create mode 100644 docs/_static/_images/favicon.ico create mode 100644 docs/_static/_images/logo.svg create mode 100644 docs/_static/style.css create mode 100644 docs/_templates/layout.html create mode 100644 docs/conf.py create mode 100644 docs/index.rst create mode 100644 docs/install.rst create mode 120000 docs/sphinx/seed_data create mode 100644 docs/usage.rst diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6f51e3d --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.DS_Store +docs/_build/ diff --git a/docs/Makefile b/docs/Makefile new file mode 100644 index 0000000..74a5269 --- /dev/null +++ b/docs/Makefile @@ -0,0 +1,20 @@ +# Minimal makefile for Sphinx documentation +# + +# You can set these variables from the command line. +SPHINXOPTS = -W +SPHINXBUILD = python3 -msphinx +SPHINXPROJ = CodeGradefs +SOURCEDIR = . +BUILDDIR = _build + +# Put it first so that "make" without argument is like "make help". +help: + @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) + +.PHONY: help Makefile + +# Catch-all target: route all unknown targets to Sphinx using the new +# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). +%: Makefile + @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) diff --git a/docs/_static/_images/favicon.ico b/docs/_static/_images/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..1a69c24df0fd9c2245ceb277b694a2e517631810 GIT binary patch literal 15086 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 F{{b#O(+U6p literal 0 HcmV?d00001 diff --git a/docs/_static/_images/logo.svg b/docs/_static/_images/logo.svg new file mode 100644 index 0000000..6b40184 --- /dev/null +++ b/docs/_static/_images/logo.svg @@ -0,0 +1,18 @@ + + + CodeGra.de + + + + + diff --git a/docs/_static/style.css b/docs/_static/style.css new file mode 100644 index 0000000..ef52c26 --- /dev/null +++ b/docs/_static/style.css @@ -0,0 +1,4 @@ +.wy-nav-content { + width: 60em; /* Change as you like. */ + max-width: 100% !important; +} diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html new file mode 100644 index 0000000..3e44f4a --- /dev/null +++ b/docs/_templates/layout.html @@ -0,0 +1,4 @@ +{% extends "!layout.html" %} +{% block extrahead %} + +{% endblock %} diff --git a/docs/conf.py b/docs/conf.py new file mode 100644 index 0000000..7ca1393 --- /dev/null +++ b/docs/conf.py @@ -0,0 +1,180 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# +# CodeGra.de documentation build configuration file, created by +# sphinx-quickstart on Thu Jun 29 15:43:19 2017. +# +# This file is execfile()d with the current directory set to its +# containing dir. +# +# Note that not all possible configuration values are present in this +# autogenerated file. +# +# All configuration values have a default; values that are commented out +# serve to show the default. + +# If extensions (or modules to document with autodoc) are in another directory, +# add these directories to sys.path here. If the directory is relative to the +# documentation root, use os.path.abspath to make it absolute, like shown here. + +import os +import sys +import subprocess +import sphinx_fontawesome +from datetime import date + +# sys.path.insert(0, os.path.abspath('../')) + +# -- General configuration ------------------------------------------------ + +# If your documentation needs a minimal Sphinx version, state it here. +# +# needs_sphinx = '1.0' + +# Add any Sphinx extension module names here, as strings. They can be +# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom +# ones. +extensions = [ + 'sphinx.ext.autodoc', + 'sphinx.ext.napoleon', + 'sphinx.ext.intersphinx', + 'sphinx.ext.coverage', + 'sphinx.ext.todo', + 'sphinx.ext.viewcode', + 'sphinx.ext.doctest', + 'sphinx.ext.githubpages', + 'sphinxcontrib.httpdomain', + 'sphinxcontrib.autohttp.flask', + 'sphinxcontrib.autohttp.flaskqref', + 'sphinx_autodoc_typehints', + 'sphinx_fontawesome', +] + +# Add any paths that contain templates here, relative to this directory. +templates_path = ['_templates'] + +# The suffix(es) of source filenames. +# You can specify multiple suffix as a list of string: +# +# source_suffix = ['.rst', '.md'] +source_suffix = '.rst' + +# The master toctree document. +master_doc = 'index' + +# General information about the project. +project = 'CodeGrade Vim Plugin' +copyright = str(date.today().year) + ', CodeGrade' +author = 'CodeGrade Team' + +# The version info for the project you're documenting, acts as replacement for +# |version| and |release|, also used in various other places throughout the +# built documents. +# +# The short X.Y version. +# version = subprocess.check_output( +# ['git', 'describe', '--abbrev=0', '--tags'] +# ).decode('utf-8').strip() +version = "v1.0.0" +# The full version, including alpha/beta/rc tags. +release = version + +# The language for content autogenerated by Sphinx. Refer to documentation +# for a list of supported languages. +# +# This is also used if you do content translation via gettext catalogs. +# Usually you set "language" from the command line for these cases. +language = 'en' + +# List of patterns, relative to source directory, that match files and +# directories to ignore when looking for source files. +# This patterns also effect to html_static_path and html_extra_path +exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store', ''] + +# The name of the Pygments (syntax highlighting) style to use. +pygments_style = 'sphinx' + +# If true, `todo` and `todoList` produce output, else they produce nothing. +todo_include_todos = False + +# -- Options for HTML output ---------------------------------------------- + +# The theme to use for HTML and HTML Help pages. See the documentation for +# a list of builtin themes. +# +html_theme = 'sphinx_rtd_theme' + +# Theme options are theme-specific and customize the look and feel of a theme +# further. For a list of options available for each theme, see the +# documentation. +# +# html_theme_options = {} + +# Add any paths that contain custom static files (such as style sheets) here, +# relative to this directory. They are copied after the builtin static files, +# so a file named "default.css" will overwrite the builtin "default.css". +html_static_path = ['_static'] + +# -- Options for HTMLHelp output ------------------------------------------ + +# Output file base name for HTML help builder. +htmlhelp_basename = 'CodeGradevim' + +# -- Options for LaTeX output --------------------------------------------- + +latex_elements = { + # The paper size ('letterpaper' or 'a4paper'). + # + # 'papersize': 'letterpaper', + + # The font size ('10pt', '11pt' or '12pt'). + # + # 'pointsize': '10pt', + + # Additional stuff for the LaTeX preamble. + # + # 'preamble': '', + + # Latex figure (float) alignment + # + # 'figure_align': 'htbp', +} + +# Grouping the document tree into LaTeX files. List of tuples +# (source start file, target name, title, +# author, documentclass [howto, manual, or own class]). +latex_documents = [(master_doc, 'CodeGrade.tex', 'CodeGrade Documentation', + author, 'manual'), ] + +# -- Options for manual page output --------------------------------------- + +# One entry per manual page. List of tuples +# (source start file, name, description, authors, manual section). +man_pages = [(master_doc, 'codegrade', 'CodeGrade Documentation', [author], + 1)] + +# -- Options for Texinfo output ------------------------------------------- + +# Grouping the document tree into Texinfo files. List of tuples +# (source start file, target name, title, author, +# dir menu entry, description, category) +texinfo_documents = [ + (master_doc, 'CodeGrade', 'CodeGrade Documentation', author, 'CodeGrade', + 'One line description of project.', 'Miscellaneous'), +] + +todo_include_todos = True + +# Example configuration for intersphinx: refer to the Python standard library. +intersphinx_mapping = { + 'https://docs.python.org/3': None, + 'http://werkzeug.pocoo.org/docs/latest/': None, + 'http://flask.pocoo.org/docs/latest/': None, + 'http://sqlalchemy-utils.readthedocs.io/en/latest': None, +} + +html_favicon = '_static/_images/favicon.ico' +html_logo = '_static/_images/logo.svg' +html_theme_options = { + 'logo_only': True, +} diff --git a/docs/index.rst b/docs/index.rst new file mode 100644 index 0000000..5375a4c --- /dev/null +++ b/docs/index.rst @@ -0,0 +1,20 @@ +.. CodeGra.de documentation master file, created by + sphinx-quickstart on Thu Jun 29 15:43:19 2017. + You can adapt this file completely to your liking, but it should at least + contain the root `toctree` directive. +.. rst-class:: fa fa-fontawesome + +CodeGrade Vim Plugin +====================================== + +Even though the CodeGrade filesystem works together with any editor by manually +editing its special files, it is recommended to use it in combination with +editor plugins. CodeGrade offers a plugin for `Vim `__, +*the editor*. This plugin is also known as *CodeGra.vim*. + +.. toctree:: + :maxdepth: 2 + :caption: CodeGrade Vim Plugin + + install + usage diff --git a/docs/install.rst b/docs/install.rst new file mode 100644 index 0000000..1484acc --- /dev/null +++ b/docs/install.rst @@ -0,0 +1,35 @@ +Installation +============= +The CodeGrade filesystem has to be installed and both the ``cgfs`` and the +``cgapi-consumer`` helper program must be available from the user's ``$PATH`` +to successfully install and use the Vim editor plugin. + +Vim 8 and up +------------- + +Installing the CodeGrade Vim plugin for Vim v8 or higher is done by creating a +CodeGrade bundle directory in your ``.vim`` folder, for instance: +``mkdir ~/.vim/pack/CodeGrade/start``. And then finally cloning the plugin +repository inside this folder via this command: +``git clone https://github.com/CodeGra-de/CodeGra.vim ~/.vim/pack/CodeGrade/start/CodeGra.vim`` + + +Up to Vim 8 +------------ +Installing the CodeGrade Vim plugin for Vim versions up to 8 is done using your +package manager of choice. Some examples for popular package managers:: + + # vim-plug + call plug#begin() + Plug 'CodeGra-de/CodeGra.vim' + call plug#end() + + # Vundle + call vundle#begin() + Plugin 'CodeGra-de/CodeGra.vim' + call vundle#end() + filetype plugin on + + # minpac + call minpac#init() + call minpac#add('CodeGra-de/CodeGra.vim') diff --git a/docs/sphinx/seed_data b/docs/sphinx/seed_data new file mode 120000 index 0000000..4e93928 --- /dev/null +++ b/docs/sphinx/seed_data @@ -0,0 +1 @@ +../../seed_data \ No newline at end of file diff --git a/docs/usage.rst b/docs/usage.rst new file mode 100644 index 0000000..b61204f --- /dev/null +++ b/docs/usage.rst @@ -0,0 +1,32 @@ +Using the Vim Plugin +======================== +After installation, the mounted folder (e.g. ``mnt/``) can be opened in Vim to +make use of the plugin with the command ``vim mnt/``. +The following commands are available in Vim when editing a file in the CodeGrade +filesystem: + ++----------------------+-------------+--------------------------------------------------------------------------------------------------+ +| Command | ``--fixed`` | Description | ++======================+=============+==================================================================================================+ +| CGEditFeedback | ✓ | Edit the current submission's global feedback. | ++----------------------+-------------+--------------------------------------------------------------------------------------------------+ +| CGEditGrade | ✓ | Edit the current submission's grade. | ++----------------------+-------------+--------------------------------------------------------------------------------------------------+ +| CGShowLineFeedback | ✗ | Show the line-feedback for the current buffer in the quickfix list and open the quickfix window. | ++----------------------+-------------+--------------------------------------------------------------------------------------------------+ +| CGEditLineFeedback | ✓ | Edit the comment for the current line in the current buffer. | ++----------------------+-------------+--------------------------------------------------------------------------------------------------+ +| CGDeleteLineFeedback | ✓ | Delete the comment for the current line in the current buffer. | ++----------------------+-------------+--------------------------------------------------------------------------------------------------+ +| CGOpenRubricEditor | ✗ | Edit the rubric of the assignment of the current file. | ++----------------------+-------------+--------------------------------------------------------------------------------------------------+ +| CGOpenRubricSelector | ✓ | Open the rubric for the current submission. | ++----------------------+-------------+--------------------------------------------------------------------------------------------------+ +| CGRubricPrevSection | ✗ | Go to the previous header in a rubric file. | ++----------------------+-------------+--------------------------------------------------------------------------------------------------+ +| CGRubricNextSection | ✗ | Go to the next header in a rubric file. | ++----------------------+-------------+--------------------------------------------------------------------------------------------------+ +| CGRubricSelectItem | ✓ | Select the rubric item on the current line. | ++----------------------+-------------+--------------------------------------------------------------------------------------------------+ + +.. note:: The ``--fixed`` flag when mounting is required to use specific commands. From 92b7b2a6fb6aac7d75209c3a8436be9e3af10333 Mon Sep 17 00:00:00 2001 From: Devin Hillenius Date: Sat, 27 Oct 2018 10:39:00 +0200 Subject: [PATCH 2/6] Add github and VERSION file --- VERSION | 1 + docs/conf.py | 7 +++---- docs/index.rst | 8 ++++++-- 3 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 VERSION diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..3eefcb9 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +1.0.0 diff --git a/docs/conf.py b/docs/conf.py index 7ca1393..25a044c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -72,10 +72,9 @@ # built documents. # # The short X.Y version. -# version = subprocess.check_output( -# ['git', 'describe', '--abbrev=0', '--tags'] -# ).decode('utf-8').strip() -version = "v1.0.0" +with open("../VERSION", 'r') as f: + version = f.read() + # The full version, including alpha/beta/rc tags. release = version diff --git a/docs/index.rst b/docs/index.rst index 5375a4c..5fb8a3d 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -4,7 +4,7 @@ contain the root `toctree` directive. .. rst-class:: fa fa-fontawesome -CodeGrade Vim Plugin +CodeGrade Vim Plug-in ====================================== Even though the CodeGrade filesystem works together with any editor by manually @@ -12,9 +12,13 @@ editing its special files, it is recommended to use it in combination with editor plugins. CodeGrade offers a plugin for `Vim `__, *the editor*. This plugin is also known as *CodeGra.vim*. +The code of the CodeGrade vim Plug-in is open-source and can be found on +`Github `__. + .. toctree:: :maxdepth: 2 - :caption: CodeGrade Vim Plugin + :caption: CodeGrade Vim Plug-in install usage + Back to Filesystem Documentation From af9382293ee462630abb1285ff0b5cb491b2d61c Mon Sep 17 00:00:00 2001 From: Devin Hillenius Date: Sat, 27 Oct 2018 12:47:49 +0200 Subject: [PATCH 3/6] Change version --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 3eefcb9..6e8bf73 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.0 +0.1.0 From 2bc9afe49ac0920bd7dcbe66b39ffe5e53a43974 Mon Sep 17 00:00:00 2001 From: Thomas Schaper Date: Mon, 29 Oct 2018 23:01:14 +0100 Subject: [PATCH 4/6] Add travis setup --- .travis.yml | 25 +++++++++++++++++++++++++ docs/_static/style.css | 25 +++++++++++++++++++++++++ docs_requirements.txt | 4 ++++ 3 files changed, 54 insertions(+) create mode 100644 .travis.yml create mode 100644 docs_requirements.txt diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..65a7966 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,25 @@ +language: python +notifications: + email: false + +branches: + only: + - master + +cache: + pip: true + apt: true + +matrix: + include: + - python: "3.7-dev" # 3.7 development branch + +install: + - pip install -r docs_requirements.txt + +script: + - ( cd docs; make html ) + - travis-sphinx build --source=docs/ + +after_success: + - travis-sphinx deploy -c docs-vim.codegra.de diff --git a/docs/_static/style.css b/docs/_static/style.css index ef52c26..5716a4c 100644 --- a/docs/_static/style.css +++ b/docs/_static/style.css @@ -2,3 +2,28 @@ width: 60em; /* Change as you like. */ max-width: 100% !important; } + +.wy-table-responsive table td { + /* !important prevents the common CSS stylesheets from overriding + this as on RTD they are loaded after this stylesheet */ + white-space: normal !important; +} + +.wy-table-responsive { + overflow: visible !important; +} + +.rst-content kbd { + display: inline-block; + padding: 3px 5px; + font-size: 11px; + line-height: 10px; + color: #444d56; + vertical-align: middle; + background-color: #fafbfc; + border: solid 1px #c6cbd1; + border-bottom-color: rgb(198, 203, 209); + border-bottom-color: #959da5; + border-radius: 3px; + box-shadow: inset 0 -1px 0 #959da5; +} diff --git a/docs_requirements.txt b/docs_requirements.txt new file mode 100644 index 0000000..299e1f8 --- /dev/null +++ b/docs_requirements.txt @@ -0,0 +1,4 @@ +sphinx-fontawesome==0.0.6 +sphinx-rtd-theme==0.4.2 +Sphinx==1.8.1 +travis-sphinx From e77c4c93da7da70c493890746737350155df4c50 Mon Sep 17 00:00:00 2001 From: Thomas Schaper Date: Mon, 29 Oct 2018 23:04:21 +0100 Subject: [PATCH 5/6] Remove useless extensions --- docs/conf.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 25a044c..d99fddb 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,11 +18,12 @@ # documentation root, use os.path.abspath to make it absolute, like shown here. import os -import sys import subprocess -import sphinx_fontawesome +import sys from datetime import date +import sphinx_fontawesome + # sys.path.insert(0, os.path.abspath('../')) # -- General configuration ------------------------------------------------ @@ -43,10 +44,6 @@ 'sphinx.ext.viewcode', 'sphinx.ext.doctest', 'sphinx.ext.githubpages', - 'sphinxcontrib.httpdomain', - 'sphinxcontrib.autohttp.flask', - 'sphinxcontrib.autohttp.flaskqref', - 'sphinx_autodoc_typehints', 'sphinx_fontawesome', ] From 12d152fb493e74de4f775c0ade9f6d88bad69a70 Mon Sep 17 00:00:00 2001 From: Thomas Schaper Date: Mon, 29 Oct 2018 23:34:28 +0100 Subject: [PATCH 6/6] Various improvements --- .travis.yml | 2 +- README.md | 8 ++++---- docs/conf.py | 2 +- docs/install.rst | 11 +++++++---- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 65a7966..6e638a9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,4 +22,4 @@ script: - travis-sphinx build --source=docs/ after_success: - - travis-sphinx deploy -c docs-vim.codegra.de + - travis-sphinx deploy -c vim-docs.codegra.de diff --git a/README.md b/README.md index d30bd66..ca42e9c 100644 --- a/README.md +++ b/README.md @@ -21,19 +21,19 @@ git clone https://github.com/CodeGra-de/CodeGra.vim ~/.vim/pack/CodeGrade/start Use your package manager of choice, below examples for few popular ones. -```sh -# vim-plug +```vim +" vim-plug call plug#begin() Plug 'CodeGra-de/CodeGra.vim' call plug#end() -# Vundle +" Vundle call vundle#begin() Plugin 'CodeGra-de/CodeGra.vim' call vundle#end() filetype plugin on -# minpac +" minpac call minpac#init() call minpac#add('CodeGra-de/CodeGra.vim') ``` diff --git a/docs/conf.py b/docs/conf.py index d99fddb..145279a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -70,7 +70,7 @@ # # The short X.Y version. with open("../VERSION", 'r') as f: - version = f.read() + version = f.read().strip() # The full version, including alpha/beta/rc tags. release = version diff --git a/docs/install.rst b/docs/install.rst index 1484acc..36a2879 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -17,19 +17,22 @@ repository inside this folder via this command: Up to Vim 8 ------------ Installing the CodeGrade Vim plugin for Vim versions up to 8 is done using your -package manager of choice. Some examples for popular package managers:: +package manager of choice. Some examples for popular package managers - # vim-plug + +.. code-block:: vim + + " vim-plug call plug#begin() Plug 'CodeGra-de/CodeGra.vim' call plug#end() - # Vundle + " Vundle call vundle#begin() Plugin 'CodeGra-de/CodeGra.vim' call vundle#end() filetype plugin on - # minpac + " minpac call minpac#init() call minpac#add('CodeGra-de/CodeGra.vim')