rails_apps_composer 2.4.44 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcc3be5bac3cdf00543a65af9d5f8234a8e5478f
-  data.tar.gz: d3f09e1f9f55f5bfb2e0beadaa95e2bbb4edde50
+  metadata.gz: 36ee352051fbe10da787c9650b2d93c1ea4e196a
+  data.tar.gz: c858e82ff0c5be3f9004ca8eca377fb1896d0f80
 SHA512:
-  metadata.gz: b2a0254725a93eff8eba126fb43f80311d45037471120f040d1d64a4ba4ae3082acdbf0614d3c4668a1b968beb7d4c299f9150ce35d53a9ee1dcce8453343987
-  data.tar.gz: 96179f1dbc708bdf8f09ff3b3ac8fb6a3781c62e7b8571100b34132e4116ca170a0fd1fbe372d40c17003bd3b86dab4ed321960a6959b4535421aa1ac03bc670
+  metadata.gz: 9d5a9ad35ea687c81e626114e1f57a10eefa81cb91776aee25b98e53a43c42edb346daa7404c8a2ba7aa9820f2201f77ae886f7e3e862799d20dc0ad4f529fac
+  data.tar.gz: 135d89811df5767c941828411f38fef1508155320b8d60db3b8afdf11a02abab74d6b7fe8f8b926383d983fc599bcc9958209a2508c9e741f02de7f2847e7bd6

data/lib/rails_wizard/diagnostics.rb

@@ -23,6 +23,9 @@ module RailsWizard
     @@recipes << %w(controllers email example extras frontend gems git init models prelaunch railsapps readme routes setup testing views)
     @@recipes << %w(controllers email example extras frontend gems git init models prelaunch railsapps readme routes saas setup testing views)
     @@recipes << %w(apps4 controllers core email extras frontend gems git init models prelaunch railsapps readme routes saas setup testing views)
+    @@recipes << %w(apps4 controllers core email extras frontend gems git init models prelaunch railsapps readme routes saas setup testing tests4 views)
+    @@recipes << %w(apps4 controllers core deployment email extras frontend gems git init models prelaunch railsapps readme routes saas setup testing views)
+    @@recipes << %w(apps4 controllers core deployment email extras frontend gems git init models prelaunch railsapps readme routes saas setup testing tests4 views)
 
     ### collections of preferences that are known to work together
 

data/recipes/core.rb

@@ -10,5 +10,5 @@ name: core
 description: "Select all core recipes."
 author: RailsApps
 
-requires: [git, railsapps, setup, readme, gems, testing, email, models, controllers, views, routes, frontend, init, apps4, prelaunch, saas, extras, deployment]
+requires: [git, railsapps, setup, readme, gems, testing, tests4, email, models, controllers, views, routes, frontend, init, apps4, prelaunch, saas, extras, deployment]
 category: collections

data/recipes/gems.rb

@@ -63,43 +63,63 @@ if prefer :templates, 'slim'
 end
 
 ## Testing Framework
-if prefer :unit_test, 'rspec'
-  add_gem 'rspec-rails', :group => [:development, :test]
-  add_gem 'capybara', :group => :test if prefer :integration, 'rspec-capybara'
-  add_gem 'database_cleaner', '1.0.1', :group => :test
-  if prefer :orm, 'mongoid'
-    if rails_4?
-      add_gem 'mongoid-rspec', '>= 1.10.0', :group => :test
-    else
-      add_gem 'mongoid-rspec', :group => :test
+if rails_4_1?
+  if prefer :tests, 'rspec'
+    add_gem 'rspec-rails', '>= 3.0.0.beta2', :group => [:development, :test]
+    add_gem 'factory_girl_rails', :group => [:development, :test]
+    add_gem 'faker', :group => :test
+    add_gem 'capybara', :group => :test
+    add_gem 'database_cleaner', :group => :test
+    add_gem 'launchy', :group => :test
+    add_gem 'selenium-webdriver', :group => :test
+    if prefer :continuous_testing, 'guard'
+      add_gem 'guard-bundler', :group => :development
+      add_gem 'guard-rails', :group => :development
+      add_gem 'guard-rspec', :group => :development
+      add_gem 'rb-inotify', :group => :development, :require => false
+      add_gem 'rb-fsevent', :group => :development, :require => false
+      add_gem 'rb-fchange', :group => :development, :require => false
     end
   end
