gb-firestarter 0.3.1 → 0.4.0

data/lib/firestarter/generators/app_generator.rb

@@ -1,34 +1,37 @@
-require 'rails/generators'
-require 'rails/generators/rails/app/app_generator'
+require "rails/generators"
+require "rails/generators/rails/app/app_generator"
 
 module Firestarter
-  class AppGenerator < Rails::Generators::AppGenerator
-    class_option :database, :type => :string, :aliases => '-d', :default => 'postgresql',
-      :desc => "Preconfigure for selected database (options: #{DATABASES.join('/')})"
+  class AppGenerator < Rails::Generators::AppGenerator # rubocop:disable Metrics/ClassLength
+    class_option :database, type: :string, aliases: "-d", default: "postgresql",
+      desc: "Preconfigure for selected database (options: #{DATABASES.join('/')})"
 
-    class_option :github, :type => :string, :aliases => '-G', :default => nil,
-      :desc => 'Create Github repository and add remote origin pointed to repo'
+    class_option :github, type: :string, aliases: "-G", default: nil,
+      desc: "Create Github repository and add remote origin pointed to repo"
 
-    class_option :skip_test_unit, :type => :boolean, :aliases => '-T', :default => true,
-      :desc => 'Skip Test::Unit files'
+    class_option :skip_test_unit, type: :boolean, aliases: "-T", default: true,
+        desc: "Skip Test::Unit files"
+
+    class_option :skip_bundle, type: :boolean, aliases: "-B", default: true,
+      desc: "Don't run bundle install"
 
     def finish_template
       invoke :firestarter_customization
       super
     end
 
-    def firestarter_customization
+    def firestarter_customization # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       invoke :customize_gemfile
+      invoke :bundle_install
       invoke :setup_development_environment
       invoke :setup_test_environment
       invoke :setup_production_environment
       invoke :setup_staging_environment
       invoke :setup_secret_token
       invoke :create_firestarter_views
-      invoke :setup_coffeescript
+      invoke :setup_javascript
       invoke :configure_app
       invoke :setup_stylesheets
-      invoke :copy_miscellaneous_files
       invoke :customize_error_pages
       invoke :remove_routes_comment_lines
       invoke :setup_git
@@ -40,13 +43,12 @@ module Firestarter
     def customize_gemfile
       build :replace_gemfile
       build :set_ruby_to_version_being_used
-      bundle_command 'install'
     end
 
     def setup_database
-      say 'Setting up database'
+      say "Setting up database"
 
-      if 'postgresql' == options[:database]
+      if "postgresql" == options[:database]
         build :use_postgres_config_template
       end
 
@@ -58,7 +60,7 @@ module Firestarter
     end
 
     def setup_development_environment
-      say 'Setting up the development environment'
+      say "Setting up the development environment"
       build :raise_on_delivery_errors
       build :raise_on_unpermitted_parameters
       build :provide_setup_script
@@ -67,7 +69,7 @@ module Firestarter
     end
 
     def setup_test_environment
-      say 'Setting up the test environment'
+      say "Setting up the test environment"
       build :enable_factory_girl_syntax
       build :test_factories_first
       build :generate_rspec
@@ -78,36 +80,38 @@ module Firestarter
     end
 
     def setup_production_environment
-      say 'Setting up the production environment'
+      say "Setting up the production environment"
       build :configure_smtp
       build :enable_rack_deflater
     end
 
     def setup_staging_environment
-      say 'Setting up the staging environment'
+      say "Setting up the staging environment"
       build :setup_staging_environment
     end
 
     def setup_secret_token
-      say 'Moving secret token out of version control'
+      say "Moving secret token out of version control"
       build :setup_secret_token
     end
 
     def create_firestarter_views
-      say 'Creating firestarter views'
+      say "Creating firestarter views"
       build :create_partials_directory
       build :create_shared_flashes
       build :create_shared_javascripts
       build :create_application_layout
     end
 
-    def setup_coffeescript
-      say 'Setting up CoffeeScript defaults'
+    def setup_javascript
+      say "Setting up JS defaults"
       build :remove_turbolinks
+      build :remove_require_tree
+      build :add_retina_tag
     end
 
-    def configure_app
-      say 'Configuring app'
+    def configure_app # rubocop:disable Metrics/MethodLength
+      say "Configuring app"
       build :configure_action_mailer
       build :configure_time_zone
       build :configure_time_formats
@@ -117,16 +121,17 @@ module Firestarter
       build :setup_default_rake_task
       build :configure_puma
       build :setup_foreman
+      build :use_rubocop_config
     end
 
     def setup_stylesheets
-      say 'Set up stylesheets'
+      say "Set up stylesheets"
       build :setup_stylesheets
     end
 
     def setup_git
-      if !options[:skip_git]
-        say 'Initializing git'
+      unless options[:skip_git]
+        say "Initializing git"
         invoke :setup_gitignore
         invoke :init_git
       end
@@ -140,13 +145,8 @@ module Firestarter
       build :init_git
     end
 
-    def copy_miscellaneous_files
-      say 'Copying miscellaneous support files'
-      build :copy_miscellaneous_files
-    end
-
     def customize_error_pages
