organization_license_audit 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41139489b1b12547a764da58f9c1d88cf003d668
-  data.tar.gz: f0609858ec29e97dd7c0e8d11091856050c468e3
+  metadata.gz: 6376a3b06af0b760663b6b6f4d9dda4f920a6eb3
+  data.tar.gz: 205d9543e0f636ef1992dfdc68b10d8596b2d347
 SHA512:
-  metadata.gz: b1560d1edffea4b522198449d530325a442adb86a7c69edcf4708b11b903d87370e1332360eb4dcb42b06303d00b33277ae129feab5cc15b0e073d562b2656b1
-  data.tar.gz: ce29ce2986fa2e0e2e7bc4a424fea532a4f062319dea5781576b9190c6444434fd67b33d541566c29546d832bf03a44a8c33c60a78d239e196ee154641b16450
+  metadata.gz: a5ea40e035be68c4c306376628768ffcf0417396ab4e30349253958713120f8b364f9c0eac72f2a84090988722df8355da7b385d0bca8f8125833da40ab8d7bd
+  data.tar.gz: 270c40199f52268faa665637bab3f08e16a54bb4f73eb8d469a507726fad20b087df626ffdc12d548429c8a0e7503ddbc81c246646bcefacc56cc598babdbd88

data/lib/organization_license_audit.rb

@@ -77,27 +77,22 @@ module OrganizationLicenseAudit
     end
 
     def find_bad(options)
-      OrganizationAudit.all(options).map do |repo|
-        next if options[:ignore_gems] and repo.gem?
-        success, output = audit_repo(repo, options)
-        $stderr.puts ""
-        [repo, output] unless success
-      end.compact
+      Dir.mktmpdir do |bundle_cache_dir|
+        OrganizationAudit.all(options).map do |repo|
+          next if options[:ignore_gems] and repo.gem?
+          success, output = audit_repo(repo, bundle_cache_dir, options)
+          $stderr.puts ""
+          [repo, output] unless success
+        end.compact
+      end
     end
 
-    def audit_repo(repo, options)
+    def audit_repo(repo, bundle_cache_dir, options)
       $stderr.puts repo.name
       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 do
-            bundled = File.exist?("Gemfile")
-            raise "Failed to bundle" if bundled && !sh("bundle --path #{BUNDLE_PATH} --quiet").first
-            options[:whitelist].each do |license|
-              raise "failed to approve #{license}" unless system("license_finder whitelist add '#{license}' >/dev/null")
-            end
-            sh("#{combined_gem_path if bundled}license_finder --quiet")
-          end
+          with_clean_env { audit_project(bundle_cache_dir, options) }
         end
       end
     rescue Exception => e
@@ -106,7 +101,53 @@ module OrganizationLicenseAudit
       true
     end
 
-    # license_finder loads all gems in the target repo, which fails if they are not available in the current ruby installation
+    def audit_project(bundle_cache_dir, options)
+      bundled = prepare_bundler bundle_cache_dir
+      prepare_npm
+      whitelist_licences options[:whitelist]
+
+      sh("#{combined_gem_path if bundled}license_finder --quiet")
+    end
+
+    def whitelist_licences(licenses)
+      licenses.each do |license|
+        unless system("license_finder whitelist add '#{license}' >/dev/null")
+          raise "failed to approve #{license}"
+        end
+      end
+    end
+
+    def prepare_bundler(bundle_cache_dir)
+      if File.exist?("Gemfile")
+        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")
+        sh "npm install --quiet"
+      end
+    end
+
+    def use_cache_dir_to_bundle(cache_dir)
+      cache_dir = File.join(cache_dir, ruby_cache)
+      FileUtils.mkdir_p cache_dir
+      FileUtils.mkdir_p File.dirname(BUNDLE_PATH)
+      FileUtils.symlink cache_dir, BUNDLE_PATH
+    end
+
+    # use one directory per ruby-version (not the same for jruby or different patch releases)
+    def ruby_cache
+      ruby_version = [".ruby-version", ".rvmrc"].detect { |f| File.exist?(f) }
+      ruby_version = File.read(ruby_version) if ruby_version
+      ruby_version ||= "default"
+      ruby_version.gsub!(/[^a-z\d\.]/, "_") # .rvmrc might include weirdness...
+      ruby_version
+    end
+
+    # license_finder needs to find all gems in the target repo, which fails if their path is not in the GEM_PATH
     # so we have to add the gems in vendor/bundle to the gems currently available from this bundle
     def combined_gem_path
       "GEM_PATH=#{`gem env path`.strip}:#{BUNDLE_PATH}/ruby/* "

data/lib/organization_license_audit/version.rb

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

metadata

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