Commit 5dc2ed13 authored by Samuel Giddins's avatar Samuel Giddins

[Repo::Push] Update for Source::Metadata

parent 9df63513
...@@ -38,6 +38,7 @@ module Pod ...@@ -38,6 +38,7 @@ module Pod
@allow_warnings = argv.flag?('allow-warnings') @allow_warnings = argv.flag?('allow-warnings')
@local_only = argv.flag?('local-only') @local_only = argv.flag?('local-only')
@repo = argv.shift_argument @repo = argv.shift_argument
@source = SourcesManager.source_with_name_or_url(@repo)
@source_urls = argv.option('sources', SourcesManager.all.map(&:url).join(',')).split(',') @source_urls = argv.option('sources', SourcesManager.all.map(&:url).join(',')).split(',')
@podspec = argv.shift_argument @podspec = argv.shift_argument
@use_frameworks = !argv.flag?('use-libraries') @use_frameworks = !argv.flag?('use-libraries')
...@@ -161,12 +162,12 @@ module Pod ...@@ -161,12 +162,12 @@ module Pod
UI.puts "\nAdding the #{'spec'.pluralize(count)} to the `#{@repo}' repo\n".yellow UI.puts "\nAdding the #{'spec'.pluralize(count)} to the `#{@repo}' repo\n".yellow
podspec_files.each do |spec_file| podspec_files.each do |spec_file|
spec = Pod::Specification.from_file(spec_file) spec = Pod::Specification.from_file(spec_file)
output_path = File.join(repo_dir, spec.name, spec.version.to_s) output_path = @source.specs_dir + @source.send(:pod_path, name) + version.to_s
if @message && !@message.empty? if @message && !@message.empty?
message = @message message = @message
elsif Pathname.new(output_path).exist? elsif output_path.exist?
message = "[Fix] #{spec}" message = "[Fix] #{spec}"
elsif Pathname.new(File.join(repo_dir, spec.name)).exist? elsif output_path.dirname.directory?
message = "[Update] #{spec}" message = "[Update] #{spec}"
else else
message = "[Add] #{spec}" message = "[Add] #{spec}"
...@@ -205,16 +206,7 @@ module Pod ...@@ -205,16 +206,7 @@ module Pod
# @return [Pathname] The directory of the repository. # @return [Pathname] The directory of the repository.
# #
def repo_dir def repo_dir
specs_dir = Pathname.new(File.join(config.repos_dir, @repo, 'Specs')) @source.specs_dir
dir = config.repos_dir + @repo
if specs_dir.exist?
dir = specs_dir
elsif dir.exist?
dir
else
raise Informative, "`#{@repo}` repo not found either in #{specs_dir} or #{dir}"
end
dir
end end
# @return [Array<Pathname>] The path of the specifications to push. # @return [Array<Pathname>] The path of the specifications to push.
......
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