Consolidate 'working effectively' text into two versions instead of four

tjgrathwell · tjgrathwell · commit 2162e7193cd4 · 2014-11-09T22:24:51.000-08:00
diff --git a/lib/step.rb b/lib/step.rb
@@ -42,10 +42,10 @@ def insert file
     # todo: unify into common 'find & process a document file' unit
     dir = File.dirname(@doc_path)
 
-    # todo: other file types
-
-    possible_paths = ["_#{file}.step", "#{file}.step", "#{file}.md"].map do |path|
-      File.join(dir, path)
+    possible_paths = ['step', 'md'].each_with_object([]) do |ext, paths|
+      paths << File.join(dir, "#{file}.#{ext}")
+      path_dir, path_file = file.match(%r{(.*/)?(.*)}).captures
+      paths << File.join(dir, "#{path_dir}_#{path_file}.#{ext}")
     end
 
     possible_paths.each do |path|
@@ -60,7 +60,7 @@ def insert file
       end
     end
 
-    raise "Couldn't find a partial for #{file}!"
+    raise "Couldn't find a partial for #{file}! Searched in #{possible_paths}"
   end
 
   ## steps
diff --git a/sites/en/frontend/_working_effectively_and_efficiently.md b/sites/en/frontend/_working_effectively_and_efficiently.md
@@ -0,0 +1,15 @@
+### Working Effectively and Efficiently
+
+We highly recommend you do the following:
+
+* Open your browser fresh or hide any windows you already have open.
+  * Bring up one window with two tabs
+    * One for this content
+    * One for interacting with your app.
+* Open your text editor and _do not ever close it_. We're not quitters.
+* Hide all extra applications. Turn off twitter, IM, and all other distractions.
+
+By minimizing the number of things you interact with, you reduce the
+amount of time spent switching between them and the context lost as
+you work through the lessons. Having 50 tabs open in your web
+browser gets confusing and wastes time.
diff --git a/sites/en/frontend/frontend.step b/sites/en/frontend/frontend.step
@@ -38,23 +38,8 @@ Optional tools if you're deploying to GitHub:
 
 * Git
 * Your [GitHub](http://github.com) account
-
-### Working Effectively and Efficiently
-
-We highly recommend you do the following:
-
-* Open your browser fresh or hide any windows you already have open.
-  * Bring up one window with two tabs
-    * One for this content
-    * One for interacting with your app.
-* Open your text editor and _do not ever close it_. We're not quitters.
-* Hide all extra applications. Turn off twitter, IM, and all other distractions.
-
-By minimizing the number of things you interact with, you reduce the
-amount of time spent switching between them and the context lost as
-you work through the lessons. Having 50 tabs open in your web
-browser gets confusing and wastes time.
-
 MARKDOWN
 
+insert 'working_effectively_and_efficiently'
+
 next_step 'introduction_to_html'
diff --git a/sites/en/intro-to-rails/_working_effectively_and_efficiently.md b/sites/en/intro-to-rails/_working_effectively_and_efficiently.md
@@ -0,0 +1,18 @@
+# Working Effectively and Efficiently
+
+We highly recommend you do the following:
+
+* Bring up your terminal and open 2 tabs:
+  * One is for regular terminal stuffs
+  * One will be for irb (a.k.a. Rails console). We'll explain later.
+* Open your browser fresh or hide any windows you already have open.
+  * Bring up one window with two tabs
+    * One for this content
+    * One for interacting with your app.
+* Open your text editor and _do not ever close it_. We're not quitters.
+* Hide all extra applications. Turn off Twitter, IM, and all other distractions.
+
+By minimizing the number of things you interact with, you reduce the
+amount of time spent switching between them and the context lost as
+you work through the lessons. Having 50 tabs open in your web
+browser gets confusing and wastes time.
diff --git a/sites/en/intro-to-rails/intro-to-rails.step b/sites/en/intro-to-rails/intro-to-rails.step
@@ -62,26 +62,11 @@ $
 </div>
 
 If you can do that, you are probably good to go.
+MARKDOWN
 
-### Working Effectively and Efficiently
-
-I highly recommend you do the following:
-
-* Bring up your terminal and open 2 tabs:
-  * One is for regular terminal stuffs
-  * One will be for irb (aka rails console). We'll explain later
-* Open your browser fresh or hide any windows you already have open.
-  * Bring up one window with two tabs
-    * One for this content
-    * One for interacting with your app.
-* Open your text editor and _do not ever close it_. We're not quitters.
-* Hide all extra applications. Turn off twitter, IM, and all other distractions.
-
-By minimizing the number of things you interact with, you reduce the
-amount of time spent switching between them and the context lost as
-you work through the lessons. Having 50 tabs open in your web
-browser gets confusing and wastes time.
+insert 'working_effectively_and_efficiently'
 
+message <<-MARKDOWN
 ### Format
 
 Each lesson will look like this:
diff --git a/sites/en/javascript/javascript.step b/sites/en/javascript/javascript.step
@@ -34,23 +34,8 @@ Optional tools if you're checking in to GitHub:
 
 * Git
 * Your [GitHub](http://github.com) account
-
-### Working Effectively and Efficiently
-
-We highly recommend you do the following:
-
-* Open your browser fresh or hide any windows you already have open.
-  * Bring up one window with two tabs
-    * One for this content
-    * One for interacting with your app.
-* Open your text editor and _do not ever close it_. We're not quitters.
-* Hide all extra applications. Turn off twitter, IM, and all other distractions.
-
-By minimizing the number of things you interact with, you reduce the
-amount of time spent switching between them and the context lost as
-you work through the lessons. Having 50 tabs open in your web
-browser gets confusing and wastes time.
-
 MARKDOWN
 
+insert '../frontend/working_effectively_and_efficiently'
+
 next_step 'javascript_not_java'
diff --git a/sites/en/job-board/job-board.step b/sites/en/job-board/job-board.step
@@ -24,26 +24,7 @@ message <<-MARKDOWN
   * When adding code, it's awesome for students to walk through the code line by line and say out loud what is happening. (i.e., "The string is being stored in the instance variable" or "The method `snorgle` is being defined"). If you do it every time, you'll get really comfortable with the vocabulary of Rails!
   * Error messages are your friend! Read them carefully, and practice understanding what Rails is telling you. Seeing an error and just diving back into your code is a natural reaction, but stop! Then read, think, and talk about what the error means before fixing it.
 MARKDOWN
-message <<-MARKDOWN
-# Working Effectively and Efficiently
-
-I highly recommend you do the following:
-
-* Bring up your terminal and open 2 tabs:
-  * One is for regular terminal stuffs
-  * One will be for irb (a.k.a. Rails console). We'll explain later.
-* Open your browser fresh or hide any windows you already have open.
-  * Bring up one window with two tabs
-    * One for this content
-    * One for interacting with your app.
-* Open your text editor and _do not ever close it_. We're not quitters.
-* Hide all extra applications. Turn off Twitter, IM, and all other distractions.
 
-By minimizing the number of things you interact with, you reduce the
-amount of time spent switching between them and the context lost as
-you work through the lessons. Having 50 tabs open in your web
-browser gets confusing and wastes time.
-
-MARKDOWN
+insert '../intro-to-rails/working_effectively_and_efficiently'
 
 next_step "create_a_rails_app"
