rails_apps_composer 2.1.1 → 2.1.2

data/README.textile

@@ -157,7 +157,7 @@ You'll be prompted for recipes and gems:
 $ rails_apps_composer new myapp
 
 Would you like to skip Test::Unit? (yes for RSpec) (y/n)
-Would you like to skip Active Record? (yes for NoSQL) (y/n)
+Would you like to skip Active Record? (yes for MongoDB) (y/n)
 
 Available Recipes:
 auth: auth
@@ -188,7 +188,7 @@ Provide a list of recipes using the @-r@ flag:
 $ rails_apps_composer new myapp -r git setup readme gems testing auth email models controllers views routes frontend database extras
 
 Would you like to skip Test::Unit? (yes for RSpec) (y/n)
-Would you like to skip Active Record? (yes for NoSQL) (y/n)
+Would you like to skip Active Record? (yes for MongoDB) (y/n)
 What gem would you like to add? (blank to finish) 
 
 Generating basic application, using:
@@ -209,7 +209,7 @@ Use the @my_defaults.yaml@ file to specify a list of recipes, preferences, and e
 
 h3. Generate an Application Template Interactively
 
-You may want an application template to share with others. For an example of an application template, see the "Rails Composer":http://railsapps.github.com/rails-composer/ tool or various "application templates":https://github.com/RailsApps/rails3-application-templates from the RailsApps project.
+You may want an application template to share with others. For an example of an application template, see the "Rails Composer":http://railsapps.github.com/rails-composer/ project.
 
 Specify a filename for the template:
 

data/lib/rails_wizard/command.rb

@@ -123,7 +123,7 @@ module RailsWizard
               break
           end
         end
-        question = "#{bold}Would you like to skip Active Record? (yes for NoSQL) \033[33m(y/n)\033[0m#{clear}"
+        question = "#{bold}Would you like to skip Active Record? (yes for MongoDB) \033[33m(y/n)\033[0m#{clear}"
         while getO = ask(question)
           case getO.downcase
             when "yes", "y"

data/recipes/auth.rb

@@ -57,7 +57,7 @@ RUBY
   ### CANCAN ###
   if prefer :authorization, 'cancan'
     generate 'cancan:ability'
-    if prefer :starter_app, 'admin_dashboard'
+    if prefer :starter_app, 'admin_app'
       # Limit access to the users#index page
       inject_into_file 'app/models/ability.rb', :after => "def initialize(user)\n" do <<-RUBY
     user ||= User.new # guest user (not logged in)

data/recipes/gems.rb

@@ -12,7 +12,7 @@ gem 'unicorn', '>= 4.3.1', :group => [:development, :test] if prefer :dev_webser
 gem 'puma', '>= 1.5.0', :group => [:development, :test] if prefer :dev_webserver, 'puma'
 gem 'thin', '>= 1.4.1', :group => :production if prefer :prod_webserver, 'thin'
 gem 'unicorn', '>= 4.3.1', :group => :production if prefer :prod_webserver, 'unicorn'
-gem 'puma', '>= 1.5.0', :group => :production if prefer :prod_webserver, 'puma'
+gem 'puma', '>= 1.6.1', :group => :production if prefer :prod_webserver, 'puma'
 
 ## Database Adapter
 gem 'mongoid', '>= 3.0.3' if prefer :orm, 'mongoid'
@@ -23,7 +23,7 @@ copy_from_repo 'config/database-mysql.yml', :prefs => 'mysql'
 
 ## Template Engine
 if prefer :templates, 'haml'
-  gem 'haml', '>= 3.1.6'
+  gem 'haml', '>= 3.1.7'
   gem 'haml-rails', '>= 0.3.4', :group => :development
   # hpricot and ruby_parser are needed for conversion of HTML to Haml
   gem 'hpricot', '>= 0.8.6', :group => :development

data/recipes/git.rb

@@ -7,7 +7,7 @@ prefs[:git] = true unless prefs.has_key? :git
 if prefer :git, true
   begin
     remove_file '.gitignore'
-    get 'https://raw.github.com/RailsApps/rails3-application-templates/master/files/gitignore.txt', '.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

data/recipes/railsapps.rb

