ad_licenselint 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d724417a61b9cdd45734e80b872bd17fcaeebb0764365bdb72324c90c4707c9
-  data.tar.gz: b937d30a641e989a44449ca682bc14012d8557b6820d2e6cef9d9d3587381da3
+  metadata.gz: 23cdf653152204886e24a5a24af739c2e9a0747de02437f82ffb3474686a6e7d
+  data.tar.gz: b72c40f5409ad00ba77d9a1e99b86c51455c9081f0284395b107eeaa691ef2bc
 SHA512:
-  metadata.gz: 66ad331fcf8166a73f4ffa825593db9034fa19676abd57684b385547ee482a945bbafed7f61b752f77ba44ce5fdbd9098294f4ab73bffeea8adc51749b67d2c9
-  data.tar.gz: f3dc44e8915c811ffdc6d094d2dc54985e263e6d95e87bfdbe6f7d67616e112e5d12ad7528e1627af62f8541df3dccd4f253a267a301657a9f61cfa65a62302b
+  metadata.gz: '09cd7f80d92e31d5d164b748af551637389305f01e15f86beb6d9bc799df61ef9287b8e8e8136fea8d3737b2571eee0e9f0e9c612a92d31e9a522a15827ba189'
+  data.tar.gz: 9fef1fe60cc5241523c8dafa45d505dffe4ead2ce1beba0f506fbcbc422b481f26a4e87575fc7f6c625408c8baf2c4fb83626b8ab538c78daccf07e50d485b23

data/lib/ad_licenselint/license_entry.rb

@@ -12,10 +12,6 @@ class LicenseEntry
     !pod_name.empty? && !license_name.empty?
   end
 
-  def is_accepted
-    ADLicenseLint::Constant::ACCEPTED_LICENSES.include?(license_name)
-  end
-
   def copyright
     (/Copyright(.*)$/.match license_content)[0]
   end

data/lib/ad_licenselint/runner.rb

@@ -1,9 +1,14 @@
+require 'yaml'
+
 module ADLicenseLint
 
   class Runner
     attr_accessor :options, :path
 
-    POD_SOURCE = Pod::Source.new("~/.cocoapods/repos/master")
+    POD_SOURCES = ["trunk", "master"]
+      .map { |source| File.join(ENV["HOME"], ".cocoapods/repos", source) }
+      .select { |path| File.exist? path }
+      .map { |path| Pod::Source.new path }
 
     def initialize(options = nil)
       if options.nil?
@@ -20,7 +25,7 @@ module ADLicenseLint
       plist_files = Dir[acknowledgements_plist_path] # one plist for each target
       json_contents = plist_files.map { |plist_file| acknowledgement_json(plist_file) }
       entries = all_entries(json_contents)
-      warning_entries = entries.reject(&:is_accepted)
+      warning_entries = entries.reject { |entry| accepted? entry }
       displayed_entries = options[:all] ? entries : warning_entries
 
       Report.new(displayed_entries)
@@ -81,9 +86,13 @@ module ADLicenseLint
     end
 
     def pod_specification(pod_name)
-      set = POD_SOURCE.set(pod_name)
-      return nil if set.highest_version.nil? # access to specification crashes if highest_version is nil
-      set.specification.to_hash
+      POD_SOURCES
+        .map { |source| source.set(pod_name) }
+        .filter { |set| !set.highest_version.nil? } # access to specification crashes if highest_version is nil
+        .sort_by(&:highest_version)
+        .reverse # highest version first
+        .map { |set| set.specification.to_hash }
+        .first
     end
 
     def pod_names_from_podfile
@@ -101,8 +110,24 @@ module ADLicenseLint
       File.join(@path, 'Pods', 'Target\ Support\ Files')
     end
 
+    def config_path
+      File.join(@path, ".ad_licenselint.yml")
+    end
+
     def acknowledgements_plist_path
       File.join(target_support_path, "Pods-*/*acknowledgements.plist")
     end
+
+    def accepted?(entry)
+      ADLicenseLint::Constant::ACCEPTED_LICENSES.include?(entry.license_name) || allowlist.include?(entry.pod_name)
+    end
+
+    def config_file
+      @config ||= (File.exist?(config_path) ? YAML.load(File.read(config_path)) : {})
+    end
+
+    def allowlist
+      config_file["allow"] || []
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ad_licenselint
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Pierre Felgines