Commit Graph

1495 Commits

Author SHA1 Message Date
Bruno
4c8f84e608 Merge pull request #112 from nwykes/master
update some cli completions: remove query and version. add doctor
2015-10-08 20:34:33 +01:00
nwykes
ffa6338664 update some cli completions: remove query and version. add doctor 2015-10-08 13:28:50 -06:00
Bruno
27af4e366c Merge pull request #102 from derekstavis/omf-theme-no-refresh
Rework omf theme code: Integrate with fish_config, ditch refresh calls
2015-10-08 01:25:14 +01:00
Derek Stavis
ea0b464f1d omf.theme: Rework theme activation code
- Move theme installation to cli entry point (omf.fish)
- Generalize XDG_CONFIG_HOME code in `omf.xdg.config_home`
- Generalize prompt conflicts check in `omf.checks.fish_prompt`
  * Migrate `omf.doctor` to use it

+ Change theme activation steps
  - Create user function path if not existent
  - Check for conflicts in fish_prompt, aborts if found
  - Remove current theme from autoloading paths
  - Add target theme to autoloading paths
  - Link target theme's fish_prompt to user's
  - Persist selected theme to $OMF_CONFIG/theme

This approach brings two major advantages:

- Theme prompt now shows accordingly in fish_config web interface
- Faster theme changes, reducing it from seconds to some milis
- Avoids calling refresh, which makes users much more happy
2015-10-07 00:50:14 -03:00
Derek Stavis
a99e3ce86a omf.install: Fix success/error return codes
Return 0 when package installs, != 0 on error
2015-10-06 18:00:10 -03:00
Bruno
284b318cb8 Merge pull request #110 from derekstavis/fix-bundle-add
bundle.add: fix theme being persisted twice
2015-10-06 21:39:12 +01:00
Derek Stavis
291d0c9784 bundle.add: fix theme being persisted twice
`omf theme` was persisting the installed theme twice, one time on
`omf.install` and other time on `omf.bundle.add`.
2015-10-06 17:05:16 -03:00
Bruno
3c5406ab35 Merge pull request #109 from oh-my-fish/move-vi-mode-back-to-omf
Bring plugin back to oh my fish organization
2015-10-06 15:11:00 +01:00
Bruno Pinto
2fa0f73c7b Bring plugin back to oh my fish organization 2015-10-06 15:09:48 +01:00
Bruno
973893e73f Merge pull request #86 from mquinnv/master
Convert plugin to new OMF architecture
2015-10-06 14:58:53 +01:00
Michael Ventura
06c452ac75 Update db with converted git-flow plugin 2015-10-06 09:48:38 -04:00
Michael Ventura
ea214c10fd Update db with converted vi-mode plugin 2015-10-06 09:47:18 -04:00
Bruno
169498efdf Merge pull request #108 from oh-my-fish/bpinto-patch-1
Fix broken documentation link
2015-10-06 03:17:26 +01:00
Bruno
8f63330269 Fix broken documentation link
Fix #101
2015-10-06 03:14:53 +01:00
Bruno
c67b0314c2 Merge pull request #100 from derekstavis/install-remove-fish-prompt
install: Remove existing fish_prompt by backuping
2015-10-05 18:16:22 +01:00
Derek Stavis
05f3be01be destroy: Revert fish_prompt backup when found
Works toward generalizing the backup restoration logic using a
function, then restoring both config.fish and fish_prompt.
2015-10-05 14:11:59 -03:00
Derek Stavis
433832bb82 install: Remove existing fish_prompt into a backup
First works toward generalizing file backup code, applying to both
config.fish file and now fish_prompt.fish too. This avoids clean
installs which start with theme issues.
2015-10-05 14:11:33 -03:00
Bruno
beca6512e1 Merge pull request #99 from derekstavis/remove-from-autoload
Implement `autoload -e` option to remove from autoload paths
2015-10-05 02:06:13 +01:00
Derek Stavis
ebd7192cd1 Implement autoload -e to remove autoload path
Address the use case of autoload path removal, which allows themes
and packages definitions to be unloaded from running fish session.
2015-10-04 15:58:38 -03:00
Bruno
ee4fc5bb30 Merge pull request #98 from oh-my-fish/missing-redirect
Forgot to suppress error message
2015-10-04 13:53:55 +01:00
Bruno Pinto
653f173971 Forgot to suppress error message 2015-10-04 13:49:58 +01:00
Bruno
436e0306df Merge pull request #97 from oh-my-fish/fishy_uninstall
Fishy packages
2015-10-03 22:40:15 +01:00
Bruno Pinto
1ab8a20b8c Fix #8: Fishy plugin template 2015-10-03 22:18:52 +01:00
Bruno Pinto
520d597947 Source uninstall.fish file before emitting event
Instead of having every plugin function inside the same file, which
increases the loading time unnecessarily and is not fishy, source the
`uninstall.fish` file for the plugin before the `uninstall_$plugin_name`
event is emitted.
2015-10-03 22:11:49 +01:00
Bruno
b4aa5a4408 Merge pull request #96 from derekstavis/update-zn-ch-readme
Update zh-CN readme header
2015-10-03 21:26:07 +01:00
Derek Stavis
472c5e1eaf zh-CN/README: Remove src attribute from spacer 2015-10-03 17:21:16 -03:00
Derek Stavis
b2b46144ad zh-CN/README: Update header badges 2015-10-03 17:21:16 -03:00
Bruno
058a222f24 Merge pull request #91 from oh-my-fish/doctor
omf doctor
2015-10-03 21:16:58 +01:00
Bruno Pinto
bc0d4847e8 Resolve #30: omf doctor command
In order to pro-actively diagnose an issue on someone's computer, a
`omf doctor' command is being added. This command will initially check
errors that could cause a theme to not be loaded, but in the future more
checks are going to be added to prevent issues from being created for
problems that are fixable by the Oh My Fish user alone.
2015-10-03 21:04:30 +01:00
Bruno
05f6691479 Merge pull request #95 from derekstavis/readme-remove-reload-message
Remove reload notice from installer script
2015-10-03 20:58:30 +01:00
Derek Stavis
7feb557569 Remove reload notice from installer script
Also fix a whitespace issue.
2015-10-03 16:45:45 -03:00
Bruno
956772daab Merge pull request #88 from derekstavis/refresh-keep-history
Save history before replacing shell process
2015-10-03 15:58:09 +01:00
Derek Stavis
8b8a7c8d73 Save history before replacing shell process
Fixes an issue with history between shell reloads via refresh function call.
As `exec` replaces the current process in a non-gently fashion, the
persistent history could be out of sync with the in-memory history.

Calling `history --save` before `exec` should force the shell to persist the
history before replacing the current process.
2015-10-02 21:49:53 -03:00
Bruno
3610868fb3 Merge pull request #94 from oh-my-fish/fix-destroy
Only emit uninstall_* event on `omf destroy`
2015-10-03 01:13:03 +01:00
Bruno Pinto
cf8a24deed Only emit uninstall_* event on omf destroy
When calling `omf destroy`, the `bundle` file is completely erased
because we are calling `remove_package` on each installed package. We
don't want to erase that file, we just want to emit the event and later
on remove the code, which is done with `rm -rf "$OMF_PATH"`.
2015-10-03 01:10:23 +01:00
Bruno
2e5761ab38 Merge pull request #90 from oh-my-fish/commands-organization
Organize commands and remove undocumented aliases
2015-10-03 01:09:56 +01:00
Bruno Pinto
46e4d036ba Organize commands and remove undocumented aliases 2015-10-03 01:07:40 +01:00
Bruno
4446cbc7ee Merge pull request #93 from derekstavis/replace-source-by-fish
install: Replace source by fish invocation
2015-10-03 00:55:56 +01:00
Derek Stavis
792e3b7b72 install: Replace source by fish invocation 2015-10-02 20:50:39 -03:00
Bruno
4c05682af9 Merge pull request #92 from derekstavis/update-install-readme
Update installation script instructions
2015-10-03 00:36:26 +01:00
Derek Stavis
ddafb8c22f Update installation script instructions 2015-10-02 20:35:02 -03:00
Bruno
db1b6887af Merge pull request #82 from derekstavis/install-as-fish
Migrate install script from bash to fish
2015-10-03 00:26:33 +01:00
Derek Stavis
8c394771df install: migrate script from bash to fish
- Checks for a supported fish version (greater than 2.1)
- Migrate travis install script to fish
2015-10-02 20:16:04 -03:00
Derek Stavis
0b2a51a93f Get PR URL and Branch using GitHub API 2015-10-02 20:16:04 -03:00
Bruno
e40f2d3ceb Merge pull request #80 from oh-my-fish/dockerize
Dockerize
2015-10-02 23:52:51 +01:00
Bruno Pinto
dde679ff98 Get original repository branch name
Travis does not provide the original repository branch name on any
environment variable. We are getting the information from the GitHub
API instead.

The misleading environment variable `TRAVIS_BRANCH` returns `master`
instead:
> TRAVIS_BRANCH: For builds not triggered by a pull request this is the
name of the branch currently being built; whereas for builds triggered
by a pull request this is the name of the branch targeted by the pull
request (in many cases this will be master).

Reference: http://docs.travis-ci.com/user/environment-variables/
2015-10-02 23:50:18 +01:00
Bruno Pinto
faba765a94 Run tests on an isolated docker environment
- Install fish from dockerfile and generate a docker image.
- Install Oh My Fish! from downloaded git repository and generate a
  docker image.
2015-10-02 23:50:18 +01:00
Bruno Pinto
319c8a05cd Don't overwrite function on test environment
Instead of overwriting functions that use `exec fish` on test
environment, skip this call if the variable `CI` has been defined on the
running shell.
2015-10-02 23:50:18 +01:00
Bruno Pinto
055178bf3d Dockerfile to install fish and test dependencies
This Dockerfile creates an ubuntu machine with fish-shell and the
dependencies we use on our test suite installed.

It does not install Oh My Fish, which one might find weird (I do). Not
confident that this is the best approach, but it's the best I could find
at the moment.
2015-10-02 23:50:18 +01:00
Bruno
e59b75125a Merge pull request #89 from coderstephen/master
Update pkg urls and add weather plugin
2015-10-02 21:56:44 +01:00