Skip to content

Commit

Permalink
Refactor to new actions. (#56)
Browse files Browse the repository at this point in the history
Refactor to new actions.
  • Loading branch information
lexbritvin authored Jan 16, 2025
1 parent a774e61 commit a35e171
Show file tree
Hide file tree
Showing 10 changed files with 347 additions and 283 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
no-tty-in-ci:
name: Ensure login command does not requires TTY if all options are passed
name: Ensure keyring:login command does not requires TTY if all options are passed
runs-on: ubuntu-latest

steps:
Expand All @@ -21,7 +21,7 @@ jobs:
whoami
make deps build
ls -lah bin/launchr
./bin/launchr login --url=http://***.git --username="***" --password="***" --keyring-passphrase="***"
./bin/launchr keyring:login --url=http://***.git --username="***" --password="***" --keyring-passphrase="***"
private-repo:
name: Ensure composition with private repo do not fail
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:
strategy: null
EOF
cat plasma-compose.yaml
./bin/launchr login --url=https://github.com/davidferlay/compose-example.git --username="${EXAMPLE_REPO_USERNAME}" --password="${EXAMPLE_REPO_PASSWORD}" --keyring-passphrase="${KEYRING_PASSWORD}"
./bin/launchr keyring:login --url=https://github.com/davidferlay/compose-example.git --username="${EXAMPLE_REPO_USERNAME}" --password="${EXAMPLE_REPO_PASSWORD}" --keyring-passphrase="${KEYRING_PASSWORD}"
./bin/launchr compose --keyring-passphrase "${KEYRING_PASSWORD}" --skip-not-versioned --conflicts-verbosity --clean
ls -lah .compose/build | grep -i FILE_FROM_EXAMPLE
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FIRST_GOPATH:=$(firstword $(subst :, ,$(GOPATH)))

# Build available information.
GIT_HASH:=$(shell git log --format="%h" -n 1 2> /dev/null)
RAW_GIT_BRANCH := $(if $(GITHUB_REF_NAME),$(GITHUB_REF_NAME),$(shell git branch 2> /dev/null | grep '*' | cut -f2 -d' '))
RAW_GIT_BRANCH := $(if $(GITHUB_REF_NAME),$(GITHUB_REF_NAME),$(shell git rev-parse --abbrev-ref HEAD))
GIT_BRANCH = $(shell echo $(RAW_GIT_BRANCH) | sed 's/[^a-zA-Z0-9-]//g')
APP_VERSION:="$(GIT_BRANCH)-$(GIT_HASH)"
GOPKG:=github.com/launchrctl/launchr
Expand Down
48 changes: 48 additions & 0 deletions action.add.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
runtime: plugin
action:
title: Compose add
description: >-
Add a new package to plasma-compose
options:
- name: allow-create
title: Allow create
description: Create plasma-compose if not exist
type: boolean
default: false
- name: package
title: Name
description: Name of the package
type: string
default: ""
- name: type
title: Type
description: "Type of the package source: git, http"
type: string
enum: [git, http]
default: git
- name: ref
title: Ref
description: Reference of the package source
type: string
default: ""
- name: tag
title: Tag
description: Tag of the package source
type: string
default: ""
- name: url
title: URL
description: URL of the package source
type: string
default: ""
- name: strategy
title: Strategy
description: Strategy name
type: array
default: []
- name: strategy-path
title: Strategy path
description: >-
Strategy paths. paths separated by |, strategies are comma separated (path/1|path/2,path/1|path/2)
type: array
default: []
33 changes: 33 additions & 0 deletions action.compose.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
runtime: plugin
action:
title: Compose
description: >-
Composes filesystem (files & dirs)
options:
- name: working-dir
shorthand: w
title: Working directory
description: Working directory for temp files
type: string
default: .compose/packages
- name: skip-not-versioned
shorthand: s
title: Skip unversioned
description: Skip not versioned files from source directory (git only)
type: boolean
default: false
- name: conflicts-verbosity
title: Conflicts verbosity
description: Log files conflicts
type: boolean
default: false
- name: clean
title: Clean
description: Remove .compose dir on start
type: boolean
default: false
- name: interactive
title: Interactive
description: Interactive mode allows to submit user credentials during action
type: boolean
default: true
11 changes: 11 additions & 0 deletions action.delete.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
runtime: plugin
action:
title: Compose delete
description: >-
Remove a package from plasma-compose
options:
- name: packages
title: Packages
description: List of packages to remove. Comma separated.
type: array
default: []
43 changes: 43 additions & 0 deletions action.update.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
runtime: plugin
action:
title: Compose update
description: >-
Update a plasma-compose package
options:
- name: package
title: Name
description: Name of the package
type: string
default: ""
- name: type
title: Type
description: "Type of the package source: git, http"
type: string
enum: [git, http]
default: git
- name: ref
title: Ref
description: Reference of the package source
type: string
default: ""
- name: tag
title: Tag
description: Tag of the package source
type: string
default: ""
- name: url
title: URL
description: URL of the package source
type: string
default: ""
- name: strategy
title: Strategy
description: Strategy name
type: array
default: []
- name: strategy-path
title: Strategy path
description: >-
Strategy paths. paths separated by |, strategies are comma separated (path/1|path/2,path/1|path/2)
type: array
default: []
46 changes: 0 additions & 46 deletions compose/cobra.go

This file was deleted.

63 changes: 33 additions & 30 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ go 1.23.2
require (
dario.cat/mergo v1.0.1
github.com/charmbracelet/huh v0.6.0
github.com/go-git/go-git/v5 v5.12.0
github.com/launchrctl/keyring v0.2.5
github.com/launchrctl/launchr v0.16.4
github.com/go-git/go-git/v5 v5.13.1
github.com/launchrctl/keyring v0.3.0
github.com/launchrctl/launchr v0.17.1
github.com/stevenle/topsort v0.2.0
gopkg.in/yaml.v3 v3.0.1
)
Expand All @@ -16,37 +16,37 @@ require (
atomicgo.dev/cursor v0.2.0 // indirect
atomicgo.dev/keyboard v0.2.9 // indirect
atomicgo.dev/schedule v0.1.0 // indirect
filippo.io/age v1.2.0 // indirect
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
filippo.io/age v1.2.1 // indirect
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/ProtonMail/go-crypto v1.0.0 // indirect
github.com/ProtonMail/go-crypto v1.1.5 // indirect
github.com/atotto/clipboard v0.1.4 // indirect
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/catppuccin/go v0.2.0 // indirect
github.com/charmbracelet/bubbles v0.20.0 // indirect
github.com/charmbracelet/bubbletea v1.1.1 // indirect
github.com/charmbracelet/lipgloss v0.13.1 // indirect
github.com/charmbracelet/x/ansi v0.3.2 // indirect
github.com/charmbracelet/x/exp/strings v0.0.0-20241022174419-46d9bb99a691 // indirect
github.com/charmbracelet/x/term v0.2.0 // indirect
github.com/charmbracelet/bubbletea v1.2.4 // indirect
github.com/charmbracelet/lipgloss v1.0.0 // indirect
github.com/charmbracelet/x/ansi v0.7.0 // indirect
github.com/charmbracelet/x/exp/strings v0.0.0-20250116134054-e10c5c25afb9 // indirect
github.com/charmbracelet/x/term v0.2.1 // indirect
github.com/cloudflare/circl v1.5.0 // indirect
github.com/containerd/console v1.0.4 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/cyphar/filepath-securejoin v0.3.4 // indirect
github.com/cyphar/filepath-securejoin v0.4.0 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/docker v27.3.1+incompatible // indirect
github.com/docker/docker v27.5.0+incompatible // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.6.0 // indirect
github.com/go-git/go-billy/v5 v5.6.2 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
github.com/gookit/color v1.5.4 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
Expand All @@ -63,43 +63,46 @@ require (
github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/mmcloughlin/avo v0.6.0 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/patternmatcher v0.6.0 // indirect
github.com/moby/sys/sequential v0.6.0 // indirect
github.com/moby/sys/signal v0.7.1 // indirect
github.com/moby/sys/user v0.3.0 // indirect
github.com/moby/sys/userns v0.1.0 // indirect
github.com/moby/term v0.5.0 // indirect
github.com/moby/term v0.5.2 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
github.com/muesli/cancelreader v0.2.2 // indirect
github.com/muesli/termenv v0.15.3-0.20240618155329-98d742f6907a // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/pjbgf/sha1cd v0.3.1 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pterm/pterm v0.12.79 // indirect
github.com/pterm/pterm v0.12.80 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
github.com/santhosh-tekuri/jsonschema/v6 v6.0.1 // indirect
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/skeema/knownhosts v1.3.0 // indirect
github.com/spf13/cobra v1.8.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect
go.opentelemetry.io/otel v1.31.0 // indirect
go.opentelemetry.io/otel/metric v1.31.0 // indirect
go.opentelemetry.io/otel/trace v1.31.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
go.opentelemetry.io/otel v1.33.0 // indirect
go.opentelemetry.io/otel/metric v1.33.0 // indirect
go.opentelemetry.io/otel/trace v1.33.0 // indirect
go.uber.org/mock v0.5.0 // indirect
golang.org/x/crypto v0.28.0 // indirect
golang.org/x/mod v0.21.0 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/term v0.25.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/crypto v0.32.0 // indirect
golang.org/x/mod v0.22.0 // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/term v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/tools v0.29.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241007155032-5fefd90f89a9 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
Expand Down
Loading

0 comments on commit a35e171

Please sign in to comment.