rails_apps_composer 2.1.2 → 2.1.3

data/README.textile

@@ -72,8 +72,14 @@ Before using the rails_apps_composer gem, you will need:
 * The Ruby language (version 1.9.3)
 * Rails 3.1 or newer
 
+The rails_apps_composer program uses the version of Rails that is currently installed when you launch the program. If you want to use the newest Rails version, upgrade before running rails_apps_composer.
+
 See the article "Installing Rails":http://railsapps.github.com/installing-rails.html for advice about updating Rails and your development environment.
 
+h4. Database
+
+Except for SQLite, which runs by default on Mac OS X, you'll need to have a database server running before you run rails_apps_composer. This is true if you use PostgreSQL, MySQL, or MongoDB; use SQLite if you don't want to set up a database server.
+
 h2. Installation
 
 I recommend installing and using rvm, the "Ruby Version Manager":https://rvm.io/, to create a new gemset for rails_apps_composer. Using an rvm gemset will make it easier to identify and isolate incompatibilities among gems.
@@ -93,15 +99,16 @@ You can list recipes with short descriptions:
 <pre>
 $ rails_apps_composer list
 
+all            # Select all available recipes.
 auth           # Add authentication and authorization.
 controllers    # Add controllers needed for starter apps.
-database       # Set up and initialize database.
 email          # Configure email accounts.
-example        # Example of a recipe
+example        # Example of a recipe.
 extras         # Various extras.
 frontend       # Install a front-end framework for HTML5 and CSS.
 gems           # Add the gems your application needs.
 git            # Initialize git for your application.
+init           # Set up and initialize database.
 models         # Add models needed for starter apps.
 railsapps      # Install RailsApps example applications.
 readme         # Build a README file for your application.
@@ -160,11 +167,12 @@ Would you like to skip Test::Unit? (yes for RSpec) (y/n)
 Would you like to skip Active Record? (yes for MongoDB) (y/n)
 
 Available Recipes:
+all: all
 auth: auth
 configuration: email, gems, git, railsapps, readme, setup
 example: example
 frontend: frontend
-initialize: database
+initialize: init
 mvc: controllers, models, routes, views
 other: extras
 testing: testing
@@ -182,10 +190,10 @@ You can specify any gem. Any string you enter will be added as a gem in the star
 
 h3. Generate an Application from a List of Recipes
 
-Provide a list of recipes using the @-r@ flag:
+Provide a list of recipes using the @-r@ flag. The "all" recipe selects all available recipes:
 
 <pre>
-$ rails_apps_composer new myapp -r git setup readme gems testing auth email models controllers views routes frontend database extras
+$ rails_apps_composer new myapp -r all
 
 Would you like to skip Test::Unit? (yes for RSpec) (y/n)
 Would you like to skip Active Record? (yes for MongoDB) (y/n)
@@ -217,11 +225,12 @@ Specify a filename for the template:
 $ rails_apps_composer template ~/Desktop/template.rb
 
 Available Recipes:
+all: all
 auth: auth
 configuration: email, gems, git, railsapps, readme, setup
 example: example
 frontend: frontend
-initialize: database
+initialize: init
 mvc: controllers, models, routes, views
 other: extras
 testing: testing
@@ -239,7 +248,7 @@ h3. Generate an Application Template from a List of Recipes
 Specify a filename for the template and provide a list of recipes:
 
 <pre>
-$ rails_apps_composer template ~/Desktop/template.rb -r git setup readme gems testing auth email models controllers views routes frontend database extras
+$ rails_apps_composer template ~/Desktop/template.rb -r all
 
 What gem would you like to add? (blank to finish)
 Generating and saving application template...

data/lib/rails_wizard/diagnostics.rb

@@ -15,8 +15,11 @@ module RailsWizard
     @@recipes << %w(gems git setup)
     @@recipes << %w(gems git readme setup)
     @@recipes << %w(extras gems git readme setup)
-    @@recipes << %w(auth controllers database email extras frontend gems git models railsapps readme routes setup testing views)
-    @@recipes << %w(auth controllers database email example extras frontend gems git models railsapps readme routes setup testing views)
+    @@recipes << %w(auth controllers email extras frontend gems git init models railsapps readme routes setup testing views)
+    @@recipes << %w(all auth controllers email extras frontend gems git init models railsapps readme routes setup testing views)
+    @@recipes << %w(auth controllers email example extras frontend gems git init models railsapps readme routes setup testing views)
+    @@recipes << %w(auth controllers email example extras frontend gems git init models prelaunch railsapps readme routes setup testing views)
+    @@recipes << %w(all auth controllers email example extras frontend gems git init models prelaunch railsapps readme routes setup testing views)
 
     ### collections of preferences that are known to work together
     @@prefs = []

