welaika-suspenders 2.15.0 → 2.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32b1ee32dac41983cbb70817bf429c893f136674
-  data.tar.gz: 8224c27cb278bb1049ddf2ae2ccb6c806a49ed7d
+  metadata.gz: 91cc2ea6ed1390515043c8f7ff4ac6449f62d32f
+  data.tar.gz: 7ba87e1804d9e7541ae1f2596c78ccf9b6f9da5c
 SHA512:
-  metadata.gz: 8b582b01e1360810da4674157134bea4e826eedde48b786ca5ea88fbbbd9dba4dec435882caa71632c679d4dba7faf28a356452a5f35e6306214b654b10e6257
-  data.tar.gz: 7792bf665153ca578d702db6051be4ab853a0ac7faaa52330c38b8cce6d6f552b1554465464a2ac039e483599233ba57b6c062b535819fec1c27b28cde0499ae
+  metadata.gz: b4589cb62f4e0827be0840f0bda3b80af544c99cb90e636044670717d5963503e7efaa4ee6624aec8ef6d48933dbdb6e619850af50996abee0b922d6ba803c6a
+  data.tar.gz: fc793ef996307b6fd202a2e668c1c949b50d555673f2144d9455642bfb1b6e3fce109ca7b0f81c8e1a2634aca6507fe64c0de968aef2ffdc871437f2217b8a5f

data/NEWS.md

@@ -1,6 +1,11 @@
-1.31.0 (unreleased)
+1.31.0 (September 3, 2015)
 
 * Update to Ruby 2.2.3
+* Add ctags configuration dotfile
+* Rename `$HOST` to `$APPLICATION_HOST` for zsh compatibility
+* Update Bitters to 1.1
+* Remove comments and newlines in config files
+* Abort tests run if `DATABASE_URL` env variable is set
 
 1.30.0 (July 30, 2015)
 

data/README.md

