organization_license_audit 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6424c2da9ef6b8f8c56cf3890e2a0fc3df447f1
-  data.tar.gz: b9617b179511cb18e310acf49fde716de06ecb1c
+  metadata.gz: 1b35157b61295f403ab5fde9070fc04cc6d43189
+  data.tar.gz: ce1ee9355f04f87417f78481e818ff44168981cc
 SHA512:
-  metadata.gz: 3d970d57025a40304df6989aae0f3f221bb2516cf844465f425946962a7bcdc763e298161cb681157cdee691818f586c6878e58ec117a7835a8ef20ef27696ed
-  data.tar.gz: dd56bbcaa5f547d3d51ea194e5345ff844cc8e22ad8c6910bbce4d6a171dc694c80fa1337c196834eaecd4990eeab5c87c7ade4bd7b9131cf9f5a788945bc265
+  metadata.gz: 55a08621a75fb4be0394bdec8d100cd3de29ba357b5b23a6d080f01ef372091d58a50f56421e53477a915e2f1fe488129d3cd49f39b798c06b82664f6ce6ab2a
+  data.tar.gz: 1a0b60c00ba891147ddbaed6db8f29fab5dbfd5aa145fc5d445d80fe0630658108d442616877d69bc4b61439bed220ee31629894ab593563b99ad2561f4e6123

data/lib/organization_license_audit.rb

@@ -2,6 +2,7 @@ require "organization_license_audit/version"
 require "tmpdir"
 require "organization_audit"
 require "shellwords"
+require "open3"
 
 module OrganizationLicenseAudit
   BUNDLE_PATH = "vendor/bundle"
@@ -78,7 +79,13 @@ module OrganizationLicenseAudit
     end
 
     def download_file(repo, file)
-      return unless content = repo.content(file)
+      begin
+        content = repo.content(file)
+      rescue StandardError => e
+        puts "Error downloading #{file}: #{e.to_s}"
+        content = repo.content(file)
+      end
+      return unless content
       FileUtils.mkdir_p(File.dirname(file))
       File.write(file, content)
     end
@@ -172,7 +179,7 @@ module OrganizationLicenseAudit
     def prepare_bundler(bundle_cache_dir, options)
       with_or_without :bundler, options do
         use_cache_dir_to_bundle(bundle_cache_dir)
-        raise "Failed to bundle" unless sh("bundle --path #{BUNDLE_PATH} --quiet").first
+        raise "Failed to bundle" unless sh_with_retry("bundle --path #{BUNDLE_PATH} --quiet 2>&1", "Gem::RemoteFetcher::FetchError").first
         true
       end
     end
@@ -234,6 +241,19 @@ module OrganizationLicenseAudit
       [$?.success?, output]
     end
 
+    def sh_with_retry(cmd, retry_on)
+      status = false
+      result = ""
+      3.times do |i|
+        $stderr.puts "Retrying failed command" if i > 0
+        status, current = sh(cmd)
+        result << current
+        return status, result if status
+        break unless current.include?(retry_on)
+      end
+      return status, result
+    end
+
     def select_parallel_group!(repos)
       return unless group = ENV["OLA_GROUP"]
       group, groups = group.split("/").map(&:to_i)

data/lib/organization_license_audit/version.rb

@@ -1,3 +1,3 @@
 module OrganizationLicenseAudit
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: organization_license_audit
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Michael Grosser
@@ -30,7 +30,7 @@ cert_chain:
   F5etKHZg0j3eHO31/i2HnswY04lqGImUu6aM5EnijFTB7PPW2KwKKM4+kKDYFdlw
   /0WV1Ng2/Y6qsHwmqGg2VlYj2h4=
   -----END CERTIFICATE-----
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: organization_audit