Skip to content
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
14 changes: 1 addition & 13 deletions .github/ruby-versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,5 @@
"3.3.3",
"3.3.2",
"3.3.1",
"3.3.0",
"3.2.11",
"3.2.10",
"3.2.9",
"3.2.8",
"3.2.7",
"3.2.6",
"3.2.5",
"3.2.4",
"3.2.3",
"3.2.2",
"3.2.1",
"3.2.0"
"3.3.0"
]
2 changes: 1 addition & 1 deletion lib/ruby_version_checker.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class RubyVersionChecker
class Error < StandardError; end

# Minimum Ruby version to consider (non-EOL versions only)
MIN_RUBY_VERSION = "3.2.0"
MIN_RUBY_VERSION = "3.3.0"

# Ruby-build repository
RUBY_BUILD_REPO = "rbenv/ruby-build"
Expand Down
6 changes: 3 additions & 3 deletions test/commands/add_ruby_version_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ def test_output_shows_version_comparison
end

def test_output_indicates_skipped_updates_for_older_version
setup_valid_environment(default_ruby: "3.3.0")
result = run_command("3.2.5")
setup_valid_environment(default_ruby: "3.4.0")
result = run_command("3.3.5")

assert_match(/not newer than current default/i, result[:output])
assert_match(/skipping/i, result[:output])
Expand Down Expand Up @@ -198,7 +198,7 @@ def create_test_file(filename, version: "3.3.0")
File.write(File.join(@temp_dir, "features/test/ruby/#{filename}"), content)
end

def setup_valid_environment(versions: ["3.3.0", "3.2.0"], default_ruby: "3.3.0", feature_version: "2.0.0")
def setup_valid_environment(versions: ["3.3.0"], default_ruby: "3.3.0", feature_version: "2.0.0")
create_versions_json(versions)
create_feature_json(version: feature_version, default_ruby: default_ruby)
create_readme(default_version: default_ruby)
Expand Down
55 changes: 27 additions & 28 deletions test/ruby_version_adder_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,15 @@ def test_accepts_valid_version_format
# ==========================================================================

def test_rejects_duplicate_version
setup_valid_environment(versions: ["3.3.0", "3.2.0"])
setup_valid_environment(versions: ["3.3.0"])
result = call_service("3.3.0")

refute result[:success], "Should fail when version already exists"
assert_match(/already exists/i, result[:error])
end

def test_accepts_new_version
setup_valid_environment(versions: ["3.3.0", "3.2.0"])
setup_valid_environment(versions: ["3.3.0"])
result = call_service("3.4.0")

assert result[:success], "Should accept new version: #{result[:error]}"
Expand All @@ -94,29 +94,28 @@ def test_accepts_new_version
# ==========================================================================

def test_adds_version_to_json_file
setup_valid_environment(versions: ["3.3.0", "3.2.0"])
setup_valid_environment(versions: ["3.3.0"])
call_service("3.4.0")

versions = read_versions_json
assert_includes versions, "3.4.0", "New version should be added to JSON"
assert_includes versions, "3.3.0", "Existing versions should be preserved"
assert_includes versions, "3.2.0", "Existing versions should be preserved"
end

def test_uses_four_space_indentation
setup_valid_environment(versions: ["3.3.0", "3.2.0"])
setup_valid_environment(versions: ["3.3.0"])
call_service("3.4.0")

content = File.read(File.join(@temp_dir, ".github/ruby-versions.json"))
assert_match(/^ "3\.4\.0"/, content, "Should use 4-space indentation")
end

def test_sorts_versions_descending
setup_valid_environment(versions: ["3.3.0", "3.2.0"])
setup_valid_environment(versions: ["3.3.0"])
call_service("3.4.0")

versions = read_versions_json
assert_equal ["3.4.0", "3.3.0", "3.2.0"], versions, "Versions should be sorted descending"
assert_equal ["3.4.0", "3.3.0"], versions, "Versions should be sorted descending"
end

def test_sorts_versions_with_double_digit_patch
Expand All @@ -129,11 +128,11 @@ def test_sorts_versions_with_double_digit_patch
end

def test_adds_older_version_in_correct_position
setup_valid_environment(versions: ["3.3.0", "3.1.0"])
call_service("3.2.0")
setup_valid_environment(versions: ["3.4.0", "3.3.0"])
call_service("3.3.5")

versions = read_versions_json
assert_equal ["3.3.0", "3.2.0", "3.1.0"], versions,
assert_equal ["3.4.0", "3.3.5", "3.3.0"], versions,
"Older version should be inserted in correct sorted position"
end

Expand All @@ -160,11 +159,11 @@ def test_updates_default_when_version_is_newer
end

def test_does_not_update_default_when_version_is_older
setup_valid_environment(versions: ["3.3.0", "3.2.0"], default_ruby: "3.3.0")
call_service("3.2.5")
setup_valid_environment(versions: ["3.4.0", "3.3.0"], default_ruby: "3.4.0")
call_service("3.3.5")

feature = read_feature_json
assert_equal "3.3.0", feature["options"]["version"]["default"],
assert_equal "3.4.0", feature["options"]["version"]["default"],
"Default should remain unchanged for older version"
end

Expand Down Expand Up @@ -201,12 +200,12 @@ def test_returns_default_updated_true_when_default_changes
end

