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
e906fc10
Commit
e906fc10
authored
Jun 27, 2016
by
Mark Schall
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixing rubocop errors
parent
e846dc89
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
push.rb
lib/cocoapods/command/repo/push.rb
+2
-2
push_spec.rb
spec/functional/command/repo/push_spec.rb
+2
-2
No files found.
lib/cocoapods/command/repo/push.rb
View file @
e906fc10
...
@@ -180,7 +180,7 @@ module Pod
...
@@ -180,7 +180,7 @@ module Pod
message
=
"[Add]
#{
spec
}
"
message
=
"[Add]
#{
spec
}
"
end
end
FileUtils
.
mkdir_p
(
output_path
)
FileUtils
.
mkdir_p
(
output_path
)
if
@use_json
if
@use_json
json_file_name
=
"
#{
spec
.
name
}
.podspec.json"
json_file_name
=
"
#{
spec
.
name
}
.podspec.json"
json_file
=
File
.
join
(
output_path
,
json_file_name
)
json_file
=
File
.
join
(
output_path
,
json_file_name
)
...
@@ -188,7 +188,7 @@ module Pod
...
@@ -188,7 +188,7 @@ module Pod
else
else
FileUtils
.
cp
(
spec_file
,
output_path
)
FileUtils
.
cp
(
spec_file
,
output_path
)
end
end
Dir
.
chdir
(
repo_dir
)
do
Dir
.
chdir
(
repo_dir
)
do
# only commit if modified
# only commit if modified
if
git!
(
'status'
,
'--porcelain'
).
include?
(
spec
.
name
)
if
git!
(
'status'
,
'--porcelain'
).
include?
(
spec
.
name
)
...
...
spec/functional/command/repo/push_spec.rb
View file @
e906fc10
...
@@ -98,7 +98,7 @@ module Pod
...
@@ -98,7 +98,7 @@ module Pod
e
.
message
.
should
.
match
(
/repo.*not clean/
)
e
.
message
.
should
.
match
(
/repo.*not clean/
)
(
@upstream
+
'PushTest/1.4/PushTest.podspec'
).
should
.
not
.
exist?
(
@upstream
+
'PushTest/1.4/PushTest.podspec'
).
should
.
not
.
exist?
end
end
it
'generate a message for commit'
do
it
'generate a message for commit'
do
cmd
=
command
(
'repo'
,
'push'
,
'master'
)
cmd
=
command
(
'repo'
,
'push'
,
'master'
)
Dir
.
chdir
(
@upstream
)
{
`git checkout -b tmp_for_push -q`
}
Dir
.
chdir
(
@upstream
)
{
`git checkout -b tmp_for_push -q`
}
...
@@ -117,7 +117,7 @@ module Pod
...
@@ -117,7 +117,7 @@ module Pod
Dir
.
chdir
(
@upstream
)
{
`git checkout master -q`
}
Dir
.
chdir
(
@upstream
)
{
`git checkout master -q`
}
(
@upstream
+
'PushTest/1.4/PushTest.podspec'
).
read
.
should
.
include
(
'PushTest'
)
(
@upstream
+
'PushTest/1.4/PushTest.podspec'
).
read
.
should
.
include
(
'PushTest'
)
end
end
it
'successfully pushes converted JSON podspec'
do
it
'successfully pushes converted JSON podspec'
do
cmd
=
command
(
'repo'
,
'push'
,
'master'
,
'--use-json'
)
cmd
=
command
(
'repo'
,
'push'
,
'master'
,
'--use-json'
)
Dir
.
chdir
(
@upstream
)
{
`git checkout -b tmp_for_push -q`
}
Dir
.
chdir
(
@upstream
)
{
`git checkout -b tmp_for_push -q`
}
...
...
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