From 2b48312e79a6799dc6b9b0804e185e34fc5cf113 Mon Sep 17 00:00:00 2001 From: SamMarkowitz Date: Mon, 14 Mar 2016 17:12:58 +0200 Subject: [PATCH 1/2] fixed issues from new cloudslangers Signed-off-by: SamMarkowitz --- _static/css/cloudslang_theme.css | 2 +- tutorial/01_lesson.rst | 5 ++++- tutorial/09_lesson.rst | 5 +++-- tutorial/10_lesson.rst | 2 +- tutorial/11_lesson.rst | 7 ++++--- tutorial/13_lesson.rst | 2 +- tutorial/14_lesson.rst | 5 +++-- tutorial/15_lesson.rst | 5 +++-- 8 files changed, 20 insertions(+), 13 deletions(-) diff --git a/_static/css/cloudslang_theme.css b/_static/css/cloudslang_theme.css index 65eeb0b..5009410 100644 --- a/_static/css/cloudslang_theme.css +++ b/_static/css/cloudslang_theme.css @@ -2,5 +2,5 @@ .wy-nav-side .wy-side-nav-search{ background-color: #6DC692; - border-color: #6DC692 + border-color: #6DC692; } diff --git a/tutorial/01_lesson.rst b/tutorial/01_lesson.rst index 0091144..52a1b31 100644 --- a/tutorial/01_lesson.rst +++ b/tutorial/01_lesson.rst @@ -33,7 +33,10 @@ Copy/Pasting Code ----------------- Because proper indentation is so important in YAML, take care to indent pasted -code examples to their proper indentation levels. +code examples to their **proper indentation levels**. If you are unsure what the +indentation level is for a particular code snippet, you can take a look at where +it fits into the rest of the code in the **New Code - Complete** section at the +bottom of each lesson. Prerequisites ------------- diff --git a/tutorial/09_lesson.rst b/tutorial/09_lesson.rst index f5672e4..cafcfef 100644 --- a/tutorial/09_lesson.rst +++ b/tutorial/09_lesson.rst @@ -150,14 +150,15 @@ Fix Up Parent Flow Finally, let's make changes to our original flow so that it makes use of the subflow we just created. -First let's replace the two tasks we took out with one new one that +First let's replace the two tasks we took out with one new task that calls the subflow instead of an operation. You may have noticed that both flows and operations take inputs, return outputs and return results. That allows us to use them almost interchangeably. We've run both flows and operations using the CLI. Now we see that we can call them both from tasks as well. -We'll call our new task ``create_email_address``. It will pass along the +Delete the ``generate_address`` and ``check_address`` tasks. We'll now replace +the with a new task we'll call ``create_email_address``. It will pass along the flow inputs, publish the necessary outputs and wire up the appropriate navigation. diff --git a/tutorial/10_lesson.rst b/tutorial/10_lesson.rst index dc6eddf..1736d91 100644 --- a/tutorial/10_lesson.rst +++ b/tutorial/10_lesson.rst @@ -70,7 +70,7 @@ removing the last item in the loop expression's list. The first thing you'll notice is that the subflow is being run several times. This is what our loop has done. Next, you'll notice that depending on whether you've passed a middle name and how big the loop -list is different things will happen. This is due to the default +list is, different things will happen. This is due to the default behavior of loops and our ``create_user_email`` subflow. By default a loop exits when either the list it is looping on has been diff --git a/tutorial/11_lesson.rst b/tutorial/11_lesson.rst index 917c96a..e8e9aa5 100644 --- a/tutorial/11_lesson.rst +++ b/tutorial/11_lesson.rst @@ -74,9 +74,10 @@ a loop. This time we'll loop through a map of items and their prices. - item - price -We'll also need to create some input variables first. One variable, that -we'll call ``order_map``, will contain the map we're looping on. Notice how a -map is most easily passed as an input value using the ``default`` property. +We'll also need to create some input variables in the flow's ``inputs`` section +first. One variable, that we'll call ``order_map``, will contain the map we're +looping on. Notice how a map is most easily passed as an input value using the +``default`` property. Also, each time through the loop we want to aggregate the data that is output. We'll create two variables, ``missing`` and ``total_cost``, for this diff --git a/tutorial/13_lesson.rst b/tutorial/13_lesson.rst index 22dfe2a..3143f7d 100644 --- a/tutorial/13_lesson.rst +++ b/tutorial/13_lesson.rst @@ -64,7 +64,7 @@ First, we'll use a system property in the inputs of ``generate_user_email`` by calling the ``get_sp()`` function in the ``default`` property of the the ``domain`` input. The ``get_sp()`` function will retrieve the value associated with the property defined by the fully qualified name in its first -argument. If no such property if found, the function will return the second +argument. If no such property is found, the function will return the second argument. .. code-block:: yaml diff --git a/tutorial/14_lesson.rst b/tutorial/14_lesson.rst index a5b1883..7aa7ac1 100644 --- a/tutorial/14_lesson.rst +++ b/tutorial/14_lesson.rst @@ -20,7 +20,8 @@ installation instructions. We'll also need to add a **requirements.txt** file to a **python-lib** folder which is at the same level as the **bin** folder that the CLI executable -resides in. +resides in. If you downloaded a pre-built CLI the **requirements.txt** file is +already there and we will be appending to its contents. The folder structure where the CLI executable is should look something like this: @@ -62,8 +63,8 @@ depends on it. Each package we need takes up one line in our .. code:: bash - pyfiglet == 0.7.2 setuptools + pyfiglet == 0.7.2 Installing ---------- diff --git a/tutorial/15_lesson.rst b/tutorial/15_lesson.rst index 55852ff..2b89555 100644 --- a/tutorial/15_lesson.rst +++ b/tutorial/15_lesson.rst @@ -186,7 +186,7 @@ For more information, see :ref:`aggregate` and :ref:`branches_context` in the DSL reference. For more information on the Python constructs used here, see -`lamda `__, +`lambda `__, `map `__ and `sum `__ in the Python documentation. @@ -234,7 +234,8 @@ file is very similar to a system properties file. It is written in plain YAML which will make it easy for us to format and it will also be more readable than if we had taken a different approach. -Here is the contents of our **hires.yaml** input file. +Here is the contents of our **hires.yaml** input file that we created in the +**tutorials/inputs** folder. .. code-block:: yaml From 8153c4051ba974ae03304513def2f96322aa2350 Mon Sep 17 00:00:00 2001 From: SamMarkowitz Date: Mon, 14 Mar 2016 17:27:47 +0200 Subject: [PATCH 2/2] small changes Signed-off-by: SamMarkowitz --- tutorial/01_lesson.rst | 11 +++++++---- tutorial/09_lesson.rst | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tutorial/01_lesson.rst b/tutorial/01_lesson.rst index 52a1b31..bd8f574 100644 --- a/tutorial/01_lesson.rst +++ b/tutorial/01_lesson.rst @@ -33,10 +33,13 @@ Copy/Pasting Code ----------------- Because proper indentation is so important in YAML, take care to indent pasted -code examples to their **proper indentation levels**. If you are unsure what the -indentation level is for a particular code snippet, you can take a look at where -it fits into the rest of the code in the **New Code - Complete** section at the -bottom of each lesson. +code examples to their **proper indentation levels**. The general rules of +indentation can be found in the structured outlines of CloudSlang files found in +the :ref:`CloudSlang Files ` section of the DSL Reference. + +If you are unsure what the indentation level is for a particular code snippet, +you can take a look at where it fits into the rest of the code in the +**New Code - Complete** section at the bottom of each lesson. Prerequisites ------------- diff --git a/tutorial/09_lesson.rst b/tutorial/09_lesson.rst index cafcfef..e942269 100644 --- a/tutorial/09_lesson.rst +++ b/tutorial/09_lesson.rst @@ -158,7 +158,7 @@ both flows and operations using the CLI. Now we see that we can call them both from tasks as well. Delete the ``generate_address`` and ``check_address`` tasks. We'll now replace -the with a new task we'll call ``create_email_address``. It will pass along the +them with a new task called ``create_email_address``. It will pass along the flow inputs, publish the necessary outputs and wire up the appropriate navigation.