Skip to content
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.

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

feat; Nickname is now display on the exercise-list and can be changed #21

Open
wants to merge 60 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
90d371f
wip: new function to get the server config with the learn-ocaml-client
LouisAyroles Jun 1, 2021
9cfd10c
wip: start of the implementation of the connection choice function
LouisAyroles Jun 2, 2021
d514304
wip: implementation function connection with login password
LouisAyroles Jun 3, 2021
b715aaa
wip: call the learn-ocaml-client in order to login a user
LouisAyroles Jun 3, 2021
6c6ff2b
fix: missing parenthesis on a function
LouisAyroles Jun 3, 2021
9439d5d
fix: update learn-ocaml-client-sign-up-cmd to add spaces between args
LouisAyroles Jun 3, 2021
3940f1e
feat: handle password compatibility almost done. Missing bind to the …
LouisAyroles Jun 7, 2021
c450634
fix: ask the server then check the server version and finally check i…
LouisAyroles Jun 8, 2021
fb5f03c
refactor: Move some code in right parts of the file.
LouisAyroles Jun 8, 2021
ed0cab4
fix: fix some details. missing 2 commands init-server and server-conf…
LouisAyroles Jun 8, 2021
e359aec
fix: update the client-config-cmd to match data send by the the clien…
LouisAyroles Jun 11, 2021
523d767
feat: handle password compatibility
LouisAyroles Jun 11, 2021
1bd9722
test: Add a test for sign up cmd
LouisAyroles Jun 11, 2021
39dee5c
fix: revert some changements which was on the wrong branch
LouisAyroles Jun 14, 2021
d36e351
test: try a new test for sign up cmd
LouisAyroles Jun 15, 2021
d5d3f6e
test: add tests for sign in and sign up
LouisAyroles Jun 15, 2021
7220697
test: add tests for sign in and sign up
LouisAyroles Jun 15, 2021
abcb55f
test: remove sign in test
LouisAyroles Jun 21, 2021
e0fcef1
fix: replace the old server image with the right server image in orde…
LouisAyroles Jun 21, 2021
127addb
fix: update server-config function to match json object and not json …
LouisAyroles Jun 24, 2021
6889e86
test: Extend the Travis CI config for use_passwd compat.
erikmd Jun 30, 2021
6e90db2
fix: update tests with the new configurations
LouisAyroles Jun 30, 2021
ad251b0
test: Add .github/workflows/test.yml
erikmd Jul 5, 2021
e8d15cb
fix: the use_passwd test should use init-user
erikmd Jul 5, 2021
fb3fa13
test: learn-ocaml:oauth-moodle-dev & use_passwd=false
erikmd Jul 5, 2021
4b64357
fix: few problems raised by Erik's review
LouisAyroles Jul 5, 2021
faaad5f
feat: logout, exercise progression and better error message when sign…
LouisAyroles Jul 5, 2021
1aa86d7
fix: start of replacing sign in and sign up command with make process…
LouisAyroles Jul 5, 2021
1f1ed09
fix: replace sign-in-cmd and sign-up-cmd with make-process instead of…
LouisAyroles Jul 6, 2021
efd9426
fix: replace also init-server-cmd with make-process instead of shell-…
LouisAyroles Jul 7, 2021
ba6f0d5
feat: Split logout into logout which remove the token and deinit whic…
LouisAyroles Jul 7, 2021
821deea
fix: missing a word in first choice connection message
LouisAyroles Jul 7, 2021
5dc2747
fix: update learn-ocaml-server-config to match with the string return…
LouisAyroles Jul 12, 2021
6c0fd53
refactor: s|NA|N/A|; s|login|e-mail|; s|old|legacy|
erikmd Jul 22, 2021
67d7704
refactor: Simplify the sentinels
erikmd Jul 22, 2021
7229dae
wip: Add .ocamlinit and .merlin to working directory
LouisAyroles Jul 23, 2021
33dc4cd
feat: Add `learn-ocaml-await-for` & Avoid `shell-command-to-string`
erikmd Jul 26, 2021
f1b7e0d
fix: Remove (close-all-buffers) that looks unnecessary
erikmd Jul 26, 2021
92a3302
docs: Add FIXME
erikmd Jul 26, 2021
870a379
test(test.sh): Change default value of env vars, for local testing
erikmd Jul 26, 2021
5a6474a
chore: Update .gitignore
erikmd Jul 27, 2021
a66a4a5
tests: Document the existing tests
erikmd Jul 27, 2021
6ba13ae
fix: Comment-out a function that seems buggy
erikmd Jul 27, 2021
3b0019d
chore: Update .gitignore
erikmd Jul 27, 2021
ee78dd8
test: A thorough but sensible refactoring of the test-suite
erikmd Jul 27, 2021
ec8fa8e
fix: minor (refactoring-copy-paste) issues
erikmd Jul 27, 2021
266a7a8
fix: Make shellcheck happy
erikmd Jul 27, 2021
29e9111
fix: test exit code of `docker pull`
erikmd Jul 27, 2021
8e12210
docs: Improve `make help`
erikmd Jul 27, 2021
5beceec
wip: update merlin flags and made a function to convert file name int…
LouisAyroles Jul 28, 2021
f44f1c8
fix: make elc
erikmd Jul 28, 2021
32339b9
fix: Uncouple (ocamlsf/learn-ocaml, pfitaxel/emacs-learn-ocaml-client…
erikmd Jul 28, 2021
9cff58e
wip: delete unecessary print
LouisAyroles Jul 28, 2021
6a21e27
wip: beginning of nickname handling
LouisAyroles Jul 28, 2021
7934879
wip: merging in order to have the new await-for command
LouisAyroles Jul 28, 2021
aeaaaf7
Merge branch 'oauth-moodle' into nickname
LouisAyroles Jul 28, 2021
b899075
fix: resolve some conflicts
LouisAyroles Jul 28, 2021
1deff4d
wip: small modification
LouisAyroles Jul 29, 2021
e31f90f
feat: Make learn-ocaml-command-to-string-await-cmd accept list of args
erikmd Jul 28, 2021
d32ba67
feat: Nickname available on the exercise-list and can be changed
LouisAyroles Jul 29, 2021
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
40 changes: 40 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Test

on:
push:
branches:
- master
pull_request:
branches:
- '**'

jobs:
test:
runs-on: ubuntu-latest
strategy:
matrix:
include:
- learnocaml_image: "ocamlsf/learn-ocaml"
learnocaml_version: "0.12"
use_passwd: "false"
- learnocaml_image: "pfitaxel/learn-ocaml"
learnocaml_version: "oauth-moodle-dev"
use_passwd: "false"
- learnocaml_image: "pfitaxel/learn-ocaml"
learnocaml_version: "oauth-moodle-dev"
use_passwd: "true"
# at most 20 concurrent jobs per free account:
max-parallel: 4
# don't cancel all in-progress jobs if one matrix job fails:
fail-fast: false
steps:
- uses: actions/checkout@v2
- name: Script
env:
EMACS_IMAGE_VERSION: "pfitaxel/emacs-learn-ocaml-client:oauth-moodle-dev"
LEARNOCAML_IMAGE: ${{ matrix.learnocaml_image }}
LEARNOCAML_VERSION: ${{ matrix.learnocaml_version }}
USE_PASSWD: ${{ matrix.use_passwd }}
run: |
make dist-tests || { ret=$?; make stop; exit $ret; }
make stop
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,10 @@ setup.log
_opam/

# End of https://www.gitignore.io/api/emacs,ocaml

### Misc ###

tests/repo/server_config.json
confirm.txt
teacher.txt
*.pid
23 changes: 0 additions & 23 deletions .travis.yml

This file was deleted.

32 changes: 30 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,21 @@ ELC := $(ELFILE:.el=.elc)
all: elc

help:
@echo '$$ make elc # byte-compile $(ELFILE)'
@echo '$$ make elc # byte-compile $(ELFILE)'
@echo '$$ make bump v=1.0.0 # Replace version strings with 1.0.0'
@echo ''
@echo 'All the following commands require sudo.'
@echo ''
@echo '$$ make back # Run a docker backend for interactive ERT tests'
@echo '$$ make back LEARNOCAML_IMAGE=ocamlsf/learn-ocaml LEARNOCAML_VERSION=0.12'
@echo ''
@echo '$$ make emacs # Run a dockerized emacs for ERT tests'
@echo '$$ make tests # Run dockerized ERT tests'
@echo ''
@echo '$$ make dist-tests # Alias-of: make back emacs tests'
@echo '$$ make dist-tests USE_PASSWD=true'
@echo ''
@echo '$$ make stop # Stop the docker backend and/or ERT frontend'

bump:
git diff -p --raw --exit-code || { echo >&2 "*** Please commit beforehand ***"; exit 1; }
Expand All @@ -26,4 +39,19 @@ elc: $(ELC)
clean:
$(RM) $(ELC)

.PHONY: all help bump elc clean
back:
./run_test_backend.sh

emacs:
./run_emacs_image.sh

tests:
./run_tests.sh

dist-tests: back emacs tests

stop:
-./stop_emacs_image.sh
./stop_test_backend.sh

.PHONY: all help bump elc clean back emacs tests dist-tests stop
Loading