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
6157e508
Commit
6157e508
authored
Jun 12, 2014
by
take_cheeze
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implement `add_conflicts`. Solve #2383.
parent
be3e36cb
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 @
6157e508
...
...
@@ -32,7 +32,7 @@ module MRuby
attr_accessor
:bins
attr_accessor
:requirements
attr_reader
:dependencies
attr_reader
:dependencies
,
:conflicts
attr_accessor
:export_include_paths
...
...
@@ -72,7 +72,7 @@ module MRuby
@bins
=
[]
@requirements
=
[]
@dependencies
=
[]
@dependencies
,
@conflicts
=
[],
[]
@export_include_paths
=
[]
@export_include_paths
<<
"
#{
dir
}
/include"
if
File
.
directory?
"
#{
dir
}
/include"
...
...
@@ -102,6 +102,10 @@ module MRuby
@dependencies
<<
{
:gem
=>
name
,
:requirements
=>
requirements
,
:default
=>
default_gem
}
end
def
add_conflicts
(
*
names
)
@conflicts
+=
names
end
def
self
.
bin
=
(
bin
)
@bins
=
[
bin
].
flatten
end
...
...
@@ -323,6 +327,9 @@ module MRuby
fail
"
#{
name
}
version should be
#{
req_versions
.
join
(
' and '
)
}
but was '
#{
dep_g
.
version
}
'"
end
end
cfls
=
g
.
conflicts
.
select
{
|
c
|
gem_table
.
key?
c
}
fail
"Conflicts of gem `
#{
g
.
name
}
` found:
#{
cfls
.
join
', '
}
"
unless
cfls
.
empty?
end
class
<<
gem_table
...
...
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