Commit Graph

633 Commits

Author SHA1 Message Date
Matthias Beyer f1c1a1f9be Eliminate EntryHeader type
Therefor introduce the "Header" trait which is implemented on Value for
backwards compatibility.

Make the default_header() function publicly available as
Entry::default_header()
2017-02-05 13:10:38 +01:00
Matthias Beyer 0e01a1ef4e Fix backwards-incompatibilities of regex crate 2017-01-30 11:15:20 +01:00
Matthias Beyer 6e47ce8de7 Update regex to 0.2.* 2017-01-30 08:06:57 +01:00
Matthias Beyer 4db44a209f Remove unused fn 2017-01-25 18:34:34 +01:00
Matthias Beyer 710d9f7b03 Remove unused variables 2017-01-25 18:34:28 +01:00
mario 8df5519f34 Move `[profile.dev] codegen-units = 2` to top-level Cargo.toml
lower level (=package/crate level) definitions for profiles are ignored
2017-01-19 20:08:51 +01:00
Matthias Beyer 91fca4ba13 Update dependencies 2016-11-30 09:36:45 +01:00
Matthias Beyer ecfe78d87b Move tests to new module 2016-11-14 15:28:57 +01:00
Matthias Beyer 847b65f3b0 We dont need to clone() here 2016-11-14 15:01:24 +01:00
Matthias Beyer 6f79e6e007 Add helper trait for extracting from Array/Table 2016-11-14 15:00:11 +01:00
Matthias Beyer bdc9318a41 Remove unreachable statements 2016-11-14 14:52:53 +01:00
Matthias Beyer a9e4148032 Refactor unpacking into helper fn 2016-11-14 14:52:53 +01:00
Matthias Beyer 6a8273808a Refactor to use try!() instead of match{}ing 2016-11-14 14:52:51 +01:00
Matthias Beyer 79f68a1b79 Prettify codebase 2016-11-14 14:52:51 +01:00
Matthias Beyer 35cfb5d651 Use helper fns to prettify error building 2016-11-14 14:52:51 +01:00
Matthias Beyer dab6ad0f20 Use default parameters from underlying functions 2016-11-14 14:52:51 +01:00
Matthias Beyer 2a04da9b3f Add EntryHeader::delete_with_sep() 2016-11-14 14:52:51 +01:00
Matthias Beyer 7cfff0f0d8 Minify EntryHeader code 2016-11-14 14:52:51 +01:00
Matthias Beyer 5470ffceac Extract TOML extension to own module 2016-11-14 14:52:50 +01:00
Matthias Beyer 303dd30ff2 impl PartialEq for Entry 2016-11-03 18:47:11 +01:00
Matthias Beyer 5d2bc65623 We can derive PartialEq for EntryHeader 2016-11-03 18:47:02 +01:00
Matthias Beyer 0a04081599 Merge pull request #656 from matthiasbeyer/cargo-rustc-codegen-units
Cargo rustc codegen units
2016-10-31 23:39:38 +01:00
Matthias Beyer aa0f496474 Impl PartialEq for StoreId 2016-10-31 14:38:05 +01:00
Matthias Beyer 5ad2bfc462 libimagstore/Cargo.toml: Update dependencies 2016-10-24 14:30:54 +02:00
Matthias Beyer df6de8e957 Add codegen-units = 2 in ./libimagstore/Cargo.toml 2016-10-24 13:51:17 +02:00
Matthias Beyer b5bfc1978c Fix: Cargo.toml does not know "website", but "homepage" 2016-10-20 14:14:18 +02:00
Matthias Beyer 4ee505c658 Merge pull request #815 from matthiasbeyer/release-prep
Release preparation things
2016-10-19 14:33:11 +02:00
Matthias Beyer 3567606008 Merge pull request #816 from matthiasbeyer/libimagstore/test-storeid-name-fix
Fix test StoreId name
2016-10-18 20:52:42 +02:00
Matthias Beyer fc464446a9 Fix test StoreId name
The name of the storeid was duplicated, which caused the tests to fail
from time to time.

This patch fixes the name of the entry which is used to test.
2016-10-18 15:41:01 +02:00
Matthias Beyer 2a514c16e6 Add meta-info in libimagstore/Cargo.toml 2016-10-18 10:56:12 +02:00
Matthias Beyer ff4a96ff59 Add missing "use" 2016-10-15 15:49:01 +02:00
Matthias Beyer da408f60fd Refactor iflet into and_then().or_else() 2016-10-15 15:49:01 +02:00
Matthias Beyer 3fe8ec5d33 Simplify line 2016-10-15 15:49:00 +02:00
Matthias Beyer 3d572dda0f Reimplement StoreId::to_str() to remove unwrap() 2016-10-15 15:49:00 +02:00
Matthias Beyer 52367edc83 Remove unwrap()s in file abstraction code 2016-10-15 15:49:00 +02:00
Matthias Beyer c0eb329abf Simplify hashmap fetching and error construction 2016-10-15 15:49:00 +02:00
Matthias Beyer 2363d6ba30 Use try!() instead of unwrapping errors 2016-10-15 15:49:00 +02:00
Matthias Beyer e8ae4c0da7 Create symlinks to documentation files in libimag*/README.md 2016-10-13 12:04:36 +02:00
Matthias Beyer e30d774670 Move all libimag*/README.md to doc/src/05100-* 2016-10-13 12:04:36 +02:00
Matthias Beyer 10b920a149 Merge branch 'libimagstore/store-tests' into libimagstore/store-tests-integration 2016-10-12 11:13:38 +02:00
Matthias Beyer 2cbcfa946c Merge branch 'master' into libimagstore/store-tests-integration
On master, we changed the Store::update() function to do nothing more
than calling Store::_update() and wrapping an error.