@@ -3,39 +3,39 @@
 
 prefs[:railsapps] = multiple_choice "Install an example application?", 
   [["No, let me build my own application", "none"], 
-  ["rails3-devise-rspec-cucumber", "rails3-devise-rspec-cucumber"], 
   ["rails3-bootstrap-devise-cancan", "rails3-bootstrap-devise-cancan"], 
+  ["rails3-devise-rspec-cucumber", "rails3-devise-rspec-cucumber"], 
   ["rails3-mongoid-devise", "rails3-mongoid-devise"],
   ["rails3-mongoid-omniauth", "rails3-mongoid-omniauth"],
   ["rails3-subdomains", "rails3-subdomains"]] unless prefs.has_key? :railsapps
 
 case prefs[:railsapps]
-  when 'rails3-devise-rspec-cucumber'
+  when 'rails3-bootstrap-devise-cancan'
     prefs[:database] = 'sqlite'
     prefs[:templates] = 'erb'
     prefs[:unit_test] = 'rspec'
     prefs[:integration] = 'cucumber'
     prefs[:fixtures] = 'factory_girl'
-    prefs[:frontend] = 'none'
+    prefs[:frontend] = 'bootstrap'
+    prefs[:bootstrap] = 'sass'
     prefs[:email] = 'gmail'
     prefs[:authentication] = 'devise'
     prefs[:devise_modules] = 'default'
-    prefs[:authorization] = 'none'
-    prefs[:starter_app] = 'users_app'
+    prefs[:authorization] = 'cancan'
+    prefs[:starter_app] = 'admin_app'
     prefs[:form_builder] = 'none'
-  when 'rails3-bootstrap-devise-cancan'
+  when 'rails3-devise-rspec-cucumber'
     prefs[:database] = 'sqlite'
     prefs[:templates] = 'erb'
     prefs[:unit_test] = 'rspec'
     prefs[:integration] = 'cucumber'
     prefs[:fixtures] = 'factory_girl'
-    prefs[:frontend] = 'bootstrap'
-    prefs[:bootstrap] = 'sass'
+    prefs[:frontend] = 'none'
     prefs[:email] = 'gmail'
     prefs[:authentication] = 'devise'
     prefs[:devise_modules] = 'default'
-    prefs[:authorization] = 'cancan'
-    prefs[:starter_app] = 'admin_app'
+    prefs[:authorization] = 'none'
+    prefs[:starter_app] = 'users_app'
     prefs[:form_builder] = 'none'
   when 'rails3-mongoid-devise'
     prefs[:database] = 'mongodb'

data/recipes/setup.rb

@@ -35,7 +35,14 @@ case prefs[:database]
     unless sqlite_detected
       prefs[:orm] = multiple_choice "How will you connect to MongoDB?", [["Mongoid","mongoid"]] unless prefs.has_key? :orm
     else
-      raise StandardError.new "SQLite detected in the Gemfile. Use '-O' or '--skip-activerecord' as in 'rails new foo -O' if you don't want ActiveRecord and SQLite"
+      say_wizard "WARNING! SQLite gem detected in the Gemfile"
+      say_wizard "If you wish to use MongoDB you must skip Active Record."
+      say_wizard "When launching rails_apps_composer, choose 'skip Active Record'."
+      say_wizard "If using an application template, use the '-O' flag as in 'rails new foo -O'."
+      prefs[:fail] = multiple_choice "Abort or continue?", [["abort", "abort"], ["continue", "continue"]]
+      if prefer :fail, 'abort'
+        raise StandardError.new "SQLite detected in the Gemfile. Use '-O' or '--skip-activerecord' as in 'rails new foo -O' if you don't want ActiveRecord and SQLite"
+      end
     end
 end
 

data/templates/helpers.erb

@@ -50,7 +50,7 @@ def after_everything(&block); @after_everything_blocks << [@current_recipe, bloc
 def before_config(&block); @before_configs[@current_recipe] = block; end
 
 def copy_from_repo(filename, opts = {})
-  repo = 'https://raw.github.com/RailsApps/rails3-application-templates/master/files-v2/'
+  repo = 'https://raw.github.com/RailsApps/rails-composer/master/files/'
   repo = opts[:repo] unless opts[:repo].nil?
   if (!opts[:prefs].nil?) && (!prefs.has_value? opts[:prefs])
     return

data/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -201,7 +201,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4222109462404343651
+      hash: -3622496980535914871
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -210,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4222109462404343651
+      hash: -3622496980535914871
 requirements: []
 rubyforge_project: rails_apps_composer
 rubygems_version: 1.8.24