Skip to content

Fix simpler conditional cases #7

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.

Sign up for GitHub

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

Merged
Daniel-N-Huss merged 1 commit into from
Aug 15, 2023
Merged

Fix simpler conditional cases #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions lib/gem_dating/input.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@ def gems
lines.each_with_object([]) do |line, gems|
line = gem_line(line.strip)
gems << cleanup(line) if line
end
end.uniq
end

def gem_line(line)
return if line.strip == "end"
return if line =~ /^\s*#/
single_word_ruby_statements = %w{end else #}
return if single_word_ruby_statements.include? line.strip

if line.start_with? "gem("
line.split("(")[1].split(",")[0]
elsif line.start_with? "gem"
line.split[1].split(",")[0]
elsif line.split.length == 1
elsif line.split.length == 1 # match "just" gemname
line
end
end
Expand Down
14 changes: 14 additions & 0 deletions test/input_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,18 @@ def test_hash_alone_causes_confusion
gems = GemDating::Input.new(pasteboard).gems
assert_equal ["tzinfo-data", "bcrypt"], gems
end

def test_conditional_versioning
pasteboard = <<-TEXT
if rails_edge?
gem 'rails'
elsif rails_next?
gem 'rails', '~> 6.2'
else
gem 'rails', '~> 5.2.8.1'
end
TEXT
gems = GemDating::Input.new(pasteboard).gems
assert_equal ["rails"], gems
end
end