Merge pull request #111 from dtaniwaki/update-gems

Update gems
dtaniwaki · Jan 29, 2017 · a22c1ac · a22c1ac
2 parents 68e7f2c + 39bdecf
commit a22c1ac
Show file tree

Hide file tree

Showing 28 changed files with 401 additions and 342 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,3 +1,4 @@
+inherit_from: .rubocop_todo.yml
 require: rubocop-rspec
 Rails:
   Enabled: true
@@ -39,7 +40,7 @@ Style/IndentArray:
 Style/DoubleNegation:
   Enabled: false
 Lint/EndAlignment:
-  AlignWith: variable
+  EnforcedStyleAlignWith: variable
 Style/FrozenStringLiteralComment:
   Enabled: false
 RSpec/AnyInstance:

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -0,0 +1,124 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2017-01-29 22:43:39 +0900 using RuboCop version 0.47.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 89
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/BlockLength:
+  Max: 219
+
+# Offense count: 1
+# Configuration parameters: CustomIncludeMethods.
+RSpec/EmptyExampleGroup:
+  Exclude:
+    - 'spec/controllers/user_api_tokens_controller_spec.rb'
+
+# Offense count: 7
+# Configuration parameters: Max.
+RSpec/ExampleLength:
+  Exclude:
+    - 'spec/controllers/browserstack_credentials_controller_spec.rb'
+    - 'spec/controllers/test_step_sets_controller_spec.rb'
+    - 'spec/models/concerns/async_concern_spec.rb'
+    - 'spec/models/test_execution_browser_spec.rb'
+    - 'spec/models/test_execution_spec.rb'
+
+# Offense count: 8
+RSpec/LeadingSubject:
+  Exclude:
+    - 'spec/mailers/user_mailer_spec.rb'
+    - 'spec/models/test_execution_browser_spec.rb'
+    - 'spec/models/test_step/step_set_spec.rb'
+    - 'spec/models/test_step_set_spec.rb'
+    - 'spec/models/test_version_spec.rb'
+
+# Offense count: 51
+RSpec/LetSetup:
+  Enabled: false
+
+# Offense count: 3
+RSpec/MessageChain:
+  Exclude:
+    - 'spec/models/concerns/async_concern_spec.rb'
+    - 'spec/models/user_test_spec.rb'
+    - 'spec/models/user_test_version_spec.rb'
+
+# Offense count: 15
+# Configuration parameters: SupportedStyles.
+# SupportedStyles: have_received, receive
+RSpec/MessageSpies:
+  EnforcedStyle: receive
+
+# Offense count: 154
+RSpec/MultipleExpectations:
+  Max: 5
+
+# Offense count: 120
+RSpec/NamedSubject:
+  Enabled: false
+
+# Offense count: 97
+# Configuration parameters: Max.
+RSpec/NestedGroups:
+  Enabled: false
+
+# Offense count: 3
+RSpec/SubjectStub:
+  Exclude:
+    - 'spec/models/concerns/async_concern_spec.rb'
+    - 'spec/models/test_step_set_spec.rb'
+
+# Offense count: 2
+# Configuration parameters: IgnoreSymbolicNames.
+RSpec/VerifiedDoubles:
+  Exclude:
+    - 'spec/models/test_execution_browser_spec.rb'
+    - 'spec/models/test_execution_spec.rb'
+
+# Offense count: 5
+Rails/FilePath:
+  Exclude:
+    - 'config/environments/development.rb'
+    - 'config/initializers/i18n.rb'
+    - 'spec/rails_helper.rb'
+
+# Offense count: 3
+Rails/OutputSafety:
+  Exclude:
+    - 'app/admin/browser.rb'
+    - 'app/helpers/devise_helper.rb'
+    - 'app/helpers/render_helper.rb'
+
+# Offense count: 2
+# Configuration parameters: Blacklist.
+# Blacklist: decrement!, decrement_counter, increment!, increment_counter, toggle!, touch, update_all, update_attribute, update_column, update_columns, update_counters
+Rails/SkipsModelValidations:
+  Exclude:
+    - 'app/admin/browser.rb'
+
+# Offense count: 3
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Exclude:
+    - 'app/models/concerns/async_concern.rb'
+    - 'app/models/test_execution.rb'
+    - 'lib/patch/i18n_tasks.rb'
+
+# Offense count: 1
+Style/MethodMissing:
+  Exclude:
+    - 'app/models/concerns/async_concern.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, EnforcedStyle, SupportedStyles.
+# SupportedStyles: predicate, comparison
+Style/NumericPredicate:
+  Exclude:
+    - 'spec/**/*'
+    - 'config/application.rb'
+    - 'lib/web_driver_ext/full_screenshot.rb'
diff --git a/Bowerfile b/Bowerfile
@@ -1,4 +1,4 @@
-asset 'startbootstrap-sb-admin-2', '1.0.8'
+asset 'startbootstrap-sb-admin-2', '1.0.7', github: 'BlackrockDigital/startbootstrap-sb-admin-2'
 asset 'pwstrength-bootstrap', '2.0.0'
 asset 'jquery-timeago', '1.5.2'
 asset 'zeroclipboard', '2.2.0'

