slining 1.1.0 → 1.2.0

data/lib/slining/generators/app_generator.rb

@@ -41,9 +41,11 @@ module Slining
       invoke :setup_stylesheets
       invoke :copy_miscellaneous_files
       invoke :customize_error_pages
+      invoke :remove_config_comment_lines
       invoke :remove_routes_comment_lines
       invoke :setup_git
       invoke :setup_database
+      invoke :setup_dotfiles
       invoke :create_heroku_apps
       invoke :create_github_repo
       invoke :setup_segment
@@ -57,10 +59,11 @@ module Slining
       build :set_ruby_to_version_being_used
 
       if options[:heroku]
-        build :setup_heroku_specific_gems
+        build :set_up_heroku_specific_gems
       end
 
       bundle_command 'install'
+      build :configure_simple_form
     end
 
     def setup_database
@@ -75,28 +78,34 @@ module Slining
 
     def setup_development_environment
       say 'Setting up the development environment'
+      build :raise_on_missing_assets_in_test
       build :raise_on_delivery_errors
       build :set_test_delivery_method
+      build :add_bullet_gem_configuration
       build :raise_on_unpermitted_parameters
       build :provide_setup_script
       build :provide_dev_prime_task
       build :configure_generators
       build :configure_i18n_for_missing_translations
+      build :configure_quiet_assets
     end
 
     def setup_test_environment
       say 'Setting up the test environment'
       build :set_up_factory_girl_for_rspec
+      build :generate_factories_file
       build :set_up_hound
       build :generate_rspec
       build :configure_rspec
       build :configure_background_jobs_for_rspec
       build :enable_database_cleaner
+      build :provide_shoulda_matchers_config
       build :configure_spec_support_features
-      build :configure_travis
+      build :configure_ci
       build :configure_i18n_for_test_environment
       build :configure_i18n_tasks
       build :configure_action_mailer_in_specs
+      build :configure_capybara_webkit
     end
 
     def setup_production_environment
@@ -132,12 +141,11 @@ module Slining
       build :configure_action_mailer
       build :configure_active_job
       build :configure_time_formats
-      build :configure_simple_form
       build :disable_xml_params
       build :fix_i18n_deprecation_warning
       build :setup_default_rake_task
-      build :configure_unicorn
-      build :setup_foreman
+      build :configure_puma
+      build :set_up_forego
     end
 
     def setup_stylesheets
@@ -161,6 +169,7 @@ module Slining
         build :set_heroku_remotes
         build :set_heroku_rails_secrets
         build :provide_deploy_script
+        build :configure_automatic_deployment
       end
     end
 
@@ -176,6 +185,10 @@ module Slining
       build :setup_segment
     end
 
+    def setup_dotfiles
+      build :copy_dotfiles
+    end
+
     def setup_gitignore
       build :gitignore_files
     end
@@ -204,6 +217,10 @@ module Slining
       build :customize_error_pages
     end
 
+    def remove_config_comment_lines
+      build :remove_config_comment_lines
+    end
+
     def remove_routes_comment_lines
       build :remove_routes_comment_lines
     end

data/lib/slining/version.rb

@@ -1,5 +1,5 @@
 module Slining
   RAILS_VERSION = "4.2.1"
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/slining.gemspec

@@ -31,4 +31,5 @@ rush to build something amazing; don't use it if you like missing deadlines.
   s.add_dependency 'rails', Slining::RAILS_VERSION
 
   s.add_development_dependency 'rspec', '~> 3.2'
+  s.add_development_dependency 'codeclimate-test-reporter'
 end

data/spec/adapters/heroku_spec.rb

