rails_apps_composer 1.5.3 → 1.5.4

data/README.textile

@@ -152,8 +152,7 @@ html5:
 
 rspec:
   rspec: true
-  factory_girl: true
-  machinist: false
+  fixtures: factory_girl
 
 sass:
   sass: true

data/recipes/compass.rb

@@ -1,6 +1,6 @@
 if config['compass']
   gem 'compass', :version => '~> 0.12.2', :group => [:assets]
-  gem 'compass-rails', :version => '~> 1.0.2', :group => [:assets]
+  gem 'compass-rails', :version => '~> 1.0.3', :group => [:assets]
   after_bundler do
     remove_file 'app/assets/stylesheets/application.css'
 

data/recipes/guard.rb

@@ -39,10 +39,6 @@ end
   RUBY
   end
 
-  def guards
-    @guards ||= []
-  end
-
   def guard(name, version = nil)
     args = []
     if version
@@ -50,14 +46,11 @@ end
     end
     args << { :group => :development }
     gem "guard-#{name}", *args
-    guards << name
   end
 
   guard 'bundler', '>= 0.1.3'
 
-  unless recipes.include? 'pow'
-    guard 'rails', '>= 0.0.3'
-  end
+  guard 'rails', '>= 0.0.3'
   
   if recipes.include? 'guard-LiveReload'
     guard 'livereload', '>= 0.3.0'
@@ -73,9 +66,6 @@ end
 
   after_bundler do
     run 'guard init'
-    guards.each do |name|
-      run "guard init #{name}"
-    end
   end
 
 else

data/recipes/heroku.rb

@@ -25,8 +25,7 @@ after_everything do
   end
 
   unless config['domain'].blank?
-    run "heroku addons:add custom_domains"
-    run "heroku domains:add #{config['domain']}"
+    run "heroku domains:add #{config['domain']} --remote #{config['staging'] ? 'production' : 'heroku'}"
   end
 
   git :push => "#{config['staging'] ? 'staging' : 'heroku'} master" if config['deploy']

data/recipes/html5.rb

@@ -5,7 +5,7 @@ case config['css_option']
 
   when 'foundation'
     # https://github.com/zurb/foundation-rails
-    gem 'zurb-foundation'
+    gem 'zurb-foundation', '>= 3.0.2'
 
   when 'bootstrap_less'
     # https://github.com/seyhunak/twitter-bootstrap-rails
@@ -19,7 +19,7 @@ case config['css_option']
   when 'bootstrap_sass'
     # https://github.com/thomas-mcdonald/bootstrap-sass
     # http://rubysource.com/twitter-bootstrap-less-and-sass-understanding-your-options-for-rails-3-1/
-    gem 'bootstrap-sass', '>= 2.0.3'
+    gem 'bootstrap-sass', '>= 2.0.4.0'
     recipes << 'bootstrap'
 
 end

data/recipes/prelaunch_signup.rb

@@ -407,7 +407,7 @@ HAML
 end
 
 # >---------------------------------[ html5 ]---------------------------------<
-gem 'bootstrap-sass', '>= 2.0.3'
+gem 'bootstrap-sass', '>= 2.0.4.0'
 recipes << 'bootstrap'
 after_bundler do
   say_wizard "HTML5 recipe running 'after bundler'"

data/recipes/rails_admin.rb

@@ -6,6 +6,14 @@ after_bundler do
   rake 'admin:ckeditor_download' if config['ckeditor']
 end
 
+inject_into_file 'config/routes.rb', :after => "routes.draw do" do 
+<<-RUBY
+\n
+  mount RailsAdmin::Engine => '/admin', :as => 'rails_admin'
+\n  
+RUBY
+end
+
 __END__
 
 name: RailsAdmin

data/recipes/rspec.rb

@@ -6,14 +6,14 @@ if config['rspec']
   if recipes.include? 'mongoid'
     # use the database_cleaner gem to reset the test database
     gem 'database_cleaner', '>= 0.8.0', :group => :test
