Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mruby
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
mruby
Commits
eebb9441
Commit
eebb9441
authored
Jun 13, 2014
by
take_cheeze
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implement `add_conflict`. Usage is similar to `add_dependency`.
parent
6157e508
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
2 deletions
+9
-2
tasks/mrbgem_spec.rake
tasks/mrbgem_spec.rake
+9
-2
No files found.
tasks/mrbgem_spec.rake
View file @
eebb9441
...
...
@@ -103,7 +103,11 @@ module MRuby
end
def
add_conflicts
(
*
names
)
@conflicts
+=
names
@conflicts
+=
names
.
map
{
|
n
|
{
:gem
=>
n
}
}
end
def
add_conflict
(
name
,
*
req
)
@conflicts
<<
{
:gem
=>
name
,
:requirements
=>
req
.
empty?
?
nil
:
req
}
end
def
self
.
bin
=
(
bin
)
...
...
@@ -328,7 +332,10 @@ module MRuby
end
end
cfls
=
g
.
conflicts
.
select
{
|
c
|
gem_table
.
key?
c
}
cfls
=
g
.
conflicts
.
select
{
|
c
|
cfl_g
=
gem_table
[
c
[
:gem
]]
cfl_g
and
cfl_g
.
version_ok?
(
c
[
:requirements
]
||
[
'>= 0.0.0'
])
}.
map
{
|
c
|
"
#{
c
[
:gem
]
}
(
#{
gem_table
[
c
[
:gem
]].
version
}
)"
}
fail
"Conflicts of gem `
#{
g
.
name
}
` found:
#{
cfls
.
join
', '
}
"
unless
cfls
.
empty?
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment