Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #10376 from SeekingMeaning/livecheck-multi-version
livecheck: split cask versions into sub-versions
- Loading branch information
Showing
5 changed files
with
107 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
# typed: strict | ||
# frozen_string_literal: true | ||
|
||
module Homebrew | ||
module Livecheck | ||
# A formula or cask version, split into its component sub-versions. | ||
# | ||
# @api private | ||
class LivecheckVersion | ||
extend T::Sig | ||
|
||
include Comparable | ||
|
||
sig { params(formula_or_cask: T.any(Formula, Cask::Cask), version: Version).returns(LivecheckVersion) } | ||
def self.create(formula_or_cask, version) | ||
versions = case formula_or_cask | ||
when Formula | ||
[version] | ||
when Cask::Cask | ||
version.to_s.split(/[,:]/).map { |s| Version.new(s) } | ||
else | ||
T.absurd(formula_or_cask) | ||
end | ||
new(versions) | ||
end | ||
|
||
sig { returns(T::Array[Version]) } | ||
attr_reader :versions | ||
|
||
sig { params(versions: T::Array[Version]).void } | ||
def initialize(versions) | ||
@versions = versions | ||
end | ||
|
||
sig { params(other: T.untyped).returns(T.nilable(Integer)) } | ||
def <=>(other) | ||
return unless other.is_a?(LivecheckVersion) | ||
|
||
lversions = versions | ||
rversions = other.versions | ||
max = [lversions.count, rversions.count].max | ||
l = r = 0 | ||
|
||
while l < max | ||
a = lversions[l] || Version::NULL | ||
b = rversions[r] || Version::NULL | ||
|
||
if a == b | ||
l += 1 | ||
r += 1 | ||
next | ||
elsif !a.null? && b.null? | ||
return 1 if a > Version::NULL | ||
|
||
l += 1 | ||
elsif a.null? && !b.null? | ||
return -1 if b > Version::NULL | ||
|
||
r += 1 | ||
else | ||
return a <=> b | ||
end | ||
end | ||
|
||
0 | ||
end | ||
end | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
# typed: false | ||
# Frozen_string_literal: true | ||
# frozen_string_literal: true | ||
|
||
require "livecheck/livecheck" | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
# typed: false | ||
# frozen_string_literal: true | ||
|
||
require "livecheck/livecheck_version" | ||
|
||
describe Homebrew::Livecheck::LivecheckVersion do | ||
let(:formula) { instance_double(Formula) } | ||
let(:cask) { instance_double(Cask::Cask) } | ||
|
||
before do | ||
# Case statements use #=== for case equality purposes | ||
allow(Formula).to receive(:===).and_call_original | ||
allow(Formula).to receive(:===).with(formula).and_return(true) | ||
allow(Cask::Cask).to receive(:===).and_call_original | ||
allow(Cask::Cask).to receive(:===).with(cask).and_return(true) | ||
end | ||
|
||
specify "::create" do | ||
expect(described_class.create(formula, Version.new("1.1.6")).versions).to eq ["1.1.6"] | ||
expect(described_class.create(formula, Version.new("2.19.0,1.8.0")).versions).to eq ["2.19.0,1.8.0"] | ||
expect(described_class.create(formula, Version.new("1.0,100:1426778671")).versions).to eq ["1.0,100:1426778671"] | ||
expect(described_class.create(formula, Version.new("0.17.0,20210111183933,226")).versions) | ||
.to eq ["0.17.0,20210111183933,226"] | ||
|
||
expect(described_class.create(cask, Version.new("1.1.6")).versions).to eq ["1.1.6"] | ||
expect(described_class.create(cask, Version.new("2.19.0,1.8.0")).versions).to eq ["2.19.0", "1.8.0"] | ||
expect(described_class.create(cask, Version.new("1.0,100:1426778671")).versions) | ||
.to eq ["1.0", "100", "1426778671"] | ||
expect(described_class.create(cask, Version.new("0.17.0,20210111183933,226")).versions) | ||
.to eq ["0.17.0", "20210111183933", "226"] | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
# typed: false | ||
# Frozen_string_literal: true | ||
# frozen_string_literal: true | ||
|
||
require "livecheck/skip_conditions" | ||
|
||
|