update dev gems (rubocop and sqlite3) and their dependencies, and fix new rubocop warnings (stringer-rss#541)

Author: David Personette

.rubocop.yml

@@ -5,7 +5,7 @@ AllCops:
     - 'db/schema.rb'
     - 'vendor/**/*'
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 120
 
 Metrics/MethodLength:

.rubocop_todo.yml

@@ -50,14 +50,13 @@ Style/PercentLiteralDelimiters:
     - 'spec/helpers/url_helpers_spec.rb'
     - 'spec/javascript/test_controller.rb'
 
-# Offense count: 3
+# Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: ConvertCodeThatCanStartToReturnNil, Whitelist.
 # Whitelist: present?, blank?, presence, try, try!
 Style/SafeNavigation:
   Exclude:
     - 'app/controllers/feeds_controller.rb'
-    - 'app/tasks/fetch_feed.rb'
 
 # Offense count: 7
 # Cop supports --auto-correct.

Gemfile

@@ -8,8 +8,8 @@ group :production do
 end
 
 group :development do
-  gem "rubocop", ">= 0.61.1", require: false
-  gem "sqlite3", "~> 1.3", ">= 1.3.8"
+  gem "rubocop", require: false
+  gem "sqlite3"
 end
 
 group :development, :test do
@@ -36,8 +36,8 @@ gem "i18n"
 gem "loofah", "~> 2.3"
 gem "nokogiri", "~> 1.11"
 gem "rack-protection", "~> 2.0"
-gem "rack-ssl", "~> 1.4"
 gem "racksh", "~> 1.0"
+gem "rack-ssl", "~> 1.4"
 gem "rake", "~> 12.3"
 gem "sass"
 gem "sinatra", "~> 2.0"

Gemfile.lock

@@ -14,7 +14,7 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.4.0)
     arel (9.0.0)
-    ast (2.4.0)
+    ast (2.4.2)
     backports (3.6.8)
     bcrypt (3.1.11)
     builder (3.2.3)
@@ -59,7 +59,6 @@ GEM
       multi_xml (>= 0.5.2)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
     json (1.8.6)
     kgio (2.11.2)
     loofah (2.3.1)
@@ -78,9 +77,9 @@ GEM
     nokogiri (1.11.0)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
-    parallel (1.19.0)
-    parser (2.6.5.0)
-      ast (~> 2.4.0)
+    parallel (1.20.1)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
     pg (0.18.4)
     pry (0.10.3)
       coderay (~> 1.1.0)
@@ -103,6 +102,8 @@ GEM
     rainbow (3.0.0)
     raindrops (0.19.0)
     rake (12.3.3)
+    regexp_parser (2.1.1)
+    rexml (3.2.4)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
@@ -119,14 +120,18 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    rubocop (0.76.0)
-      jaro_winkler (~> 1.5.1)
+    rubocop (1.10.0)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    ruby-progressbar (1.10.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    ruby-progressbar (1.11.0)
     sass (3.4.22)
     sax-machine (1.3.2)
     shotgun (0.9.1)
@@ -159,7 +164,7 @@ GEM
       rack (> 1, < 3)
     sprockets-helpers (1.2.1)
       sprockets (>= 2.2)
-    sqlite3 (1.3.11)
+    sqlite3 (1.4.2)
     term-ansicolor (1.3.2)
       tins (~> 1.0)
     thor (0.19.1)
@@ -172,7 +177,7 @@ GEM
       thread_safe (~> 0.1)
     uglifier (3.0.2)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.6.0)