-      say 'Customizing the 500/404/422 pages'
+      say "Customizing the 500/404/422 pages"
       build :customize_error_pages
     end
 
@@ -154,12 +154,12 @@ module Firestarter
       build :remove_routes_comment_lines
     end
 
-    def outro
-      say 'Congratulations! You just started a fire.'
+    def bundle_install
+      bundle_command "install"
     end
 
-    def run_bundle
-      # Let's not: We'll bundle manually at the right spot
+    def outro
+      say "Congratulations! You just started a fire."
     end
 
     def ruby_version_with_patch_level
@@ -168,7 +168,7 @@ module Firestarter
 
     protected
 
-    def get_builder_class
+    def get_builder_class # rubocop:disable Style/AccessorMethodName
       Firestarter::AppBuilder
     end
 
@@ -177,8 +177,8 @@ module Firestarter
     end
 
     def patch_level
-      if RUBY_PATCHLEVEL == 0 && RUBY_VERSION >= '2.1.0'
-        ''
+      if RUBY_PATCHLEVEL == 0 && RUBY_VERSION >= "2.1.0"
+        ""
       else
         "-p#{RUBY_PATCHLEVEL}"
       end

data/lib/firestarter/version.rb

@@ -1,4 +1,4 @@
 module Firestarter
-  RAILS_VERSION = ENV['RAILS_VERSION'] || '4.2.0'
-  VERSION = '0.3.1'
+  RAILS_VERSION = ENV["RAILS_VERSION"] || "4.2.0"
+  VERSION = "0.4.0"
 end

data/spec/features/new_project_spec.rb

@@ -1,38 +1,36 @@
-require 'spec_helper'
+require "spec_helper"
 
-feature 'Suspend a new project with default configuration' do
-  scenario 'specs pass' do
+RSpec.describe "ignite a new project with default configuration" do
+  before(:all) do
+    drop_dummy_database
+    remove_project_directory
     run_firestarter
+    setup_app_dependencies
+  end
 
+  it "passes the specs" do
     Dir.chdir(project_path) do
       Bundler.with_clean_env do
-        expect(`rake`).to include('0 failures')
+        expect(`rake`).to include("0 failures")
       end
     end
   end
 
-  scenario 'staging config is inherited from production' do
-    run_firestarter
-
+  it "inherits the staging config from production" do
     staging_file = IO.read("#{project_path}/config/environments/staging.rb")
     config_stub = "Dummy::Application.configure do"