-  add_gem 'email_spec', :group => :test
-end
-if prefer :unit_test, 'minitest'
-  add_gem 'minitest-spec-rails', :group => :test
-  add_gem 'minitest-wscolor', :group => :test
-  add_gem 'capybara', :group => :test if prefer :integration, 'minitest-capybara'
-end
-if prefer :integration, 'cucumber'
-  add_gem 'cucumber-rails', :group => :test, :require => false
-  add_gem 'database_cleaner', '1.0.1', :group => :test unless prefer :unit_test, 'rspec'
-  add_gem 'launchy', :group => :test
-  add_gem 'capybara', :group => :test
-end
-add_gem 'turnip', '>= 1.1.0', :group => :test if prefer :integration, 'turnip'
-if prefer :continuous_testing, 'guard'
-  add_gem 'guard-bundler', :group => :development
-  add_gem 'guard-cucumber', :group => :development if prefer :integration, 'cucumber'
-  add_gem 'guard-rails', :group => :development
-  add_gem 'guard-rspec', :group => :development if prefer :unit_test, 'rspec'
-  add_gem 'rb-inotify', :group => :development, :require => false
-  add_gem 'rb-fsevent', :group => :development, :require => false
-  add_gem 'rb-fchange', :group => :development, :require => false
+else
+  if prefer :unit_test, 'rspec'
+    add_gem 'rspec-rails', :group => [:development, :test]
+    add_gem 'capybara', :group => :test if prefer :integration, 'rspec-capybara'
+    add_gem 'database_cleaner', '1.0.1', :group => :test
+    if prefer :orm, 'mongoid'
+      if rails_4?
+        add_gem 'mongoid-rspec', '>= 1.10.0', :group => :test
+      else
+        add_gem 'mongoid-rspec', :group => :test
+      end
+    end
+    add_gem 'email_spec', :group => :test
+  end
+  if prefer :unit_test, 'minitest'
+    add_gem 'minitest-spec-rails', :group => :test
+    add_gem 'minitest-wscolor', :group => :test
+    add_gem 'capybara', :group => :test if prefer :integration, 'minitest-capybara'
+  end
+  if prefer :integration, 'cucumber'
+    add_gem 'cucumber-rails', :group => :test, :require => false
+    add_gem 'database_cleaner', '1.0.1', :group => :test unless prefer :unit_test, 'rspec'
+    add_gem 'launchy', :group => :test
+    add_gem 'capybara', :group => :test
+  end
+  add_gem 'turnip', '>= 1.1.0', :group => :test if prefer :integration, 'turnip'
+  if prefer :continuous_testing, 'guard'
+    add_gem 'guard-bundler', :group => :development
+    add_gem 'guard-cucumber', :group => :development if prefer :integration, 'cucumber'
+    add_gem 'guard-rails', :group => :development
+    add_gem 'guard-rspec', :group => :development if prefer :unit_test, 'rspec'
+    add_gem 'rb-inotify', :group => :development, :require => false
+    add_gem 'rb-fsevent', :group => :development, :require => false
+    add_gem 'rb-fchange', :group => :development, :require => false
+  end
+  add_gem 'factory_girl_rails', :group => [:development, :test] if prefer :fixtures, 'factory_girl'
+  add_gem 'fabrication', :group => [:development, :test] if prefer :fixtures, 'fabrication'
+  add_gem 'machinist', :group => :test if prefer :fixtures, 'machinist'
 end
-add_gem 'factory_girl_rails', :group => [:development, :test] if prefer :fixtures, 'factory_girl'
-add_gem 'fabrication', :group => [:development, :test] if prefer :fixtures, 'fabrication'
-add_gem 'machinist', :group => :test if prefer :fixtures, 'machinist'
 
 ## Front-end Framework
 add_gem 'rails_layout', :group => :development

