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
581c5edb
Commit
581c5edb
authored
Dec 31, 2016
by
Danielle Tomlinson
Committed by
GitHub
Dec 31, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6364 from CocoaPods/dani_git_progress
[Repo::Add] Add --progress option to show git progress
parents
469e9a24
fae712fe
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
5 deletions
+25
-5
CHANGELOG.md
CHANGELOG.md
+3
-1
add.rb
lib/cocoapods/command/repo/add.rb
+21
-3
setup.rb
lib/cocoapods/command/setup.rb
+1
-1
No files found.
CHANGELOG.md
View file @
581c5edb
...
@@ -8,7 +8,9 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
...
@@ -8,7 +8,9 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
##### Enhancements
##### Enhancements
*
None.
*
Show git progress when downloading the CocoaPods Specs repo.
[
Danielle Tomlinson
](
https://github.com/dantoml
)
[
#5937
](
https://github.com/CocoaPods/CocoaPods/issues/5937
)
##### Bug Fixes
##### Bug Fixes
...
...
lib/cocoapods/command/repo/add.rb
View file @
581c5edb
...
@@ -15,10 +15,17 @@ module Pod
...
@@ -15,10 +15,17 @@ module Pod
CLAide
::
Argument
.
new
(
'BRANCH'
,
false
),
CLAide
::
Argument
.
new
(
'BRANCH'
,
false
),
]
]
def
self
.
options
[
[
'--progress'
,
'Show the progress of cloning the spec repository'
],
].
concat
(
super
)
end
def
initialize
(
argv
)
def
initialize
(
argv
)
@name
=
argv
.
shift_argument
@name
=
argv
.
shift_argument
@url
=
argv
.
shift_argument
@url
=
argv
.
shift_argument
@branch
=
argv
.
shift_argument
@branch
=
argv
.
shift_argument
@progress
=
argv
.
flag?
(
'progress'
)
super
super
end
end
...
@@ -66,9 +73,20 @@ module Pod
...
@@ -66,9 +73,20 @@ module Pod
# @return [void]
# @return [void]
#
#
def
clone_repo
def
clone_repo
Dir
.
chdir
(
config
.
repos_dir
)
do
changes
=
if
@progress
command
=
[
'clone'
,
@url
,
@name
]
{
:verbose
=>
true
}
git!
(
command
)
else
{}
end
config
.
with_changes
(
changes
)
do
Dir
.
chdir
(
config
.
repos_dir
)
do
command
=
[
'clone'
,
@url
,
@name
]
if
@progress
command
<<
'--progress'
end
git!
(
command
)
end
end
end
end
end
...
...
lib/cocoapods/command/setup.rb
View file @
581c5edb
...
@@ -50,7 +50,7 @@ module Pod
...
@@ -50,7 +50,7 @@ module Pod
# @return [void]
# @return [void]
#
#
def
add_master_repo
def
add_master_repo
cmd
=
[
'master'
,
url
,
'master'
]
cmd
=
[
'master'
,
url
,
'master'
,
'--progress'
]
Repo
::
Add
.
parse
(
cmd
).
run
Repo
::
Add
.
parse
(
cmd
).
run
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