Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
brew
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to JiHu GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
KMSCAKKSCFKA AKFACAMADCAS
brew
Commits
bc2d676b
Commit
bc2d676b
authored
8 years ago
by
Markus Reiter
Browse files
Options
Downloads
Patches
Plain Diff
Refactor logic to always choose first matched language.
parent
546a91f7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Library/Homebrew/cask/lib/hbc/dsl.rb
+23
-13
23 additions, 13 deletions
Library/Homebrew/cask/lib/hbc/dsl.rb
Library/Homebrew/cask/test/cask/dsl_test.rb
+6
-0
6 additions, 0 deletions
Library/Homebrew/cask/test/cask/dsl_test.rb
with
29 additions
and
13 deletions
Library/Homebrew/cask/lib/hbc/dsl.rb
+
23
−
13
View file @
bc2d676b
...
...
@@ -101,27 +101,37 @@ module Hbc
def
language
(
*
args
,
&
block
)
if
!
args
.
empty?
&&
block_given?
args
.
each
do
|
arg
|
MacOS
.
languages
.
each_with_index
do
|
l
,
index
|
next
unless
arg
==
:default
||
l
.
match
(
arg
)
next
unless
@language
.
nil?
||
@language
[
:level
].
nil?
||
@language
[
:level
]
>
index
@language
=
{
block:
block
,
level:
index
,
}
end
end
@language_blocks
||=
{}
@language_blocks
[
args
]
=
block
else
language_eval
@language
end
end
def
language_eval
if
@language
.
is_a?
(
Hash
)
&&
@language
.
key?
(
:block
)
@language
=
@language
[
:block
].
call
return
if
instance_variable_defined?
(
:@language
)
return
unless
instance_variable_defined?
(
:@language_blocks
)
default_key
=
@language_blocks
.
keys
.
detect
{
|
key
|
key
.
include?
(
:default
)
}
MacOS
.
languages
.
each
do
|
language
|
@language_blocks
.
each
do
|
regexes_or_strings
,
block
|
if
regexes_or_strings
.
include?
(
:default
)
regexes_or_strings
=
regexes_or_strings
-
[
:default
]
+
[
%r{^en}
]
end
case
language
when
*
regexes_or_strings
@language
=
block
.
call
return
end
end
end
# fallback to :default
@language
=
default_key
.
nil?
?
nil
:
@language_blocks
[
default_key
].
call
end
def
url
(
*
args
,
&
block
)
...
...
This diff is collapsed.
Click to expand it.
Library/Homebrew/cask/test/cask/dsl_test.rb
+
6
−
0
View file @
bc2d676b
...
...
@@ -148,6 +148,12 @@ describe Hbc::DSL do
MacOS
.
stubs
(
languages:
[
"THIRD_LANGUAGE"
])
cask
.
call
.
language
.
must_equal
:default
MacOS
.
stubs
(
languages:
[
"THIRD_LANGUAGE"
,
"SECOND_LANGUAGE"
,
"FIRST_LANGUAGE"
])
cask
.
call
.
language
.
must_equal
:second
MacOS
.
stubs
(
languages:
[
"THIRD_LANGUAGE"
,
"FIRST_LANGUAGE"
,
"SECOND_LANGUAGE"
])
cask
.
call
.
language
.
must_equal
:first
end
end
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment