commit 8f8f89ccce6b80b04b62454b06f4c54a1ce17f8b · anil.recoil.org/shelter

+1

README.md

···

       1
        
       shelter

     

       2
        
       -------

     

       3
        
       

     

       4
       +
       A shell session shim that makes exploring from the terminal a little bit easier.

     

       5

+11 -7

cshell.opam shelter.opam

···

       1
        
       # This file is generated by dune, edit dune-project instead

     

       2
        
       opam-version: "2.0"

     

       3
       -
       synopsis: "A short synopsis"

     

       4
       -
       description: "A longer description"

     

       5
       -
       maintainer: ["Maintainer Name <maintainer@example.com>"]

     

       6
       -
       authors: ["Author Name <author@example.com>"]

     

       7
       -
       license: "LICENSE"

     

       8
       -
       tags: ["add topics" "to describe" "your" "project"]

     

       9
        
       homepage: "https://github.com/username/reponame"

     

       10
       -
       doc: "https://url/to/documentation"

     

       11
        
       bug-reports: "https://github.com/username/reponame/issues"

     

       12
        
       depends: [

     

       13
        
         "dune" {>= "3.17"}

     

       14
        
         "ocaml"

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       15
        
         "odoc" {with-doc}

     

       16
        
       ]

     

       17
        
       build: [

···

       1
        
       # This file is generated by dune, edit dune-project instead

     

       2
        
       opam-version: "2.0"

     

       3
       +
       synopsis: "Shelter from the Storm"

     

       4
       +
       description: "A shell session shim to help you explore!"

     

       5
       +
       maintainer: ["Patrick Ferris <patrick@sirref.org>"]

     

       6
       +
       authors: ["Patrick Ferris <patrick@sirref.org>"]

     

       7
       +
       license: "ISC"

     

       8
       +
       tags: ["shell"]

     

       9
        
       homepage: "https://github.com/username/reponame"

     

       0
        
       
     

       10
        
       bug-reports: "https://github.com/username/reponame/issues"

     

       11
        
       depends: [

     

       12
        
         "dune" {>= "3.17"}

     

       13
        
         "ocaml"

     

       14
       +
         "eio_posix"

     

       15
       +
         "void"

     

       16
       +
         "zfs"

     

       17
       +
         "cid"

     

       18
       +
         "ppx_repr"

     

       19
        
         "odoc" {with-doc}

     

       20
        
       ]

     

       21
        
       build: [

+16 -11

dune-project

···

       1
        
       (lang dune 3.17)

     

       2
        
       

     

       3
       -
       (name cshell)

     

       4
        
       

     

       5
        
       (generate_opam_files true)

     

       6
        
       

     

       7
        
       (source

     

       8
        
        (github username/reponame))

     

       9
        
       

     

       10
       -
       (authors "Author Name <author@example.com>")

     

       11
        
       

     

       12
       -
       (maintainers "Maintainer Name <maintainer@example.com>")

     

       13
        
       

     

       14
       -
       (license LICENSE)

     

       15
        
       

     

       16
       -
       (documentation https://url/to/documentation)

     

       17
        
       

     

       18
        
       (package

     

       19
       -
        (name cshell)

     

       20
       -
        (synopsis "A short synopsis")

     

       21
       -
        (description "A longer description")

     

       22
       -
        (depends ocaml)

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       23
        
        (tags

     

       24
       -
         ("add topics" "to describe" your project)))

     

       25
        
       

     

       26
       -
       ; See the complete stanza docs at https://dune.readthedocs.io/en/stable/reference/dune-project/index.html

···

       1
        
       (lang dune 3.17)

     

       2
        
       

     

       3
       +
       (name shelter)

     

       4
        
       

     

       5
        
       (generate_opam_files true)

     

       6
        
       

     

       7
        
       (source

     

       8
        
        (github username/reponame))

     

       9
        
       

     

       10
       +
       (authors "Patrick Ferris <patrick@sirref.org>")

     

       11
        
       

     

       12
       +
       (maintainers "Patrick Ferris <patrick@sirref.org>")

     

       13
        
       

     

       14
       +
       (license ISC)

     

       15
        
       

     

       0
        
       
     

       16
        
       

     

       17
        
       (package

     

       18
       +
        (name shelter)

     

       19
       +
        (synopsis "Shelter from the Storm")

     

       20
       +
        (description "A shell session shim to help you explore!")

     

       21
       +
        (depends

     

       22
       +
          ocaml

     

       23
       +
          eio_posix

     

       24
       +
          void

     

       25
       +
          zfs

     

       26
       +
          cid

     

       27
       +
          ppx_repr

     

       28
       +
         )

     

       29
        
        (tags

     

       30
       +
         ("shell")))

     

       31
        
       

     

       0

+3 -3

src/bin/dune

···

       1
        
       (executable

     

       2
       -
        (public_name cshell)

     

       3
       -
        (package cshell)

     

       4
        
        (name main)

     

       5
       -
        (libraries cshell fmt.tty cshell.shelter cshell.passthrough eio void))

···

       1
        
       (executable

     

       2
       +
        (public_name shelter)

     

       3
       +
        (package shelter)

     

       4
        
        (name main)

     

       5
       +
        (libraries shelter fmt.tty shelter.main shelter.passthrough eio void))

+2 -2

src/bin/main.ml

···

       5
        
         let merge = Irmin.Merge.default (Repr.option t)

     

       6
        
       end

     

       7
        
       

     

       8
       -
       module Pass = Cshell.Make (History) (Cshell_passthrough)

     

       9
       -
       module Shelter = Cshell.Make (Shelter.History) (Shelter)

     

       10
        
       

     

       11
        
       let home = Unix.getenv "HOME"

     

       12

···

       5
        
         let merge = Irmin.Merge.default (Repr.option t)

     

       6
        
       end

     

       7
        
       

     

       8
       +
       module Pass = Shelter.Make (History) (Shelter_passthrough)

     

       9
       +
       module Shelter = Shelter.Make (Shelter_main.History) (Shelter_main)

     

       10
        
       

     

       11
        
       let home = Unix.getenv "HOME"

     

       12

src/lib/cshell.ml src/lib/shelter.ml

+2 -2

src/lib/dune

···

       1
        
       (library

     

       2
       -
        (name cshell)

     

       3
       -
        (public_name cshell)

     

       4
        
        (libraries irmin-fs.unix eio.unix eio linenoise void repr))

···

       1
        
       (library

     

       2
       +
        (name shelter)

     

       3
       +
        (public_name shelter)

     

       4
        
        (libraries irmin-fs.unix eio.unix eio linenoise void repr))

+3 -3

src/lib/passthrough/cshell_passthrough.ml src/lib/passthrough/shelter_passthrough.ml

···

       18
        
       

     

       19
        
       type ctx = unit

     

       20
        
       

     

       21
       -
       let init _ _ (Cshell.History.Store ((module S), store) : entry Cshell.History.t)

     

       22
       -
           =

     

       23
        
         match S.list store history_key with

     

       24
        
         | [] -> ()

     

       25
        
         | xs ->

     
···

       34
        
             List.iter (fun v -> LNoise.history_add v |> ignore) entries

     

       35
        
       

     

       36
        
       let run _fs clock proc

     

       37
       -
           ( ((Cshell.History.Store ((module S), store) : entry Cshell.History.t) as

     

       38
        
              full_store),

     

       39
        
             () ) (Exec command) =

     

       40
        
         let info () =

···

       18
        
       

     

       19
        
       type ctx = unit

     

       20
        
       

     

       21
       +
       let init _ _

     

       22
       +
           (Shelter.History.Store ((module S), store) : entry Shelter.History.t) =

     

       23
        
         match S.list store history_key with

     

       24
        
         | [] -> ()

     

       25
        
         | xs ->

     
···

       34
        
             List.iter (fun v -> LNoise.history_add v |> ignore) entries

     

       35
        
       

     

       36
        
       let run _fs clock proc

     

       37
       +
           ( ((Shelter.History.Store ((module S), store) : entry Shelter.History.t) as

     

       38
        
              full_store),

     

       39
        
             () ) (Exec command) =

     

       40
        
         let info () =

-1

src/lib/passthrough/cshell_passthrough.mli

···

       1
       -
       include Cshell.Engine.S with type entry = string

···

       0

+3 -3

src/lib/passthrough/dune

···

       1
        
       (library

     

       2
       -
        (name cshell_passthrough)

     

       3
       -
        (public_name cshell.passthrough)

     

       4
        
        (preprocess

     

       5
        
         (pps ppx_repr))

     

       6
       -
        (libraries cshell))

···

       1
        
       (library

     

       2
       +
        (name shelter_passthrough)

     

       3
       +
        (public_name shelter.passthrough)

     

       4
        
        (preprocess

     

       5
        
         (pps ppx_repr))

     

       6
       +
        (libraries shelter))

+1

src/lib/passthrough/shelter_passthrough.mli

···

       0

···

       1
       +
       include Shelter.Engine.S with type entry = string

+3 -3

src/lib/shelter/dune

···

       1
        
       (library

     

       2
       -
        (name shelter)

     

       3
       -
        (public_name cshell.shelter)

     

       4
        
        (preprocess

     

       5
        
         (pps ppx_repr))

     

       6
       -
        (libraries cshell cid void zfs))

···

       1
        
       (library

     

       2
       +
        (name shelter_main)

     

       3
       +
        (public_name shelter.main)

     

       4
        
        (preprocess

     

       5
        
         (pps ppx_repr))

     

       6
       +
        (libraries shelter cid void zfs))

+1 -1

src/lib/shelter/shelter.ml src/lib/shelter/shelter_main.ml

···

       1
        
       open Eio

     

       2
        
       module Store = Store

     

       3
       -
       module H = Cshell.History

     

       4
        
       

     

       5
        
       module History = struct

     

       6
        
         type mode = Void.mode

···

       1
        
       open Eio

     

       2
        
       module Store = Store

     

       3
       +
       module H = Shelter.History

     

       4
        
       

     

       5
        
       module History = struct

     

       6
        
         type mode = Void.mode

+1 -1

src/lib/shelter/shelter.mli src/lib/shelter/shelter_main.mli

···

       13
        
         include Irmin.Contents.S with type t := t

     

       14
        
       end

     

       15
        
       

     

       16
       -
       include Cshell.Engine.S with type entry = History.t

···

       13
        
         include Irmin.Contents.S with type t := t

     

       14
        
       end

     

       15
        
       

     

       16
       +
       include Shelter.Engine.S with type entry = History.t