diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3ae98ce..c113c04 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,8 +14,9 @@ jobs: strategy: matrix: ruby: - - '3.1.2' - - '2.7.6' + - '3.4.4' + - '3.3.8' + - '3.2.8' steps: - name: Setup Graphviz @@ -26,5 +27,7 @@ jobs: with: ruby-version: ${{ matrix.ruby }} bundler-cache: true + - name: Check rubocop version + run: bundle exec rubocop -v - name: Run the default task run: bundle exec rake diff --git a/.gitignore b/.gitignore index b04a8c8..c19ee6e 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,6 @@ # rspec failure tracking .rspec_status + +Gemfile.lock +.ruby-version diff --git a/.rubocop.yml b/.rubocop.yml index 0283986..57834cd 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,5 +1,5 @@ AllCops: - TargetRubyVersion: 2.6 + TargetRubyVersion: 3.2 SuggestExtensions: false NewCops: enable Exclude: diff --git a/Gemfile b/Gemfile index 42f6d6f..3dda896 100644 --- a/Gemfile +++ b/Gemfile @@ -5,10 +5,11 @@ source "https://rubygems.org" # Specify your gem's dependencies in snapbot.gemspec gemspec -gem "launchy", "~> 2.5.0" - +# Development dependencies +gem "launchy", "~> 2.5" gem "rake", "~> 13.0" - -gem "rspec", "~> 3.0" - -gem "rubocop", "~> 1.21" +gem "rbs", "~> 3.9" +gem "rspec", "~> 3.13" +gem "rubocop", "~> 1.75" +gem "sqlite3", ">= 2.1" +gem "steep", "~> 1.10" diff --git a/lib/snapbot/diagram/dot_generator.rb b/lib/snapbot/diagram/dot_generator.rb index e81ff23..852edc2 100644 --- a/lib/snapbot/diagram/dot_generator.rb +++ b/lib/snapbot/diagram/dot_generator.rb @@ -2,7 +2,7 @@ require "snapbot/reflector" -if defined?(::RSpec) +if defined?(RSpec) require "snapbot/rspec/lets" require "binding_of_caller" end diff --git a/snapbot.gemspec b/snapbot.gemspec index 2a1447d..16c3faa 100644 --- a/snapbot.gemspec +++ b/snapbot.gemspec @@ -11,7 +11,7 @@ Gem::Specification.new do |spec| spec.summary = "A `save_and_open_diagram` tool to visualise ActiveRecord test records" spec.homepage = "https://github.com/rgarner/snapbot" spec.license = "MIT" - spec.required_ruby_version = ">= 2.6.0" + spec.required_ruby_version = ">= 3.2.0" spec.metadata["homepage_uri"] = spec.homepage spec.metadata["source_code_uri"] = "https://github.com/rgarner/snapbot" @@ -31,14 +31,9 @@ Gem::Specification.new do |spec| spec.add_dependency "binding_of_caller", "~> 1.0" version_string = [">= 6.1"] - spec.add_runtime_dependency "actionpack", version_string - spec.add_runtime_dependency "activerecord", version_string - spec.add_runtime_dependency "activesupport", version_string - - spec.add_development_dependency "launchy" - spec.add_development_dependency "rbs" - spec.add_development_dependency "sqlite3" - spec.add_development_dependency "steep" + spec.add_dependency "actionpack", version_string + spec.add_dependency "activerecord", version_string + spec.add_dependency "activesupport", version_string # For more information and examples about making a new gem, check out our # guide at: https://bundler.io/guides/creating_gem.html diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index ff0c2c3..bd30bc2 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -2,7 +2,7 @@ require "snapbot" -Dir[File.join(File.dirname(__FILE__), "support", "**", "*.rb")].sort.each { |f| require f } +Dir[File.join(File.dirname(__FILE__), "support", "**", "*.rb")].each { |f| require f } RSpec.configure do |config| # Enable flags like --only-failures and --next-failure