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
a6029d66
Commit
a6029d66
authored
Dec 18, 2012
by
Fabio Pelosin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Integration] Cleaned specs.
parent
5190db62
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
35 additions
and
7 deletions
+35
-7
Gemfile.lock
Gemfile.lock
+2
-2
installer.rb
lib/cocoapods/installer.rb
+8
-1
analyzer.rb
lib/cocoapods/installer/analyzer.rb
+1
-1
local_pod.rb
lib/cocoapods/local_pod.rb
+1
-1
integration_spec.rb
spec/integration_spec.rb
+0
-0
spec_helper.rb
spec/spec_helper.rb
+22
-1
bacon.rb
spec/spec_helper/bacon.rb
+1
-1
No files found.
Gemfile.lock
View file @
a6029d66
GIT
GIT
remote: git://github.com/CocoaPods/Core.git
remote: git://github.com/CocoaPods/Core.git
revision:
08a308017a4fbf327143f14353cf698460088ac9
revision:
65076d5eb9b6b99ecce7b4628ce08b4c0f98f192
specs:
specs:
cocoapods-core (0.17.0.alpha)
cocoapods-core (0.17.0.alpha)
activesupport (~> 3.2.6)
activesupport (~> 3.2.6)
...
@@ -63,7 +63,7 @@ GEM
...
@@ -63,7 +63,7 @@ GEM
multipart-post (~> 1.1)
multipart-post (~> 1.1)
faraday_middleware (0.9.0)
faraday_middleware (0.9.0)
faraday (>= 0.7.4, < 0.9)
faraday (>= 0.7.4, < 0.9)
github-markup (0.7.
4
)
github-markup (0.7.
5
)
hashie (1.2.0)
hashie (1.2.0)
i18n (0.6.1)
i18n (0.6.1)
json (1.7.5)
json (1.7.5)
...
...
lib/cocoapods/installer.rb
View file @
a6029d66
...
@@ -128,6 +128,13 @@ module Pod
...
@@ -128,6 +128,13 @@ module Pod
#-------------------------------------------------------------------------#
#-------------------------------------------------------------------------#
# @!group Hooks compatiblity
alias
:project
:pods_project
alias
:pods
:local_pods
#-------------------------------------------------------------------------#
# @!group Installation steps
# @!group Installation steps
private
private
...
@@ -238,7 +245,7 @@ module Pod
...
@@ -238,7 +245,7 @@ module Pod
unless
analyzer
.
sandbox_state
.
deleted
.
empty?
unless
analyzer
.
sandbox_state
.
deleted
.
empty?
UI
.
section
"Removing deleted dependencies"
do
UI
.
section
"Removing deleted dependencies"
do
pods_deleted_from_the_lockfile
.
each
do
|
pod_name
|
analyzer
.
sandbox_state
.
deleted
.
each
do
|
pod_name
|
UI
.
section
(
"Removing
#{
pod_name
}
"
,
"-> "
.
red
)
do
UI
.
section
(
"Removing
#{
pod_name
}
"
,
"-> "
.
red
)
do
path
=
sandbox
.
root
+
pod_name
path
=
sandbox
.
root
+
pod_name
path
.
rmtree
if
path
.
exist?
path
.
rmtree
if
path
.
exist?
...
...
lib/cocoapods/installer/analyzer.rb
View file @
a6029d66
...
@@ -203,7 +203,7 @@ module Pod
...
@@ -203,7 +203,7 @@ module Pod
lib
.
user_targets
=
[]
lib
.
user_targets
=
[]
lib
.
user_build_configurations
=
{}
lib
.
user_build_configurations
=
{}
lib
.
platform
=
target_definition
.
platform
lib
.
platform
=
target_definition
.
platform
raise
Informative
"It is necessary to specify the platform in the Podfile if not integrating."
unless
target_definition
.
platform
raise
Informative
,
"It is necessary to specify the platform in the Podfile if not integrating."
unless
target_definition
.
platform
end
end
libraries
<<
lib
libraries
<<
lib
end
end
...
...
lib/cocoapods/local_pod.rb
View file @
a6029d66
...
@@ -44,7 +44,7 @@ module Pod
...
@@ -44,7 +44,7 @@ module Pod
# generated and be cleaned.
# generated and be cleaned.
#
#
attr_accessor
:downloaded
attr_accessor
:downloaded
alias_method
:downloaded?
,
:downloaded
alias_method
:downloaded?
,
:downloaded
# @param [Specification] specification The first activated specification
# @param [Specification] specification The first activated specification
# of the pod.
# of the pod.
...
...
spec/integration_spec.rb
View file @
a6029d66
This diff is collapsed.
Click to expand it.
spec/spec_helper.rb
View file @
a6029d66
...
@@ -33,7 +33,6 @@ module Bacon
...
@@ -33,7 +33,6 @@ module Bacon
include
Pod
::
Config
::
Mixin
include
Pod
::
Config
::
Mixin
include
SpecHelper
::
Fixture
include
SpecHelper
::
Fixture
include
SpecHelper
::
Command
include
SpecHelper
::
Command
def
skip_xcodebuild?
def
skip_xcodebuild?
ENV
[
'SKIP_XCODEBUILD'
]
ENV
[
'SKIP_XCODEBUILD'
]
end
end
...
@@ -64,6 +63,28 @@ def copy_fixture_to_pod(name, pod)
...
@@ -64,6 +63,28 @@ def copy_fixture_to_pod(name, pod)
FileUtils
.
cp_r
(
path
,
pod
.
root
)
FileUtils
.
cp_r
(
path
,
pod
.
root
)
end
end
#-----------------------------------------------------------------------------#
# Override {Specification#source} to return sources from fixtures and limit
# network connections.
#
module
Pod
class
Specification
alias
:original_source
:source
def
source
fixture
=
SpecHelper
.
fixture
(
"integration/
#{
name
}
"
)
result
=
super
if
fixture
.
exist?
# puts "Using fixture [#{name}]"
result
[
:git
]
=
fixture
.
to_s
else
# puts "MISSING fixture [#{name}]"
end
result
end
end
end
SpecHelper
::
Fixture
.
fixture
(
'banana-lib'
)
# ensure it exists
SpecHelper
::
Fixture
.
fixture
(
'banana-lib'
)
# ensure it exists
require
"active_support/core_ext/string/strip"
require
"active_support/core_ext/string/strip"
spec/spec_helper/bacon.rb
View file @
a6029d66
...
@@ -81,7 +81,7 @@ module Bacon
...
@@ -81,7 +81,7 @@ module Bacon
end
end
def
handle_requirement
(
description
,
disabled
=
false
)
def
handle_requirement
(
description
,
disabled
=
false
)
if
false
&&
@first_error
if
@first_error
print
Bacon
.
color
(
nil
,
'_'
)
print
Bacon
.
color
(
nil
,
'_'
)
else
else
error
=
yield
error
=
yield
...
...
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