Commit 9b03b45b authored by Samuel Ford's avatar Samuel Ford

remove "was_absolute" tracking and simplify local pod handling to always use absolute paths

parent 25919883
......@@ -352,7 +352,7 @@ module Pod
UI.titled_section("Fetching podspec for `#{name}` #{description}", { :verbose_prefix => "-> " }) do
podspec = podspec_path
store_podspec(sandbox, podspec)
sandbox.store_local_path(name, podspec.dirname, Pathname.new(declared_path).absolute?)
sandbox.store_local_path(name, podspec.dirname)
end
end
......
......@@ -69,7 +69,6 @@ module Pod
@head_pods = []
@checkout_sources = {}
@development_pods = {}
@development_pods_were_absolute = {}
end
# @return [Lockfile] the manifest which contains the information about the
......@@ -160,16 +159,6 @@ module Pod
end
end
# Returns true if the path as originally specified was absolute.
#
# @param [String] name
#
# @return [Bool] true if originally absolute
#
def local_path_was_absolute?(name)
@development_pods_were_absolute[name]
end
# @return [Pathname] the directory where to store the documentation.
#
def documentation_dir
......@@ -354,10 +343,9 @@ module Pod
#
# @return [void]
#
def store_local_path(name, path, was_absolute = false)
def store_local_path(name, path)
root_name = Specification.root_name(name)
development_pods[root_name] = path.to_s
@development_pods_were_absolute[root_name] = was_absolute
end
# @return [Hash{String=>String}] The path of the Pods with a local source
......
......@@ -251,7 +251,6 @@ module Pod
podfile_path = Pathname.new('/Podfile')
config.stubs(:podfile_path).returns(podfile_path)
@installer.send(:prepare_pods_project)
@installer.pods_project['Podfile'].path.should == podfile_path
end
it "adds the Podfile to the Pods project" do
......
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