organization_license_audit 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6376a3b06af0b760663b6b6f4d9dda4f920a6eb3
-  data.tar.gz: 205d9543e0f636ef1992dfdc68b10d8596b2d347
+  metadata.gz: 9ad3ee51ea481dc2f0edd109e9ef064c68fe35c2
+  data.tar.gz: db9c9733ff2e99f535f52e87121d8b7c441dba5b
 SHA512:
-  metadata.gz: a5ea40e035be68c4c306376628768ffcf0417396ab4e30349253958713120f8b364f9c0eac72f2a84090988722df8355da7b385d0bca8f8125833da40ab8d7bd
-  data.tar.gz: 270c40199f52268faa665637bab3f08e16a54bb4f73eb8d469a507726fad20b087df626ffdc12d548429c8a0e7503ddbc81c246646bcefacc56cc598babdbd88
+  metadata.gz: d46391b9cbafe88db3a50dc40ace5a3663368743f778b08d4a8385e498a74dad93501c93d8d4067d0e006e59384059c02732945ad77b3d639d9021d11645c2f7
+  data.tar.gz: 7cb299769d973b388d9ba7645fd016ac51451c5e08dabe241f0d23fcf16a1c4573202e84527778a031cd582d6642367260d0c9bc7b047108d0506716d69cc433

data/bin/organization-license-audit

@@ -31,6 +31,7 @@ BANNER
     options[:csv] = separator
   end
   parser.on("--ignore-gems", "Ignore repos that have a %{repo}.gemspec") { options[:ignore_gems] = true }
+  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("-h", "--help", "Show this.") { puts parser; exit }
   parser.on("-v", "--version", "Show Version"){ puts OrganizationLicenseAudit::VERSION; exit}

data/lib/organization_license_audit/version.rb

@@ -1,3 +1,3 @@
 module OrganizationLicenseAudit
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/organization_license_audit.rb

@@ -6,6 +6,8 @@ module OrganizationLicenseAudit
   BUNDLE_PATH = "vendor/bundle"
   RESULT_LINE = /(^[a-z_\d-]+), ([^,]+), (.+)/
   APPROVAL_HEADING = "Dependencies that need approval"
+  NPM_PACKAGE_FILE = "package.json"
+  BUNDLER_PACKAGE_FILE = "Gemfile"
 
   class << self
     def run(options)
@@ -92,7 +94,7 @@ module OrganizationLicenseAudit
       in_temp_dir do
         raise "Clone failed" unless sh("git clone #{repo.clone_url} --depth 1 --quiet").first
         Dir.chdir repo.name do
-          with_clean_env { audit_project(bundle_cache_dir, options) }
+          audit_project(bundle_cache_dir, options)
         end
       end
     rescue Exception => e
@@ -102,11 +104,13 @@ module OrganizationLicenseAudit
     end
 
     def audit_project(bundle_cache_dir, options)
-      bundled = prepare_bundler bundle_cache_dir
-      prepare_npm
-      whitelist_licences options[:whitelist]
+      with_clean_env do
+        bundled = prepare_bundler bundle_cache_dir, options
+        prepare_npm options
+        whitelist_licences options[:whitelist]
 
-      sh("#{combined_gem_path if bundled}license_finder --quiet")
+        sh "#{combined_gem_path if bundled}license_finder --quiet"
+      end
     end
 
     def whitelist_licences(licenses)
@@ -117,16 +121,16 @@ module OrganizationLicenseAudit
       end
     end
 
-    def prepare_bundler(bundle_cache_dir)
-      if File.exist?("Gemfile")
+    def prepare_bundler(bundle_cache_dir, options)
+      with_or_without "bundler", BUNDLER_PACKAGE_FILE, options do
         use_cache_dir_to_bundle(bundle_cache_dir)
         raise "Failed to bundle" unless sh("bundle --path #{BUNDLE_PATH} --quiet").first
         true
       end
     end
 
-    def prepare_npm
-      if File.exist?("package.json")
+    def prepare_npm(options)
+      with_or_without "npm", NPM_PACKAGE_FILE, options do
         sh "npm install --quiet"
       end
     end
@@ -177,5 +181,14 @@ module OrganizationLicenseAudit
       end
       [$?.success?, output]
     end
+
+    def with_or_without(thing, file, options)
+      return unless File.exist?(file)
+      if (options[:without] || []).include?(thing)
+        File.unlink(file)
+      else
+        yield
+      end
+    end
   end
 end

data.tar.gz.sig

@@ -1 +1,2 @@
-��5Y~����ֺ!��	�]-�f,0�	[xf�����E�_��4ĝ�^��^/(1p&Z�^[����O����0�K1���=�kY�U���o���ʤ$���țlT��Y�|�₻�Y����p��
@Ld��>���x�$̲4�,\��^[
������a���c��s�3��������$h��(��~�w�`�4�J6jBZ�Ѿ���#�� 2���W
���p�/���U��[.���ΕE0�	
+�Z����z���~I�y���	o����)��/]�m����BӣdX��u����}��Ir\O�ݏm���LO
�D�Q'����ZWӍ�ck��L+����Ե�8�,�.�]f,Y�gL���c���m�b�=�̷3�zk&p���*Ɏ��,Hk�a§�DZ��N��o���]�08U�i�e�'��b�
+�o��d}�Zx�7�u�Q�X󙉾����.�4K[

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: organization_license_audit
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Michael Grosser