Unverified Commit 8094d02e authored by Dimitris Koutsogiorgas's avatar Dimitris Koutsogiorgas Committed by GitHub

Merge pull request #7639 from dnkoutso/remove_unused_attribute

Remove unused #specific_source attribute
parents 0cf463ee edd3b916
...@@ -91,19 +91,13 @@ module Pod ...@@ -91,19 +91,13 @@ module Pod
end end
end end
# @return [Hash] @see Downloader#checkout_options
#
attr_reader :specific_source
#-----------------------------------------------------------------------# #-----------------------------------------------------------------------#
private private
# @!group Installation Steps # @!group Installation Steps
# Downloads the source of the Pod. It also stores the specific options # Downloads the source of the Pod.
# needed to recreate the same exact installation if needed in
# `#specific_source`.
# #
# @return [void] # @return [void]
# #
...@@ -111,7 +105,7 @@ module Pod ...@@ -111,7 +105,7 @@ module Pod
verify_source_is_secure(root_spec) verify_source_is_secure(root_spec)
download_result = Downloader.download(download_request, root, :can_cache => can_cache?) download_result = Downloader.download(download_request, root, :can_cache => can_cache?)
if (@specific_source = download_result.checkout_options) && specific_source != root_spec.source if (specific_source = download_result.checkout_options) && specific_source != root_spec.source
sandbox.store_checkout_source(root_spec.name, specific_source) sandbox.store_checkout_source(root_spec.name, specific_source)
end end
end end
......
...@@ -18,7 +18,6 @@ module Pod ...@@ -18,7 +18,6 @@ module Pod
it 'downloads the source' do it 'downloads the source' do
@spec.source = { :git => SpecHelper.fixture('banana-lib'), :tag => 'v1.0' } @spec.source = { :git => SpecHelper.fixture('banana-lib'), :tag => 'v1.0' }
@installer.install! @installer.install!
@installer.specific_source[:tag].should == 'v1.0'
pod_folder = config.sandbox.pod_dir('BananaLib') pod_folder = config.sandbox.pod_dir('BananaLib')
pod_folder.should.exist pod_folder.should.exist
end end
...@@ -26,7 +25,6 @@ module Pod ...@@ -26,7 +25,6 @@ module Pod
it 'returns the checkout options of the downloader if any' do it 'returns the checkout options of the downloader if any' do
@spec.source = { :git => SpecHelper.fixture('banana-lib'), :branch => 'topicbranch' } @spec.source = { :git => SpecHelper.fixture('banana-lib'), :branch => 'topicbranch' }
@installer.install! @installer.install!
@installer.specific_source[:commit].should == '446b22414597f1bb4062a62c4eed7af9627a3f1b'
pod_folder = config.sandbox.pod_dir('BananaLib') pod_folder = config.sandbox.pod_dir('BananaLib')
pod_folder.should.exist pod_folder.should.exist
end end
......
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