diff --git a/.github/workflows/install.yaml b/.github/workflows/install.yaml new file mode 100644 index 000000000..07615349d --- /dev/null +++ b/.github/workflows/install.yaml @@ -0,0 +1,21 @@ +name: Test installs +on: + - pull_request + - push + +jobs: + + install: + strategy: + matrix: + python-version: + - 2.7 + - 3.6 + - 3.7 + - 3.8 + runs-on: ubuntu-latest + container: python:${{ matrix.python-version }} + steps: + - uses: actions/checkout@v2 + - run: python setup.py install + - run: mackup --help diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml new file mode 100644 index 000000000..4502ca383 --- /dev/null +++ b/.github/workflows/lint.yaml @@ -0,0 +1,14 @@ +name: Lint Python +on: + - pull_request + - push + +jobs: + + black: + runs-on: ubuntu-latest + container: python + steps: + - run: pip install black + - uses: actions/checkout@v2 + - run: black --check --target-version py27 . diff --git a/.github/workflows/mackup.yaml b/.github/workflows/mackup.yaml deleted file mode 100644 index a273613c9..000000000 --- a/.github/workflows/mackup.yaml +++ /dev/null @@ -1,86 +0,0 @@ -name: Mackup -on: [push, pull_request] - -jobs: - - mdl: - runs-on: ubuntu-latest - container: rsrchboy/mdl - steps: - - uses: actions/checkout@v2 - - run: mdl . - - black: - runs-on: ubuntu-latest - container: python - steps: - - run: pip install black - - uses: actions/checkout@v2 - - run: black --check --target-version py27 . - - nose-2_7: - runs-on: ubuntu-latest - container: python:2.7 - steps: - - run: pip install docopt six nose - - uses: actions/checkout@v2 - - run: nosetests --with-coverage --cover-tests --cover-inclusive --cover-branches --cover-package=mackup - - nose-3_6: - runs-on: ubuntu-latest - container: python:3.6 - steps: - - run: pip install pipenv - - uses: actions/checkout@v2 - - run: pipenv install -d - - run: make test - - nose-3_7: - runs-on: ubuntu-latest - container: python:3.7 - steps: - - run: pip install pipenv - - uses: actions/checkout@v2 - - run: pipenv install -d - - run: make test - - nose-3_8: - runs-on: ubuntu-latest - container: python:3.8 - steps: - - run: pip install pipenv - - uses: actions/checkout@v2 - - run: pipenv install -d - - run: make test - - install-2_7: - runs-on: ubuntu-latest - container: python:2.7 - steps: - - uses: actions/checkout@v2 - - run: python setup.py install - - run: mackup --help - - install-3_6: - runs-on: ubuntu-latest - container: python:3.6 - steps: - - uses: actions/checkout@v2 - - run: python setup.py install - - run: mackup --help - - install-3_7: - runs-on: ubuntu-latest - container: python:3.7 - steps: - - uses: actions/checkout@v2 - - run: python setup.py install - - run: mackup --help - - install-3_8: - runs-on: ubuntu-latest - container: python:3.8 - steps: - - uses: actions/checkout@v2 - - run: python setup.py install - - run: mackup --help diff --git a/.github/workflows/markdown.yaml b/.github/workflows/markdown.yaml new file mode 100644 index 000000000..5b1e62b9a --- /dev/null +++ b/.github/workflows/markdown.yaml @@ -0,0 +1,13 @@ +name: Lint Markdown +on: + - pull_request + - push + +jobs: + + mdl: + runs-on: ubuntu-latest + container: rsrchboy/mdl + steps: + - uses: actions/checkout@v2 + - run: mdl . diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml new file mode 100644 index 000000000..430fe795d --- /dev/null +++ b/.github/workflows/test.yaml @@ -0,0 +1,29 @@ +name: Run tests +on: + - pull_request + - push + +jobs: + + nose-2_7: + runs-on: ubuntu-latest + container: python:2.7 + steps: + - run: pip install docopt six nose + - uses: actions/checkout@v2 + - run: nosetests --with-coverage --cover-tests --cover-inclusive --cover-branches --cover-package=mackup + + nose: + runs-on: ubuntu-latest + strategy: + matrix: + python-version: + - 3.6 + - 3.7 + - 3.8 + container: python:${{ matrix.python-version }} + steps: + - run: pip install pipenv + - uses: actions/checkout@v2 + - run: pipenv install -d + - run: make test diff --git a/CHANGELOG.md b/CHANGELOG.md index aec4a9a74..cb339dca1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ - Added support for PyCharm 2020.1 (via @ameyuuno) - Added support for Powerline (via @ho-oto) - Added support for Yarn (via @dhb52) +- Add support for Quitter (via @guillaumealgis) ## Mackup 0.8.28 diff --git a/README.md b/README.md index 5aad2fa0e..10225a13f 100644 --- a/README.md +++ b/README.md @@ -486,6 +486,7 @@ See the [README](doc/README.md) file in the doc directory for more info. - [PyRadio](http://www.coderholic.com/pyradio/) - [Querious](http://www.araelium.com/querious/) - [Quicksilver](http://qsapp.com/) +- [Quitter](https://marco.org/apps) - [Qutebrowser](http://qutebrowser.org/) - [R](http://www.r-project.org/) - [Rails](http://rubyonrails.org/) diff --git a/doc/README.md b/doc/README.md index 8212eea43..879b0d76d 100644 --- a/doc/README.md +++ b/doc/README.md @@ -154,6 +154,9 @@ fork Mackup and open a [Pull Request](https://help.github.com/articles/using-pull-requests). The stock application configs are in the `mackup/applications` directory. +Remember to follow the guidelines in [CONTRIBUTING.md](https://github.com/lra/mackup/blob/master/.github/CONTRIBUTING.md) +to get your Pull Request merged faster. + ### Add support for an application or any file or directory You can customize the Mackup engine and add support for unsupported diff --git a/mackup/applications/pycharm.cfg b/mackup/applications/pycharm.cfg index bef747772..d0946853d 100644 --- a/mackup/applications/pycharm.cfg +++ b/mackup/applications/pycharm.cfg @@ -20,3 +20,5 @@ Library/Application Support/PyCharm2019.2 Library/Application Support/PyCharm2019.3 .PyCharmCE2019.3/config Library/Application Support/JetBrains/PyCharm2020.1 +Library/Application Support/JetBrains/PyCharmCE2020.1 +Library/Application Support/PyCharm diff --git a/mackup/applications/quitter.cfg b/mackup/applications/quitter.cfg new file mode 100644 index 000000000..1dae8b0c1 --- /dev/null +++ b/mackup/applications/quitter.cfg @@ -0,0 +1,5 @@ +[application] +name = Quitter + +[configuration_files] +Library/Preferences/com.marcoarment.quitter.plist diff --git a/mackup/applications/tmux.cfg b/mackup/applications/tmux.cfg index af8f5d27c..eecfa29c5 100644 --- a/mackup/applications/tmux.cfg +++ b/mackup/applications/tmux.cfg @@ -3,3 +3,6 @@ name = Tmux [configuration_files] .tmux.conf + +[xdg_configuration_files] +tmux/tmux.conf diff --git a/mackup/applications/webstorm.cfg b/mackup/applications/webstorm.cfg index ce6f5e18e..a18ac928e 100644 --- a/mackup/applications/webstorm.cfg +++ b/mackup/applications/webstorm.cfg @@ -2,6 +2,7 @@ name = WebStorm [configuration_files] +Library/Application Support/WebStorm Library/Application Support/WebStorm8 Library/Preferences/WebStorm8 Library/Application Support/WebStorm9 @@ -40,3 +41,4 @@ Library/Application Support/WebStorm2020.2 Library/Preferences/WebStorm2020.2 Library/Application Support/WebStorm2020.3 Library/Preferences/WebStorm2020.3 +Library/Application Support/JetBrains/WebStorm2020.1