Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test with more modern rubies, bump runtime/development dependencies #87

Merged
merged 6 commits into from
Mar 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu, macos]
ruby: [2.3, 2.4, 2.5, 2.6, 2.7, truffleruby, truffleruby-head]
ruby: ["2.7", "3.0", "3.1", "3.2", "3.3", "truffleruby", "truffleruby-head"]
runs-on: ${{ matrix.os }}-latest
steps:
- uses: actions/checkout@v2
Expand Down
6 changes: 3 additions & 3 deletions churn.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ Gem::Specification.new do |s|
s.add_runtime_dependency "main", ">= 0"
# TODO: How to replace chronic, or just have less verbose time support
s.add_runtime_dependency "chronic", ">= 0.2.3"
s.add_runtime_dependency "sexp_processor", "~> 4.1"
s.add_runtime_dependency "sexp_processor", "~> 4.17"
s.add_runtime_dependency "ruby_parser", "~> 3.0"
# TODO: Just have clean output and drop hirb
s.add_runtime_dependency "hirb", ">= 0"

s.add_development_dependency 'pry-byebug'
s.add_development_dependency "minitest", "~> 5.3"
s.add_development_dependency "minitest", "~> 5.22"
s.add_development_dependency "test_construct", "~> 2.0.0"
s.add_development_dependency "rake", ">= 0"
s.add_development_dependency "mocha", "~> 1.1.0"
s.add_development_dependency "mocha", "~> 2.1.0"
s.add_development_dependency "simplecov", ">= 0"
s.add_development_dependency "yard", "~> 0.9.20"
# NOTE: we haven't been updating the man file, and ronn was used to do that... clean up
Expand Down
2 changes: 1 addition & 1 deletion lib/churn/location_mapping.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def process_class(exp)
start_line = exp.line
last_line = deep_last_line(exp)
name = name if name.is_a?(Symbol)
name = name.values.value if name.is_a?(Sexp) #deals with cases like class Test::Unit::TestCase
name = name.to_a.last if name.is_a?(Sexp) #deals with cases like class Test::Unit::TestCase
@current_class = name
@klasses_collection[name.to_s] = [] unless @klasses_collection.include?(name)
@klasses_collection[name.to_s] << (start_line..last_line)
Expand Down
2 changes: 1 addition & 1 deletion test/data/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
require 'minitest/autorun'
require 'shoulda'
require 'test_construct'
require 'mocha/mini_test'
require 'mocha/minitest'

$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
$LOAD_PATH.unshift(File.dirname(__FILE__))
Expand Down
3 changes: 1 addition & 2 deletions test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
require 'minitest/autorun'
#require 'shoulda'
require 'test_construct'
require 'mocha/mini_test'
require 'mocha/minitest'

SimpleCov.start do
add_filter 'specs/ruby/1.9.1/gems/'
Expand All @@ -14,7 +14,6 @@
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
$LOAD_PATH.unshift(File.dirname(__FILE__))
require 'churn/calculator'
Mocha::Configuration.prevent(:stubbing_non_existent_method)

class Minitest::Test
include TestConstruct::Helpers
Expand Down
Loading