Commit a6029d66 authored by Fabio Pelosin's avatar Fabio Pelosin

[Integration] Cleaned specs.

parent 5190db62
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)
......
...@@ -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?
......
...@@ -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
......
...@@ -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.
......
This diff is collapsed.
...@@ -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"
...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment