Permalink
Browse files

Update RuboCop and fix offenses

  • Loading branch information...
1 parent b9bea14 commit 59f87939baf167b7d359f6841595a909d3af9aaf @mvz mvz committed Dec 5, 2016
Showing with 25 additions and 22 deletions.
  1. +4 −0 .rubocop.yml
  2. +19 −18 Gemfile
  3. +1 −2 spec/support/mocks/flickr_mock.rb
  4. +1 −2 spec/support/mocks/http_mock.rb
View
@@ -13,6 +13,10 @@ AllCops:
Rails:
Enabled: true
+# We have duplication due to extra logic in the Gemfile
+Bundler/DuplicatedGem:
+ Enabled: false
+
# Allow if (foo = get_foo) style
Lint/AssignmentInCondition:
AllowSafeAssignment: true
View
@@ -4,8 +4,8 @@ if ENV['HEROKU']
ruby '2.1.5'
gem 'pg'
- gem 'thin' # Change this to another web server if you want (ie. unicorn, passenger, puma...)
gem 'rails_12factor'
+ gem 'thin' # Change this to another web server if you want (ie. unicorn, passenger, puma...)
else
require 'yaml'
@@ -38,19 +38,19 @@ end
gem 'rails', '~> 5.0.0'
-gem 'publify_core', '~> 9.0.0.pre4'
+# Store sessions in the database
+gem 'activerecord-session_store', '~> 1.0.0'
+
gem 'publify_amazon_sidebar', '~> 9.0.0.pre1'
+gem 'publify_core', '~> 9.0.0.pre4'
gem 'publify_textfilter_code', '~> 9.0.0.pre1'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# Needed for the lightbox and flickr text filters
-gem 'flickraw-cached', '20120701'
gem 'flickraw', '~> 0.9.8'
-
-# Store sessions in the database
-gem 'activerecord-session_store', '~> 1.0.0'
+gem 'flickraw-cached', '20120701'
gem 'non-stupid-digest-assets', '~> 1.0'
gem 'rake', '~> 11.1'
@@ -59,30 +59,31 @@ group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', '~> 9.0'
- gem 'factory_girl', '~> 4.5'
gem 'capybara', '~> 2.7'
+ gem 'factory_girl', '~> 4.5'
+ gem 'i18n-tasks', '~> 0.9.1', require: false
+ gem 'pry', '~> 0.10.3'
+ gem 'pry-rails', '~> 0.3.4'
gem 'rspec-rails', '~> 3.4'
+ gem 'rubocop', '~> 0.46.0', require: false
gem 'simplecov', '~> 0.12.0', require: false
- gem 'pry-rails', '~> 0.3.4'
- gem 'pry', '~> 0.10.3'
-
- gem 'rubocop', '~> 0.45.0', require: false
- gem 'i18n-tasks', '~> 0.9.1', require: false
end
group :development do
- # Access an IRB console on exception pages or by using <%= console %> in views
- gem 'web-console', '~> 3.0' if RUBY_VERSION >= '2.2.2'
+ gem 'better_errors', '~> 2.1.1'
+ gem 'binding_of_caller', '~> 0.7.2'
+
+ gem 'guard-rspec'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring', '~> 2.0.0'
- gem 'spring-commands-rspec', '~> 1.0'
gem 'spring-commands-cucumber', '~> 1.0'
+ gem 'spring-commands-rspec', '~> 1.0'
gem 'thin', '~> 1.6'
- gem 'better_errors', '~> 2.1.1'
- gem 'binding_of_caller', '~> 0.7.2'
- gem 'guard-rspec'
+
+ # Access an IRB console on exception pages or by using <%= console %> in views
+ gem 'web-console', '~> 3.0' if RUBY_VERSION >= '2.2.2'
end
group :test do
@@ -1,8 +1,7 @@
# remove_const "Flickr"
class FlickRaw::Flickr
- def initialize
- end
+ def initialize; end
def photos
Photos.new
@@ -9,8 +9,7 @@ def post(query, post, headers = {})
end
class Net::HTTP
- def initialize(*_args)
- end
+ def initialize(*_args); end
def self.start(host, port)
request = Request.new

0 comments on commit 59f8793

Please sign in to comment.