Commit 944f3407 authored by Fabio Pelosin's avatar Fabio Pelosin

Merge branch 'licenses' of https://github.com/cmckni3/CocoaPods into cmckni3-licenses

* 'licenses' of https://github.com/cmckni3/CocoaPods:
  Just add license as a key to get from the specification
  Move license info into podfile-info command
  Add licenses command to pod cli
parents 8d16e1b8 beaaa73b
...@@ -21,6 +21,7 @@ module Pod ...@@ -21,6 +21,7 @@ module Pod
def initialize(argv) def initialize(argv)
@info_all = argv.flag?('all') @info_all = argv.flag?('all')
@info_in_md = argv.flag?('md') @info_in_md = argv.flag?('md')
@info_license = argv.flag?('license')
@podfile_path = argv.shift_argument @podfile_path = argv.shift_argument
super super
end end
...@@ -57,7 +58,7 @@ module Pod ...@@ -57,7 +58,7 @@ module Pod
pods.collect! {|pod| (pod.is_a?(Hash)) ? pod.keys.first : pod} pods.collect! {|pod| (pod.is_a?(Hash)) ? pod.keys.first : pod}
end end
def pods_info_hash(pods, keys=[:name, :homepage, :summary]) def pods_info_hash(pods, keys=[:name, :homepage, :summary, :license])
pods_info = [] pods_info = []
pods.each do |pod| pods.each do |pod|
spec = (Pod::SourcesManager.search_by_name(pod).first rescue nil) spec = (Pod::SourcesManager.search_by_name(pod).first rescue nil)
...@@ -74,13 +75,13 @@ module Pod ...@@ -74,13 +75,13 @@ module Pod
end end
def pods_info(pods, in_md=false) def pods_info(pods, in_md=false)
pods = pods_info_hash(pods, [:name, :homepage, :summary]) pods = pods_info_hash(pods, [:name, :homepage, :summary, :license])
pods.each do |pod| pods.each do |pod|
if in_md if in_md
UI.puts "* [#{pod[:name]}](#{pod[:homepage]}) - #{pod[:summary]}" UI.puts "* [#{pod[:name]}](#{pod[:homepage]}) - #{pod[:summary]} - #{pod[:license][:type]}"
else else
UI.puts "- #{pod[:name]} - #{pod[:summary]}" UI.puts "- #{pod[:name]} - #{pod[:summary]} - #{pod[:license][:type]}"
end end
end end
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