data/recipes/all.rb

@@ -0,0 +1,14 @@
+# Application template recipe for the rails_apps_composer. Change the recipe here:
+# https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/all.rb
+
+## Git
+say_wizard "selected all recipes"
+
+__END__
+
+name: all
+description: "Select all available recipes."
+author: RailsApps
+
+requires: [git, railsapps, setup, readme, gems, testing, auth, email, models, controllers, views, routes, frontend, init, extras]
+category: all

data/recipes/example.rb

@@ -45,7 +45,7 @@ end
 __END__
 
 name: example
-description: "Example of a recipe"
+description: "Example of a recipe."
 author: githubname
 
 category: example

data/recipes/extras.rb

@@ -69,7 +69,7 @@ if prefs[:rvmrc]
   begin
     RVM.gemset_use! app_name
   rescue StandardError
-    raise "Use rvm gem 1.11.3.5 or newer."
+    raise "rvm failure: unable to use gemset #{app_name}"
   end
   run "rvm gemset list"
   copy_from_repo '.rvmrc'
@@ -92,7 +92,7 @@ after_everything do
   gsub_file 'config/routes.rb', /\n^\s*\n/, "\n"
   # GIT
   git :add => '.' if prefer :git, true
-  git :commit => "-aqm 'rails_apps_composer: starter app complete'" if prefer :git, true
+  git :commit => "-aqm 'rails_apps_composer: extras'" if prefer :git, true
 end
 
 __END__
@@ -102,7 +102,7 @@ description: "Various extras."
 author: RailsApps
 
 requires: [gems]
-run_after: [gems]
+run_after: [init, gems]
 category: other
 
 config:

data/recipes/frontend.rb

@@ -36,12 +36,12 @@ RUBY
     insert_into_file 'app/assets/javascripts/application.js', "//= require foundation\n", :after => "jquery_ujs\n"
     insert_into_file 'app/assets/stylesheets/application.css.scss', " *= require foundation\n", :after => "require_self\n"
   elsif prefer :frontend, 'skeleton'
-    copy_from_repo 'app/assets/stylesheets/normalize.css.scss', :repo => 'https://raw.github.com/necolas/normalize.css/master/normalize.css'
-    copy_from_repo 'app/assets/stylesheets/base.css.scss', :repo => 'https://raw.github.com/dhgamache/Skeleton/master/stylesheets/base.css'
-    copy_from_repo 'app/assets/stylesheets/layout.css.scss', :repo => 'https://raw.github.com/dhgamache/Skeleton/master/stylesheets/layout.css'
-    copy_from_repo 'app/assets/stylesheets/skeleton.css.scss', :repo => 'https://raw.github.com/dhgamache/Skeleton/master/stylesheets/skeleton.css'
+    copy_from 'https://raw.github.com/necolas/normalize.css/master/normalize.css', 'app/assets/stylesheets/normalize.css'
+    copy_from 'https://raw.github.com/dhgamache/Skeleton/master/stylesheets/base.css', 'app/assets/stylesheets/base.css'
+    copy_from 'https://raw.github.com/dhgamache/Skeleton/master/stylesheets/layout.css', 'app/assets/stylesheets/layout.css'
+    copy_from 'https://raw.github.com/dhgamache/Skeleton/master/stylesheets/skeleton.css', 'app/assets/stylesheets/skeleton.css'
   elsif prefer :frontend, 'normalize'
-    copy_from_repo 'app/assets/stylesheets/normalize.css.scss', :repo => 'https://raw.github.com/necolas/normalize.css/master/normalize.css'
+    copy_from 'https://raw.github.com/necolas/normalize.css/master/normalize.css', 'app/assets/stylesheets/normalize.css'
   end
   ### GIT ###
   git :add => '.' if prefer :git, true

data/recipes/gems.rb

@@ -15,6 +15,7 @@ gem 'unicorn', '>= 4.3.1', :group => :production if prefer :prod_webserver, 'uni
 gem 'puma', '>= 1.6.1', :group => :production if prefer :prod_webserver, 'puma'
 
 ## Database Adapter
+gsub_file 'Gemfile', /gem 'sqlite3'\n/, '' unless prefer :database, 'sqlite'
 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'

data/recipes/git.rb

@@ -5,12 +5,7 @@
 say_wizard "initialize git"
 prefs[:git] = true unless prefs.has_key? :git
 if prefer :git, true