@@ -83,3 +83,6 @@ List of changes we made since [this is commit](https://github.com/thoughtbot/sus
 - drop support for IE 9 in AutoPrefixer
 - removed [hound](https://houndci.com) configuration
 - add [bullet](https://github.com/flyerhzm/bullet)
+- add [draper](https://github.com/drapergem/draper) gem and rename `presenters` folder to `decorators`
+- add [rubocop](https://github.com/bbatsov/rubocop) and a template of `.rubocop.yml`
+- change rake default task: now includes rubocop and brakeman too

data/lib/suspenders/app_builder.rb

@@ -355,7 +355,7 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
       copy_file 'suspenders_gitignore', '.gitignore'
       [
         'app/forms',
-        'app/presenters',
+        'app/decorators',
         'app/queries',
         'app/services',
         'app/views/pages',
@@ -363,7 +363,7 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
         'spec/forms',
         'spec/helpers',
         'spec/lib',
-        'spec/presenters',
+        'spec/decorators',
         'spec/queries',
         'spec/services',
         'spec/fixtures',
@@ -463,7 +463,15 @@ you can deploy to staging and production with:
 
     def setup_bundler_audit
       copy_file "bundler_audit.rake", "lib/tasks/bundler_audit.rake"
-      append_file "Rakefile", %{\ntask default: "bundler:audit"\n}
+    end
+
+    def setup_brakeman
+      copy_file "brakeman.rake", "lib/tasks/brakeman.rake"
+    end
+
+    def setup_rubocop
+      copy_file "rubocop.rake", "lib/tasks/rubocop.rake"
+      copy_file "rubocop.yml", ".rubocop.yml"
     end
 
     def setup_spring
@@ -472,6 +480,7 @@ you can deploy to staging and production with:
 
     def create_binstubs
       bundle_command "binstubs brakeman"
+      bundle_command "binstubs rubocop"
     end
 
     def copy_miscellaneous_files
@@ -493,6 +502,28 @@ you can deploy to staging and production with:
       end
     end
 
+    def remove_config_comment_lines
+      config_files = [
+        "application.rb",
+        "environment.rb",
+        "environments/development.rb",
+        "environments/production.rb",
+        "environments/test.rb",
+      ]
+
+      config_files.each do |config_file|
+        path = File.join(destination_root, "config/#{config_file}")
+
+        accepted_content = File.readlines(path).reject do |line|
+          line =~ /^.*#.*$/ || line =~ /^$\n/
+        end
+
+        File.open(path, "w") do |file|
+          accepted_content.each { |line| file.puts line }
+        end
+      end
+    end
+
     def remove_routes_comment_lines
       replace_in_file 'config/routes.rb',
         /Rails\.application\.routes\.draw do.*end/m,
@@ -507,7 +538,6 @@ you can deploy to staging and production with:
       append_file 'Rakefile' do
         <<-EOS
 task(:default).clear
-task default: [:spec]
 
 if defined? RSpec
   task(:spec).clear
@@ -515,6 +545,11 @@ if defined? RSpec
     t.verbose = false
   end
 end
+
+task default: :rubocop
+task default: :spec
+task default: "brakeman:check"
+task default: "bundler:audit"
         EOS
       end
     end

data/lib/suspenders/generators/app_generator.rb

@@ -43,13 +43,13 @@ module Suspenders
       invoke :install_refills
       invoke :copy_miscellaneous_files
       invoke :customize_error_pages
+      invoke :remove_config_comment_lines
       invoke :remove_routes_comment_lines
       invoke :setup_dotfiles
       invoke :setup_git
       invoke :setup_database
       invoke :create_heroku_apps
       invoke :create_github_repo
-      invoke :setup_bundler_audit
       invoke :setup_spring
       invoke :create_binstubs
       invoke :outro
@@ -87,6 +87,9 @@ module Suspenders
       build :provide_dev_prime_task
       build :configure_generators
       build :configure_i18n_for_missing_translations
+      build :setup_rubocop
+      build :setup_brakeman
+      build :setup_bundler_audit
     end
 
     def setup_test_environment
@@ -200,11 +203,6 @@ module Suspenders
       build :gitignore_files
     end
 
-    def setup_bundler_audit
-      say "Setting up bundler-audit"
-      build :setup_bundler_audit
-    end
-
     def setup_spring
       say "Springifying binstubs"
       build :setup_spring
@@ -229,6 +227,10 @@ module Suspenders
       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/suspenders/version.rb

@@ -1,5 +1,5 @@
 module Suspenders
   RAILS_VERSION = "~> 4.2.0"
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  VERSION = "2.15.0"
+  VERSION = "2.17.0"
 end

data/spec/features/new_project_spec.rb

@@ -158,8 +158,28 @@ RSpec.describe "Suspend a new project with default configuration" do
     expect(File).to exist("#{project_path}/spec/rails_helper.rb")
   end
 
+  it "adds rubocop configuration file" do
+    expect(File).to exist("#{project_path}/.rubocop.yml")
+  end
+
   it "creates binstubs" do
     expect(File).to exist("#{project_path}/bin/brakeman")
+    expect(File).to exist("#{project_path}/bin/rubocop")
+  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
 
   def analytics_partial

data/suspenders.gemspec

@@ -25,7 +25,7 @@ weLaika's fork of the famous thoughbot suspenders gem.
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.version = Suspenders::VERSION
 
-  s.add_dependency 'bitters', '~> 1.0.0'
+  s.add_dependency 'bitters', '~> 1.1.0'
   s.add_dependency 'bundler', '~> 1.3'
   s.add_dependency 'rails', Suspenders::RAILS_VERSION
 

data/templates/Gemfile.erb

@@ -7,6 +7,7 @@ gem "autoprefixer-rails"
 gem "bourbon", "~> 4.2.0"
 gem "coffee-rails", "~> 4.1.0"
 gem "delayed_job_active_record"
+gem "draper"
 gem "email_validator"
 gem "flutie"
 gem "high_voltage"
@@ -49,6 +50,7 @@ group :development, :test do
   gem "pry-byebug"
   gem "pry-rails"
   gem "rspec-rails", "~> 3.3.0"
+  gem "rubocop", require: false
 end
 
 group :test do

data/templates/brakeman.rake

@@ -0,0 +1,18 @@
+if Rails.env.development? || Rails.env.test?
+  namespace :brakeman do
+    desc "Run Brakeman"
+    task :run, :output_files do |_t, args|
+      require 'brakeman'
+
+      files = args[:output_files].split(' ') if args[:output_files]
+      Brakeman.run app_path: ".", output_files: files, print_report: true
+    end
+
+    desc "Check your code with Brakeman"
+    task :check do
+      require 'brakeman'
+      result = Brakeman.run app_path: '.', print_report: true
+      exit Brakeman::Warnings_Found_Exit_Code unless result.filtered_warnings.empty?
+    end
+  end
+end

data/templates/capybara_rspec.rb.erb

@@ -2,7 +2,6 @@ Capybara.javascript_driver = :webkit
 Capybara.asset_host = "http://localhost:<%= config[:port_number] %>"
 
 module CapybaraHelper
-
   def page!
     save_and_open_page
   end

data/templates/circle.yml.erb

@@ -1,8 +1,9 @@
+checkout:
+  post:
+    - cp .sample.env .env
+database:
+  override:
+    - bin/setup
 test:
   override:
     - bundle exec rake
-deployment:
-  staging:
-    branch: master
-    commands:
-      - bin/deploy staging

data/templates/config_i18n_tasks.yml

@@ -66,6 +66,7 @@ ignore_unused:
   - 'date.*'
   - 'time.*'
   - 'titles.*'
+  - 'helpers.page_entries_info.*'
 
 ## Exclude these keys from `i18n-tasks eq-base' report
 # ignore_eq_base:

data/templates/disable_xml_params.rb

@@ -1,3 +1 @@
-# Protect against injection attacks
-# http://www.kb.cert.org/vuls/id/380039
 ActionDispatch::ParamsParser::DEFAULT_PARSERS.delete(Mime::XML)

data/templates/rails_helper.rb

@@ -1,6 +1,7 @@
 ENV["RAILS_ENV"] = "test"
 
 require File.expand_path("../../config/environment", __FILE__)
+abort("DATABASE_URL environment variable is set") if ENV["DATABASE_URL"]
 
 require "rspec/rails"
 require "shoulda/matchers"

data/templates/rubocop.rake

@@ -0,0 +1,5 @@
+if Rails.env.development? || Rails.env.test?
+  require 'rubocop/rake_task'
+
+  RuboCop::RakeTask.new
+end

data/templates/rubocop.yml

@@ -0,0 +1,23 @@
+AllCops:
+  RunRailsCops: true
+  Exclude:
+    - 'db/**/*'
+    - 'config/**/*'
+    - 'bin/*'
+
+Metrics/LineLength:
+  Max: 100
+
+Style/StringLiterals:
+  Enabled: false
+  EnforcedStyle: double_quotes
+
+Style/Documentation:
+  Enabled: false
+
+Metrics/AbcSize:
+  Max: 18
+
+Lint/Debugger:
+  Exclude:
+    - 'spec/support/capybara.rb'

data/templates/spec_helper.rb

@@ -1,10 +1,7 @@
 require "simplecov"
 require "simplecov-json"
 SimpleCov.start "rails" do
-  add_group "Queries", "app/queries"
   add_group "Services", "app/services"
-  add_group "Validators", "app/validators"
-  add_group "Presenter", "app/presenters"
 end
 SimpleCov.formatter = SimpleCov::Formatter::JSONFormatter
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: welaika-suspenders
 version: !ruby/object:Gem::Version
-  version: 2.15.0
+  version: 2.17.0
 platform: ruby
 authors:
 - thoughtbot
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-29 00:00:00.000000000 Z
+date: 2015-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitters
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -129,6 +129,7 @@ files:
 - templates/application.css.sass
 - templates/bin_deploy
 - templates/bin_setup.erb
+- templates/brakeman.rake
 - templates/browserslist
 - templates/bundler_audit.rake
 - templates/capybara_rspec.rb.erb
@@ -151,6 +152,8 @@ files:
 - templates/puma.rb
 - templates/queries_helper_rspec.rb
 - templates/rails_helper.rb
+- templates/rubocop.rake
+- templates/rubocop.yml
 - templates/sample.env
 - templates/secrets.yml
 - templates/slim.rb