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
c30e0909
Commit
c30e0909
authored
May 08, 2017
by
Dimitris Koutsogiorgas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use `git!` when executing `push` command in order to raise informative and set exit code.
parent
f8edd737
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
3 deletions
+23
-3
CHANGELOG.md
CHANGELOG.md
+4
-0
push.rb
lib/cocoapods/command/repo/push.rb
+1
-1
push_spec.rb
spec/functional/command/repo/push_spec.rb
+18
-2
No files found.
CHANGELOG.md
View file @
c30e0909
...
...
@@ -14,6 +14,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
##### Bug Fixes
*
Use
`git!`
when executing
`push`
command in order to raise informative and set exit code.
[
Dimitris Koutsogiorgas
](
https://github.com/dnkoutso
)
[
#6700
](
https://github.com/CocoaPods/CocoaPods/pull/6700
)
*
Make copy resources echoes always return true to work around issue where Xcode stops handling build script output greater than ~440 characters (rdar://30607704).
[
postmechanical
](
https://github.com/postmechanical
)
[
#6595
](
https://github.com/CocoaPods/CocoaPods/issues/6595
)
...
...
lib/cocoapods/command/repo/push.rb
View file @
c30e0909
...
...
@@ -213,7 +213,7 @@ module Pod
#
def
push_repo
UI
.
puts
"
\n
Pushing the `
#{
@repo
}
' repo
\n
"
.
yellow
UI
.
puts
`git -C "
#{
repo_dir
}
" push origin master 2>&1`
repo_git
(
'-C'
,
repo_dir
,
'push'
,
'origin'
,
'master'
)
end
#---------------------------------------------------------------------#
...
...
spec/functional/command/repo/push_spec.rb
View file @
c30e0909
...
...
@@ -177,7 +177,11 @@ module Pod
Validator
.
any_instance
.
expects
(
:podfile_from_spec
).
with
(
:tvos
,
nil
,
true
).
twice
cmd
=
command
(
'repo'
,
'push'
,
'master'
)
Dir
.
chdir
(
temporary_directory
)
{
cmd
.
run
}
# Git push will throw an exception here since this is a local custom git repo. All we care is the validator
# tests so the exception is swallowed.
lambda
do
Dir
.
chdir
(
temporary_directory
)
{
cmd
.
run
}
end
.
should
.
raise
Informative
end
it
'validates specs as libraries if requested'
do
...
...
@@ -187,7 +191,19 @@ module Pod
Validator
.
any_instance
.
expects
(
:podfile_from_spec
).
with
(
:tvos
,
nil
,
false
).
twice
cmd
=
command
(
'repo'
,
'push'
,
'master'
,
'--use-libraries'
)
Dir
.
chdir
(
temporary_directory
)
{
cmd
.
run
}
# Git push will throw an exception here since this is a local custom git repo. All we care is the validator
# tests so the exception is swallowed.
lambda
do
Dir
.
chdir
(
temporary_directory
)
{
cmd
.
run
}
end
.
should
.
raise
Informative
end
it
'raises error and exit code when push fails'
do
cmd
=
command
(
'repo'
,
'push'
,
'master'
)
e
=
lambda
do
Dir
.
chdir
(
temporary_directory
)
{
cmd
.
run
}
end
.
should
.
raise
Informative
e
.
exit_status
.
should
.
equal
(
1
)
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