Merge pull request #269 from hjwp/rename-17

Rename chapter 17

Author: hjwp

.gitmodules

@@ -41,7 +41,7 @@
 	path = source/chapter_16_javascript/superlists
 	url = [email protected]:hjwp/book-example.git
 [submodule "source/chapter_15/superlists"]
-	path = source/chapter_deploying_validation/superlists
+	path = source/chapter_17_second_deploy/superlists
 	url = [email protected]:hjwp/book-example.git
 [submodule "source/chapter_16/superlists"]
 	path = source/chapter_spiking_custom_auth/superlists

Makefile

@@ -127,9 +127,9 @@ test_chapter_15_advanced_forms: chapter_15_advanced_forms.html $(TMPDIR) $(VENV)
 .PHONY: test_chapter_16_javascript
 test_chapter_16_javascript: chapter_16_javascript.html $(TMPDIR) $(VENV)/bin
 	$(VENV)/bin/pytest -s --tb=short ./tests/test_chapter_16_javascript.py
-.PHONY: test_chapter_deploying_validation
-test_chapter_deploying_validation: chapter_deploying_validation.html $(TMPDIR) $(VENV)/bin
-	$(VENV)/bin/pytest -s --tb=short ./tests/test_chapter_deploying_validation.py
+.PHONY: test_chapter_17_second_deploy
+test_chapter_17_second_deploy: chapter_17_second_deploy.html $(TMPDIR) $(VENV)/bin
+	$(VENV)/bin/pytest -s --tb=short ./tests/test_chapter_17_second_deploy.py
 .PHONY: test_chapter_spiking_custom_auth
 test_chapter_spiking_custom_auth: chapter_spiking_custom_auth.html $(TMPDIR) $(VENV)/bin
 	$(VENV)/bin/pytest -s --tb=short ./tests/test_chapter_spiking_custom_auth.py

appendix_IV_testing_migrations.asciidoc

@@ -27,7 +27,7 @@ An Attempted Deploy to Staging
 
 
 Here's what happened to me when I first tried to deploy our new validation
-constraints in <<chapter_deploying_validation>>:
+constraints in <<chapter_17_second_deploy>>:
 
 
 [role="skipme"]

appendix_github_links.asciidoc

@@ -35,7 +35,7 @@ Full List of Links for Each Chapter
 <<chapter_14_simple_form>>:: https://github.com/hjwp/book-example/tree/chapter_14_simple_form
 <<chapter_15_advanced_forms>>:: https://github.com/hjwp/book-example/tree/chapter_15_advanced_forms
 <<chapter_16_javascript>>:: https://github.com/hjwp/book-example/tree/chapter_16_javascript
-<<chapter_deploying_validation>>:: https://github.com/hjwp/book-example/tree/chapter_deploying_validation
+<<chapter_17_second_deploy>>:: https://github.com/hjwp/book-example/tree/chapter_17_second_deploy
 <<chapter_spiking_custom_auth>>:: https://github.com/hjwp/book-example/tree/chapter_spiking_custom_auth
 <<chapter_mocking>>:: https://github.com/hjwp/book-example/tree/chapter_mocking
 <<chapter_fixtures_and_wait_decorator>>:: https://github.com/hjwp/book-example/tree/chapter_fixtures_and_wait_decorator

atlas.json

@@ -28,7 +28,7 @@
     "chapter_14_simple_form.asciidoc",
     "chapter_15_advanced_forms.asciidoc",
     "chapter_16_javascript.asciidoc",
-    "chapter_deploying_validation.asciidoc",
+    "chapter_17_second_deploy.asciidoc",
     "part3.asciidoc",
     "chapter_spiking_custom_auth.asciidoc",
     "chapter_mocking.asciidoc",

book.asciidoc

@@ -38,7 +38,7 @@ include::chapter_13_database_layer_validation.asciidoc[]
 include::chapter_14_simple_form.asciidoc[]
 include::chapter_15_advanced_forms.asciidoc[]
 include::chapter_16_javascript.asciidoc[]
-include::chapter_deploying_validation.asciidoc[]
+include::chapter_17_second_deploy.asciidoc[]
 
 include::part3.forbook.asciidoc[]
 include::chapter_spiking_custom_auth.asciidoc[]

chapter_15_advanced_forms.asciidoc

@@ -349,7 +349,7 @@ compatible.
 To fix this problem, we can just delete `src/db.sqlite3` and run the migration again.
 We can do this because the database on our laptop is only used for dev, so the data in it is not important.
 
-In <chapter_deploying_validation>>, we'll deploy our new code to production,
+In <chapter_17_second_deploy>>, we'll deploy our new code to production,
 and discuss what to do if we run into migrations and data integrity issues at that point.
 
 Now if we change our duplicates test to do a `.save` instead of a

chapter_deploying_validation.asciidoc renamed to chapter_17_second_deploy.asciidoc

@@ -1,4 +1,4 @@
-[[chapter_deploying_validation]]
+[[chapter_17_second_deploy]]
 Deploying Our New Code
 ----------------------
 

preface.asciidoc

@@ -189,7 +189,7 @@ I've split this book into three parts.
     stage. I also introduce the Testing Goat.
 
 
-<<part2>> (Chapters pass:[<a data-type="xref" data-xrefstyle="select:labelnumber" href="#chapter_08_prettification">#chapter_08_prettification</a>–<a data-type="xref" data-xrefstyle="select:labelnumber" href="#chapter_deploying_validation">#chapter_deploying_validation</a>]): Web development essentials:: 
+<<part2>> (Chapters pass:[<a data-type="xref" data-xrefstyle="select:labelnumber" href="#chapter_08_prettification">#chapter_08_prettification</a>–<a data-type="xref" data-xrefstyle="select:labelnumber" href="#chapter_17_second_deploy">#chapter_17_second_deploy</a>]): Web development essentials:: 
     Covers some of the trickier but unavoidable aspects of web development, and
     shows how testing can help us with them: static files, deployment to
     production, form data validation, database migrations, and the dreaded

rename-chapter.sh

@@ -5,15 +5,19 @@ set -o pipefail
 OLD_CHAPTER=$1
 NEW_NAME=$2
 
-git mv "$OLD_CHAPTER.asciidoc" "$NEW_NAME.asciidoc"
-mv "$OLD_CHAPTER.html" "$NEW_NAME.html" || touch "$NEW_NAME.html"
-git mv "tests/test_$OLD_CHAPTER.py" "tests/test_$NEW_NAME.py"
-
-git mv "source/$OLD_CHAPTER" "source/$NEW_NAME"
-
+# git mv "$OLD_CHAPTER.asciidoc" "$NEW_NAME.asciidoc"
+# mv "$OLD_CHAPTER.html" "$NEW_NAME.html" || touch "$NEW_NAME.html"
+#
+# if [ -e "tests/test_$OLD_CHAPTER.py" ]; then
+#     git mv "tests/test_$OLD_CHAPTER.py" "tests/test_$NEW_NAME.py"
+# fi
+#
+# git mv "source/$OLD_CHAPTER" "source/$NEW_NAME"
+#
 cd "source/$NEW_NAME/superlists" 
-git checkout "$OLD_CHAPTER"
-git checkout -b "$NEW_NAME"
+# git checkout "$OLD_CHAPTER"
+# git checkout -b "$NEW_NAME"
+git checkout "$NEW_NAME"
 git push -u local
 git push -u origin
 cd ../../..