Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
clpm
clpm
Commits
a2ced048
Commit
a2ced048
authored
Feb 23, 2020
by
Eric Timmons
Browse files
Make client names a little more uniform
parent
b3764562
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/clpm-client/asdf.lisp
View file @
a2ced048
...
...
@@ -15,21 +15,20 @@
(
:export
#:*clpm-system-not-found-behavior*
#:activate-clpm-asdf-integration
#:clpm-asdf-integration-active-p
#:clpm-install-and-reload-bundle
#:clpm-install-system-and-dependencies
#:clpm-missing-system
#:clpm-reload-bundle
#:clpm-system-search
#:deactivate-clpm-asdf-integration
#:install-and-reload-bundle
#:install-system
#:install-system-and-dependencies
#:reload-bundle
))
#:deactivate-clpm-asdf-integration
))
(
in-package
#:clpm-client/asdf
)
(
defvar
*clpm-system-not-found-behavior*
:error
"The behavior if CLPM is asked to find a system that is not installed. One of:
+ :ERROR :: Signal a CLPM-MISSING-SYSTEM condition with the INSTALL-SYSTEM
restart available.
+ :ERROR :: Signal a CLPM-MISSING-SYSTEM condition with the
CLPM-
INSTALL-SYSTEM
and CLPM-INSTALL-SYSTEM-AND-DEPENDENCIES
restart
s
available.
+ :INSTALL :: Just install the system without prompting.
...
...
@@ -90,12 +89,12 @@ into the lock file and then reload the config."
(
restart-case
;; Prevent RESTART-CASE from using WITH-CONDITION-RESTARTS
(
signal-missing-system
system-name
)
(
install-and-reload-bundle
()
(
clpm-
install-and-reload-bundle
()
:report
"Run bundle install and reload configuration form clpmfile.lock"
(
when
(
clpm-bundle-install
:validate
'clpm-bundle-install-validate-diff
)
(
reload-config
)
(
asdf:find-system
system-name
)))
(
reload-bundle
()
(
clpm-
reload-bundle
()
:report
"Clear ASDF configuration and reload from clpmfile.lock."
(
reload-config
)
(
asdf:find-system
system-name
))))
...
...
@@ -121,12 +120,12 @@ use."
(
restart-case
;; Prevent RESTART-CASE from using WITH-CONDITION-RESTARTS
(
signal-missing-system
system-name
)
(
install-system
()
(
clpm-
install-system
()
:report
"Attempt to install the system using CLPM."
(
let
((
*clpm-system-not-found-behavior*
nil
))
(
clpm-install-system
system-name
:no-deps-p
t
)
(
lookup-system
)))
(
install-system-and-dependencies
()
(
clpm-
install-system-and-dependencies
()
:report
"Attempt to install the system and its dependencies using CLPM."
(
let
((
*clpm-system-not-found-behavior*
nil
))
(
clpm-install-system
system-name
)
...
...
src/clpm-client/clpm-client.lisp
View file @
a2ced048
...
...
@@ -18,19 +18,16 @@
#:activate-clpm-asdf-integration
#:cleanup-clpm!
#:clpm-asdf-integration-active-p
#:clpm-install-and-reload-bundle
#:clpm-install-system
#:clpm-install-system-and-dependencies
#:clpm-missing-system
#:clpm-client-version
#:clpm-inside-bundle-exec-p
#:clpm-reload-bundle
#:clpm-version
#:clpmfile-pathname
#:deactivate-clpm-asdf-integration
#:install-and-reload-bundle
#:install-system
#:install-system-and-dependencies
#:launch-clpm
#:reload-bundle
#:run-clpm
))
#:deactivate-clpm-asdf-integration
))
(
in-package
#:clpm-client
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment