Merge branch 'rspec' into registry-522

This commit is contained in:
Artur Beljajev 2017-05-25 19:42:34 +03:00
commit 1d72dc92e9
4 changed files with 2 additions and 32 deletions

View file

@ -1,4 +1,5 @@
language: ruby language: ruby
cache: bundler
env: env:
- DB=postgresql - DB=postgresql
bundler_args: --without development staging production bundler_args: --without development staging production

View file

@ -135,8 +135,6 @@ group :development, :test do
# debug # debug
gem 'pry', '0.10.1' gem 'pry', '0.10.1'
# code review
gem 'rubycritic', '3.2.0'
gem 'bullet', '4.14.7' # for finding database optimizations gem 'bullet', '4.14.7' # for finding database optimizations
gem 'bundler-audit' gem 'bundler-audit'
gem 'brakeman', '3.6.1', require: false # for security audit' gem 'brakeman', '3.6.1', require: false # for security audit'

View file

@ -141,8 +141,6 @@ GEM
xpath (~> 2.0) xpath (~> 2.0)
chronic (0.10.2) chronic (0.10.2)
cliver (0.3.2) cliver (0.3.2)
codeclimate-engine-rb (0.4.0)
virtus (~> 1.0)
codeclimate-test-reporter (1.0.8) codeclimate-test-reporter (1.0.8)
simplecov (<= 0.13) simplecov (<= 0.13)
coderay (1.1.0) coderay (1.1.0)
@ -195,15 +193,6 @@ GEM
ffi (1.9.18) ffi (1.9.18)
figaro (1.1.1) figaro (1.1.1)
thor (~> 0.14) thor (~> 0.14)
flay (2.8.1)
erubis (~> 2.7.0)
path_expander (~> 1.0)
ruby_parser (~> 3.0)
sexp_processor (~> 4.0)
flog (4.6.1)
path_expander (~> 1.0)
ruby_parser (~> 3.1, > 3.1.0)
sexp_processor (~> 4.8)
globalid (0.3.7) globalid (0.3.7)
activesupport (>= 4.1.0) activesupport (>= 4.1.0)
grape (0.12.0) grape (0.12.0)
@ -271,7 +260,7 @@ GEM
liquid (3.0.6) liquid (3.0.6)
loofah (2.0.3) loofah (2.0.3)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
mail (2.6.4) mail (2.6.5)
mime-types (>= 1.16, < 4) mime-types (>= 1.16, < 4)
method_source (0.8.2) method_source (0.8.2)
mime-types (3.1) mime-types (3.1)
@ -303,7 +292,6 @@ GEM
orm_adapter (0.5.0) orm_adapter (0.5.0)
parser (2.4.0.0) parser (2.4.0.0)
ast (~> 2.2) ast (~> 2.2)
path_expander (1.0.1)
pdfkit (0.6.2) pdfkit (0.6.2)
pg (0.19.0) pg (0.19.0)
phantomjs (1.9.8.0) phantomjs (1.9.8.0)
@ -372,10 +360,6 @@ GEM
i18n i18n
polyamorous (~> 1.1) polyamorous (~> 1.1)
rdoc (4.3.0) rdoc (4.3.0)
reek (4.6.1)
codeclimate-engine-rb (~> 0.4.0)
parser (>= 2.3.1.2, < 2.5)
rainbow (~> 2.0)
ref (2.0.0) ref (2.0.0)
request_store (1.1.0) request_store (1.1.0)
responders (2.3.0) responders (2.3.0)
@ -414,15 +398,6 @@ GEM
ruby-progressbar (1.8.1) ruby-progressbar (1.8.1)
ruby_parser (3.8.4) ruby_parser (3.8.4)
sexp_processor (~> 4.1) sexp_processor (~> 4.1)
rubycritic (3.2.0)
flay (~> 2.8)
flog (~> 4.4)
launchy (= 2.4.3)
parser (= 2.4.0)
rainbow (~> 2.1)
reek (~> 4.4)
ruby_parser (~> 3.8)
virtus (~> 1.0)
safe_yaml (1.0.4) safe_yaml (1.0.4)
sass (3.4.23) sass (3.4.23)
sass-rails (5.0.6) sass-rails (5.0.6)
@ -581,7 +556,6 @@ DEPENDENCIES
rest-client rest-client
rspec-rails (~> 3.6) rspec-rails (~> 3.6)
rubocop (= 0.48.1) rubocop (= 0.48.1)
rubycritic (= 3.2.0)
sass-rails (= 5.0.6) sass-rails (= 5.0.6)
sdoc (= 0.4.1) sdoc (= 0.4.1)
select2-rails (= 3.5.9.3) select2-rails (= 3.5.9.3)

View file

@ -58,9 +58,6 @@ BCODE=0 # tmp
bundle exec brakeman -q bundle exec brakeman -q
echo "END_OF_SECURITY_RESULTS" echo "END_OF_SECURITY_RESULTS"
# update code review
bundle exec rubycritic app lib
if [ $RCODE == 0 ] && [ $TCODE == 0 ] &&[ $BCODE == 0 ]; then if [ $RCODE == 0 ] && [ $TCODE == 0 ] &&[ $BCODE == 0 ]; then
exit 0 exit 0
else else