On the libimagstore/store-tests branch, we modified the
Store::_update() function to contain an additional flag in the
parameters, whether the File-Lock-Entry internal `precense`-value should
be updated.

This merge commit resolves that conflict.
2016-10-12 08:53:11 +02:00
Matthias Beyer b4d2f5c1a6 Each test should test with a unique test file name 2016-10-12 08:38:07 +02:00
Matthias Beyer 600059be82 Add error output 2016-10-12 08:38:07 +02:00
Matthias Beyer 27e816fc69 Do not simply unwrap, but return error in case of error 2016-10-12 08:38:07 +02:00
Matthias Beyer 9a8a2f1c29 Add hook tests for hooks that error with an error that does not abort the action 2016-10-09 18:26:16 +02:00
Matthias Beyer 7050067675 Merge pull request #761 from matthiasbeyer/libimagstore/store-tests-more-succeeding-hook-tests
libimagstore/store-tests: more succeeding hook tests
2016-10-09 13:29:48 +02:00
Matthias Beyer 5202c5112a Add flag for _update() whether precense should be modified
This is a bugfix for an very particular issue.

Here's what happens:

If we create() an FileLockEntry and then update() it, we are running
into a problem because update() calls _update() which changes the
precense status of a FileLockEntry.

Because update() is _consuming_, the FileLockEntry gets drop()ed
afterwards. This _again_ causes _update() to be called, but with a new
presence status, which is not true in this moment (as the FileLockEntry
is still borrowed, but we already marked it as present).

This patch is a short-term fix. The real problem is, that our Store
interface is consuming. If the Store interface would be non-consuming,
this issue wouldn't happen, as the drop() call would not happen.

I'm rather sure that this patch will not be reverted in the process of
rewriting the Store interface to be non-consuming. But we never know.
2016-10-07 21:59:37 +02:00
Matthias Beyer 7b11e7dabb Add testing implementation for Drop for FileLockEntry 2016-10-07 21:59:37 +02:00
Matthias Beyer d375a6d2c6 Add output to test helper, so we can see in the trace whats happening 2016-10-07 21:59:37 +02:00
Matthias Beyer ae66b00f5f store tests: Add erroring-hook-tests 2016-10-07 21:59:37 +02:00
Matthias Beyer 095ae19416 [CHERRY-PICK] Add flag for _update() whether precense should be modified
This is a bugfix for an very particular issue.

Here's what happens:

If we create() an FileLockEntry and then update() it, we are running
into a problem because update() calls _update() which changes the
precense status of a FileLockEntry.

Because update() is _consuming_, the FileLockEntry gets drop()ed
afterwards. This _again_ causes _update() to be called, but with a new
presence status, which is not true in this moment (as the FileLockEntry
is still borrowed, but we already marked it as present).

This patch is a short-term fix. The real problem is, that our Store
interface is consuming. If the Store interface would be non-consuming,
this issue wouldn't happen, as the drop() call would not happen.

I'm rather sure that this patch will not be reverted in the process of
rewriting the Store interface to be non-consuming. But we never know.
2016-10-07 21:18:49 +02:00
Matthias Beyer cf50ddae33 [CHERRY-PICK] Add testing implementation for Drop for FileLockEntry 2016-10-07 21:18:49 +02:00
Matthias Beyer 485d280236 Bugfix: The StoreEntry should know the _new_ StoreId
When moving a entry in the store, we also should tell the StoreEntry
the new id.
2016-10-07 21:18:49 +02:00
Matthias Beyer c72291159e Add comment/documentation for Store::move_by_id() 2016-10-07 17:53:11 +02:00
Matthias Beyer b189bf7b8c Add check if entry is present
If we try to rename an entry that is borrowed, we fail, as renaming an
borrowed entry might result in some _really_ ugly bugs.
2016-10-07 17:32:35 +02:00
Matthias Beyer 1e83ad7bbd Add test for hook execution for each hook position 2016-10-07 17:32:35 +02:00
Matthias Beyer d9f4898a3a Abstract testing of hook execution in helper function 2016-10-07 17:32:35 +02:00
Matthias Beyer dd621a08a6 Merge pull request #772 from matthiasbeyer/libimagstore/store-tests-erroring-hooks
libimagstore/store-tests: erroring hooks
2016-10-06 18:30:24 +02:00
Matthias Beyer 1244a6666f Add assert to Store::get() the new ID 2016-10-03 12:34:07 +02:00
Matthias Beyer 6cc1a90870 libimagstore: Add copyright notice to all files 2016-10-01 17:35:06 +02:00
Matthias Beyer 1526c0b2dc Make hook configurable whether it succeeds or not 2016-09-30 13:39:33 +02:00
Matthias Beyer f16c09a981 Do not check whether old or new id exists/does not exist 2016-09-30 13:20:37 +02:00
Matthias Beyer 886eed3ff4 Rename: SucceedingHook -> TestHook 2016-09-22 08:47:29 +02:00
Matthias Beyer 4f83b22b98 Fix Store::move_by_id(): Move in cache as well 2016-09-22 08:42:19 +02:00
Matthias Beyer caa214f1bd Fix negation error
We check whether the old key already exists.

