From 1969445a3ad02a369625aebdf66907c883bb400d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Harold=20Gim=C3=A9nez?= <hgimenez@thoughtbot.com>
Date: Fri, 21 Oct 2011 16:53:51 -0400
Subject: [PATCH] The subdirectory is no longer needed

---
 bin/suspenders                                       | 2 +-
 templates/{files => }/Gemfile_additions              | 0
 templates/{files => }/Procfile                       | 0
 templates/{files => }/README_FOR_SUSPENDERS          | 0
 templates/{files => }/_flashes.html.erb              | 0
 templates/{files => }/_javascript.html.erb           | 0
 templates/{files => }/errors.rb                      | 0
 templates/{files => }/factory_girl_steps.rb          | 0
 templates/{files => }/import_scss_styles             | 0
 templates/{files => }/javascripts/prefilled_input.js | 0
 templates/{files => }/postgresql_database.yml.erb    | 0
 templates/{files => }/suspenders_gitignore           | 0
 templates/{files => }/suspenders_layout.html.erb.erb | 0
 templates/{files => }/time_formats.rb                | 0
 14 files changed, 1 insertion(+), 1 deletion(-)
 rename templates/{files => }/Gemfile_additions (100%)
 rename templates/{files => }/Procfile (100%)
 rename templates/{files => }/README_FOR_SUSPENDERS (100%)
 rename templates/{files => }/_flashes.html.erb (100%)
 rename templates/{files => }/_javascript.html.erb (100%)
 rename templates/{files => }/errors.rb (100%)
 rename templates/{files => }/factory_girl_steps.rb (100%)
 rename templates/{files => }/import_scss_styles (100%)
 rename templates/{files => }/javascripts/prefilled_input.js (100%)
 rename templates/{files => }/postgresql_database.yml.erb (100%)
 rename templates/{files => }/suspenders_gitignore (100%)
 rename templates/{files => }/suspenders_layout.html.erb.erb (100%)
 rename templates/{files => }/time_formats.rb (100%)

diff --git a/bin/suspenders b/bin/suspenders
index 6b5ee094c..1daecf877 100755
--- a/bin/suspenders
+++ b/bin/suspenders
@@ -9,7 +9,7 @@ if ['create', '--create'].include? ARGV[0]
   puts "[WARNING] the suspenders create argument is deprecated. Just use `suspenders #{ARGV.join}` instead"
 end
 
-templates_root = File.expand_path(File.join("..", "templates", "files"), File.dirname(__FILE__))
+templates_root = File.expand_path(File.join("..", "templates"), File.dirname(__FILE__))
 Suspenders::Generator.source_root templates_root
 Suspenders::Generator.source_paths << Rails::Generators::AppGenerator.source_root << templates_root
 
diff --git a/templates/files/Gemfile_additions b/templates/Gemfile_additions
similarity index 100%
rename from templates/files/Gemfile_additions
rename to templates/Gemfile_additions
diff --git a/templates/files/Procfile b/templates/Procfile
similarity index 100%
rename from templates/files/Procfile
rename to templates/Procfile
diff --git a/templates/files/README_FOR_SUSPENDERS b/templates/README_FOR_SUSPENDERS
similarity index 100%
rename from templates/files/README_FOR_SUSPENDERS
rename to templates/README_FOR_SUSPENDERS
diff --git a/templates/files/_flashes.html.erb b/templates/_flashes.html.erb
similarity index 100%
rename from templates/files/_flashes.html.erb
rename to templates/_flashes.html.erb
diff --git a/templates/files/_javascript.html.erb b/templates/_javascript.html.erb
similarity index 100%
rename from templates/files/_javascript.html.erb
rename to templates/_javascript.html.erb
diff --git a/templates/files/errors.rb b/templates/errors.rb
similarity index 100%
rename from templates/files/errors.rb
rename to templates/errors.rb
diff --git a/templates/files/factory_girl_steps.rb b/templates/factory_girl_steps.rb
similarity index 100%
rename from templates/files/factory_girl_steps.rb
rename to templates/factory_girl_steps.rb
diff --git a/templates/files/import_scss_styles b/templates/import_scss_styles
similarity index 100%
rename from templates/files/import_scss_styles
rename to templates/import_scss_styles
diff --git a/templates/files/javascripts/prefilled_input.js b/templates/javascripts/prefilled_input.js
similarity index 100%
rename from templates/files/javascripts/prefilled_input.js
rename to templates/javascripts/prefilled_input.js
diff --git a/templates/files/postgresql_database.yml.erb b/templates/postgresql_database.yml.erb
similarity index 100%
rename from templates/files/postgresql_database.yml.erb
rename to templates/postgresql_database.yml.erb
diff --git a/templates/files/suspenders_gitignore b/templates/suspenders_gitignore
similarity index 100%
rename from templates/files/suspenders_gitignore
rename to templates/suspenders_gitignore
diff --git a/templates/files/suspenders_layout.html.erb.erb b/templates/suspenders_layout.html.erb.erb
similarity index 100%
rename from templates/files/suspenders_layout.html.erb.erb
rename to templates/suspenders_layout.html.erb.erb
diff --git a/templates/files/time_formats.rb b/templates/time_formats.rb
similarity index 100%
rename from templates/files/time_formats.rb
rename to templates/time_formats.rb