Skip to content

Commit

Permalink
Initial commit of application's next version
Browse files Browse the repository at this point in the history
A fresh Rails 5.1 app was generated with:

```
rails new . -d postgresql --skip-action-mailer --skip-spring
  --skip-listen --skip-coffee --skip-turbolinks --skip-test
  --skip-bundle --skip-keeps
```

Updated configuration files were added for the following:

- Code Climate
- EditorConfig
- Rspec
- Rubocop
- Travis CI

For now, the app will use Rspec feature specs instead of the new
Rails 5.1 system tests pending resolution of this rspec/rspec-rails PR:
rspec/rspec-rails#1813
  • Loading branch information
jgarber623 committed Jul 5, 2017
1 parent c66ad44 commit 7501a21
Show file tree
Hide file tree
Showing 184 changed files with 835 additions and 4,207 deletions.
16 changes: 7 additions & 9 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,18 @@ engines:
enabled: true
config:
languages:
- ruby
- javascript
- ruby
- javascript
fixme:
enabled: true
rubocop:
enabled: true
ratings:
paths:
- Gemfile.lock
- "**.erb"
- "**.rake"
- "app/**/*"
- "lib/**/*"
- "**.rb"
exclude_paths:
- config/
- db/
- public/presentations
- vendor/
- "public/**/*"
- "spec/**/*"
- "vendor/**/*"
4 changes: 0 additions & 4 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,3 @@ insert_final_newline = true
indent_size = 2
indent_style = space
trim_trailing_whitespace = true

[*.{erb,html,js,md,scss}]
indent_size = 4
indent_style = tab
12 changes: 7 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@

# Ignore all logfiles and tempfiles.
/log/*
!/log/.keep
/tmp
/tmp/*

config/database.yml
config/secrets.yml
/node_modules
/yarn-error.log

public/uploads
.byebug_history

/config/database.yml
/config/secrets.yml
2 changes: 1 addition & 1 deletion .rspec
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
--color
--format progress
--require spec_helper
--require rails_helper
12 changes: 11 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@
AllCops:
Exclude:
- 'bin/**/*'
- 'db/**/*'

Metrics/BlockLength:
Exclude:
- '**/Gemfile'
- 'spec/**/*.rb'

Metrics/LineLength:
Enabled: false

Metrics/MethodLength:
Max: 15

Style/Documentation:
Enabled: false

Style/FrozenStringLiteralComment:
Enabled: false
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.2.4
2.4.1
16 changes: 13 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@
dist: trusty
addons:
postgresql: 9.6
services:
- postgresql
language: ruby
cache: bundler
rvm:
- 2.2.4
- 2.4.1
before_install:
- gem update --system
before_script:
- psql -c 'create database sixtwothree_test;' -U postgres
- cp config/database.yml.example config/database.yml
- cp config/secrets.yml.example config/secrets.yml
- cp config/database.yml{.example,}
- cp config/secrets.yml{.example,}
after_success:
- bundle exec codeclimate-test-reporter
notifications:
email: false
slack: sixtwothree:yATLmjTW15443qR7jbCWr3RO
27 changes: 0 additions & 27 deletions Capfile

This file was deleted.

55 changes: 22 additions & 33 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,43 +1,32 @@
ruby '2.2.4'
ruby '2.4.1'

source 'https://rubygems.org' do
# Application
gem 'francis_cms', git: 'https://github.com/FrancisCMS/FrancisCMS.git'
# gem 'francis_cms', path: '~/Projects/FrancisCMS'
gem 'puma', '~> 2.15'
git_source(:github) do |repo_name|
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?('/')
"https://github.com/#{repo_name}.git"
end

# Assets
gem 'breakpoint', '~> 2.7'
gem 'sass-rails', '~> 5.0'
gem 'uglifier', '~> 2.7'
source 'https://rubygems.org' do
gem 'jbuilder', '~> 2.7'
gem 'pg', '~> 0.21.0'
gem 'puma', '~> 3.9', '>= 3.9.1'
gem 'rails', '~> 5.1', '>= 5.1.2'
gem 'sass-rails', '~> 5.0', '>= 5.0.6'
gem 'uglifier', '~> 3.2'

group :development do
gem 'capistrano', '~> 3.4', require: false
gem 'capistrano-chruby', '~> 0.1.2', require: false
gem 'capistrano-rails', '~> 1.1', require: false
gem 'foreman', '~> 0.82.0'
gem 'pry', '~> 0.10.4'
gem 'quiet_assets', '~> 1.1'
gem 'svgeez', '~> 0.2.3'
group :development, :test do
gem 'byebug', '~> 9.0', '>= 9.0.6'
gem 'rails-controller-testing', '~> 1.0', '>= 1.0.2'
gem 'rspec-rails', '~> 3.6'
gem 'rubocop', '~> 0.49.1', require: false
end

group :development, :test do
gem 'rspec-rails', '~> 3.5'
gem 'rubocop', '~> 0.44.1', require: false
group :development do
gem 'web-console', '~> 3.5', '>= 3.5.1'
end

group :test do
gem 'codeclimate-test-reporter', '~> 0.6.0', require: false
gem 'simplecov', '~> 0.12.0', require: false
gem 'simplecov-console', '~> 0.3.1', require: false
gem 'codeclimate-test-reporter', '~> 1.0', '>= 1.0.8', require: false
gem 'simplecov', '~> 0.13.0', require: false
gem 'simplecov-console', '~> 0.4.2', require: false
end
end

source 'https://rails-assets.org' do
gem 'rails-assets-aria-collapsible'
gem 'rails-assets-cashcash'
gem 'rails-assets-fetch'
gem 'rails-assets-html5shiv'
gem 'rails-assets-respond'
gem 'rails-assets-routerrouter'
end
Loading

0 comments on commit 7501a21

Please sign in to comment.