technofab/jsonnet-bundler
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/jsonnet-bundler.git synced 2025-12-11 23:50:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: update single dependencies

Browse source 
The `update` command now takes dependency URI's like the `install`
command.

In contrast to `install`, `update` always pulls the latest version.
This commit is contained in:
sh0rez 2020-03-17 17:40:33 +01:00
parent cd5e2945d2
commit eeea4677d2
No known key found for this signature in database
GPG key ID: 87C71DF9F8181FF1
2 changed files with 29 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cmd/jb/main.go
View file

@ -52,10 +52,11 @@ func Main() int {
initCmd := a.Command(initActionName, "Initialize a new empty jsonnetfile")
installCmd := a.Command(installActionName, "Install all dependencies or install specific ones")
installCmd := a.Command(installActionName, "Install new dependencies. Existing ones are silently skipped")
installCmdURIs := installCmd.Arg("uris", "URIs to packages to install, URLs or file paths").Strings()
updateCmd := a.Command(updateActionName, "Update all dependencies.")
updateCmd := a.Command(updateActionName, "Update all or specific dependencies.")
updateCmdURIs := updateCmd.Arg("uris", "URIs to packages to update, URLs or file paths").Strings()
rewriteCmd := a.Command(rewriteActionName, "Automatically rewrite legacy imports to absolute ones")
@ -79,7 +80,7 @@ func Main() int {
case installCmd.FullCommand():
return installCommand(workdir, cfg.JsonnetHome, *installCmdURIs)
case updateCmd.FullCommand():
return updateCommand(workdir, cfg.JsonnetHome)
return updateCommand(workdir, cfg.JsonnetHome, *updateCmdURIs)
case rewriteCmd.FullCommand():
return rewriteCommand(workdir, cfg.JsonnetHome)
default:

35
cmd/jb/update.go
View file

@ -15,7 +15,6 @@
package main
import (
"net/url"
"os"
"path/filepath"
@ -27,28 +26,44 @@ import (
"github.com/jsonnet-bundler/jsonnet-bundler/spec/v1/deps"
)
func updateCommand(dir, jsonnetHome string, urls ...*url.URL) int {
func updateCommand(dir, jsonnetHome string, uris []string) int {
if dir == "" {
dir = "."
}
// load jsonnetfiles
jsonnetFile, err := jsonnetfile.Load(filepath.Join(dir, jsonnetfile.File))
kingpin.FatalIfError(err, "failed to load jsonnetfile")
lockFile, err := jsonnetfile.Load(filepath.Join(dir, jsonnetfile.LockFile))
kingpin.FatalIfError(err, "failed to load lockfile")
kingpin.FatalIfError(
os.MkdirAll(filepath.Join(dir, jsonnetHome, ".tmp"), os.ModePerm),
"creating vendor folder")
// When updating, locks are ignored.
locks := map[string]deps.Dependency{}
locked, err := pkg.Ensure(jsonnetFile, jsonnetHome, locks)
kingpin.FatalIfError(err, "failed to install packages")
locks := lockFile.Dependencies
for _, u := range uris {
d := deps.Parse(dir, u)
if d == nil {
kingpin.Fatalf("Unable to parse package URI `%s`", u)
}
delete(locks, d.Name())
}
// no uris: update all
if len(uris) == 0 {
locks = make(map[string]deps.Dependency)
}
newLocks, err := pkg.Ensure(jsonnetFile, jsonnetHome, locks)
kingpin.FatalIfError(err, "updating")
kingpin.FatalIfError(
writeJSONFile(filepath.Join(dir, jsonnetfile.File), jsonnetFile),
"updating jsonnetfile.json")
kingpin.FatalIfError(
writeJSONFile(filepath.Join(dir, jsonnetfile.LockFile), v1.JsonnetFile{Dependencies: locked}),
writeJSONFile(filepath.Join(dir, jsonnetfile.LockFile), v1.JsonnetFile{Dependencies: newLocks}),
"updating jsonnetfile.lock.json")
return 0
}