Fix bug with touching file in a directory that doesn't exist

Author: JoshDevHub

generators/exercise_generator.rb

@@ -10,7 +10,7 @@ def initialize(namespace, exercise_group_name, exercise_name)
   TEMPLATE_DIR_PATH = "generators/exercise_template".freeze
 
   def generate
-    unless Dir.exist?(exercise_directory_path)
+    unless Dir.exist?(exercise_group_path)
       make_exercise_directory
       make_solutions_directory
     end
@@ -23,16 +23,20 @@ def generate
 
   attr_reader :namespace, :exercise_group_name, :exercise_name
 
-  def exercise_directory_path
+  def exercise_group_path
     File.join(namespace, exercise_group_name)
   end
 
+  def exercise_directory_path
+    File.join(exercise_group_path, "exercises")
+  end
+
   def exercise_file_path
-    File.join(exercise_directory_path, "exercises", "#{exercise_name}.rb")
+    File.join(exercise_directory_path, "#{exercise_name}.rb")
   end
 
   def spec_file_path
-    File.join(exercise_directory_path, "spec", "#{exercise_name}_spec.rb")
+    File.join(exercise_group_path, "spec", "#{exercise_name}_spec.rb")
   end
 
   def spec_template
@@ -47,13 +51,14 @@ def spec_template
 
   def make_exercise_directory
     FileUtils::mkdir_p(exercise_directory_path)
-    FileUtils::copy_entry(TEMPLATE_DIR_PATH, exercise_directory_path)
+    FileUtils::copy_entry(TEMPLATE_DIR_PATH, exercise_group_path)
   end
 
   def make_solutions_directory
-    solutions_directory_path = File.join("solutions", exercise_directory_path)
+    solutions_group_path = File.join("solutions", exercise_group_path)
+    solutions_exercise_path = File.join("solutions", exercise_directory_path)
 
-    FileUtils::mkdir_p(solutions_directory_path)
-    FileUtils::copy_entry(TEMPLATE_DIR_PATH, solutions_directory_path)
+    FileUtils::mkdir_p(solutions_exercise_path)
+    FileUtils::copy_entry(TEMPLATE_DIR_PATH, solutions_group_path)
   end
 end

generators/spec/exercise_generator_spec.rb

@@ -41,7 +41,7 @@
       it "sends a `::mkdir_p` message to `FileUtils` to create exercise path" do
         generator.generate
 
-        expected_path = "test_namespace/1_test_group"
+        expected_path = "test_namespace/1_test_group/exercises"
         expect(FileUtils).to have_received(:mkdir_p).with(expected_path)
       end
 
@@ -56,7 +56,7 @@
       it "sends a `::mkdir_p` message to `FileUtils` to create solutions path" do
         generator.generate
 
-        expected_path = "solutions/test_namespace/1_test_group"
+        expected_path = "solutions/test_namespace/1_test_group/exercises"
         expect(FileUtils).to have_received(:mkdir_p).with(expected_path)
       end