rails_apps_composer 2.0.1 → 2.1.0

data/README.textile

@@ -1,4 +1,4 @@
-h1. !http://railsapps.github.com/images/rails-36x36.jpg(Rails Apps Composer Gem)! Rails Apps Composer 2.0
+h1. !http://railsapps.github.com/images/rails-36x36.jpg(Rails Apps Composer Gem)! Rails Apps Composer 2.1
 
 The Rails Apps Composer gem installs a command line tool to assemble a Rails application from a collection of "recipes."
 
@@ -7,6 +7,8 @@ What you can do with the rails_apps_composer gem:
 * create a starter app from the command line
 * make a reusable application template
 
+You can use local recipes as well as recipes supplied with the gem.
+
 The "Rails Composer":http://railsapps.github.com/rails-composer/ tool is built with the rails_apps_composer gem. The Rails Composer tool creates the "example applications":http://railsapps.github.com/ for the "RailsApps":http://railsapps.github.com/ project.
 
 The "Guide to the Rails Apps Composer Gem":http://railsapps.github.com/tutorial-rails-apps-composer.html provides complete documentation:
@@ -26,9 +28,15 @@ h2. !http://twitter-badges.s3.amazonaws.com/t_logo-a.png(Follow on Twitter)!:htt
 
 Follow the project on Twitter: "@rails_apps":http://twitter.com/rails_apps. Tweet some praise if you like what you've found.
 
-h2. What's New in Version 2.0
+h2. What's New
+
+See the "CHANGELOG":https://github.com/RailsApps/rails_apps_composer/blob/master/CHANGELOG.textile for details.
+
+h3. Version 2.1
+
+* use local recipes
 
-Rails_apps_composer 2.0 is significantly different from earlier versions:
+h3. Version 2.0
 
 * the "Guide":http://railsapps.github.com/tutorial-rails-apps-composer.html provides complete documentation
 * diagnostics compare your selected recipes and preferences to known working combinations

data/lib/rails_wizard/command.rb

@@ -7,7 +7,9 @@ module RailsWizard
     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 @@ module RailsWizard
     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 @@ module RailsWizard
       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)..

data/lib/rails_wizard/recipes.rb

@@ -34,5 +34,15 @@ module RailsWizard
     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

data/lib/rails_wizard.rb

@@ -4,8 +4,4 @@ require 'rails_wizard/config'
 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')

data/recipes/gems.rb

@@ -15,7 +15,7 @@ gem 'unicorn', '>= 4.3.1', :group => :production if prefer :prod_webserver, 'uni
 gem 'puma', '>= 1.5.0', :group => :production if prefer :prod_webserver, 'puma'
 
 ## Database Adapter
-gem 'mongoid', '>= 3.0.1' if prefer :orm, 'mongoid'
+gem 'mongoid', '>= 3.0.3' if prefer :orm, 'mongoid'
 gem 'pg', '>= 0.14.0' if prefer :database, 'postgresql'
 gem 'mysql2', '>= 0.3.11' if prefer :database, 'mysql'
 copy_from_repo 'config/database-postgresql.yml', :prefs => 'postgresql'
@@ -54,24 +54,24 @@ end
 if prefer :integration, 'cucumber'
   gem 'cucumber-rails', '>= 1.3.0', :group => :test, :require => false
   gem 'database_cleaner', '>= 0.8.0', :group => :test unless prefer :orm, 'mongoid'
-  gem 'launchy', '>= 2.1.0', :group => :test
+  gem 'launchy', '>= 2.1.2', :group => :test
 end
 gem 'turnip', '>= 1.0.0', :group => :test if prefer :integration, 'turnip'
-gem 'factory_girl_rails', '>= 3.5.0', :group => [:development, :test] if prefer :fixtures, 'factory_girl'
-gem 'machinist', :group => :test if prefer :fixtures, 'machinist'
+gem 'factory_girl_rails', '>= 4.0.0', :group => [:development, :test] if prefer :fixtures, 'factory_girl'
+gem 'machinist', '>= 2.0', :group => :test if prefer :fixtures, 'machinist'
 
 ## Front-end Framework
 gem 'bootstrap-sass', '>= 2.0.4.0' if prefer :bootstrap, 'sass'
-gem 'zurb-foundation', '>= 3.0.5' if prefer :frontend, 'foundation'
+gem 'zurb-foundation', '>= 3.0.8' if prefer :frontend, 'foundation'
 if prefer :bootstrap, 'less'
