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
1c126b89
Commit
1c126b89
authored
May 14, 2016
by
Samuel Giddins
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5319 from jberkel/fix-executable
[Executable] fix NameError
parents
d2cb0925
7a1aaf3d
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
1 deletion
+11
-1
CHANGELOG.md
CHANGELOG.md
+3
-0
executable.rb
lib/cocoapods/executable.rb
+1
-1
executable_spec.rb
spec/unit/executable_spec.rb
+7
-0
No files found.
CHANGELOG.md
View file @
1c126b89
...
@@ -20,6 +20,9 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
...
@@ -20,6 +20,9 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[
Juan Civile
](
https://github.com/champo
)
[
Juan Civile
](
https://github.com/champo
)
[
#5282
](
https://github.com/CocoaPods/CocoaPods/issues/5282
)
[
#5282
](
https://github.com/CocoaPods/CocoaPods/issues/5282
)
*
Fix error when executables cannot be found.
[
Jan Berkel
](
https://github.com/jberkel
)
[
#5319
](
https://github.com/CocoaPods/CocoaPods/pull/5319
)
## 1.0.0 (2016-05-10)
## 1.0.0 (2016-05-10)
...
...
lib/cocoapods/executable.rb
View file @
1c126b89
...
@@ -108,7 +108,7 @@ module Pod
...
@@ -108,7 +108,7 @@ module Pod
#
#
def
self
.
which!
(
program
)
def
self
.
which!
(
program
)
which
(
program
).
tap
do
|
bin
|
which
(
program
).
tap
do
|
bin
|
raise
Informative
,
"Unable to locate the executable `
#{
executable
}
`"
unless
bin
raise
Informative
,
"Unable to locate the executable `
#{
program
}
`"
unless
bin
end
end
end
end
...
...
spec/unit/executable_spec.rb
View file @
1c126b89
...
@@ -73,6 +73,13 @@ module Pod
...
@@ -73,6 +73,13 @@ module Pod
io
.
should
==
" 0
\n
1
\n
2
\n
"
io
.
should
==
" 0
\n
1
\n
2
\n
"
end
end
it
'shows the name in the error message when the command was not found'
do
e
=
lambda
do
Executable
.
execute_command
(
'___notfound___'
,
[],
true
)
end
.
should
.
raise
Informative
e
.
message
.
should
.
match
/___notfound___/
end
describe
Executable
::
Indenter
do
describe
Executable
::
Indenter
do
it
'indents any appended strings'
do
it
'indents any appended strings'
do
UI
.
indentation_level
=
4
UI
.
indentation_level
=
4
...
...
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