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
af4fe25a
Commit
af4fe25a
authored
Feb 05, 2018
by
Eric Amorde
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove :lockfile attribute from SandboxAnalyzer
parent
66373327
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
21 deletions
+7
-21
analyzer.rb
lib/cocoapods/installer/analyzer.rb
+1
-1
sandbox_analyzer.rb
lib/cocoapods/installer/analyzer/sandbox_analyzer.rb
+5
-12
cocoapods-integration-specs
spec/cocoapods-integration-specs
+1
-1
sandbox_analyzer_spec.rb
spec/unit/installer/analyzer/sandbox_analyzer_spec.rb
+0
-7
No files found.
lib/cocoapods/installer/analyzer.rb
View file @
af4fe25a
...
@@ -861,7 +861,7 @@ module Pod
...
@@ -861,7 +861,7 @@ module Pod
def
generate_sandbox_state
def
generate_sandbox_state
sandbox_state
=
nil
sandbox_state
=
nil
UI
.
section
'Comparing resolved specification to the sandbox manifest'
do
UI
.
section
'Comparing resolved specification to the sandbox manifest'
do
sandbox_analyzer
=
SandboxAnalyzer
.
new
(
sandbox
,
result
.
specifications
,
update_mode?
,
lockfile
)
sandbox_analyzer
=
SandboxAnalyzer
.
new
(
sandbox
,
result
.
specifications
,
update_mode?
)
sandbox_state
=
sandbox_analyzer
.
analyze
sandbox_state
=
sandbox_analyzer
.
analyze
sandbox_state
.
print
sandbox_state
.
print
end
end
...
...
lib/cocoapods/installer/analyzer/sandbox_analyzer.rb
View file @
af4fe25a
...
@@ -42,23 +42,16 @@ module Pod
...
@@ -42,23 +42,16 @@ module Pod
alias_method
:update_mode?
,
:update_mode
alias_method
:update_mode?
,
:update_mode
# @return [Lockfile] The lockfile of the installation as a fall-back if
# there is no sandbox manifest.
#
attr_reader
:lockfile
# Init a new SandboxAnalyzer
# Init a new SandboxAnalyzer
#
#
# @param [Sandbox] sandbox @see #sandbox
# @param [Sandbox] sandbox @see sandbox
# @param [Array<Specifications>] specs @see #specs
# @param [Array<Specifications>] specs @see specs
# @param [Bool] update_mode @see #update_mode
# @param [Bool] update_mode @see update_mode
# @param [Lockfile] lockfile @see #lockfile
#
#
def
initialize
(
sandbox
,
specs
,
update_mode
,
lockfile
=
nil
)
def
initialize
(
sandbox
,
specs
,
update_mode
)
@sandbox
=
sandbox
@sandbox
=
sandbox
@specs
=
specs
@specs
=
specs
@update_mode
=
update_mode
@update_mode
=
update_mode
@lockfile
=
lockfile
end
end
# Performs the analysis to the detect the state of the sandbox respect
# Performs the analysis to the detect the state of the sandbox respect
...
@@ -160,7 +153,7 @@ module Pod
...
@@ -160,7 +153,7 @@ module Pod
# @return [Lockfile] The manifest to use for the sandbox.
# @return [Lockfile] The manifest to use for the sandbox.
#
#
def
sandbox_manifest
def
sandbox_manifest
sandbox
.
manifest
||
lockfile
sandbox
.
manifest
end
end
#--------------------------------------#
#--------------------------------------#
...
...
cocoapods-integration-specs
@
d7a64c03
Subproject commit
1f8a4113cdb89f7bda6aea5f9932a6944f9e36fe
Subproject commit
d7a64c03deab9decfa5c7e3af0af88ae225b1fc9
spec/unit/installer/analyzer/sandbox_analyzer_spec.rb
View file @
af4fe25a
...
@@ -92,13 +92,6 @@ module Pod
...
@@ -92,13 +92,6 @@ module Pod
@analyzer
.
send
(
:sandbox_manifest
).
should
==
@manifest
@analyzer
.
send
(
:sandbox_manifest
).
should
==
@manifest
end
end
it
'returns the lockfile as the sandbox if one is not available'
do
lockfile
=
Lockfile
.
new
({})
@sandbox
.
stubs
(
:manifest
)
@analyzer
.
stubs
(
:lockfile
).
returns
(
lockfile
)
@analyzer
.
send
(
:sandbox_manifest
).
should
==
lockfile
end
#--------------------------------------#
#--------------------------------------#
it
'returns the root name of the resolved Pods'
do
it
'returns the root name of the resolved Pods'
do
...
...
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