aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authors-ol <s-ol@users.noreply.github.com>2019-10-09 11:53:36 +0000
committers-ol <s-ol@users.noreply.github.com>2019-10-09 11:53:36 +0000
commitb866465f2f9017d43b2a8ebb2cb889cdce737737 (patch)
tree7e57bfc3cf65cd40b4a8631910affe7437edd1ba
parentmake ba_log browsable (diff)
downloadmmm-b866465f2f9017d43b2a8ebb2cb889cdce737737.tar.gz
mmm-b866465f2f9017d43b2a8ebb2cb889cdce737737.zip
rename LFS to FS store
-rw-r--r--Dockerfile2
-rw-r--r--mmm/mmmfs/stores/fs.moon (renamed from mmm/mmmfs/stores/lfs.moon)5
-rw-r--r--mmm/mmmfs/stores/init.moon10
-rw-r--r--spec/stores_spec.moon (renamed from spec/driver_spec.moon)14
4 files changed, 15 insertions, 16 deletions
diff --git a/Dockerfile b/Dockerfile
index f8c158b..273043a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,4 +16,4 @@ WORKDIR /code
RUN tup init && tup generate --config tup.docker.config build-static.sh && ./build-static.sh
EXPOSE 8000
-ENTRYPOINT ["moon", "build/server.moon", "/db.sqlite3", "0.0.0.0", "8000"]
+ENTRYPOINT ["moon", "build/server.moon", "sql:/db.sqlite3", "0.0.0.0", "8000"]
diff --git a/mmm/mmmfs/stores/lfs.moon b/mmm/mmmfs/stores/fs.moon
index a90b55a..41ce729 100644
--- a/mmm/mmmfs/stores/lfs.moon
+++ b/mmm/mmmfs/stores/fs.moon
@@ -8,8 +8,7 @@ dir_base = (path) ->
dir, base
-
-class LFSStore
+class FSStore
new: (opts = {}) =>
opts.root or= 'root'
opts.verbose or= false
@@ -153,5 +152,5 @@ class LFSStore
file\close!
{
- :LFSStore
+ :FSStore
}
diff --git a/mmm/mmmfs/stores/init.moon b/mmm/mmmfs/stores/init.moon
index 17595fe..381c80b 100644
--- a/mmm/mmmfs/stores/init.moon
+++ b/mmm/mmmfs/stores/init.moon
@@ -1,7 +1,7 @@
require = relative ..., 0
-- instantiate a store from a CLI arg
--- e.g.: sql, lfs:/path/to/root, sql:MEMORY, sql:db.sqlite3
+-- e.g.: sql, fs:/path/to/root, sql:MEMORY, sql:db.sqlite3
get_store = (args='sql', opts={verbose: true}) ->
type, arg = args\match '(%w+):(.*)'
type = arg unless type
@@ -13,19 +13,19 @@ get_store = (args='sql', opts={verbose: true}) ->
if arg == 'MEMORY'
opts.memory = true
else
- opts.name = arg
+ opts.file = arg
SQLStore opts
- when 'lfs'
- import LFSStore from require '.lfs'
+ when 'fs'
+ import LFSStore from require '.fs'
opts.root = arg
LFSStore opts
else
- warn "unknown or missing value for STORE: valid types values are sql, lfs"
+ warn "unknown or missing value for STORE: valid types values are sql, fs"
os.exit 1
{
diff --git a/spec/driver_spec.moon b/spec/stores_spec.moon
index 918f620..3997ded 100644
--- a/spec/driver_spec.moon
+++ b/spec/stores_spec.moon
@@ -10,7 +10,7 @@ toseq2 = (iter) ->
with v = [{x, y} for x, y in iter]
table.sort v, sort2
-test_driver = (ts) ->
+test_store = (ts) ->
randomize false
it "starts out empty", ->
@@ -89,13 +89,13 @@ test_driver = (ts) ->
ts\remove_fileder '/hello'
assert.are.same {}, toseq ts\list_all_fileders!
-describe "SQL driver", ->
- import SQLStore from require 'mmm.mmmfs.drivers.sql'
+describe "SQL spec", ->
+ import SQLStore from require 'mmm.mmmfs.stores.sql'
- test_driver SQLStore memory: true
+ test_store SQLStore memory: true
-describe "LFS driver", ->
- import LFSStore from require 'mmm.mmmfs.drivers.lfs'
+describe "FS store", ->
+ import FSStore from require 'mmm.mmmfs.stores.fs'
lfs = require 'lfs'
@@ -105,7 +105,7 @@ describe "LFS driver", ->
assert os.remove root
assert lfs.mkdir root
- test_driver LFSStore :root
+ test_store LFSStore :root
teardown ->
assert lfs.rmdir root