-    # include RSpec matchers from the mongoid-rspec gem
-    gem 'mongoid-rspec', '>= 1.4.6', :group => :test
+    # include RSpec matchers from the mongoid-rspec gem, 1.4.6 requires mongoid 3.0.0.rc making it impossible to resolve dependencies
+    gem 'mongoid-rspec', '1.4.5', :group => :test
   end
-  if config['machinist']
-    gem 'machinist', :group => :test
-  end
-  if config['factory_girl']
-    gem 'factory_girl_rails', '>= 3.5.0', :group => [:development, :test]
+  case config['fixtures']
+    when 'machinist'
+      gem 'machinist', :group => :test
+    when 'factory_girl'
+      gem 'factory_girl_rails', '>= 3.5.0', :group => [:development, :test]
   end
   # add a collection of RSpec matchers and Cucumber steps to make testing email easy
   gem 'email_spec', '>= 1.2.1', :group => :test
@@ -38,7 +38,7 @@ if config['rspec']
   config.include(EmailSpec::Matchers)
 RUBY
     end
-    if config['machinist']
+    if config['fixtures'] === 'machinist'
       say_wizard "Generating blueprints file for Machinist"
       generate 'machinist:install'
     end
@@ -52,7 +52,7 @@ RUBY
     config.generators do |g|
       g.view_specs false
       g.helper_specs false
-      #{"g.fixture_replacement :machinist" if config['machinist']}
+      #{"g.fixture_replacement :machinist" if config['fixtures'] === 'machinist'}
     end
 
 RUBY
@@ -125,9 +125,7 @@ config:
   - rspec:
       type: boolean
       prompt: Would you like to use RSpec instead of TestUnit?
-  - factory_girl:
-      type: boolean
-      prompt: Would you like to use factory_girl for test fixtures with RSpec?
-  - machinist:
-      type: boolean
-      prompt: Would you like to use machinist for test fixtures with RSpec?
+  - fixtures:
+      type: multiple_choice
+      prompt: Which library would you like to use for test fixtures with RSpec?
+      choices: [["None", none], ["factory_girl", factory_girl], ["machinist", machinist]]

data/recipes/unicorn.rb

@@ -0,0 +1,29 @@
+# Application template recipe for the rails_apps_composer. Check for a newer version here:
+# https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/unicorn.rb
+
+case config['unicorn']
+  when 'development' 
+    say_wizard "Adding 'unicorn'"
+    gem "unicorn-rails", :platform => :ruby, :group => [:development, :test]
+  when 'production' 
+    say_wizard "Adding 'unicorn'"
+    gem "unicorn-rails", :platform => :ruby, :group => :production
+  when 'both' 
+    say_wizard "Adding 'unicorn'"
+    gem "unicorn-rails", :platform => :ruby
+end
+
+__END__
+
+name: Unicorn
+description: "Use Unicorn as your default server (works on Heroku with the Celadon Cedar stack)."
+author: mmacedo
+
+category: server
+tags: [server]
+
+config:
+  - unicorn:
+      type: multiple_choice
+      prompt: Would you like to use unicorn as your server?
+      choices: [["No", no], ["In development only", development], ["In production only", production], ["Both development and production", both]]

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "1.5.3"
+  VERSION = "1.5.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-26 00:00:00.000000000 Z
+date: 2012-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -197,6 +197,7 @@ files:
 - recipes/slim.rb
 - recipes/static_page.rb
 - recipes/subdomains.rb
+- recipes/unicorn.rb
 - recipes/users_page.rb
 - README.textile
 - version.rb
@@ -226,7 +227,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -260435814497186721
+      hash: -215979203623829965
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -235,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -260435814497186721
+      hash: -215979203623829965
 requirements: []
 rubyforge_project: rails_apps_composer
 rubygems_version: 1.8.24