-  begin
-    remove_file '.gitignore'
-    get 'https://raw.github.com/RailsApps/rails-composer/master/files/gitignore.txt', '.gitignore'
-  rescue OpenURI::HTTPError
-    say_wizard "Unable to obtain gitignore file from the repo"
-  end
+  copy_from 'https://raw.github.com/RailsApps/rails-composer/master/files/gitignore.txt', '.gitignore'
   git :init
   git :add => '.'
   git :commit => "-aqm 'rails_apps_composer: initial commit'"

data/recipes/{database.rb → init.rb}

@@ -1,5 +1,5 @@
 # Application template recipe for the rails_apps_composer. Change the recipe here:
-# https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/database.rb
+# https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/init.rb
 
 after_everything do
   say_wizard "recipe running after everything"
@@ -62,7 +62,7 @@ end # after_everything
 
 __END__
 
-name: database
+name: init
 description: "Set up and initialize database."
 author: RailsApps
 

data/recipes/prelaunch.rb

@@ -37,9 +37,9 @@ end # signup_app
 __END__
 
 name: prelaunch
-description: "Generates a Prelaunch Signup App"
+description: "Not implemented."
 author: RailsApps
 
-requires: [setup, gems, auth, models, controllers, views, frontend, database]
-run_after: [setup, gems, auth, models, controllers, views, frontend, database]
+requires: [setup, gems, auth, models, controllers, views, frontend, init]
+run_after: [setup, gems, auth, models, controllers, views, frontend, init]
 category: apps

data/recipes/railsapps.rb

@@ -11,6 +11,7 @@ prefs[:railsapps] = multiple_choice "Install an example application?",
 
 case prefs[:railsapps]
   when 'rails3-bootstrap-devise-cancan'
+    prefs[:git] = true
     prefs[:database] = 'sqlite'
     prefs[:templates] = 'erb'
     prefs[:unit_test] = 'rspec'
@@ -25,6 +26,7 @@ case prefs[:railsapps]
     prefs[:starter_app] = 'admin_app'
     prefs[:form_builder] = 'none'
   when 'rails3-devise-rspec-cucumber'
+    prefs[:git] = true
     prefs[:database] = 'sqlite'
     prefs[:templates] = 'erb'
     prefs[:unit_test] = 'rspec'
@@ -38,6 +40,7 @@ case prefs[:railsapps]
     prefs[:starter_app] = 'users_app'
     prefs[:form_builder] = 'none'
   when 'rails3-mongoid-devise'
+    prefs[:git] = true
     prefs[:database] = 'mongodb'
     prefs[:orm] = 'mongoid'
     prefs[:templates] = 'erb'
@@ -52,6 +55,7 @@ case prefs[:railsapps]
     prefs[:starter_app] = 'users_app'
     prefs[:form_builder] = 'none'
   when 'rails3-mongoid-omniauth'
+    prefs[:git] = true
     prefs[:database] = 'mongodb'
     prefs[:orm] = 'mongoid'
     prefs[:templates] = 'erb'
@@ -66,6 +70,7 @@ case prefs[:railsapps]
     prefs[:starter_app] = 'users_app'
     prefs[:form_builder] = 'none'
   when 'rails3-subdomains'
+    prefs[:git] = true
     prefs[:database] = 'mongodb'
     prefs[:orm] = 'mongoid'
     prefs[:templates] = 'haml'
@@ -87,6 +92,6 @@ name: railsapps
 description: "Install RailsApps example applications."
 author: RailsApps
 
-requires: [auth, controllers, database, email, extras, frontend, gems, git, models, readme, routes, setup, testing, views]
+requires: [auth, controllers, email, extras, frontend, gems, git, init, models, readme, routes, setup, testing, views]
 run_after: [git]
 category: configuration

data/recipes/readme.rb

@@ -29,8 +29,10 @@ after_everything do
   # Ruby on Rails
   gsub_file "README.textile", /\* Ruby/, "* Ruby version #{RUBY_VERSION}"
   gsub_file "README.textile", /\* Rails/, "* Rails version #{Rails::VERSION::STRING}"
-
+    
   # Database
+  gsub_file "README.textile", /SQLite/, "PostgreSQL" if prefer :database, 'postgresql'
+  gsub_file "README.textile", /SQLite/, "MySQL" if prefer :database, 'mysql'
   gsub_file "README.textile", /SQLite/, "MongoDB" if prefer :database, 'mongodb'
   gsub_file "README.textile", /ActiveRecord/, "the Mongoid ORM" if prefer :orm, 'mongoid'
 

data/recipes/testing.rb

@@ -127,6 +127,21 @@ after_everything do
       remove_file 'spec/helpers/home_helper_spec.rb'
       remove_file 'spec/helpers/users_helper_spec.rb'
     end