def test_returns_default_updated_false_when_default_unchanged
setup_valid_environment(versions: ["3.3.0"], default_ruby: "3.3.0")
result = call_service("3.2.5")
setup_valid_environment(versions: ["3.4.0", "3.3.0"], default_ruby: "3.4.0")
result = call_service("3.3.5")

assert result[:success]
refute result[:default_updated], "Should indicate default was not updated"
assert_equal "3.3.0", result[:previous_default]
assert_equal "3.4.0", result[:previous_default]
assert_nil result[:new_default]
end

Expand Down Expand Up @@ -242,11 +241,11 @@ def test_updates_readme_when_version_is_newer
end

def test_does_not_update_readme_when_version_is_older
setup_valid_environment(default_ruby: "3.3.0")
call_service("3.2.5")
setup_valid_environment(default_ruby: "3.4.0")
call_service("3.3.5")

readme = read_readme
assert_match(/\| string \| 3\.3\.0 \|/, readme,
assert_match(/\| string \| 3\.4\.0 \|/, readme,
"README should keep old default version")
end

Expand All @@ -264,8 +263,8 @@ def test_bumps_feature_version_when_default_changes
end

def test_does_not_bump_feature_version_when_default_unchanged
setup_valid_environment(feature_version: "2.0.0", default_ruby: "3.3.0")
call_service("3.2.5")
setup_valid_environment(feature_version: "2.0.0", default_ruby: "3.4.0")
call_service("3.3.5")

feature = read_feature_json
assert_equal "2.0.0", feature["version"],
Expand Down Expand Up @@ -305,21 +304,21 @@ def test_updates_test_files_when_default_changes
end

def test_does_not_update_test_files_when_default_unchanged
setup_valid_environment(default_ruby: "3.3.0")
call_service("3.2.5")
setup_valid_environment(default_ruby: "3.4.0")
call_service("3.3.5")

test_content = read_test_file("test.sh")
assert_match(/3\.3\.0/, test_content, "test.sh should keep old version")
refute_match(/3\.2\.5/, test_content, "test.sh should not contain older version")
assert_match(/3\.4\.0/, test_content, "test.sh should keep old version")
refute_match(/3\.3\.5/, test_content, "test.sh should not contain older version")
end

# ==========================================================================
# Files Modified Tests
# ==========================================================================

def test_returns_files_modified_for_older_version
setup_valid_environment(versions: ["3.3.0"], default_ruby: "3.3.0")
result = call_service("3.2.5")
setup_valid_environment(versions: ["3.4.0", "3.3.0"], default_ruby: "3.4.0")
result = call_service("3.3.5")

assert result[:success]
assert_includes result[:files_modified], ".github/ruby-versions.json"
Expand Down Expand Up @@ -475,7 +474,7 @@ def read_test_file(filename)
File.read(File.join(@temp_dir, "features/test/ruby/#{filename}"))
end

def setup_valid_environment(versions: ["3.3.0", "3.2.0"], default_ruby: "3.3.0", feature_version: "2.0.0")
def setup_valid_environment(versions: ["3.3.0"], default_ruby: "3.3.0", feature_version: "2.0.0")
create_versions_json(versions)
create_feature_json(version: feature_version, default_ruby: default_ruby)
create_readme(default_version: default_ruby)
Expand Down
16 changes: 8 additions & 8 deletions test/ruby_version_checker_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ def teardown
end

def test_check_returns_new_versions
setup_versions_file(["3.3.0", "3.2.0"])
stub_github_api(available_versions: ["3.4.0", "3.3.0", "3.2.0"])
setup_versions_file(["3.3.0"])
stub_github_api(available_versions: ["3.4.0", "3.3.0"])

result = RubyVersionChecker.check(
working_dir: @temp_dir,
Expand All @@ -48,8 +48,8 @@ def test_check_returns_new_versions
end

def test_check_returns_empty_when_up_to_date
setup_versions_file(["3.4.0", "3.3.0", "3.2.0"])
stub_github_api(available_versions: ["3.4.0", "3.3.0", "3.2.0"])
setup_versions_file(["3.4.0", "3.3.0"])
stub_github_api(available_versions: ["3.4.0", "3.3.0"])

result = RubyVersionChecker.check(
working_dir: @temp_dir,
Expand Down Expand Up @@ -87,13 +87,13 @@ def test_check_filters_versions_below_minimum
)

assert result[:success]
# Only 3.4.0 should be returned (>= 3.2.0 and not already in config)
# Only 3.4.0 should be returned (>= 3.3.0 and not already in config)
assert_equal ["3.4.0"], result[:new_versions]
end

def test_check_sorts_versions_descending
setup_versions_file(["3.2.0"])
stub_github_api(available_versions: ["3.3.0", "3.4.0", "3.2.5", "3.2.0"])
setup_versions_file(["3.3.0"])
stub_github_api(available_versions: ["3.3.5", "3.4.0", "3.3.0"])

result = RubyVersionChecker.check(
working_dir: @temp_dir,
Expand All @@ -102,7 +102,7 @@ def test_check_sorts_versions_descending
)

assert result[:success]
assert_equal ["3.4.0", "3.3.0", "3.2.5"], result[:new_versions]
assert_equal ["3.4.0", "3.3.5"], result[:new_versions]
end

def test_check_fails_when_versions_file_missing
Expand Down