+    unicode-display_width (2.0.0)
     unicorn (5.4.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
@@ -206,7 +211,7 @@ DEPENDENCIES
   rake (~> 12.3)
   rspec (~> 3.4)
   rspec-html-matchers (~> 0.7)
-  rubocop (>= 0.61.1)
+  rubocop
   sass
   shotgun (~> 0.9)
   simplecov
@@ -216,7 +221,7 @@ DEPENDENCIES
   sinatra-flash (~> 0.3)
   sprockets (~> 3.7)
   sprockets-helpers
-  sqlite3 (~> 1.3, >= 1.3.8)
+  sqlite3
   thread (~> 0.2)
   timecop (~> 0.8)
   uglifier

Rakefile

@@ -14,7 +14,7 @@ require "./app"
 require_relative "./app/jobs/fetch_feed_job"
 require_relative "./app/tasks/fetch_feeds"
 require_relative "./app/tasks/change_password"
-require_relative "./app/tasks/remove_old_stories.rb"
+require_relative "./app/tasks/remove_old_stories"
 
 desc "Fetch all feeds."
 task :fetch_feeds do
@@ -83,6 +83,6 @@ begin
   RSpec::Core::RakeTask.new(:spec)
 
   task default: [:speedy_tests]
-rescue LoadError # rubocop:disable Lint/HandleExceptions
+rescue LoadError
   # allow for bundle install --without development:test
 end

app/fever_api/read_items.rb

@@ -9,10 +9,10 @@ def initialize(options = {})
     def call(params = {})
       if params.keys.include?("items")
         item_ids = begin
-                     params[:with_ids].split(",")
-                   rescue StandardError
-                     nil
-                   end
+          params[:with_ids].split(",")
+        rescue StandardError
+          nil
+        end
 
         {
           items: items(item_ids, params[:since_id]),

app/helpers/url_helpers.rb

@@ -14,7 +14,7 @@ def expand_absolute_urls(content, base_url)
 
         begin
           node.set_attribute(attr, URI.join(base_url, url).to_s)
-        rescue URI::InvalidURIError # rubocop:disable Lint/HandleExceptions
+        rescue URI::InvalidURIError
           # Just ignore. If we cannot parse the url, we don't want the entire
           # import to blow up.
         end

app/tasks/change_password.rb

@@ -26,7 +26,7 @@ def ask_confirmation
 
   def ask_hidden(question)
     print(question)
-    input = STDIN.noecho(&:gets).chomp
+    input = $stdin.noecho(&:gets).chomp
     puts
     input
   end

app/tasks/fetch_feed.rb

@@ -26,7 +26,7 @@ def fetch
   rescue StandardError => e
     FeedRepository.set_status(:red, @feed)
 
-    @logger.error "Something went wrong when parsing #{@feed.url}: #{e}" if @logger
+    @logger&.error "Something went wrong when parsing #{@feed.url}: #{e}"
   end
 
   private
@@ -37,7 +37,7 @@ def fetch_raw_feed
   end
 
   def feed_not_modified
-    @logger.info "#{@feed.url} has not been modified since last fetch" if @logger
+    @logger&.info "#{@feed.url} has not been modified since last fetch"
   end
 
   def feed_modified(raw_feed)

app/utils/sample_story.rb

@@ -1,5 +1,5 @@
-SampleStory = Struct.new(:source, :title, :lead, :is_read, :published) do # rubocop:disable Metrics/BlockLength
-  BODY = <<~EOS.freeze
+SampleStory = Struct.new(:source, :title, :lead, :is_read, :published) do
+  BODY = <<~EOS.freeze # rubocop:disable Lint/ConstantDefinitionInBlock
     <p>Tofu shoreditch intelligentsia <a href="#">umami</a>, fashion axe photo booth
     try-hard terry richardson quinoa actually fingerstache meggings fixie. Aesthetic
     salvia vinyl raw denim, keffiyeh master cleanse tonx selfies mlkshk occupy twee

db/migrate/20130409010818_create_feeds.rb

@@ -5,7 +5,7 @@ def change
       t.string :url
       t.timestamp :last_fetched
 
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end

db/migrate/20130409010826_create_stories.rb

@@ -7,7 +7,7 @@ def change
 
       t.references :feed
 
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end

db/migrate/20130418221144_add_user_model.rb

@@ -4,7 +4,7 @@ def change
       t.string :email
       t.string :password_digest
 
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end

db/migrate/20130425222157_add_delayed_job.rb

@@ -30,7 +30,7 @@ def self.up
       # The name of the queue this job is in
       table.string :queue
 
-      table.timestamps
+      table.timestamps null: false
     end
 
     add_index :delayed_jobs, [:priority, :run_at], name: "delayed_jobs_priority"

spec/commands/feeds/import_from_opml_spec.rb

@@ -14,14 +14,14 @@ def import
     Group.delete_all
   end
 
-  let(:group_1) { Group.find_by_name("Football News") }
-  let(:group_2) { Group.find_by_name("RoR") }
+  let(:group1) { Group.find_by_name("Football News") }
+  let(:group2) { Group.find_by_name("RoR") }
 
   context "adding group_id for existing feeds" do
-    let!(:feed_1) do
+    let!(:feed1) do
       Feed.create(name: "TMW Football Transfer News", url: "http://www.transfermarketweb.com/rss")
     end
-    let!(:feed_2) do
+    let!(:feed2) do
       Feed.create(
         name: "GIANT ROBOTS SMASHING INTO OTHER GIANT ROBOTS - Home",
         url: "http://feeds.feedburner.com/GiantRobotsSmashingIntoOtherGiantRobots"
@@ -30,26 +30,26 @@ def import
     before { import }
 
     it "retains exising feeds" do
-      expect(feed_1).to be_valid
-      expect(feed_2).to be_valid
+      expect(feed1).to be_valid
+      expect(feed2).to be_valid
     end
 
     it "creates new groups" do
-      expect(group_1).to be
-      expect(group_2).to be
+      expect(group1).to be
+      expect(group2).to be
     end
 
     it "sets group_id for existing feeds" do
-      expect(feed_1.reload.group).to eq group_1
-      expect(feed_2.reload.group).to eq group_2
+      expect(feed1.reload.group).to eq group1
+      expect(feed2.reload.group).to eq group2
     end
   end
 
   context "creates new feeds with groups" do
-    let(:feed_1) do
+    let(:feed1) do
       Feed.where(name: "TMW Football Transfer News", url: "http://www.transfermarketweb.com/rss")
     end
-    let(:feed_2) do
+    let(:feed2) do
       Feed.where(
         name: "GIANT ROBOTS SMASHING INTO OTHER GIANT ROBOTS - Home",
         url: "http://feeds.feedburner.com/GiantRobotsSmashingIntoOtherGiantRobots"
@@ -58,34 +58,34 @@ def import
     before { import }
 
     it "creates groups" do
-      expect(group_1).to be
-      expect(group_1).to be
+      expect(group1).to be
+      expect(group1).to be
     end
 
     it "creates feeds" do
-      expect(feed_1).to exist
-      expect(feed_2).to exist
+      expect(feed1).to exist
+      expect(feed2).to exist
     end
 
     it "sets group" do
-      expect(feed_1.first.group).to eq group_1
-      expect(feed_2.first.group).to eq group_2
+      expect(feed1.first.group).to eq group1
+      expect(feed2.first.group).to eq group2
     end
   end
 
   context "creates new feeds without group" do
-    let(:feed_1) { Feed.where(name: "Autoblog", url: "http://feeds.autoblog.com/weblogsinc/autoblog/").first }
-    let(:feed_2) { Feed.where(name: "City Guide News", url: "http://www.probki.net/news/RSS_news_feed.asp").first }
+    let(:feed1) { Feed.where(name: "Autoblog", url: "http://feeds.autoblog.com/weblogsinc/autoblog/").first }
+    let(:feed2) { Feed.where(name: "City Guide News", url: "http://www.probki.net/news/RSS_news_feed.asp").first }
 
     before { import }
 
     it "does not create any new group for feeds without group" do
-      expect(Group.where("id NOT IN (?)", [group_1.id, group_2.id]).count).to eq 0
+      expect(Group.where("id NOT IN (?)", [group1.id, group2.id]).count).to eq 0
     end
 
     it "creates feeds without group_id" do
-      expect(feed_1.group_id).to be_nil
-      expect(feed_2.group_id).to be_nil
+      expect(feed1.group_id).to be_nil
+      expect(feed2.group_id).to be_nil
     end
   end
 end

spec/factories/feed_factory.rb

@@ -17,7 +17,7 @@ def self.build(params = {})
     FakeFeed.new(
       id: rand(100),
       group_id: params[:group_id] || rand(100),
-      name: params[:name] || Faker::Name.name + " on Software",
+      name: params[:name] || Faker::Name.name + " on Software", # rubocop:disable Style/StringConcatenation
       url: params[:url] || Faker::Internet.url,
       last_fetched: params[:last_fetched] || Time.now,
       stories: params[:stories] || [],

spec/factories/group_factory.rb

@@ -11,7 +11,7 @@ def as_fever_json
   def self.build(params = {})
     FakeGroup.new(
       id: rand(100),
-      name: params[:name] || Faker::Name.name + " group"
+      name: params[:name] || Faker::Name.name + " group" # rubocop:disable Style/StringConcatenation
     )
   end
 end

spec/fever_api/read_groups_spec.rb

@@ -3,14 +3,14 @@
 app_require "fever_api/read_groups"
 
 describe FeverAPI::ReadGroups do
-  let(:group_1) { double("group_1", as_fever_json: { id: 1, title: "IT news" }) }
-  let(:group_2) { double("group_2", as_fever_json: { id: 2, title: "World news" }) }
+  let(:group1) { double("group1", as_fever_json: { id: 1, title: "IT news" }) }
+  let(:group2) { double("group2", as_fever_json: { id: 2, title: "World news" }) }
   let(:group_repository) { double("repo") }
 
   subject { FeverAPI::ReadGroups.new(group_repository: group_repository) }
 
   it "returns a group list if requested" do
-    expect(group_repository).to receive(:list).and_return([group_1, group_2])
+    expect(group_repository).to receive(:list).and_return([group1, group2])
     expect(subject.call("groups" => nil)).to eq(
       groups: [
         {