Files
mgmt/util/afero.go
James Shubin 96dccca475 lang: Add module imports and more
This enables imports in mcl code, and is one of last remaining blockers
to using mgmt. Now we can start writing standalone modules, and adding
standard library functions as needed. There's still lots to do, but this
was a big missing piece. It was much harder to get right than I had
expected, but I think it's solid!

This unfortunately large commit is the result of some wild hacking I've
been doing for the past little while. It's the result of a rebase that
broke many "wip" commits that tracked my private progress, into
something that's not gratuitously messy for our git logs. Since this was
a learning and discovery process for me, I've "erased" the confusing git
history that wouldn't have helped. I'm happy to discuss the dead-ends,
and a small portion of that code was even left in for possible future
use.

This patch includes:

* A change to the cli interface:
You now specify the front-end explicitly, instead of leaving it up to
the front-end to decide when to "activate". For example, instead of:

mgmt run --lang code.mcl

we now do:

mgmt run lang --lang code.mcl

We might rename the --lang flag in the future to avoid the awkward word
repetition. Suggestions welcome, but I'm considering "input". One
side-effect of this change, is that flags which are "engine" specific
now must be specified with "run" before the front-end name. Eg:

mgmt run --tmp-prefix lang --lang code.mcl

instead of putting --tmp-prefix at the end. We also changed the GAPI
slightly, but I've patched all code that used it. This also makes things
consistent with the "deploy" command.

* The deploys are more robust and let you deploy after a run
This has been vastly improved and let's mgmt really run as a smart
engine that can handle different workloads. If you don't want to deploy
when you've started with `run` or if one comes in, you can use the
--no-watch-deploy option to block new deploys.

* The import statement exists and works!
We now have a working `import` statement. Read the docs, and try it out.
I think it's quite elegant how it fits in with `SetScope`. Have a look.
As a result, we now have some built-in functions available in modules.
This also adds the metadata.yaml entry-point for all modules. Have a
look at the examples or the tests. The bulk of the patch is to support
this.

* Improved lang input parsing code:
I re-wrote the parsing that determined what ran when we passed different
things to --lang. Deciding between running an mcl file or raw code is
now handled in a more intelligent, and re-usable way. See the inputs.go
file if you want to have a look. One casualty is that you can't stream
code from stdin *directly* to the front-end, it's encapsulated into a
deploy first. You can still use stdin though! I doubt anyone will notice
this change.

* The scope was extended to include functions and classes:
Go forth and import lovely code. All these exist in scopes now, and can
be re-used!

* Function calls actually use the scope now. Glad I got this sorted out.

* There is import cycle detection for modules!
Yes, this is another dag. I think that's #4. I guess they're useful.

* A ton of tests and new test infra was added!
This should make it much easier to add new tests that run mcl code. Have
a look at TestAstFunc1 to see how to add more of these.

As usual, I'll try to keep these commits smaller in the future!
2018-12-21 06:22:12 -05:00

195 lines
5.6 KiB
Go