@@ -0,0 +1,52 @@
+require "spec_helper"
+
+module Slining
+  module Adapters
+    RSpec.describe Heroku do
+      it "sets the heroku remotes" do
+        setup_file = "bin/setup"
+        app_builder = double(app_name: app_name)
+        allow(app_builder).to receive(:append_file)
+
+        Heroku.new(app_builder).set_heroku_remotes
+
+        expect(app_builder).to have_received(:append_file).
+          with(setup_file, /heroku join --app #{app_name.dasherize}-production/)
+        expect(app_builder).to have_received(:append_file).
+          with(setup_file, /heroku join --app #{app_name.dasherize}-staging/)
+      end
+
+      it "sets up the heroku specific gems" do
+        app_builder = double(app_name: app_name)
+        allow(app_builder).to receive(:inject_into_file)
+
+        Heroku.new(app_builder).set_up_heroku_specific_gems
+
+        expect(app_builder).to have_received(:inject_into_file).
+          with("Gemfile", /rails_stdout_logging/, anything)
+      end
+
+      it "sets the heroku rails secrets" do
+        app_builder = double(app_name: app_name)
+        allow(app_builder).to receive(:run)
+
+        Heroku.new(app_builder).set_heroku_rails_secrets
+
+        expect(app_builder).to(
+          have_configured_var("staging", "SECRET_KEY_BASE"),
+        )
+        expect(app_builder).to(
+          have_configured_var("production", "SECRET_KEY_BASE"),
+        )
+      end
+
+      def app_name
+        SliningTestHelpers::APP_NAME
+      end
+
+      def have_configured_var(remote_name, var)
+        have_received(:run).with(/config:add #{var}=.+ --remote #{remote_name}/)
+      end
+    end
+  end
+end

data/spec/features/heroku_spec.rb

@@ -1,46 +1,72 @@
 require "spec_helper"
 
 RSpec.describe "Heroku" do
-  before do
-    drop_dummy_database
-    remove_project_directory
-  end
+  context "--heroku" do
+    before(:all) do
+      clean_up
+      run_slining("--heroku=true")
+    end
+
+    it "slinings a project for Heroku" do
+      app_name = SliningTestHelpers::APP_NAME.dasherize
+
+      expect(FakeHeroku).to(
+        have_gem_included(project_path, "rails_stdout_logging"),
+      )
+      expect(FakeHeroku).to have_created_app_for("staging")
+      expect(FakeHeroku).to have_created_app_for("production")
+      expect(FakeHeroku).to have_configured_vars("staging", "SECRET_KEY_BASE")
+      expect(FakeHeroku).to have_configured_vars(
+        "production",
+        "SECRET_KEY_BASE",
+      )
 
-  it "slining a project for Heroku" do
-    run_slining("--heroku=true")
+      bin_setup_path = "#{project_path}/bin/setup"
+      bin_setup = IO.read(bin_setup_path)
 
-    expect(FakeHeroku).to(
-      have_gem_included(project_path, "rails_stdout_logging")
-    )
-    expect(FakeHeroku).to have_created_app_for("staging")
-    expect(FakeHeroku).to have_created_app_for("production")
-    expect(FakeHeroku).to have_configured_vars("staging", "SECRET_KEY_BASE")
-    expect(FakeHeroku).to have_configured_vars("production", "SECRET_KEY_BASE")
+      expect(bin_setup).to include("heroku join --app #{app_name}-production")
+      expect(bin_setup).to include("heroku join --app #{app_name}-staging")
+      expect(File.stat(bin_setup_path)).to be_executable
 
-    bin_setup_path = "#{project_path}/bin/setup"
-    bin_setup = IO.read(bin_setup_path)
-    app_name = SliningTestHelpers::APP_NAME.dasherize
+      bin_deploy_path = "#{project_path}/bin/deploy"
+      bin_deploy = IO.read(bin_deploy_path)
 
-    expect(bin_setup).to include("heroku join --app #{app_name}-production")
-    expect(bin_setup).to include("heroku join --app #{app_name}-staging")
-    expect(File.stat(bin_setup_path)).to be_executable
+      expect(bin_deploy).to include("heroku run rake db:migrate")
+      expect(File.stat(bin_deploy_path)).to be_executable
 
-    bin_deploy_path = "#{project_path}/bin/deploy"
-    bin_deploy = IO.read(bin_deploy_path)
+      readme = IO.read("#{project_path}/README.md")
 
-    expect(bin_deploy).to include("heroku run rake db:migrate")
-    expect(File.stat(bin_deploy_path)).to be_executable
+      expect(readme).to include("./bin/deploy staging")
+      expect(readme).to include("./bin/deploy production")
 
-    readme = IO.read("#{project_path}/README.md")
+      circle_yml_path = "#{project_path}/circle.yml"
+      circle_yml = IO.read(circle_yml_path)
 
-    expect(readme).to include("./bin/deploy staging")
-    expect(readme).to include("./bin/deploy production")
+      expect(circle_yml).to include <<-YML.strip_heredoc
+      deployment:
+        staging:
+          branch: master
+          commands:
+            - bin/deploy staging
+      YML
+    end
   end
 
-  it "slining a project with extra Heroku flags" do
-    run_slining(%{--heroku=true --heroku-flags="--region eu"})
+  context "--heroku with region flag" do
+    before(:all) do
+      clean_up
+      run_slining(%{--heroku=true --heroku-flags="--region eu"})
+    end
 
-    expect(FakeHeroku).to have_created_app_for("staging", "--region eu")
-    expect(FakeHeroku).to have_created_app_for("production", "--region eu")
+    it "slinings a project with extra Heroku flags" do
+      expect(FakeHeroku).to have_created_app_for("staging", "--region eu")
+      expect(FakeHeroku).to have_created_app_for("production", "--region eu")
+    end
+  end
+
+  def clean_up
+    drop_dummy_database
+    remove_project_directory
+    FakeHeroku.clear!
   end
 end

data/spec/features/new_project_spec.rb

@@ -29,6 +29,10 @@ RSpec.describe "Slining a new project with default configuration" do
     expect(ruby_version_file).to eq "#{RUBY_VERSION}\n"
   end
 
+  it "copies dotfiles" do
+    expect(File).to exist("#{project_path}/.ctags")
+  end
+
   it "loads secret_key_base from env" do
     secrets_file = IO.read("#{project_path}/config/secrets.yml")
 
@@ -39,6 +43,10 @@ RSpec.describe "Slining a new project with default configuration" do
     expect(File).to exist("#{project_path}/spec/support/action_mailer.rb")
   end
 
+  it "configures capybara-webkit" do
+    expect(File).to exist("#{project_path}/spec/support/capybara_webkit.rb")
+  end
+
   it "adds support file for i18n" do
     expect(File).to exist("#{project_path}/spec/support/i18n.rb")
   end
@@ -72,6 +80,14 @@ RSpec.describe "Slining a new project with default configuration" do
     )
   end
 
+  it "adds explicit quiet_assets configuration" do
+    result = IO.read("#{project_path}/config/application.rb")
+
+    expect(result).to match(
+      /^ +config.quiet_assets = true$/
+    )
+  end
+
   it "raises on missing translations in development and test" do
     %w[development test].each do |environment|
       environment_file =
@@ -107,6 +123,12 @@ RSpec.describe "Slining a new project with default configuration" do
       to match(/^ +config.action_mailer.delivery_method = :test$/)
   end
 
+  it "uses APPLICATION_HOST, not HOST in the production config" do
+    prod_env_file = IO.read("#{project_path}/config/environments/production.rb")
+    expect(prod_env_file).to match(/"APPLICATION_HOST"/)
+    expect(prod_env_file).not_to match(/"HOST"/)
+  end
+
   it "configs active job queue adapter" do
     application_config = IO.read("#{project_path}/config/application.rb")
     test_config = IO.read("#{project_path}/config/environments/test.rb")
@@ -119,16 +141,56 @@ RSpec.describe "Slining a new project with default configuration" do
     )
   end
 
+  it "configs bullet gem in development" do
+    test_config = IO.read("#{project_path}/config/environments/development.rb")
+
+    expect(test_config).to match /^ +Bullet.enable = true$/
+    expect(test_config).to match /^ +Bullet.bullet_logger = true$/
+    expect(test_config).to match /^ +Bullet.rails_logger = true$/
+  end
+
+  it "configs missing assets to raise in test" do
+    test_config = IO.read("#{project_path}/config/environments/test.rb")
+    expect(test_config).to match /^ +config.assets.raise_runtime_errors = true$/
+  end
+
   it "adds spring to binstubs" do
     expect(File).to exist("#{project_path}/bin/spring")
 
-    spring_line = /^ +load File.expand_path\("\.\.\/spring", __FILE__\)$/
-    bin_stubs = %w(rake rails rspec)
-    bin_stubs.each do |bin_stub|
-      expect(IO.read("#{project_path}/bin/#{bin_stub}")).to match(spring_line)
+    bin_stub_files = [
+      IO.read("#{project_path}/bin/rails"),
+      IO.read("#{project_path}/bin/rake"),
+      IO.read("#{project_path}/bin/rspec"),
+    ]
+
+    spring_line1 = /^ +spring_bin_path = File.expand_path\('\.\.\/spring', __FILE__\)$/
+    spring_line2 = /^ +load spring_bin_path$/
+
+    bin_stub_files.each do |file|
+      expect(file).to match(spring_line1)
+      expect(file).to match(spring_line2)
     end
   end
 
+  it "removes comments and extra newlines from config files" do
+    config_files = [
+      IO.read("#{project_path}/config/application.rb"),
+      IO.read("#{project_path}/config/environment.rb"),
+      IO.read("#{project_path}/config/environments/development.rb"),
+      IO.read("#{project_path}/config/environments/production.rb"),
+      IO.read("#{project_path}/config/environments/test.rb"),
+    ]
+
+    config_files.each do |file|
+      expect(file).not_to match(/.*#.*/)
+      expect(file).not_to match(/^$\n/)
+    end
+  end
+
+  it "copies factories.rb" do 
+    expect(File).to exist("#{project_path}/spec/factories.rb")
+  end
+
   def analytics_partial
     IO.read("#{project_path}/app/views/application/_analytics.html.erb")
   end

data/spec/spec_helper.rb

@@ -1,5 +1,8 @@
 require 'bundler/setup'
 
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
+
 Bundler.require(:default, :test)
 
 require (Pathname.new(__FILE__).dirname + '../lib/slining').expand_path
@@ -10,11 +13,11 @@ RSpec.configure do |config|
   config.include SliningTestHelpers
 
   config.before(:all) do
+    add_fakes_to_path
     create_tmp_directory
   end
 
   config.before(:each) do
-    FakeHeroku.clear!
     FakeGithub.clear!
   end
 end

data/spec/support/fake_heroku.rb

@@ -36,8 +36,10 @@ class FakeHeroku
   end
 
   def self.has_configured_vars?(remote_name, var)
-    File.foreach(RECORDER).any? do |line|
-      line =~ /^config:add #{var}=.+ --remote #{remote_name}\n$/
-    end
+    commands_ran =~ /^config:add #{var}=.+ --remote #{remote_name}\n/
+  end
+
+  def self.commands_ran
+    @commands_ran ||= File.read(RECORDER)
   end
 end

data/spec/support/slining.rb

@@ -12,9 +12,10 @@ module SliningTestHelpers
   def run_slining(arguments = nil)
     Dir.chdir(tmp_path) do
       Bundler.with_clean_env do
-        ENV['TESTING'] = '1'
-
-        %x(#{slining_bin} #{APP_NAME} #{arguments})
+        add_fakes_to_path
+        `
+          #{slining_bin} #{APP_NAME} #{arguments}
+        `
       end
     end
   end
@@ -29,21 +30,28 @@ module SliningTestHelpers
     end
   end
 
+  def add_fakes_to_path
+    ENV["PATH"] = "#{support_bin}:#{ENV["PATH"]}"
+  end
+
   def project_path
     @project_path ||= Pathname.new("#{tmp_path}/#{APP_NAME}")
   end
 
   private
+    def tmp_path
+      @tmp_path ||= Pathname.new("#{root_path}/tmp")
+    end
 
-  def tmp_path
-    @tmp_path ||= Pathname.new("#{root_path}/tmp")
-  end
+    def slining_bin
+      File.join(root_path, 'bin', 'slining')
+    end
 
-  def slining_bin
-    File.join(root_path, 'bin', 'slining')
-  end
+    def support_bin
+      File.join(root_path, "spec", "fakes", "bin")
+    end
 
-  def root_path
-    File.expand_path('../../../', __FILE__)
-  end
+    def root_path
+      File.expand_path('../../../', __FILE__)
+    end
 end