Update Ruby and Rubocop versions; fix linting issues

primer · lukasoppermann · Apr 4, 2024 · Aug 28, 2023 · Aug 29, 2023 · Aug 29, 2023
commit f11c53068829398e22ad8b1601e534cf2db17c4f
@@ -101,7 +101,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: 3.2
       - uses: actions/download-artifact@v4
         with:
           name: octicons-build
@@ -130,7 +130,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: 3.2
       - uses: actions/download-artifact@v4
         with:
           name: octicons-gem
@@ -153,7 +153,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: 3.2
       - uses: actions/download-artifact@v4
         with:
           name: octicons-gem

@@ -26,7 +26,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: 3.2
 
       - name: Install dependencies
         run: |

@@ -2,3 +2,5 @@ inherit_gem:
   rubocop-github:
     - config/default.yml
     - config/rails.yml
+AllCops:
+  NewCops: enable
@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 source "https://rubygems.org"
 
 gemspec
 
 group :development, :test do
   gem "minitest"
   gem "rake"
-  gem "rubocop", "0.59"
-  gem "rubocop-github", "0.12.0"
+  gem "rubocop", "~> 1.0"
+  gem "rubocop-github", "0.20.0"
 end
diff --git a/lib/octicons_gem/Rakefile b/lib/octicons_gem/Rakefile
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "rake/testtask"
 require "rubocop/rake_task"
 require "bundler/gem_tasks"

diff --git a/lib/octicons_gem/lib/octicons.rb b/lib/octicons_gem/lib/octicons.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "octicons/version"
 require "octicons/octicon"
 require "json"

diff --git a/lib/octicons_gem/lib/octicons/octicon.rb b/lib/octicons_gem/lib/octicons/octicon.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Octicons
   class Octicon
     DEFAULT_HEIGHT = 16

diff --git a/lib/octicons_gem/lib/octicons/version.rb b/lib/octicons_gem/lib/octicons/version.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Octicons
   VERSION = "19.8.0".freeze
 end
diff --git a/lib/octicons_gem/octicons.gemspec b/lib/octicons_gem/octicons.gemspec
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path("../lib/octicons/version", __FILE__)
 
 Gem::Specification.new do |s|

diff --git a/lib/octicons_gem/test/helper.rb b/lib/octicons_gem/test/helper.rb
@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 require "minitest/autorun"
 require "octicons"
 
 def octicon(symbol, options = {})
-  ::Octicons::Octicon.new(symbol, options)
+  Octicons::Octicon.new(symbol, options)
 end
diff --git a/lib/octicons_gem/test/octicon_test.rb b/lib/octicons_gem/test/octicon_test.rb
@@ -1,4 +1,5 @@
-require_relative "./helper"
+# frozen_string_literal: true
+require_relative "helper"
 
 describe Octicons::Octicon do
   it "fails when the octicon doesn't exist" do

diff --git a/lib/octicons_gem/test/octicons_test.rb b/lib/octicons_gem/test/octicons_test.rb
@@ -1,4 +1,5 @@
-require_relative "./helper"
+# frozen_string_literal: true
+require_relative "helper"
 
 describe Octicons do
   it "loads all icons on initialization" do

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gemspec
@@ -8,6 +10,6 @@ gem "rails"
 group :development, :test do
   gem "minitest"
   gem "rake"
-  gem "rubocop", "0.59"
-  gem "rubocop-github", "0.12.0"
+  gem "rubocop", "~> 1.0"
+  gem "rubocop-github", "0.20.0"
 end
diff --git a/lib/octicons_helper/Rakefile b/lib/octicons_helper/Rakefile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rake/testtask"
 require "rubocop/rake_task"
 require "bundler/gem_tasks"

diff --git a/lib/octicons_helper/lib/octicons_helper.rb b/lib/octicons_helper/lib/octicons_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "octicons_helper/version"
 require "octicons_helper/helper"
 require "octicons_helper/railtie" if defined?(Rails)
diff --git a/lib/octicons_helper/lib/octicons_helper/helper.rb b/lib/octicons_helper/lib/octicons_helper/helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "octicons"
 require "action_view"
 

diff --git a/lib/octicons_helper/lib/octicons_helper/railtie.rb b/lib/octicons_helper/lib/octicons_helper/railtie.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails"
 
 module OcticonsHelper

diff --git a/lib/octicons_helper/lib/octicons_helper/version.rb b/lib/octicons_helper/lib/octicons_helper/version.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OcticonsHelper
   VERSION = "19.8.0".freeze
 end
diff --git a/lib/octicons_helper/octicons_helper.gemspec b/lib/octicons_helper/octicons_helper.gemspec
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path("../lib/octicons_helper/version", __FILE__)
 
 Gem::Specification.new do |s|

diff --git a/lib/octicons_helper/test/helper.rb b/lib/octicons_helper/test/helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "minitest/autorun"
 require "octicons_helper"
 

diff --git a/lib/octicons_helper/test/octicons_helper_test.rb b/lib/octicons_helper/test/octicons_helper_test.rb
@@ -1,4 +1,6 @@
-require_relative "./helper"
+# frozen_string_literal: true
+
+require_relative "helper"
 
 describe OcticonsHelper do
   describe "rendering" do
@@ -20,23 +22,7 @@
 
     it "caches SVGs for two calls with the same arguments" do
       OcticonsHelper.octicons_helper_cache = {}
-
-      mock = Minitest::Mock.new
-      def mock.path
-        @@call_count ||= 0
-        @@call_count += 1
-
-        raise "Octicon library called twice" if @@call_count > 1
-
-        "foo"
-      end
-      def mock.options; end
-
-      Octicons::Octicon.stub :new, mock do
-        octicon("alert")
-        octicon("alert")
-      end
-
+      assert octicon("alert").object_id == octicon("alert").object_id
       OcticonsHelper.octicons_helper_cache = {}
     end
   end

diff --git a/lib/octicons_jekyll/.rubocop.yml b/lib/octicons_jekyll/.rubocop.yml
@@ -4,3 +4,6 @@ inherit_gem:
 
 Naming/FileName:
   Enabled: false
+
+AllCops:
+  NewCops: enable
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 source "https://rubygems.org"
 
 gemspec
@@ -7,6 +8,6 @@ gem "octicons", "19.8.0"
 group :development, :test do
   gem "minitest"
   gem "rake"
-  gem "rubocop", "0.59"
-  gem "rubocop-github", "0.12.0"
+  gem "rubocop", "~> 1.0"
+  gem "rubocop-github", "0.20.0"
 end
diff --git a/lib/octicons_jekyll/Rakefile b/lib/octicons_jekyll/Rakefile
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "rake/testtask"
 require "rubocop/rake_task"
 require "bundler/gem_tasks"

diff --git a/lib/octicons_jekyll/jekyll-octicons.gemspec b/lib/octicons_jekyll/jekyll-octicons.gemspec
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path("../lib/jekyll-octicons/version", __FILE__)
 
 Gem::Specification.new do |s|

diff --git a/lib/octicons_jekyll/lib/jekyll-octicons.rb b/lib/octicons_jekyll/lib/jekyll-octicons.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "octicons"
 require "jekyll-octicons/version"
 require "liquid"

diff --git a/lib/octicons_jekyll/lib/jekyll-octicons/version.rb b/lib/octicons_jekyll/lib/jekyll-octicons/version.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Prevent bundler errors
 module Liquid; class Tag; end; end
 

diff --git a/lib/octicons_jekyll/test/helper.rb b/lib/octicons_jekyll/test/helper.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "minitest/autorun"
 require "jekyll-octicons"
 

diff --git a/lib/octicons_jekyll/test/octicon_tag_test.rb b/lib/octicons_jekyll/test/octicon_tag_test.rb
@@ -1,4 +1,5 @@
-require_relative "./helper"
+# frozen_string_literal: true
+require_relative "helper"
 
 describe Jekyll::Octicons do
   describe "parsing" do