-    expect(staging_file).to match(/^require_relative 'production'/)
+    expect(staging_file).to match(/^require_relative "production"/)
     expect(staging_file).to match(/#{config_stub}/), staging_file
   end
 
-  if RUBY_PATCHLEVEL == 0 && RUBY_VERSION >= '2.1.0'
-    scenario '.ruby-version does not include patchlevel for Ruby 2.1.0+' do
-      run_firestarter
+  it "creates .ruby-version from Suspenders .ruby-version" do
+    ruby_version_file = IO.read("#{project_path}/.ruby-version")
+    expect(ruby_version_file).to eq "#{RUBY_VERSION}\n"
+  end
 
-      ruby_version_file = IO.read("#{project_path}/.ruby-version")
-      expect(ruby_version_file).to eq "#{RUBY_VERSION}\n"
-    end
-  else
-    scenario '.ruby-version includes patchlevel for all pre-Ruby 2.1.0 versions' do
-      run_firestarter
+  it "downloads a .rubocop.yml" do
+    rubocop_file = IO.read("#{project_path}/.rubocop.yml")
 
-      ruby_version_file = IO.read("#{project_path}/.ruby-version")
-      expect(ruby_version_file).to eq "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}\n"
-    end
+    expect(rubocop_file).to match %r{Style/StringLiterals}
   end
 end

data/spec/spec_helper.rb

@@ -1,11 +1,11 @@
-require 'capybara/rspec'
-require 'bundler/setup'
+require "capybara/rspec"
+require "bundler/setup"
 
 Bundler.require(:default, :test)
 
-require (Pathname.new(__FILE__).dirname + '../lib/firestarter').expand_path
+require File.join(Pathname.new(__FILE__).dirname, "../lib/firestarter")
 
-Dir['./spec/support/**/*.rb'].each { |file| require file }
+Dir["./spec/support/**/*.rb"].each { |file| require file }
 
 RSpec.configure do |config|
   config.include FirestarterTestHelpers
@@ -13,9 +13,4 @@ RSpec.configure do |config|
   config.before(:all) do
     create_tmp_directory
   end
-
-  config.before(:each) do
-    drop_dummy_database
-    remove_project_directory
-  end
 end

data/spec/support/firestarter.rb

@@ -1,5 +1,5 @@
 module FirestarterTestHelpers
-  APP_NAME = 'dummy'
+  APP_NAME = "dummy"
 
   def remove_project_directory
     FileUtils.rm_rf(project_path)
@@ -12,15 +12,15 @@ module FirestarterTestHelpers
   def run_firestarter(arguments = nil)
     Dir.chdir(tmp_path) do
       Bundler.with_clean_env do
-        ENV['TESTING'] = '1'
+        ENV["TESTING"] = "1"
 
-        %x(#{firestarter_bin} #{APP_NAME} #{arguments})
+        `bundle exec #{firestarter_bin} #{APP_NAME} #{arguments}`
       end
     end
   end
 
   def drop_dummy_database
-    if File.exists?(project_path)
+    if File.exist?(project_path)
       Dir.chdir(project_path) do
         Bundler.with_clean_env do
           `rake db:drop`
@@ -29,6 +29,16 @@ module FirestarterTestHelpers
     end
   end
 
+  def setup_app_dependencies
+    if File.exist?(project_path)
+      Dir.chdir(project_path) do
+        Bundler.with_clean_env do
+          `bundle check || bundle install`
+        end
+      end
+    end
+  end
+
   def project_path
     @project_path ||= Pathname.new("#{tmp_path}/#{APP_NAME}")
   end
@@ -40,10 +50,10 @@ module FirestarterTestHelpers
   end
 
   def firestarter_bin
-    File.join(root_path, 'bin', 'firestarter')
+    File.join(root_path, "bin", "firestarter")
   end
 
   def root_path
-    File.expand_path('../../../', __FILE__)
+    File.expand_path("../../../", __FILE__)
   end
 end

data/templates/Gemfile.erb

@@ -1,56 +1,49 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-ruby '<%= RUBY_VERSION %>'
+ruby "<%= RUBY_VERSION %>"
 
-gem 'bourbon'
-gem 'coffee-rails'
-gem 'dotenv-rails'
-gem 'email_validator'
-gem 'foreman'
-gem 'jquery-rails'
-gem 'pg'
-gem 'pry-rails'
-gem 'puma'
-gem 'rack-timeout'
-gem 'rails', '~> <%= Firestarter::RAILS_VERSION %>'
-gem 'recipient_interceptor'
-gem 'sass-rails'
-gem 'slim-rails'
-gem 'title'
-gem 'uglifier'
+gem "clearance"
+gem "foreman"
+gem "jquery-rails"
+gem "pg"
+gem "pry-rails"
+gem "puma"
+gem "rails", "~> <%= Firestarter::RAILS_VERSION %>"
+gem "retina_tag", github: "naps62/retina_tag", ref: "9389bec"
+gem "sass-rails"
+gem "slim-rails"
 
 group :development do
-  gem 'better_errors'
-  gem 'binding_of_caller'
-  gem 'letter_opener'
+  gem "better_errors"
+  gem "binding_of_caller"
+  gem "letter_opener"
+  gem "quiet_assets"
+  gem "spring", require: false
+  gem "spring-commands-rspec", require: false
 end
 
 group :development, :test do
-  gem 'awesome_print'
-  gem 'factory_girl_rails'
-  gem 'rspec-rails', '~> 3.0'
-  gem 'rubocop', require: false
-  gem 'scss_lint', require: false
+  gem "factory_girl_rails"
+  gem "pry-remote", github: "Mon-Ouie/pry-remote"
+  gem "rspec-rails", "~> 3.0"
+  gem "rubocop", require: false
+  gem "scss_lint", require: false
 end
 
 group :test do
-  gem 'capybara-webkit', '>= 1.0.0'
-  gem 'database_cleaner'
-  gem 'launchy'
-  gem 'simplecov', require: false
-  gem 'timecop'
-  gem 'webmock'
-end
+  gem "capybara"
+  gem "database_cleaner"
+  gem "simplecov", require: false
+  gem "timecop"
+  gem "webmock"
 
-group :production, :staging do
-  gem 'rails_12factor'
+  install_if -> { `cat /etc/os-release 2> /dev/null` !~ /Arch Linux/ } do
+    gem "capybara-webkit"
+  end
 end
 
-group :deploy do
-  gem 'capistrano', '~> 3.2.1', require: false
-  gem 'capistrano-rails', require: false
-  gem 'capistrano-rvm', require: false
-  gem 'capistrano-bundler', require: false
-  gem 'capistrano3-env', require: false
-  gem 'capistrano-foreman', github: 'groupbuddies/capistrano-foreman', branch: :master
+group :production, :staging do
+  gem "rack-timeout"
+  gem "rails_12factor"
+  gem "uglifier"
 end

data/templates/database_cleaner_rspec.rb

@@ -7,7 +7,7 @@ RSpec.configure do |config|
     DatabaseCleaner.strategy = :transaction
   end
 
-  config.before(:each, :js => true) do
+  config.before(:each, js: true) do
     DatabaseCleaner.strategy = :deletion
   end
 

data/templates/development_seeds.rb

@@ -1,9 +1,9 @@
 if Rails.env.development?
-  require 'factory_girl'
+  require "factory_girl"
 
   namespace :dev do
-    desc 'Seed data for development environment'
-    task setup: 'db:setup' do
+    desc "Seed data for development environment"
+    task setup: "db:setup" do
       FactoryGirl.find_definitions
       include FactoryGirl::Syntax::Methods