-  gem 'twitter-bootstrap-rails', '>= 2.0.3', :group => :assets
+  gem 'twitter-bootstrap-rails', '>= 2.1.1', :group => :assets
   # install gem 'therubyracer' to use Less
-  gem 'therubyracer', :group => :assets, :platform => :ruby
+  gem 'therubyracer', '>= 0.10.2', :group => :assets, :platform => :ruby
 end
 
 ## Email
-gem 'sendgrid' if prefer :email, 'sendgrid'
-gem 'hominid' if prefer :email, 'mandrill'
+gem 'sendgrid', '>= 1.0.1' if prefer :email, 'sendgrid'
+gem 'hominid', '>= 3.0.5' if prefer :email, 'mandrill'
 
 ## Authentication (Devise)
 gem 'devise', '>= 2.1.2' if prefer :authentication, 'devise'
@@ -89,7 +89,7 @@ gem 'omniauth-tumblr' if prefer :omniauth_provider, 'tumblr'
 ## Authorization 
 if prefer :authorization, 'cancan'
   gem 'cancan', '>= 1.6.8'
-  gem 'rolify', '>= 3.1.0'
+  gem 'rolify', '>= 3.2.0'
 end
 
 ## Signup App 

data/recipes/models.rb

@@ -33,17 +33,19 @@ after_bundler do
   ### SUBDOMAINS ###
   copy_from_repo 'app/models/user.rb', :repo => 'https://raw.github.com/RailsApps/rails3-subdomains/master/' if prefer :starter_app, 'subdomains'
   ### AUTHORIZATION (insert 'rolify' after User model is created) ###
-  unless prefer :orm, 'mongoid'
-    generate 'rolify:role Role User'
-  else
-    generate 'rolify:role Role User mongoid'
-  	# correct the generation of rolify 3.1 with mongoid
-  	# the call to `rolify` should be *after* the inclusion of mongoid
-  	# (see https://github.com/EppO/rolify/issues/61)
-  	# This isn't needed for rolify>=3.2.0.beta4, but should cause no harm
-  	gsub_file 'app/models/user.rb',
-  		  /^\s*(rolify.*?)$\s*(include Mongoid::Document.*?)$/,
-  		  "  \\2\n  extend Rolify\n  \\1\n"
+  if prefer :authorization, 'cancan'
+    unless prefer :orm, 'mongoid'
+      generate 'rolify:role Role User'
+    else
+      generate 'rolify:role Role User mongoid'
+    	# correct the generation of rolify 3.1 with mongoid
+    	# the call to `rolify` should be *after* the inclusion of mongoid
+    	# (see https://github.com/EppO/rolify/issues/61)
+    	# This isn't needed for rolify>=3.2.0.beta4, but should cause no harm
+    	gsub_file 'app/models/user.rb',
+    		  /^\s*(rolify.*?)$\s*(include Mongoid::Document.*?)$/,
+    		  "  \\2\n  extend Rolify\n  \\1\n"
+    end
   end
   ### GIT ###
   git :add => '.' if prefer :git, true

data/spec/rails_wizard/recipes_spec.rb

@@ -21,4 +21,9 @@ describe RailsWizard::Recipes do
       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

data/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

data/templates/layout.erb

@@ -98,7 +98,11 @@ end
 # >-----------------------------[ Run 'Bundle Install' ]-------------------------------<
 
 say_wizard "Installing gems. This will take a while."
-run 'bundle install --without production'
+if prefs.has_key? :bundle_path
+  run "bundle install --without production #{prefs[:bundle_path]}"
+else
+  run 'bundle install --without production'
+end
 
 # >-----------------------------[ Run 'After Bundler' Callbacks ]-------------------------------<
 

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "2.0.1"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-09 00:00:00.000000000 Z
+date: 2012-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -183,6 +183,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/rails_directory.rb
 - spec/support/template_runner.rb
+- spec/test_recipes/test_recipe_in_file.rb
 - bin/rails_apps_composer
 homepage: http://github.com/RailsApps/rails_apps_composer
 licenses: []
@@ -198,7 +199,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2921388160186911464
+      hash: 282801510994621394
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -207,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2921388160186911464
+      hash: 282801510994621394
 requirements: []
 rubyforge_project: rails_apps_composer
 rubygems_version: 1.8.24
@@ -223,3 +224,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/rails_directory.rb
 - spec/support/template_runner.rb
+- spec/test_recipes/test_recipe_in_file.rb