Skip to content

Commit 005fc94

Browse files
authored
Merge pull request #152 from common-workflow-language/140-ask-better-questions
Improve question wording
2 parents 5d25e88 + 55b9b47 commit 005fc94

12 files changed

+20
-18
lines changed

_episodes/02-1st-example.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: "First Example"
33
teaching: 5
44
exercises: 0
55
questions:
6-
- "How do I wrap a simple command line tool?"
6+
- "How do I write a CWL description of a simple command line tool?"
77
objectives:
88
- "Learn the basic structure of a CWL description."
99
keypoints:

_episodes/03-input.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ title: "Essential Input Parameters"
33
teaching: 10
44
exercises: 0
55
questions:
6-
- "How do I describe inputs to a command?"
7-
- "How do I specify the order in which inputs appear in a command?"
6+
- "How can I pass arguments to a command?"
7+
- "How is the order of parameters defined for a command?"
88
objectives:
99
- "Learn how to describe and handle input parameters and files to a tool."
1010
keypoints:

_episodes/04-output.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ title: "Returning Output Files"
33
teaching: 10
44
exercises: 0
55
questions:
6-
- "How do I describe outputs from a command?"
6+
- "Where does the output of a command go?"
7+
- "How can I save the output of a command?"
78
objectives:
89
- "Learn how to describe and handle outputs from a tool."
910
keypoints:

_episodes/05-stdout.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: "Capturing Standard Output"
33
teaching: 10
44
exercises: 0
55
questions:
6-
- "How do I capture a tool's standard output stream?"
6+
- "How do I capture the standard output stream of a command?"
77
objectives:
88
- "Learn how to capture streamed output from a tool."
99
keypoints:

_episodes/06-params.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: "Parameter References"
33
teaching: 10
44
exercises: 0
55
questions:
6-
- "How do I reference input parameters in other fields?"
6+
- "How can I re-use parameter values in another location?"
77
objectives:
88
- "Learn how to make parameter references in descriptions."
99
keypoints:

_episodes/09-array-inputs.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: "Array Inputs"
33
teaching: 10
44
exercises: 0
55
questions:
6-
- "How do I specify input parameters in arrays?"
6+
- "How do I provide multiple values for a single argument?"
77
objectives:
88
- "Learn how to provide parameter arrays as input to a tool."
99
- "Learn how to control the organization of array parameters on the command
@@ -75,7 +75,6 @@ separator string.
7575

7676
Note that the arrays of inputs are specified inside square brackets `[]` in `array-inputs-job.yml`. Arrays can also be expressed over multiple lines, where
7777
array values that are not defined with an associated key is marked by a leading
78-
`-`.
7978
This will be demonstrated in the next lesson
8079
and is discussed in more detail in the [YAML Guide](/yaml#arrays).
8180
You can specify arrays of arrays, arrays of records, and other complex types.

_episodes/10-array-outputs.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ title: "Array Outputs"
33
teaching: 10
44
exercises: 0
55
questions:
6-
- "How do I specify tool outputs as arrays?"
6+
- "What do I do when a tool produces output in more than one file?"
7+
- "How do I specify which output files should be kept?"
78
objectives:
89
- "Learn how to create arrays of output files."
910
keypoints:

_episodes/11-records.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: "Advanced Inputs"
33
teaching: 10
44
exercises: 0
55
questions:
6-
- "How do I describe dependent and exclusive parameters?"
6+
- "How do I describe which parameters must and must not be used in combination?"
77
objectives:
88
- "Learn how to use records to describe the relationships between inputs."
99
keypoints:

_episodes/14-runtime.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ exercises: 0
55
questions:
66
- "How do I create required input files from input parameters at runtime?"
77
- "How do I invoke a script rather than just a simple command line?"
8-
- "How do I make inputs available to my script?"
8+
- "Besides `inputBinding`, how else can I pass arguments to the tool?"
99
objectives:
1010
- "Learn how to create files on the fly during runtime."
1111
- "Learn how to use expressions in bash scripts."
@@ -15,7 +15,7 @@ created during tool runtime."
1515
---
1616
Sometimes you need to create a file on the fly from input parameters,
1717
such as tools which expect to read their input configuration from a file
18-
rather than the command line parameters, or need a small wrapper shell script.
18+
rather than the command line parameters, or need a small wrapper shell script.
1919

2020
To generate such files we can use the `InitialWorkDirRequirement`.
2121

@@ -26,7 +26,7 @@ To generate such files we can use the `InitialWorkDirRequirement`.
2626
~~~
2727
{: .source}
2828

29-
Any [expressions](../13-expressions/index.html) like `$(inputs.message)` are expanded by the CWL engine before creating the file; here inserting the value at the input `message`.
29+
Any [expressions](../13-expressions/index.html) like `$(inputs.message)` are expanded by the CWL engine before creating the file; here inserting the value at the input `message`.
3030

3131
> **Tip:** The _CWL expressions_ are independent of any _shell variables_ used later during command line tool invocation. That means that any genuine need for the character `$` should be **escaped** with `\`, for instance `\${PREFIX}` above is expanded to `${PREFIX}` in the generated file to be evaluated by the shell script instead of the CWL engine.
3232

_episodes/15-staging.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: "Staging Input Files"
33
teaching: 10
44
exercises: 0
55
questions:
6-
- "How do I stage input files in the working directory?"
6+
- "What can I do if a tool needs to be able to write output to the location where its input files are stored?"
77
objectives:
88
- "Learn how to handle situations where a tool expects to write output files to
99
the same directory as its input files."

_episodes/16-file-formats.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ title: "File Formats"
33
teaching: 10
44
exercises: 0
55
questions:
6-
- "How can I allow type-checking of input and output files?"
6+
- "How can I mark the required file format for input files?"
7+
- "How can I mark the produced file format of output files?"
78
objectives:
89
- "Learn how to unambiguously specify the format of `File` objects."
910
keypoints:
@@ -23,7 +24,7 @@ others. You can browse existing file format listings for IANA [here][IANA] and
2324
for EDAM [here][EDAM].
2425

2526
In the next tutorial, we explain the `$namespace` and `$schema` section of the
26-
document in greater detail, so don't worry about these for now.
27+
document in greater detail, so don't worry about these for now.
2728

2829
Note that for added value `cwltool` can do some basic reasoning based on file
2930
formats and warn you if there seem to be some obvious mismatches.

_episodes/17-metadata.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: "Metadata and Authorship"
33
teaching: 10
44
exercises: 0
55
questions:
6-
- "How do I provide information for people to cite my tool descriptions?"
6+
- "How do I make it easier for people to cite my tool descriptions?"
77
objectives:
88
- "Learn how to add authorship information and other metadata to a CWL
99
description."
@@ -16,7 +16,7 @@ Implementation extensions not required for correct execution (for example,
1616
fields related to GUI presentation) and metadata about the tool or workflow
1717
itself (for example, authorship for use in citations) may be provided as
1818
additional fields on any object. Such extensions fields (e.g. `format: edam:format_2572`)
19-
can use a namespace prefix listed in the `$namespaces`section of the document
19+
can use a namespace prefix listed in the `$namespaces`section of the document
2020
(e.g edam: http://edamontology.org/) as described in the [Schema Salad specification][schema-salad].
2121
Once you add the namespace prefix, you can access it anywhere in the document as shown below.
2222
Otherwise one must use full URLs: `format: http://edamontology.org/format_2572`.

0 commit comments

Comments
 (0)