organization_license_audit 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14a8ff97904b324543f7cb11217c164dd0deb7b0
-  data.tar.gz: 2b988a0e00bd2ad81febc27665a6762e2a5b952d
+  metadata.gz: eee0452f115cdbe368c067b71c9037df3a1df35e
+  data.tar.gz: b322f2e530c1d223a02e986b286123cc9a482d3d
 SHA512:
-  metadata.gz: 856767681e8befa89e37d27bb7cd2eaa3a6faf99f25f38b2d369f6c8a7407774fa6bb1b62ae2bb311bdca7ba74ffd39a32dc72730c86e81652e86aed9767ed10
-  data.tar.gz: 75602c0aaf489633a374c4631132e8cf3ea48171385bb0cd21762149fd8aa01e61ac6cb1dc15f481f472616284ef536134e4ced6efe7add1d23f2c337199909e
+  metadata.gz: b9c44a552c07566ac0955449668e063848d1134bed3b0f02f21ee0f7922d1b107e2c6b775b26b6ecbf1aa89df89a3a03090c755503aac0b34a43c66076fbea5f
+  data.tar.gz: c367e37bec7258f79f3dc90eb606308ada3b1b9509b3c87499d4529cb8564a08a7a3e0a7cae72bd25dc90d9532af90731dd9ff339d19b2f547db07d8bf2c4a34

checksums.yaml.gz.sig

@@ -1,2 +1,2 @@
-
�j��#�z�n��s�W��V_��)$�{��;�R<����,Z�A�����k���e8a���̆�<��'��J�ž�Vt�h�S!��ρ*1iՊN/�Pȧ(�(�g�瞾6Ipߦ��I����9!;��%�l�vI��]#�dPů.���#3HH�.�)#4��
-�LѲ!u$�k�|j�T������!09�]`y��1:��%A�Ylr���6�RV#YJ���X?_��`�ϔƕ�C�i�������u��
+a�L� \�L�L�����{��P��V��q�eK�<.�����
(,��$���;d'��.���.i�K�d[*L3x-�pF�0��#����~��:���"a��d�o/���5��tt���ᒵ���uҒ	Z�	��{���DIl����Z���gn�M�e-�"�X桅���KSa]"I,��Bо�ͻ��F
+�Ha-�'�H���oMMI[u!�;-����[�Dս�ǶN)�ϛxvwN�s�	�+�%

data/bin/organization-license-audit

@@ -13,7 +13,8 @@ end
 options = {
   :ignore => [],
   :user => git_config("github.user"),
-  :whitelist => []
+  :whitelist => [],
+  :approve => [],
 }
 OptionParser.new do |parser|
   parser.banner = <<BANNER
@@ -31,9 +32,10 @@ BANNER
     options[:csv] = separator
   end
   parser.on("--ignore-gems", "Ignore repos that have a %{repo}.gemspec") { options[:ignore_gems] = true }
-  parser.on("--debug REPO", String, "Only run on this repo for fast debugging") { |repo| options[:debug] = repo }
+  parser.on("--debug REPO", String, "Only run on this repo for fast debugging") { |repo| options[:debug] = repo.split(",") }
   parser.on("--without TYPES", String, "Do not run for bundler/npm dependencies (comma separated)") { |without| options[:without] = without.split(",") }
-  parser.on("-w", "--whitelist=LICENSES", String, "Comma separated list of licenses") { |whitelist| options[:whitelist] = whitelist.split(",") }
+  parser.on("-w", "--whitelist LICENSES", String, "Comma separated list of licenses") { |whitelist| options[:whitelist] = whitelist.split(",") }
+  parser.on("-a", "--approve DEPENDENCIES", String, "Comma separated list of dependencies to approve") { |approve| options[:approve] = approve.split(",") }
   parser.on("-h", "--help", "Show this.") { puts parser; exit }
   parser.on("-v", "--version", "Show Version"){ puts OrganizationLicenseAudit::VERSION; exit}
 end.parse!

data/lib/organization_license_audit.rb

@@ -64,7 +64,7 @@ module OrganizationLicenseAudit
     end
 
     def extract_error(output)
-      if output.include?(APPROVAL_HEADING)
+      if output.to_s.include?(APPROVAL_HEADING)
         output = output.split("\n")
         output.reject! { |l| l.include?(APPROVAL_HEADING) || l.strip == "" }
         output.map do |line|
@@ -86,7 +86,7 @@ module OrganizationLicenseAudit
     def find_bad(options)
       Dir.mktmpdir do |bundle_cache_dir|
         repos = OrganizationAudit.all(options)
-        repos.select! { |r| r.name == options[:debug] } if options[:debug]
+        repos.select! { |r| options[:debug].include?(r.name) } if options[:debug]
         repos.map do |repo|
           next if options[:ignore_gems] && repo.gem?
           success, output = audit_repo(repo, bundle_cache_dir, options)
@@ -111,7 +111,8 @@ module OrganizationLicenseAudit
     rescue Exception => e
       raise if e.is_a?(Interrupt) # user interrupted
       $stderr.puts "Error auditing #{repo.name} (#{e})"
-      true
+      puts e.backtrace if options[:debug]
+      false
     end
 
     def needed_files(repo, options)
@@ -123,19 +124,44 @@ module OrganizationLicenseAudit
       supported & list
     end
 
-    def audit_project(bundle_cache_dir, options)
+    def audit_project(bundle_cache_dir, options={})
       with_clean_env do
         bundled = prepare_bundler bundle_cache_dir, options
         prepare_npm options
         prepare_bower options
         whitelist_licences options[:whitelist]
+        approve_dependencies options[:approve]
 
         sh "#{combined_gem_path if bundled}license_finder --quiet"
       end
     end
 
+    def approve_dependencies(dependencies)
+      return unless dependencies and dependencies.any?
+
+      # do not keep connection to Sequel around or next run fails
+      # reproducible with 2 repos --debug repo1,repo2 --approve xxx
+      # even disconnect + connect does not help since it never re-runs
+      # migrations, and then fails to run migrations properly
+      fork do
+        require 'license_finder'
+        require 'license_finder/tables'
+        require 'license_finder/tables/dependency'
+        require 'license_finder/tables/license_alias'
+        require 'license_finder/tables/approval'
+
+        dependencies.each do |name|
+          dependency = LicenseFinder::Dependency.new(name: name, version: ">=0")
+          dependency.license = LicenseFinder::LicenseAlias.create(name: "other")
+          dependency.approval = LicenseFinder::Approval.create(:state => true)
+          dependency.save
+        end
+      end
+      Process.waitall # wait for fork to finish
+    end
+
     def whitelist_licences(licenses)
-      return if licenses.none?
+      return unless licenses and licenses.any?
       licenses = licenses.map { |l| Shellwords.escape(l) }.join(" ")
       unless system("license_finder whitelist add #{licenses} >/dev/null")
         raise "failed to approve #{licenses}"

data/lib/organization_license_audit/version.rb

@@ -1,3 +1,3 @@
 module OrganizationLicenseAudit
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: organization_license_audit
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Michael Grosser
@@ -29,7 +29,7 @@ cert_chain:
   y0kCSWmK6D+x/SbfS6r7Ke07MRqziJdB9GuE1+0cIRuFh8EQ+LN6HXCKM5pon/GU
   ycwMXfl0
   -----END CERTIFICATE-----
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: organization_audit