Rearrange code generators for features.

(Making room for gem spec and associated steps).

2 files changed, 4 insertions, 42 deletions

diff --git a/features/step_definitions/compilation.rb b/features/step_definitions/compilation.rb
index cd584a0..3cc00fb 100644
--- a/features/step_definitions/compilation.rb
+++ b/features/step_definitions/compilation.rb
@@ -1,7 +1,6 @@
 Given /^a extension named '(.*)'$/ do |extension_name|
-  setup_extension_scaffold
-  setup_extension_task_for extension_name
-  setup_source_for extension_name
+  generate_extension_task_for extension_name
+  generate_source_code_for extension_name
 end
 
 Given /^not changed any file since$/ do
@@ -21,42 +20,3 @@ Then /^binary extension '(.*)' (do|do not) exist in '(.*)'$/ do |extension_name,
     File.exist?(ext_for_platform).should be_false
   end
 end
-
-def setup_extension_scaffold
-  # create folder structure
-  FileUtils.mkdir_p "lib"
-  FileUtils.mkdir_p "tasks"
-  FileUtils.mkdir_p "tmp"
-
-  # create Rakefile loader
-  File.open("Rakefile", 'w') do |rakefile|
-    rakefile.puts template_rakefile.strip
-  end
-end
-
-def setup_extension_task_for(extension_name)
-  # create folder structure
-  FileUtils.mkdir_p "ext/#{extension_name}"
-
-  # create specific extension rakefile
-  File.open("tasks/#{extension_name}.rake", 'w') do |ext_rake|
-    ext_rake.puts template_rake_extension(extension_name)
-  end
-end
-
-def setup_source_for(extension_name)
-  # source C file
-  File.open("ext/#{extension_name}/source.c", 'w') do |c|
-    c.puts template_source_c(extension_name)
-  end
-
-  # header H file
-  File.open("ext/#{extension_name}/source.h", 'w') do |h|
-    h.puts template_source_h
-  end
-
-  # extconf.rb file
-  File.open("ext/#{extension_name}/extconf.rb", 'w') do |ext|
-    ext.puts template_extconf(extension_name)
-  end
-end
diff --git a/features/step_definitions/folders.rb b/features/step_definitions/folders.rb
index 53e39b0..27faf3f 100644
--- a/features/step_definitions/folders.rb
+++ b/features/step_definitions/folders.rb
@@ -6,6 +6,8 @@ Given /^a safe project directory$/ do
   FileUtils.rm_rf @safe_dir
   FileUtils.mkdir_p @safe_dir
   Dir.chdir @safe_dir
+
+  generate_scaffold_structure
 end
 
 Given /^'(.*)' folder (exist|is deleted)$/ do |folder, condition|