data/recipes/railsapps.rb

@@ -75,9 +75,6 @@ case prefs[:apps4]
     prefs[:templates] = 'erb'
     prefs[:git] = true
     prefs[:database] = 'default'
-    prefs[:unit_test] = false
-    prefs[:integration] = false
-    prefs[:fixtures] = false
     prefs[:frontend] = 'foundation5'
     prefs[:email] = 'gmail'
     prefs[:authentication] = false
@@ -85,7 +82,6 @@ case prefs[:apps4]
     prefs[:authorization] = false
     prefs[:starter_app] = false
     prefs[:form_builder] = 'simple_form'
-    prefs[:continuous_testing] = false
     prefs[:quiet_assets] = true
     prefs[:local_env_file] = 'none'
     prefs[:better_errors] = true
@@ -96,9 +92,6 @@ case prefs[:apps4]
   when 'rails-bootstrap'
     prefs[:git] = true
     prefs[:database] = 'default'
-    prefs[:unit_test] = false
-    prefs[:integration] = false
-    prefs[:fixtures] = false
     prefs[:frontend] = 'bootstrap3'
     prefs[:email] = 'none'
     prefs[:authentication] = false
@@ -114,9 +107,6 @@ case prefs[:apps4]
   when 'rails-foundation'
     prefs[:git] = true
     prefs[:database] = 'default'
-    prefs[:unit_test] = false
-    prefs[:integration] = false
-    prefs[:fixtures] = false
     prefs[:frontend] = 'foundation5'
     prefs[:email] = 'none'
     prefs[:authentication] = false
@@ -131,9 +121,6 @@ case prefs[:apps4]
     prefs[:deployment] = 'none'
   when 'rails-devise'
     prefs[:git] = true
-    prefs[:unit_test] = false
-    prefs[:integration] = false
-    prefs[:fixtures] = false
     prefs[:authentication] = 'devise'
     prefs[:authorization] = false
     prefs[:starter_app] = false
@@ -144,9 +131,6 @@ case prefs[:apps4]
     prefs[:deployment] = 'none'
   when 'rails-devise-pundit'
     prefs[:git] = true
-    prefs[:unit_test] = false
-    prefs[:integration] = false
-    prefs[:fixtures] = false
     prefs[:authentication] = 'devise'
     prefs[:authorization] = 'pundit'
     prefs[:starter_app] = 'admin_app'
@@ -157,9 +141,6 @@ case prefs[:apps4]
     prefs[:deployment] = 'none'
   when 'rails-omniauth'
     prefs[:git] = true
-    prefs[:unit_test] = false
-    prefs[:integration] = false
-    prefs[:fixtures] = false
     prefs[:email] = 'none'
     prefs[:authentication] = 'omniauth'
     prefs[:authorization] = 'none'

data/recipes/setup.rb

@@ -34,8 +34,13 @@ if prefs[:prod_webserver] == 'same'
 end
 
 ## Database Adapter
-prefs[:database] = multiple_choice "Database used in development?", [["SQLite", "sqlite"], ["PostgreSQL", "postgresql"],
-  ["MySQL", "mysql"], ["MongoDB", "mongodb"]] unless prefs.has_key? :database
+if rails_4_1?
+  prefs[:database] = multiple_choice "Database used in development?", [["SQLite", "sqlite"], ["PostgreSQL", "postgresql"],
+    ["MySQL", "mysql"]] unless prefs.has_key? :database
+else
+  prefs[:database] = multiple_choice "Database used in development?", [["SQLite", "sqlite"], ["PostgreSQL", "postgresql"],
+    ["MySQL", "mysql"], ["MongoDB", "mongodb"]] unless prefs.has_key? :database
+end
 case prefs[:database]
   when 'mongodb'
     unless sqlite_detected