diff --git a/Gemfile b/Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 ruby '2.3.0'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '>= 5.0.0.rc1', '< 5.1'
+gem 'rails', '~> 5.0.1'
 # Use mysql2 as the database for Active Record
 gem 'mysql2', '~> 0.4.4'
 # Use Puma as the app server
@@ -28,101 +28,89 @@ gem 'jbuilder', github: 'rails/jbuilder', branch: :master # To use with rails-ap
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
 
-gem 'paperclip', '~> 5.0.0.beta1'
 gem 'fog-aws', '~> 0.9.0'
 gem 'fog-local', '~> 0.3.0'
+gem 'paperclip', '~> 5.1.0'
 # gem 'poltergeist'
-gem 'selenium-webdriver', '~> 2.53.0'
+gem 'activeadmin', '~> 1.0.0.pre4'
+gem 'activemodel-serializers-xml', github: 'rails/activemodel-serializers-xml', ref: 'dd9c0acf26aab111ebc647cd8deb99ebc6946531'
+gem 'acts_as_hashids', '~> 0.1.2'
+gem 'acts_as_list', '~> 0.7.2'
+gem 'bootstrap-kaminari-views', '~> 0.0.5'
+gem 'bootstrap-sass', '~> 3.3.6'
+gem 'bower-rails', '~> 0.10.0'
+gem 'bugsnag', '~> 4.0.0'
+gem 'cocoon', '~> 1.2.9'
+gem 'config', '~> 1.1.0'
+gem 'devise', '~> 4.2.0'
+gem 'devise_invitable', '~> 1.6.0'
+gem 'draper', github: 'audionerd/draper', branch: 'rails5', ref: 'e816e0e5876b76c648c0928f1c3f2aa2c7a3d1f2'
+gem 'enum_help', '~> 0.0.15'
 gem 'faraday', '~> 0.9.2'
 gem 'faraday_middleware', '~> 0.10.0'
+gem 'gravatar_image_tag', '~> 1.2.0'
 gem 'mini_magick', '~> 4.5.1'
-gem 'pry-rails', '~> 0.3.4'
-gem 'config', '~> 1.1.0'
-gem 'bootstrap-sass', '~> 3.3.6'
-gem 'devise', '~> 4.0.0.rc1'
-gem 'devise_invitable', '~> 1.6.0'
-gem 'sidekiq', '~> 4.1.0'
-gem 'sidekiq-unique-jobs', '~> 4.0.13'
-gem 'sidekiq-failures', '~> 0.4.5'
-gem 'yajl-ruby', '~> 1.2.1'
-gem 'sinatra', github: 'sinatra/sinatra', require: nil
-gem 'redis-namespace', '~> 1.5.2'
-gem 'omniauth', '~> 1.3.1'
-gem 'omniauth-google-oauth2', '~> 0.3.1'
-gem 'sprockets-es6', '~> 0.9.0'
-gem 'acts_as_list', '~> 0.7.2'
+gem 'nilify_blanks', '~> 1.2.1'
+gem 'omniauth', '~> 1.3.2'
+gem 'omniauth-google-oauth2', '~> 0.4.1'
 gem 'paranoia', github: 'rubysherpas/paranoia', branch: 'core'
-gem 'slim-rails', '~> 3.0.1'
+gem 'pry-rails', '~> 0.3.4'
 gem 'pundit', '~> 1.1.0'
-gem 'bugsnag', '~> 4.0.0'
+gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'
 gem 'redcarpet', '~> 3.2.3'
-gem 'gravatar_image_tag', '~> 1.2.0'
+gem 'redis-namespace', '~> 1.5.2'
+gem 'redis-rails', '~> 5.0.1'
+gem 'selenium-webdriver', '~> 2.53.0'
+gem 'sidekiq', '~> 4.2.9'
+gem 'sidekiq-failures', '~> 0.4.5'
+gem 'sidekiq-unique-jobs', '~> 4.0.13'
 gem 'simple_form', '~> 3.2.1'