+    if (prefer :authentication, 'devise') && (prefer :starter_app, 'admin_app')
+      say_wizard "copying RSpec files from the rails3-bootstrap-devise-cancan examples"
+      repo = 'https://raw.github.com/RailsApps/rails3-bootstrap-devise-cancan/master/'
+      copy_from_repo 'spec/factories/users.rb', :repo => repo
+      gsub_file 'spec/factories/users.rb', /# confirmed_at/, "confirmed_at" if (prefer :devise_modules, 'confirmable') || (prefer :devise_modules, 'invitable')
+      copy_from_repo 'spec/controllers/home_controller_spec.rb', :repo => repo
+      copy_from_repo 'spec/controllers/users_controller_spec.rb', :repo => repo
+      copy_from_repo 'spec/models/user_spec.rb', :repo => repo
+      remove_file 'spec/views/home/index.html.erb_spec.rb'
+      remove_file 'spec/views/home/index.html.haml_spec.rb'
+      remove_file 'spec/views/users/show.html.erb_spec.rb'
+      remove_file 'spec/views/users/show.html.haml_spec.rb'
+      remove_file 'spec/helpers/home_helper_spec.rb'
+      remove_file 'spec/helpers/users_helper_spec.rb'
+    end
     ## RSPEC AND OMNIAUTH
     if (prefer :authentication, 'omniauth') && (prefer :starter_app, 'users_app')
       say_wizard "copying RSpec files from the rails3-mongoid-omniauth examples"
@@ -166,6 +181,31 @@ after_everything do
     When I sign in with valid credentials
     Then I see an unconfirmed account message
     And I should be signed out
+RUBY
+        end
+      end
+    end
+    if (prefer :authentication, 'devise') && (prefer :starter_app, 'admin_app')
+      say_wizard "copying Cucumber scenarios from the rails3-bootstrap-devise-cancan examples"
+      repo = 'https://raw.github.com/RailsApps/rails3-bootstrap-devise-cancan/master/'
+      copy_from_repo 'spec/controllers/home_controller_spec.rb', :repo => repo
+      copy_from_repo 'features/users/sign_in.feature', :repo => repo
+      copy_from_repo 'features/users/sign_out.feature', :repo => repo
+      copy_from_repo 'features/users/sign_up.feature', :repo => repo
+      copy_from_repo 'features/users/user_edit.feature', :repo => repo
+      copy_from_repo 'features/users/user_show.feature', :repo => repo
+      copy_from_repo 'features/step_definitions/user_steps.rb', :repo => repo
+      copy_from_repo 'features/support/paths.rb', :repo => repo
+      if (prefer :devise_modules, 'confirmable') || (prefer :devise_modules, 'invitable')
+        gsub_file 'features/step_definitions/user_steps.rb', /Welcome! You have signed up successfully./, "A message with a confirmation link has been sent to your email address."
+        inject_into_file 'features/users/sign_in.feature', :before => '    Scenario: User signs in successfully' do
+<<-RUBY
+  Scenario: User has not confirmed account
+    Given I exist as an unconfirmed user
+    And I am not logged in
+    When I sign in with valid credentials
+    Then I see an unconfirmed account message
+    And I should be signed out
 RUBY
         end
       end

data/templates/helpers.erb

@@ -49,6 +49,15 @@ def after_everything(&block); @after_everything_blocks << [@current_recipe, bloc
 @before_configs = {}
 def before_config(&block); @before_configs[@current_recipe] = block; end
 
+def copy_from(source, destination)
+  begin
+    remove_file destination
+    get source, destination
+  rescue OpenURI::HTTPError
+    say_wizard "Unable to obtain #{source}"
+  end
+end
+
 def copy_from_repo(filename, opts = {})
   repo = 'https://raw.github.com/RailsApps/rails-composer/master/files/'
   repo = opts[:repo] unless opts[:repo].nil?

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "2.1.2"
+  VERSION = "2.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-12 00:00:00.000000000 Z
+date: 2012-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -155,15 +155,16 @@ files:
 - lib/rails_wizard/recipes.rb
 - lib/rails_wizard/template.rb
 - lib/rails_wizard.rb
+- recipes/all.rb
 - recipes/auth.rb
 - recipes/controllers.rb
-- recipes/database.rb
 - recipes/email.rb
 - recipes/example.rb
 - recipes/extras.rb
 - recipes/frontend.rb
 - recipes/gems.rb
 - recipes/git.rb
+- recipes/init.rb
 - recipes/models.rb
 - recipes/prelaunch.rb
 - recipes/railsapps.rb
@@ -201,7 +202,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3622496980535914871
+      hash: -1918959604150442453
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -210,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3622496980535914871
+      hash: -1918959604150442453
 requirements: []
 rubyforge_project: rails_apps_composer
 rubygems_version: 1.8.24