If it does _not_ exist, the entry is borrowed, from my understanding.
I'm not sure, though.
2016-09-22 08:41:12 +02:00
Matthias Beyer d5a275fec0 Add test: Store::move_by_id() 2016-09-22 08:41:01 +02:00
Matthias Beyer 61201082c8 Fix: FileAbstraction::remove_file(): Add implementation 2016-09-21 10:20:16 +02:00
Matthias Beyer babf74e1e5 Fix Store::get() to not check FS but internal hashmap 2016-09-21 10:20:16 +02:00
Matthias Beyer 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
Matthias Beyer 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
Matthias Beyer 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
Matthias Beyer 83ebe88022 Add PreCreate hook test 2016-09-19 21:51:14 +02:00
Matthias Beyer 4155924f85 Add test for Store::retrieve_for_module() 2016-09-19 11:25:36 +02:00
Matthias Beyer 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
Matthias Beyer 8345ff8248 Add test to delete non-existent entries 2016-09-19 11:03:38 +02:00
Matthias Beyer 52b2a4589d Add test to get non-existent entries 2016-09-19 11:01:56 +02:00
Matthias Beyer 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
Matthias Beyer 85097554e9 Add hook implementation for succeeding hook tests 2016-09-19 10:38:46 +02:00
Matthias Beyer 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
Matthias Beyer 07ff755ed7 Minify error handling in Store::_update with try!() 2016-09-18 14:52:55 +02:00
Matthias Beyer b288e938f9 Minify error handling in Store::update() 2016-09-18 14:52:00 +02:00
Matthias Beyer 41c7cd2363 [CHERRY-PICK] Add newline before header
The lastest release of the `toml-rs` crate (2.1) removes leading spaces
before arrays and tables, causing our tests to fail.

This fixes it.
2016-09-09 17:22:20 +02:00
Matthias Beyer d5647069cb Add test that Store::retrieve() does ::create() underneath 2016-09-09 13:07:46 +02:00
Matthias Beyer c9994c33b6 Add test whether store-internal hashmap gets actually filled on Store::create() 2016-09-09 13:07:45 +02:00
Matthias Beyer e023a856f1 Add Store testing 2016-09-09 13:07:32 +02:00
Matthias Beyer ff5a4b46c7 Remove StoreId::is_file() 2016-09-09 12:56:29 +02:00
Matthias Beyer 21714660df Merge pull request #729 from matthiasbeyer/fix-header-missing-newline
Add newline before header
2016-09-09 12:54:28 +02:00
Matthias Beyer 7b827ff149 Add newline before header
The lastest release of the `toml-rs` crate (2.1) removes leading spaces
before arrays and tables, causing our tests to fail.

This fixes it.
2016-09-09 11:52:12 +02:00
Matthias Beyer 88ff94fb6d Remove StoreId::is_dir() 2016-09-08 15:05:25 +02:00
Matthias Beyer 3252f9b751 Move Update-Hook execution into Store._update() 2016-09-08 14:23:10 +02:00
Matthias Beyer d1fee32c7d Just do not execute mutable hooks, but let pass the nonmutables 2016-09-07 22:05:30 +02:00
Matthias Beyer af4a0bfaf2 Export result-helper here 2016-09-06 15:31:55 +02:00
Matthias Beyer 5f04d29345 Adapt store to not use StoreId::into() but new StoreId::into_pathbuf() 2016-09-06 15:31:55 +02:00
Matthias Beyer a313cede06 Add StoreId::into_pathbuf() 2016-09-06 15:31:55 +02:00
Matthias Beyer b8f612632d Add error kind if StoreId has no base part 2016-09-06 15:31:29 +02:00
Matthias Beyer 84b279de95 Remove Into<PathBuf> for StoreId 2016-09-06 15:31:29 +02:00
Matthias Beyer aa7e050436 Merge pull request #707 from matthiasbeyer/libimagstore/remove-storeid-storified
Remove StoreId::storified()
2016-09-06 12:31:01 +02:00
Matthias Beyer d7447a64c8 Remove StoreId::storified() 2016-09-06 09:37:25 +02:00
Matthias Beyer 364ad01179 Use StoreId::from_full_path() in GlobStoreIdIterator::next() 2016-09-05 18:22:55 +02:00
Matthias Beyer 8362b077e2 Add StoreId::from_full_path() 2016-09-05 18:21:34 +02:00