organization_license_audit 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3f98fc0834e82188a802b3680ec30a39bd45da1
-  data.tar.gz: 299577cef26bbeccc308ed4007582cf1ef125db3
+  metadata.gz: a89c9fdc93f0edd11c07091733e8da1d0ea842fd
+  data.tar.gz: 569e59dfc0e12564943ce11bb1c62811bc28bdf1
 SHA512:
-  metadata.gz: cd9ba96f16ff5681e849a680d0680834a8213f346097e486048a27f3008ebe111cef0e5d7811b5b2b3e126ea2bff1fe163ca0bba65fcd0b4a6e840e7f34c4176
-  data.tar.gz: 36d8a5617f2badf86e9c378c3b1cb9f9d85c8339cd31dddd20cb0f139c488c8863a18fccbf223913940d13220bfb40e47be8e6ff31981a329ad5ac1b9a8772e3
+  metadata.gz: 936067f7327b52ecd4c3c138b7799c6a9ec31879a4beec9e8fe24b3a5c8f2f1b58f4779799ec10adbe6190e3ea80f309cfd2b3248646d184f599d252b0b427b7
+  data.tar.gz: 963a1c534f30508d42b0f85e4115ed488cb3937419a5dcb5e5bea843c8e0dc36d7d6f3ada99a8ec3a4d8760853c2881ee8aad25b1b167787e4a87911bb31f9fa

data/lib/organization_license_audit.rb

@@ -1,12 +1,14 @@
 require "organization_license_audit/version"
 require "tmpdir"
 require "organization_audit"
+require "shellwords"
 
 module OrganizationLicenseAudit
   BUNDLE_PATH = "vendor/bundle"
   RESULT_LINE = /(^[a-z_\d\.-]+), ([^,]+), (.+)/i
   APPROVAL_HEADING = "Dependencies that need approval"
   NPM_PACKAGE_FILE = "package.json"
+  BOWER_PACKAGE_FILE = "bower.json"
   BUNDLER_PACKAGE_FILE = "Gemfile"
 
   class << self
@@ -107,6 +109,7 @@ module OrganizationLicenseAudit
       with_clean_env do
         bundled = prepare_bundler bundle_cache_dir, options
         prepare_npm options
+        prepare_bower options
         whitelist_licences options[:whitelist]
 
         sh "#{combined_gem_path if bundled}license_finder --quiet"
@@ -114,10 +117,10 @@ module OrganizationLicenseAudit
     end
 
     def whitelist_licences(licenses)
-      licenses.each do |license|
-        unless system("license_finder whitelist add '#{license}' >/dev/null")
-          raise "failed to approve #{license}"
-        end
+      return if licenses.none?
+      licenses = licenses.map { |l| Shellwords.escape(l) }.join(" ")
+      unless system("license_finder whitelist add #{licenses} >/dev/null")
+        raise "failed to approve #{licenses}"
       end
     end
 
@@ -135,6 +138,10 @@ module OrganizationLicenseAudit
       end
     end
 
+    def prepare_bower(options)
+      with_or_without "bower", BOWER_PACKAGE_FILE, options
+    end
+
     def use_cache_dir_to_bundle(cache_dir)
       cache_dir = File.join(cache_dir, ruby_cache)
       FileUtils.mkdir_p cache_dir
@@ -187,7 +194,7 @@ module OrganizationLicenseAudit
       if (options[:without] || []).include?(thing)
         File.unlink(file)
       else
-        yield
+        yield if block_given?
       end
     end
   end

data/lib/organization_license_audit/version.rb

@@ -1,3 +1,3 @@
 module OrganizationLicenseAudit
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: organization_license_audit
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Michael Grosser
@@ -29,7 +29,7 @@ cert_chain:
   y0kCSWmK6D+x/SbfS6r7Ke07MRqziJdB9GuE1+0cIRuFh8EQ+LN6HXCKM5pon/GU
   ycwMXfl0
   -----END CERTIFICATE-----
-date: 2014-01-02 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: organization_audit
@@ -51,14 +51,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.4
 description: 
 email: michael@grosser.it
 executables: