Skip to content
This repository was archived by the owner on Jan 19, 2018. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions atomicapp/cli/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ def create_parser(self):
formatter_class=argparse.RawDescriptionHelpFormatter,
add_help=False,
description=(
"This will install and run an Atomic App, "
"This will fetch and run an Atomic App, "
"a containerized application conforming to the Nulecule Specification"))
# Add a help function to the toplevel parser but don't output
# help information for it. We need this because of the way we
Expand Down Expand Up @@ -284,7 +284,7 @@ def create_parser(self):
dest="destination",
default=None,
help=('''
Destination directory for install. This defaults to a
Destination directory for fetching. This defaults to a
directory under %s. Specify 'none' to not persist
files and have them cleaned up when finished.''' % CACHE_DIR))
run_subparser.set_defaults(func=cli_run)
Expand Down Expand Up @@ -338,7 +338,7 @@ def create_parser(self):
stop_subparser.add_argument(
"app_spec",
help=('''
Path to the directory where the Atomic App is installed
Path to the directory where the Atomic App is fetched
that is to be stopped.'''))
stop_subparser.set_defaults(func=cli_stop)

Expand Down
6 changes: 3 additions & 3 deletions atomicapp/nulecule/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,12 @@ def load_from_path(cls, src, config=None, namespace=GLOBAL_CONF,
update (bool): Update existing application if True, else reuse it.

Returns:
A Nulecule instance or None in case of some dry run (installing
from image).
A Nulecule instance or None in case of some dry run (fetching
an image).
"""
nulecule_path = os.path.join(src, MAIN_FILE)
if dryrun and not os.path.exists(nulecule_path):
raise NuleculeException("Installed Nulecule components are required to initiate dry-run. "
raise NuleculeException("Fetched Nulecule components are required to initiate dry-run. "
"Please specify your app via atomicapp --dry-run /path/to/your-app")
nulecule_data = anymarkup.parse_file(nulecule_path)
nulecule = Nulecule(config=config, basepath=src,
Expand Down
2 changes: 1 addition & 1 deletion atomicapp/nulecule/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
class NuleculeManager(object):

"""
Interface to install, run, stop a Nulecule application.
Interface to fetch, run, stop a Nulecule application.
"""

def __init__(self, app_spec, destination=None,
Expand Down
4 changes: 2 additions & 2 deletions docs/file_handling.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Install
## Fetch

Installing an Atomic App means to download the artifacts and sample answerfile.
Fetching an Atomic App means to download the artifacts and sample answerfile.

## Developing and Debugging

Expand Down