Commit 048955d3 authored by Boris Bügling's avatar Boris Bügling Committed by GitHub

Merge pull request #5504 from CocoaPods/require-fourflusher-instead-of-autoload

Use `require` instead of `autoload` for fourflusher
parents 877249a5 467aa0de
...@@ -26,6 +26,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre` ...@@ -26,6 +26,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[Samuel Giddins](https://github.com/segiddins) [Samuel Giddins](https://github.com/segiddins)
[#5321](https://github.com/CocoaPods/CocoaPods/issues/5321) [#5321](https://github.com/CocoaPods/CocoaPods/issues/5321)
* Use `require` instead of `autoload` to solve an issue with loading `fourflusher`.
[Boris Bügling](https://github.com/neonichu)
[#5445](https://github.com/CocoaPods/CocoaPods/issues/5445)
## 1.0.1 (2016-06-02) ## 1.0.1 (2016-06-02)
......
require 'active_support/core_ext/array' require 'active_support/core_ext/array'
require 'active_support/core_ext/string/inflections' require 'active_support/core_ext/string/inflections'
autoload :Fourflusher, 'fourflusher'
module Pod module Pod
# Validates a Specification. # Validates a Specification.
# #
...@@ -719,6 +717,7 @@ module Pod ...@@ -719,6 +717,7 @@ module Pod
# returns its output (both STDOUT and STDERR). # returns its output (both STDOUT and STDERR).
# #
def xcodebuild def xcodebuild
require 'fourflusher'
command = %w(clean build -workspace App.xcworkspace -scheme App -configuration Release) command = %w(clean build -workspace App.xcworkspace -scheme App -configuration Release)
case consumer.platform_name case consumer.platform_name
when :ios when :ios
......
...@@ -392,6 +392,7 @@ module Pod ...@@ -392,6 +392,7 @@ module Pod
end end
it 'checks if xcodebuild returns a successful status code' do it 'checks if xcodebuild returns a successful status code' do
require 'fourflusher'
Fourflusher::SimControl.any_instance.stubs(:destination).returns(['-destination', 'id=XXX']) Fourflusher::SimControl.any_instance.stubs(:destination).returns(['-destination', 'id=XXX'])
Validator.any_instance.unstub(:xcodebuild) Validator.any_instance.unstub(:xcodebuild)
validator = Validator.new(podspec_path, config.sources_manager.master.map(&:url)) validator = Validator.new(podspec_path, config.sources_manager.master.map(&:url))
...@@ -411,6 +412,7 @@ module Pod ...@@ -411,6 +412,7 @@ module Pod
end end
it 'runs xcodebuild with correct arguments for code signing' do it 'runs xcodebuild with correct arguments for code signing' do
require 'fourflusher'
Fourflusher::SimControl.any_instance.stubs(:destination).returns(['-destination', 'id=XXX']) Fourflusher::SimControl.any_instance.stubs(:destination).returns(['-destination', 'id=XXX'])
Validator.any_instance.unstub(:xcodebuild) Validator.any_instance.unstub(:xcodebuild)
validator = Validator.new(podspec_path, config.sources_manager.master.map(&:url)) validator = Validator.new(podspec_path, config.sources_manager.master.map(&:url))
......
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