c6e32a4fa8
Merge pull request #763 from matthiasbeyer/imag-view/implement-default-functionality
...
imag-view: implement default functionality
2016-09-22 08:09:25 +02:00
54120852ce
Merge pull request #762 from matthiasbeyer/imag-diary/move-viewer-impl
...
imag-diary: move viewer impl
2016-09-22 08:09:06 +02:00
352bccde51
Respecify view-in-editor argument
...
As we use the `--editor` flag in the Runtime, we should not override it
here.
By passing `--editor foo` one can override the editor application-wide,
the argument is now `--in-editor` therefor.
2016-09-21 17:20:39 +02:00
2b2116fb95
View in stdout if not specified otherwise
2016-09-21 17:20:39 +02:00
8e331f1f08
Move viewer implementation for imag-diary to libimagdiary
2016-09-21 16:58:21 +02:00
f98afd4b01
Move dependencies
2016-09-21 16:58:21 +02:00
7124a1d27e
Merge pull request #760 from matthiasbeyer/libimagstore/store-tests-extend-create-delete-get-test
...
libimagstore/store-tests: extend create delete get test
2016-09-21 12:17:33 +02:00
61201082c8
Fix: FileAbstraction::remove_file(): Add implementation
2016-09-21 10:20:16 +02:00
babf74e1e5
Fix Store::get() to not check FS but internal hashmap
2016-09-21 10:20:16 +02:00
4f2019a20a
Extend test_store_create_delete_get()
...
to actually test:
1. get -> Should return Ok(None)
2. create -> Should return Ok(())
3. get -> Should return Ok(Some(_))
4. delete -> Should return Ok(())
5. get -> Should return Ok(None)
2016-09-21 09:52:37 +02:00
90bb61674f
Merge pull request #758 from matthiasbeyer/libimagstorestdhook/git-fix-empty-commits
...
libimagstorestdhook/git: fix empty commits
2016-09-20 17:10:21 +02:00
5085d75208
Return if the file is not new and not modified
2016-09-20 15:19:35 +02:00
9dc4054a92
Add debug output on file status
2016-09-20 15:19:35 +02:00
5a6d8adc55
Merge pull request #757 from matthiasbeyer/libimagstorestdhook/git-revert-no-commit-on-clean-wd
...
libimagstorestdhook/git revert no commit on clean wd
2016-09-20 12:23:56 +02:00
896f5e2bc4
Merge pull request #756 from matthiasbeyer/libimagstorestdhook/git-hook-disable
...
Libimagstorestdhook/git hook disable
2016-09-20 12:07:43 +02:00
06c814d6e9
Revert "Add helper fn to check whether the repository WD is dirty"
...
This reverts commit eb378d47c2
2016-09-20 10:27:48 +02:00
128ed27bb8
Revert "Abort the execution of the UpdateHook if repo isnt dirty"
...
This reverts commit b2a0758b1a
2016-09-20 10:27:39 +02:00
050aec2aa1
Merge pull request #734 from matthiasbeyer/test-via-makefile
...
Execute tests via Makefile
2016-09-20 10:20:59 +02:00
52bb74da15
util: get_bool_cfg(): Output with warn!() instead of debug!()
2016-09-20 09:35:03 +02:00
b4fb226bb7
util: get_bool_cfg(): more debug output
2016-09-20 09:35:03 +02:00
da8736d003
UpdateHook: return Ok(()) if disabled
2016-09-20 09:35:03 +02:00
fbd195db25
DeleteHook: return Ok(()) if disabled
2016-09-20 09:35:03 +02:00
d115e4ca8e
Add config helper to check whether hook is enabled or not
2016-09-20 09:35:02 +02:00
ece7fe061c
Add settings for enable/disable hook
2016-09-20 09:35:02 +02:00
ba1df8bb48
Remove unused config sections
2016-09-20 09:08:59 +02:00
e1177717ee
Merge pull request #486 from matthiasbeyer/libimagstorestdhook/git
...
libimagstorestdhook/git
2016-09-20 09:04:36 +02:00
513a9bd066
Merge pull request #751 from matthiasbeyer/libimagstore/store-tests-succeeding-hook-tests
...
libimagstore/store: tests succeeding hook tests
2016-09-19 22:39:23 +02:00
e24619a08f
Minify travis script by using Makefile
2016-09-19 22:13:23 +02:00
fb2300a799
Add Makefile for testing imag-store
2016-09-19 22:12:14 +02:00
72a95ee5da
Rewrite config validity checker to return Result<()>
...
And add more detailed error kinds for config errors
2016-09-19 21:52:28 +02:00
83ebe88022
Add PreCreate hook test
2016-09-19 21:51:14 +02:00
1ac54ad29a
Merge pull request #752 from matthiasbeyer/libimagstorestdhook/git-integration
...
libimagstorestdhook/git: integration
2016-09-19 14:39:15 +02:00
321b0493fb
Merge pull request #749 from matthiasbeyer/libimagstorestdhook/git-reenable-warning-deny
...
libimagstorestdhook/git: reenable warning deny
2016-09-19 14:39:00 +02:00
4155924f85
Add test for Store::retrieve_for_module()
2016-09-19 11:25:36 +02:00
fd41fe5998
Fix Store::delete() for nonexistent IDs
...
If the ID does not exist, we should return an error instead of doing
nothing, shouldn't we?
2016-09-19 11:07:38 +02:00
8345ff8248
Add test to delete non-existent entries
2016-09-19 11:03:38 +02:00
52b2a4589d
Add test to get non-existent entries
2016-09-19 11:01:56 +02:00
de6b641201
Merge branch 'master' into libimagstorestdhook/git-integration
...
This is a integration-merge, because the libimagstorestdhook/git branch
got really long and rebasing is not an option, as it would mainly
destroy history.
Using an integration branch is less hassle, really.
2016-09-19 10:44:57 +02:00
85097554e9
Add hook implementation for succeeding hook tests
2016-09-19 10:38:46 +02:00
0cdeeb4c55
Fix test backend implementation
...
We must return an error if the file is not found here.
This is because if we unwrap() here, we panic if the store action was
Store::retrieve() and there wasn't a file there. We then unwrap() on
None and panic because of this, causing all other tests to panic as
well because the Mutex gets corrupted.
The store handles FileNotFound errors on its own, so it is safe to
return the error here.
2016-09-19 10:37:28 +02:00
b25aa29fee
Fix make call in travis config
2016-09-19 10:08:13 +02:00
Julian Ganz
d041d62d09
Replace invocation of "find" with test for a Makefile
2016-09-19 10:07:18 +02:00
Julian Ganz
c5d660d3f7
Make "test" a postfix to library targets rather than a prefix
2016-09-19 10:07:18 +02:00
Julian Ganz
f6dc039554
Make the binary tests depend on the binaries
2016-09-19 10:07:18 +02:00
Julian Ganz
0ff53a6925
Add general testing target
2016-09-19 10:07:18 +02:00
Julian Ganz
f9b4818607
Add a convenience target for binary tests
2016-09-19 10:07:18 +02:00
57114e159f
Execute tests by calling another Makefile
2016-09-19 10:07:18 +02:00
12b6da5c90
Add first idea how to exec all the tests in the Makefile
2016-09-19 10:07:18 +02:00
f5d73ace0e
Fix debug output, use action to generate msg
2016-09-19 10:02:40 +02:00
43bdedea8e
Fix check whether we should checkout the ensure_branch
...
We should test this not at the top of the function, as if we do not have
to check out the ensure_branch, we still have to verify that there
actually is a branch checked out we have to ensure.
What I'm saying is: We might have to be on "master", but we might not
have to check it out if we aren't.
Therefor, this commit moves the location where we check whether we
should checkout the branch.
2016-09-19 10:02:40 +02:00
