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
c6b210b0
Commit
c6b210b0
authored
Oct 23, 2014
by
Eloy Durán
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Various doc and style fixes.
parent
c8ce4ad1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
11 deletions
+12
-11
file_references_installer.rb
lib/cocoapods/installer/file_references_installer.rb
+6
-5
file_accessor.rb
lib/cocoapods/sandbox/file_accessor.rb
+4
-4
file_accessor_spec.rb
spec/unit/sandbox/file_accessor_spec.rb
+1
-1
headers_store_spec.rb
spec/unit/sandbox/headers_store_spec.rb
+1
-1
No files found.
lib/cocoapods/installer/file_references_installer.rb
View file @
c6b210b0
...
@@ -8,7 +8,7 @@ module Pod
...
@@ -8,7 +8,7 @@ module Pod
#
#
attr_reader
:sandbox
attr_reader
:sandbox
# @return [Array<
Library
>] The libraries of the installation.
# @return [Array<
PodTarget
>] The libraries of the installation.
#
#
attr_reader
:libraries
attr_reader
:libraries
...
@@ -17,7 +17,7 @@ module Pod
...
@@ -17,7 +17,7 @@ module Pod
attr_reader
:pods_project
attr_reader
:pods_project
# @param [Sandbox] sandbox @see sandbox
# @param [Sandbox] sandbox @see sandbox
# @param [Array<
Library
>] libraries @see libraries
# @param [Array<
PodTarget
>] libraries @see libraries
# @param [Project] libraries @see libraries
# @param [Project] libraries @see libraries
#
#
def
initialize
(
sandbox
,
libraries
,
pods_project
)
def
initialize
(
sandbox
,
libraries
,
pods_project
)
...
@@ -167,11 +167,12 @@ module Pod
...
@@ -167,11 +167,12 @@ module Pod
# Computes the destination sub-directory in the sandbox
# Computes the destination sub-directory in the sandbox
#
#
# @param [Pathname] headers_sandbox
# @param [Pathname] headers_sandbox
# The sandbox where the header
s
links should be stored for this
# The sandbox where the header links should be stored for this
# Pod.
# Pod.
#
#
# @param [Specification::Consumer] consumer
# @param [Sandbox::FileAccessor] file_accessor
# The consumer for which the headers need to be linked.
# The consumer file accessor for which the headers need to be
# linked.
#
#
# @param [Array<Pathname>] headers
# @param [Array<Pathname>] headers
# The absolute paths of the headers which need to be mapped.
# The absolute paths of the headers which need to be mapped.
...
...
lib/cocoapods/sandbox/file_accessor.rb
View file @
c6b210b0
...
@@ -149,7 +149,7 @@ module Pod
...
@@ -149,7 +149,7 @@ module Pod
# @return [Pathname] The path of the auto-detected README file.
# @return [Pathname] The path of the auto-detected README file.
#
#
def
readme
def
readme
path_list
.
glob
(
%w( readme{*,.*} )
).
first
path_list
.
glob
(
[
'readme{*,.*}'
]
).
first
end
end
# @return [Pathname] The path of the license file as indicated in the
# @return [Pathname] The path of the license file as indicated in the
...
@@ -159,7 +159,7 @@ module Pod
...
@@ -159,7 +159,7 @@ module Pod
if
spec_consumer
.
spec
.
root
.
license
[
:file
]
if
spec_consumer
.
spec
.
root
.
license
[
:file
]
path_list
.
root
+
spec_consumer
.
spec
.
root
.
license
[
:file
]
path_list
.
root
+
spec_consumer
.
spec
.
root
.
license
[
:file
]
else
else
path_list
.
glob
(
%w( licen{c,s}e{*,.*} )
).
first
path_list
.
glob
(
[
'licen{c,s}e{*,.*}'
]
).
first
end
end
end
end
...
@@ -195,12 +195,12 @@ module Pod
...
@@ -195,12 +195,12 @@ module Pod
#
#
# @return [String] the glob pattern.
# @return [String] the glob pattern.
#
#
def
glob_for_attribute
(
attrbute
)
def
glob_for_attribute
(
attr
i
bute
)
globs
=
{
globs
=
{
:source_files
=>
'*.{h,hpp,hh,m,mm,c,cpp}'
.
freeze
,
:source_files
=>
'*.{h,hpp,hh,m,mm,c,cpp}'
.
freeze
,
:public_header_files
=>
"*.{
#{
HEADER_EXTENSIONS
*
','
}
}"
.
freeze
,
:public_header_files
=>
"*.{
#{
HEADER_EXTENSIONS
*
','
}
}"
.
freeze
,
}
}
globs
[
attrbute
]
globs
[
attr
i
bute
]
end
end
# Matches the given patterns to the file present in the root of the path
# Matches the given patterns to the file present in the root of the path
...
...
spec/unit/sandbox/file_accessor_spec.rb
View file @
c6b210b0
...
@@ -74,7 +74,7 @@ module Pod
...
@@ -74,7 +74,7 @@ module Pod
]
]
end
end
it
'filters the private headers f
or
m the public headers'
do
it
'filters the private headers f
ro
m the public headers'
do
@spec_consumer
.
stubs
(
:public_header_files
).
returns
([])
@spec_consumer
.
stubs
(
:public_header_files
).
returns
([])
@spec_consumer
.
stubs
(
:private_header_files
).
returns
([
'**/*Private*'
])
@spec_consumer
.
stubs
(
:private_header_files
).
returns
([
'**/*Private*'
])
@accessor
.
public_headers
.
sort
.
should
==
[
@accessor
.
public_headers
.
sort
.
should
==
[
...
...
spec/unit/sandbox/headers_store_spec.rb
View file @
c6b210b0
...
@@ -12,7 +12,7 @@ module Pod
...
@@ -12,7 +12,7 @@ module Pod
@header_dir
.
root
.
should
==
temporary_directory
+
'Sandbox/Headers/Public'
@header_dir
.
root
.
should
==
temporary_directory
+
'Sandbox/Headers/Public'
end
end
it
"can add namespaced headers to it
'
s header path using symlinks and return the relative path"
do
it
"can add namespaced headers to its header path using symlinks and return the relative path"
do
FileUtils
.
mkdir_p
(
@sandbox
.
root
+
'ExampleLib/'
)
FileUtils
.
mkdir_p
(
@sandbox
.
root
+
'ExampleLib/'
)
namespace_path
=
Pathname
.
new
(
'ExampleLib'
)
namespace_path
=
Pathname
.
new
(
'ExampleLib'
)
relative_header_paths
=
[
relative_header_paths
=
[
...
...
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