// Mgmt
// Copyright (C) 2013-2018+ James Shubin and the project contributors
// Written by James Shubin <james@shubin.ca> and the project contributors
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
package util
import (
"fmt"
"io"
"os"
"path"
"github.com/spf13/afero"
)
// FsTree returns a string representation of the file system tree similar to the
// well-known `tree` command.
func FsTree(fs afero.Fs, name string) (string, error) {
str := ".\n" // top level dir
s, err := stringify(fs, path.Clean(name), []bool{})
if err != nil {
return "", err
}
str += s
return str, nil
}
func stringify(fs afero.Fs, name string, indent []bool) (string, error) {
str := ""
dir, err := fs.Open(name)
if err != nil {
return "", err
}
fileinfo, err := dir.Readdir(-1)
if err != nil && err != io.EOF {
return "", err
}
for i, fi := range fileinfo {
for _, last := range indent {
if last {
str += " "
} else {
str += "│ "
}
}
header := "├── "
var last bool
if i == len(fileinfo)-1 { // if last
header = "└── "
last = true
}
p := fi.Name()
if fi.IsDir() {
p += "/" // identify as a dir
}
str += fmt.Sprintf("%s%s\n", header, p)
if fi.IsDir() {
indented := append(indent, last)
s, err := stringify(fs, path.Join(name, p), indented)
if err != nil {
return "", err // TODO: return partial tree?
}
str += s
}
}
return str, nil
}
// CopyFs copies a dir from the srcFs to a dir on the dstFs. It expects that the
// dst will be either empty, or that the force flag will be set to true. If the
// dst has a different set of contents in the same location, the behaviour is
// currently undefined.
// TODO: this should be made more rsync like and robust!
func CopyFs(srcFs, dstFs afero.Fs, src, dst string, force bool) error {
src = path.Join("/", src)
dst = path.Join("/", dst)
// TODO: clean this up with function that gets parent dir?
src = path.Clean(src)
parentDir, _ := path.Split(src)
srcFsLen := len(parentDir)
walkFn := func(name string, info os.FileInfo, err error) error {
if err != nil {
return err
}
perm := info.Mode() // get file permissions
p := path.Join(dst, name[srcFsLen:])
if info.IsDir() {
err := dstFs.Mkdir(p, perm)
if os.IsExist(err) && (name == "/" || force) {
return nil
}
return err
}
data, err := afero.ReadFile(srcFs, name)
if err != nil {
return err
}
// create file
return afero.WriteFile(dstFs, p, data, perm)
}
return afero.Walk(srcFs, src, walkFn)
}
// CopyFsContents copies a dir from the srcFs to a dir on the dstFs. It expects
// that the dst will be either empty, or that the force flag will be set to
// true. If the dst has a different set of contents in the same location, the
// behaviour is currently undefined. Notably, this does not copy the src dir
// itself, and only includes the contents. This is similar to `rsync dir/` vs.
// `rsync dir`. This function does the former, where as CopyFs does the latter.
// TODO: this should be made more rsync like and robust!
func CopyFsContents(srcFs afero.Fs, dstFs afero.Fs, src string, dst string, force bool) error {
src = path.Join("/", src)
dst = path.Join("/", dst)
// TODO: clean this up with function that gets parent dir?
src = path.Clean(src)
parentDir, _ := path.Split(src)
srcFsLen := len(parentDir)
walkFn := func(name string, info os.FileInfo, err error) error {
if err != nil {
return err
}
perm := info.Mode() // get file permissions
// basically, we want to go "up" one dir so we don't copy it...
// this is like `rsync dir/` vs. `rsync dir`
p, err := RemovePathPrefix(path.Join(dst, name[srcFsLen:]))
if err != nil {
return err
}
if info.IsDir() {
err := dstFs.Mkdir(p, perm)
if os.IsExist(err) && (p == "/" || force) {
return nil
}
return err
}
data, err := afero.ReadFile(srcFs, name)
if err != nil {
return err
}
// create file
return afero.WriteFile(dstFs, p, data, perm)
}
return afero.Walk(srcFs, src, walkFn)
}
// CopyFsToDisk performs exactly as CopyFs, except that the dst fs is our local
// disk os fs.
func CopyFsToDisk(srcFs afero.Fs, src, dst string, force bool) error {
return CopyFs(srcFs, afero.NewOsFs(), src, dst, force)
}
// CopyDiskToFs performs exactly as CopyFs, except that the src fs is our local
// disk os fs.
func CopyDiskToFs(dstFs afero.Fs, src, dst string, force bool) error {
return CopyFs(afero.NewOsFs(), dstFs, src, dst, force)
}
// CopyFsContentsToDisk performs exactly as CopyFs, except that the dst fs is
// our local disk os fs, and we don't keep the source dir name, we only copy the
// contents.
func CopyFsContentsToDisk(srcFs afero.Fs, src, dst string, force bool) error {
return CopyFsContents(srcFs, afero.NewOsFs(), src, dst, force)
}
// CopyDiskContentsToFs performs exactly as CopyFs, except that the src fs is
// our local disk os fs, and we don't keep the source dir name, we only copy the
// contents.
func CopyDiskContentsToFs(dstFs afero.Fs, src, dst string, force bool) error {
return CopyFsContents(afero.NewOsFs(), dstFs, src, dst, force)
}