Permalink
Browse files

Update latest from ruby-template

  • Loading branch information...
Jeffrey Horn
Jeffrey Horn committed Feb 18, 2016
1 parent 5e834f6 commit 62e375b616e7a89d40a59c6497cb248dbeafa718
Showing with 324 additions and 81 deletions.
  1. +175 −10 .gitignore
  2. +3 −0 .rspec
  3. +1 −1 .ruby-version
  4. +13 −18 Gemfile
  5. +86 −52 Gemfile.lock
  6. +46 −0 LICENSE
@@ -1,13 +1,178 @@
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'

# Ignore bundler config.
/.bundle
# Created by https://www.gitignore.io/api/rails,ruby,node,osx,linux,windows

# Ignore all logfiles and tempfiles.
/log/*
!/log/.keep
### Rails ###
*.rbc
capybara-*.html
# .rspec
/log
/tmp
/db/*.sqlite3
/db/*.sqlite3-journal
/public/system
/coverage/
/spec/tmp
**.orig
rerun.txt
pickle-email-*.html

# TODO Comment out these rules if you are OK with secrets being uploaded to the repo
config/initializers/secret_token.rb
config/secrets.yml

## Environment normalization:
/.bundle
/vendor/bundle

# these should all be checked in to normalize the environment:
# Gemfile.lock, .ruby-version, .ruby-gemset

# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
.rvmrc

# if using bower-rails ignore default bower_components path bower.json files
/vendor/assets/bower_components
*.bowerrc
bower.json

# Ignore pow environment settings
.powenv

# Ignore Byebug command history file.
.byebug_history


### Ruby ###
*.gem
*.rbc
/.config
/coverage/
/InstalledFiles
/pkg/
/spec/reports/
/spec/examples.txt
/test/tmp/
/test/version_tmp/
/tmp/

## Specific to RubyMotion:
.dat*
.repl_history
build/

## Documentation cache and generated files:
/.yardoc/
/_yardoc/
/doc/
/rdoc/

## Environment normalization:
/.bundle/
/vendor/bundle
/lib/bundler/man/

# for a library or gem, you might want to ignore these files since the code is
# intended to run in multiple environments; otherwise, check them in:
# Gemfile.lock
# .ruby-version
# .ruby-gemset

# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
.rvmrc


### Node ###
# Logs
logs
*.log
npm-debug.log*

# Runtime data
pids
*.pid
*.seed

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# node-waf configuration
.lock-wscript

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Dependency directory
node_modules

# Optional npm cache directory
.npm

# Optional REPL history
.node_repl_history


### OSX ###
.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon

# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk


### Linux ###
*~

# temporary files which can be created if a process still has a handle open of a deleted file
.fuse_hidden*

# KDE directory preferences
.directory

# Linux trash folder which might appear on any partition or disk
.Trash-*


### Windows ###
# Windows image file caches
Thumbs.db
ehthumbs.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msm
*.msp

# Windows shortcuts
*.lnk
3 .rspec
@@ -0,0 +1,3 @@
--color
--require spec_helper
--format documentation
@@ -1 +1 @@
2.2.3
2.2.4
31 Gemfile
@@ -1,28 +1,23 @@
# Look for ruby gems here
source 'https://rubygems.org'
ruby '2.2.4'

# Set required ruby version (for heroku)
ruby '2.2.3'

gem 'rails', '4.2.4'

# Reduce rails kitchen sink approach
gem 'rails-api'

# Cross-Origin Resource Sharing
gem 'rails', '~> 4.2.5'
gem 'rails-api', git: 'git@github.com:rails-api/rails-api.git'
gem 'active_model_serializers', git: 'git@github.com:rails-api/active_model_serializers.git'
gem 'rack-cors', require: 'rack/cors'

# Use PostgreSQL database
gem 'pg'

# Use ActiveModel has_secure_password
gem 'bcrypt', '~> 3.1.7'

# Help with JSON serialization
gem 'active_model_serializers'
group :development, :test do
gem 'pry', '~> 0.10'
gem 'byebug', '~> 8.0'
gem 'pry-byebug', '~> 3.3.0'
end

group :development do
# Use pry over irb for rails console
gem 'pry-rails'
gem 'byebug'
end

group :test do
gem 'rspec', '~> 3.3'
end
Oops, something went wrong.

0 comments on commit 62e375b

Please sign in to comment.