Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
cocoapods
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gengmeiios
cocoapods
Commits
784d6bc6
Commit
784d6bc6
authored
Sep 17, 2015
by
Muhammed Yavuz Nuzumlali
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adds specs. Indentation correction.
parent
9d3049a0
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
47 additions
and
4 deletions
+47
-4
resolver.rb
lib/cocoapods/resolver.rb
+4
-4
PrereleaseMonkey.podspec
...repo/PrereleaseMonkey/1.0-alpha1/PrereleaseMonkey.podspec
+11
-0
PrereleaseMonkey.podspec
..._repo/PrereleaseMonkey/1.0-beta1/PrereleaseMonkey.podspec
+11
-0
resolver_spec.rb
spec/unit/resolver_spec.rb
+21
-0
No files found.
lib/cocoapods/resolver.rb
View file @
784d6bc6
...
@@ -389,10 +389,10 @@ module Pod
...
@@ -389,10 +389,10 @@ module Pod
conflict
.
requirement
.
external_source
||
conflict
.
requirement
.
external_source
||
conflict
.
requirement
.
head?
)
conflict
.
requirement
.
head?
)
)
)
# Conflict was caused by not specifying an explicit version for the requirement #[name],
# Conflict was caused by not specifying an explicit version for the requirement #[name],
# and there is no available stable version for the requirement.
# and there is no available stable version for the requirement.
message
=
"There is no corresponding stable version for `
#{
name
}
`. "
\
message
=
"There is no corresponding stable version for `
#{
name
}
`. "
\
"You should explicitly specify the version in order to install a pre-release version of `
#{
name
}
`"
"You should explicitly specify the version in order to install a pre-release version of `
#{
name
}
`"
elsif
!
conflict
.
existing
elsif
!
conflict
.
existing
conflict
.
requirements
.
values
.
flatten
.
each
do
|
r
|
conflict
.
requirements
.
values
.
flatten
.
each
do
|
r
|
unless
search_for
(
r
).
empty?
unless
search_for
(
r
).
empty?
...
...
spec/fixtures/spec-repos/test_repo/PrereleaseMonkey/1.0-alpha1/PrereleaseMonkey.podspec
0 → 100644
View file @
784d6bc6
Pod
::
Spec
.
new
do
|
s
|
s
.
name
=
"PrereleaseMonkey"
s
.
version
=
"1.0-alpha1"
s
.
author
=
{
"Funky Monkey"
=>
"funky@monkey.local"
}
s
.
summary
=
"🙈🙉🙊"
s
.
description
=
"See no evil! Hear no evil! Speak no evil!"
s
.
homepage
=
"http://httpbin.org/html"
s
.
source
=
{
:git
=>
"http://monkey.local/monkey.git"
,
:tag
=>
s
.
version
.
to_s
}
s
.
license
=
'MIT'
s
.
vendored_library
=
'monkey.a'
end
spec/fixtures/spec-repos/test_repo/PrereleaseMonkey/1.0-beta1/PrereleaseMonkey.podspec
0 → 100644
View file @
784d6bc6
Pod
::
Spec
.
new
do
|
s
|
s
.
name
=
"PrereleaseMonkey"
s
.
version
=
"1.0-beta1"
s
.
author
=
{
"Funky Monkey"
=>
"funky@monkey.local"
}
s
.
summary
=
"🙈🙉🙊"
s
.
description
=
"See no evil! Hear no evil! Speak no evil!"
s
.
homepage
=
"http://httpbin.org/html"
s
.
source
=
{
:git
=>
"http://monkey.local/monkey.git"
,
:tag
=>
s
.
version
.
to_s
}
s
.
license
=
'MIT'
s
.
vendored_library
=
'monkey.a'
end
spec/unit/resolver_spec.rb
View file @
784d6bc6
...
@@ -641,6 +641,27 @@ module Pod
...
@@ -641,6 +641,27 @@ module Pod
specs
.
should
!=
[
'AFNetworking (1.0RC3)'
]
specs
.
should
!=
[
'AFNetworking (1.0RC3)'
]
specs
.
should
==
[
'AFNetworking (1.2.1)'
]
specs
.
should
==
[
'AFNetworking (1.2.1)'
]
end
end
it
'raises when there is no explicit version specified and there are only pre-release versions'
do
podfile
=
Podfile
.
new
do
platform
:ios
pod
'PrereleaseMonkey'
end
resolver
=
Resolver
.
new
(
config
.
sandbox
,
podfile
,
empty_graph
,
SourcesManager
.
all
)
e
=
lambda
{
resolver
.
resolve
}.
should
.
raise
Informative
e
.
message
.
should
.
match
(
/There is no corresponding stable version for `PrereleaseMonkey`/
)
e
.
message
.
should
.
match
(
/You should explicitly specify the version in order to install a pre-release version of `PrereleaseMonkey`/
)
end
it
'resolves when there is explicit pre-release version specified and there are only pre-release versions'
do
podfile
=
Podfile
.
new
do
platform
:ios
pod
'PrereleaseMonkey'
,
'1.0-beta1'
end
resolver
=
Resolver
.
new
(
config
.
sandbox
,
podfile
,
empty_graph
,
SourcesManager
.
all
)
specs
=
resolver
.
resolve
.
values
.
flatten
.
map
(
&
:to_s
).
sort
specs
.
should
==
[
'PrereleaseMonkey (1.0-beta1)'
]
end
end
end
end
end
end
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