-gem 'cocoon', '~> 1.2.9'
-gem 'nilify_blanks', '~> 1.2.1'
-gem 'bootstrap-kaminari-views', '~> 0.0.5'
-gem 'bower-rails', '~> 0.10.0'
-gem 'acts_as_hashids', '~> 0.1.2'
-gem 'enum_help', '~> 0.0.15'
-gem 'validates_timeliness', '~> 4.0.2'
+gem 'sinatra', '~> 1.0', require: nil
+gem 'slim-rails', '~> 3.1.1'
+gem 'sprockets-es6', '~> 0.9.2'
 gem 'swagger-blocks', '~> 1.3.3'
-gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'
-
-################################
-# redis-rails Rails 5 support
-# gem 'redis-rack', github: "schuylr/redis-rack", ref: "a01bfe5a8ee1df4af6c3a886e005896fe711aab7"
-gem 'redis-rack', github: 'redis-store/redis-rack', ref: '83a7b7b895bb528c1ae88329e4bca09a97d9fbbf'
-gem 'redis-activesupport', github: 'claudiob/redis-activesupport', ref: 'd83917b3a852a98cd0bee8709ab52e5437f7ca11'
-# gem 'redis-actionpack', github: "schuylr/redis-actionpack", ref: "b4b37571e3db63cf10713995e7d1ef85e3183b42"
-gem 'redis-actionpack', github: 'marcroberts/redis-actionpack', ref: '4e23b49c814ee49ed216bbcaa7811f55c84b5cd2'
-gem 'redis-rails', github: 'redis-store/redis-rails', branch: :master
-################################
+gem 'validates_timeliness', '~> 4.0.2'
+gem 'yajl-ruby', '~> 1.2.1'
 
 ################################
-# ActiveAdmin Rails 5 support
-gem 'activeadmin', github: 'activeadmin/activeadmin', branch: 'master'
-gem 'ransack',    github: 'activerecord-hackery/ransack'
-gem 'kaminari',   github: 'amatsuda/kaminari', branch: '0-17-stable'
-gem 'formtastic', github: 'justinfrench/formtastic'
-gem 'draper',     github: 'audionerd/draper', branch: 'rails5', ref: 'e816e0e587'
-# To fix a Draper deprecation error
-gem 'activemodel-serializers-xml', github: 'rails/activemodel-serializers-xml'
+# activeadmin Rails 5 support
+gem 'inherited_resources', git: 'https://github.com/activeadmin/inherited_resources'
 ################################
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug', '~> 8.2.2'
-  gem 'pry-byebug', '~> 3.3.0'
   gem 'factory_girl_rails', '~> 4.6.0'
+  gem 'pry-byebug', '~> 3.3.0'
   # i18n generators
   gem 'i18n-tasks', '~> 0.9.5'
   gem 'i18n_generators', '~> 2.1.1'
 end
 
 group :development do
   # Access an IRB console on exception pages or by using <%= console %> in views
-  gem 'web-console', '~> 3.0'
   gem 'listen', '~> 3.0.5'
+  gem 'web-console', '~> 3.0'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring', '~> 1.6.4'
   gem 'spring-watcher-listen', '~> 2.0.0'
   # Code regulation
-  gem 'rubocop', '~> 0.37.2', require: false
-  gem 'rubocop-rspec', '~> 1.4.0', require: false
+  gem 'rubocop', '~> 0.47.1', require: false
+  gem 'rubocop-rspec', '~> 1.10.0', require: false
   # Vulnerability scan
   gem 'brakeman', '~> 3.2.1', require: false
   # Debug Email
   gem 'letter_opener_web', '~> 1.3.0'
 end
 
 group :test do
-  gem 'rspec-rails', '~> 3.5.0.beta2'
   gem 'rails-controller-testing', '~> 0.1.1'
+  gem 'rspec-rails', '~> 3.5.0.beta2'
   # Test Coverage
-  gem 'simplecov', '~> 0.11.2', require: false
-  gem 'coveralls', '~> 0.8.13', require: false
   gem 'codeclimate-test-reporter', '~> 0.5.0', require: false
+  gem 'coveralls', '~> 0.8.13', require: false
   gem 'database_rewinder', '~> 0.5.3'
+  gem 'simplecov', '~> 0.11.2', require: false
   # gem 'fuubar'
   gem 'timecop', '~> 0.8.0'
   gem 'webmock', '~> 1.24.2', require: false