@@ -56,12 +61,24 @@ end
 prefs[:templates] = multiple_choice "Template engine?", [["ERB", "erb"], ["Haml", "haml"], ["Slim", "slim"]] unless prefs.has_key? :templates
 
 ## Testing Framework
-if recipes.include? 'testing'
-  prefs[:unit_test] = multiple_choice "Unit testing?", [["Test::Unit", "test_unit"], ["RSpec", "rspec"], ["MiniTest", "minitest"]] unless prefs.has_key? :unit_test
-  prefs[:integration] = multiple_choice "Integration testing?", [["None", "none"], ["RSpec with Capybara", "rspec-capybara"],
-    ["Cucumber with Capybara", "cucumber"], ["Turnip with Capybara", "turnip"], ["MiniTest with Capybara", "minitest-capybara"]] unless prefs.has_key? :integration
-  prefs[:continuous_testing] = multiple_choice "Continuous testing?", [["None", "none"], ["Guard", "guard"]] unless prefs.has_key? :continuous_testing
-  prefs[:fixtures] = multiple_choice "Fixture replacement?", [["None","none"], ["Factory Girl","factory_girl"], ["Machinist","machinist"], ["Fabrication","fabrication"]] unless prefs.has_key? :fixtures
+if rails_4_1?
+  if recipes.include? 'tests4'
+    prefs[:tests] = multiple_choice "Test framework?", [["None", "none"],
+      ["RSpec with Capybara", "rspec"]] unless prefs.has_key? :tests
+    case prefs[:tests]
+      when 'rspec'
+        say_wizard "Adding DatabaseCleaner, FactoryGirl, Faker, Launchy, Selenium"
+        prefs[:continuous_testing] = multiple_choice "Continuous testing?", [["None", "none"], ["Guard", "guard"]] unless prefs.has_key? :continuous_testing
+      end
+  end
+else
+  if recipes.include? 'testing'
+    prefs[:unit_test] = multiple_choice "Unit testing?", [["Test::Unit", "test_unit"], ["RSpec", "rspec"], ["MiniTest", "minitest"]] unless prefs.has_key? :unit_test
+    prefs[:integration] = multiple_choice "Integration testing?", [["None", "none"], ["RSpec with Capybara", "rspec-capybara"],
+      ["Cucumber with Capybara", "cucumber"], ["Turnip with Capybara", "turnip"], ["MiniTest with Capybara", "minitest-capybara"]] unless prefs.has_key? :integration
+    prefs[:continuous_testing] = multiple_choice "Continuous testing?", [["None", "none"], ["Guard", "guard"]] unless prefs.has_key? :continuous_testing
+    prefs[:fixtures] = multiple_choice "Fixture replacement?", [["None","none"], ["Factory Girl","factory_girl"], ["Machinist","machinist"], ["Fabrication","fabrication"]] unless prefs.has_key? :fixtures
+  end
 end
 
 ## Front-end Framework
@@ -91,14 +108,8 @@ if recipes.include? 'models'
       if prefer :orm, 'mongoid'
         prefs[:devise_modules] = multiple_choice "Devise modules?", [["Devise with default modules","default"]] unless prefs.has_key? :devise_modules
       else
