Merge pull request #89 from tomykaira/custom_recipes

Custom recipes.  Fix #86

Author: DanielKehoe

lib/rails_wizard.rb

@@ -4,8 +4,4 @@
 require 'rails_wizard/diagnostics'
 require 'rails_wizard/template'
 
-Dir[File.dirname(__FILE__) + '/../recipes/*.rb'].each do |path|
-  key = File.basename(path, '.rb')
-  recipe = RailsWizard::Recipe.generate(key, File.open(path))
-  RailsWizard::Recipes.add(recipe)
-end
+RailsWizard::Recipes.add_from_directory(File.dirname(__FILE__) + '/../recipes')

lib/rails_wizard/command.rb

@@ -7,7 +7,9 @@ class Command < Thor
     desc "new APP_NAME", "create a new Rails app"
     method_option :recipes, :type => :array, :aliases => "-r"
     method_option :defaults, :type => :string, :aliases => "-d"
+    method_option :recipe_dirs, :type => :array, :aliases => "-l"
     def new(name)
+      add_recipes
       args = ask_for_args
       recipes, defaults = load_defaults
       recipes = ask_for_recipes(recipes)
@@ -18,7 +20,9 @@ def new(name)
     desc "template TEMPLATE_FILE", "create a new Rails template"
     method_option :recipes, :type => :array, :aliases => "-r"
     method_option :defaults, :type => :string, :aliases => "-d"
+    method_option :recipe_dirs, :type => :array, :aliases => "-l"
     def template(template_name)
+      add_recipes
       recipes, defaults = load_defaults
       recipes = ask_for_recipes(recipes)
       gems = ask_for_gems
@@ -46,6 +50,12 @@ def red; "\033[31m" end
       def green; "\033[32m" end
       def yellow; "\033[33m" end
 
+      def add_recipes
+        if dirs = options[:recipe_dirs]
+          dirs.each { |d| Recipes.add_from_directory(d) }
+        end
+      end
+
       def load_defaults
         # Load defaults from a file; if a file specifies recipes, they'll be run *before*
         # any on the command line (or prompted for)..

lib/rails_wizard/recipes.rb

@@ -34,5 +34,15 @@ def self.for(category)
     def self.remove_from_category(category, recipe)
       (@@categories[category.to_s] ||= []).delete(recipe.key)
     end
+
+    def self.add_from_directory(directory)
+      Dir.foreach(directory) do |file|
+        path = File.join(directory, file)
+        next unless path.match /\.rb$/
+        key = File.basename(path, '.rb')
+        recipe = Recipe.generate(key, File.open(path))
+        add(recipe)
+      end
+    end
   end
 end

spec/rails_wizard/recipes_spec.rb

@@ -21,4 +21,9 @@
       RailsWizard::Recipes.for('test').should be_include('recipe_test')
     end
   end
+
+  it 'should add recipes in a directory with add_from_directory' do
+    subject.add_from_directory(File.join(File.dirname(__FILE__), '..', 'test_recipes'))
+    subject.list.should include 'test_recipe_in_file'
+  end
 end

spec/test_recipes/test_recipe_in_file.rb

@@ -0,0 +1,9 @@
+say_wizard "Hi! I am a test."
+
+__END__
+
+name: test_recipe_in_file
+description: "this is test file"
+author: githubname
+
+category: test