Skip to content

Commit

Permalink
Merge pull request #22 from fga-gpp-mds/homolog
Browse files Browse the repository at this point in the history
Pass homolog data to master branch
  • Loading branch information
fabio1079 authored Apr 19, 2017
2 parents b350657 + b22e589 commit 75a39e3
Show file tree
Hide file tree
Showing 75 changed files with 2,442 additions and 13 deletions.
24 changes: 24 additions & 0 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
engines:
rubocop:
enabled: true
brakeman:
enabled: true
eslint:
enabled: false
csslint:
enabled: false
duplication:
enabled: true
config:
languages:
- ruby
ratings:
paths:
- app/**
- lib/**
- "**.rb"
- "**.go"
exclude_paths:
- spec/**/*
- "**/vendor/**/*"

4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,8 @@
*.swp
coverage
vendor/bundle
path

.vagrant/
.DS_Store
public/system/
9 changes: 9 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,19 @@ sript:
- bundle exec rspec
sudo: false
dist: xenial
branch:
only:
- master
- homolog
deploy:
provider: heroku
api_key:
secure: "d5573795-53f2-49f9-8180-ac98f4af24f0"
app:
homolog: cadernos-api
run:
- "rake db:migrate"
addons:
code_climate:
repo_token: c277e3c368b533d9674e2e08ddc7db4e155899532abf9e11fdd0531e9d848be1

23 changes: 15 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,18 @@ gem 'rails', '~> 5.0.2'
# Use Puma as the app server
gem 'puma', '~> 3.0'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
# gem 'jbuilder', '~> 2.5'
gem 'jbuilder', '~> 2.5'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 3.0'
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'
gem 'bcrypt', '~> 3.1.7'

gem 'jwt'

gem 'simple_command'

#Upload file gem
gem "paperclip"

# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development
Expand All @@ -27,11 +34,13 @@ group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platform: :mri
gem 'rspec-rails', '~> 3.5'
gem 'simplecov'
gem 'coveralls', require: false

gem "factory_girl_rails"
gem 'simplecov', '~> 0.12.0'
gem 'coveralls', '~> 0.8.19', require: false
gem 'rails-controller-testing'
# Use sqlite3 as the database for Active Record
gem 'sqlite3'
gem 'database_cleaner'
end

group :development do
Expand All @@ -41,9 +50,7 @@ group :development do
gem 'spring-watcher-listen', '~> 2.0.0'
end


group :production do
gem 'pg'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
#gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
39 changes: 37 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -39,23 +39,37 @@ GEM
minitest (~> 5.1)
tzinfo (~> 1.1)
arel (7.1.4)
bcrypt (3.1.11)
builder (3.2.3)
byebug (9.0.6)
climate_control (0.1.0)
cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0)
concurrent-ruby (1.0.5)
coveralls (0.8.19)
json (>= 1.8, < 3)
simplecov (~> 0.12.0)
term-ansicolor (~> 1.3)
thor (~> 0.19.1)
tins (~> 1.6)
database_cleaner (1.5.3)
diff-lcs (1.3)
docile (1.1.5)
erubis (2.7.0)
factory_girl (4.8.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.8.0)
factory_girl (~> 4.8.0)
railties (>= 3.0.0)
ffi (1.9.18)
globalid (0.3.7)
activesupport (>= 4.1.0)
i18n (0.8.1)
jbuilder (2.6.3)
activesupport (>= 3.0.0, < 5.2)
multi_json (~> 1.2)
json (2.0.3)
jwt (1.5.6)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
Expand All @@ -67,11 +81,19 @@ GEM
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mimemagic (0.3.2)
mini_portile2 (2.1.0)
minitest (5.10.1)
multi_json (1.12.1)
nio4r (2.0.0)
nokogiri (1.7.1)
mini_portile2 (~> 2.1.0)
paperclip (5.1.0)
activemodel (>= 4.2.0)
activesupport (>= 4.2.0)
cocaine (~> 0.5.5)
mime-types
mimemagic (~> 0.3.0)
pg (0.20.0)
puma (3.8.2)
rack (2.0.1)
Expand All @@ -90,6 +112,10 @@ GEM
bundler (>= 1.3.0, < 2.0)
railties (= 5.0.2)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.1)
actionpack (~> 5.x)
actionview (~> 5.x)
activesupport (~> 5.x)
rails-dom-testing (2.0.2)
activesupport (>= 4.2.0, < 6.0)
nokogiri (~> 1.6)
Expand Down Expand Up @@ -122,6 +148,7 @@ GEM
rspec-mocks (~> 3.5.0)
rspec-support (~> 3.5.0)
rspec-support (3.5.0)
simple_command (0.0.9)
simplecov (0.12.0)
docile (~> 1.1.0)
json (>= 1.8, < 3)
Expand Down Expand Up @@ -155,15 +182,23 @@ PLATFORMS
ruby

DEPENDENCIES
bcrypt (~> 3.1.7)
byebug
coveralls
coveralls (~> 0.8.19)
database_cleaner
factory_girl_rails
jbuilder (~> 2.5)
jwt
listen (~> 3.0.5)
paperclip
pg
puma (~> 3.0)
rack-cors
rails (~> 5.0.2)
rails-controller-testing
rspec-rails (~> 3.5)
simplecov
simple_command
simplecov (~> 0.12.0)
spring
spring-watcher-listen (~> 2.0.0)
sqlite3
Expand Down
Loading

0 comments on commit 75a39e3

Please sign in to comment.