-        if rails_4?
-          prefs[:devise_modules] = multiple_choice "Devise modules?", [["Devise with default modules","default"],
-          ["Devise with Confirmable module","confirmable"],
-          ["Devise with Confirmable and Invitable modules","invitable"]] unless prefs.has_key? :devise_modules
-        else
-          prefs[:devise_modules] = multiple_choice "Devise modules?", [["Devise with default modules","default"],
-          ["Devise with Confirmable module","confirmable"]] unless prefs.has_key? :devise_modules
-        end
+        prefs[:devise_modules] = multiple_choice "Devise modules?", [["Devise with default modules","default"],
+        ["Devise with Confirmable module","confirmable"]] unless prefs.has_key? :devise_modules
       end
     when 'omniauth'
       prefs[:omniauth_provider] = multiple_choice "OmniAuth provider?", [["Facebook", "facebook"], ["Twitter", "twitter"], ["GitHub", "github"],

data/recipes/tests4.rb

@@ -0,0 +1,100 @@
+# Application template recipe for the rails_apps_composer. Change the recipe here:
+# https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/tests4.rb
+
+after_bundler do
+  say_wizard "recipe running after 'bundle install'"
+  ### RSPEC ###
+  if prefer :tests, 'rspec'
+    say_wizard "recipe installing RSpec"
+    run 'rm -rf test/' # Removing test folder (not needed for RSpec)
+    generate 'rspec:install'
+    inject_into_file '.rspec', "--format documentation\n", :after => "--color\n"
+    gsub_file 'spec/spec_helper.rb', /ActiveRecord::Migration.check_pending! if defined?(ActiveRecord::Migration)/, "ActiveRecord::Migration.maintain_test_schema!"
+    inject_into_file 'config/application.rb', :after => "Rails::Application\n" do <<-RUBY
+
+    config.generators do |g|
+      g.test_framework :rspec,
+        fixtures: true,
+        view_specs: false,
+        helper_specs: false,
+        routing_specs: false,
+        controller_specs: false,
+        request_specs: false
+      g.fixture_replacement :factory_girl, dir: "spec/factories"
+    end
+
+RUBY
+    end
+    ### Configure Launchy to display CSS and JavaScript
+    create_file 'spec/support/capybara.rb', "Capybara.asset_host = 'http://localhost:3000'\n"
+    ### Configure Database Cleaner to test JavaScript
+    gsub_file 'spec/spec_helper.rb', /config.use_transactional_fixtures = true/, "config.use_transactional_fixtures = false"
+    create_file 'spec/support/database_cleaner.rb' do
+    <<-RUBY
+RSpec.configure do |config|
+  config.before(:suite) do
+    DatabaseCleaner.clean_with(:truncation)
+  end
+
+  config.before(:each) do
+    DatabaseCleaner.strategy = :transaction
+  end
+
+  config.before(:each, :js => true) do
+    DatabaseCleaner.strategy = :truncation
+  end
+
+  config.before(:each) do
+    DatabaseCleaner.start
+  end
+
+  config.append_after(:each) do
+    DatabaseCleaner.clean
+  end
+end
+RUBY
+    end
+    ### Configure FactoryGirl for shortcuts
+    create_file 'spec/support/factory_girl.rb' do
+    <<-RUBY
+RSpec.configure do |config|
+  config.include FactoryGirl::Syntax::Methods
+end
+RUBY
+    end
+    ## RSPEC AND DEVISE
+    if prefer :authentication, 'devise'
+      # add Devise test helpers
+      create_file 'spec/support/devise.rb' do
+      <<-RUBY
+RSpec.configure do |config|
+  config.include Devise::TestHelpers, :type => :controller
+end
+RUBY
+      end
+    end
+  end
+  ### GUARD
+  if prefer :continuous_testing, 'guard'
+    say_wizard "recipe initializing Guard"
+    run 'bundle exec guard init'
+  end
+  ### GIT ###
+  git :add => '-A' if prefer :git, true
+  git :commit => '-qm "rails_apps_composer: testing framework"' if prefer :git, true
+end # after_bundler
+
+after_everything do
+  say_wizard "recipe running after everything"
+  # copy tests from repos here
+end # after_everything
+
+__END__
+
+name: tests4
+description: "Add testing framework."
+author: RailsApps
+
+requires: [setup, gems]
+run_after: [setup, gems]
+category: testing

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "2.4.44"
+  VERSION = "2.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 2.4.44
+  version: 2.5.0
 platform: ruby
 authors:
 - Daniel Kehoe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-12 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -139,6 +139,7 @@ files:
 - recipes/saas.rb
 - recipes/setup.rb
 - recipes/testing.rb
+- recipes/tests4.rb
 - recipes/views.rb
 - spec/rails_wizard/config_spec.rb
 - spec/rails_wizard/recipe_spec.rb