license_scout 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '083e8edafd9a99be05ba58d2af282874c2afedfef05cc7d5548f68c377178f63'
-  data.tar.gz: a00c763ddafbcf149fdfacc7b005bb372509f3bd07186858b3d9247976b2c5b3
+  metadata.gz: 7e473b91a8ecd48f0f275b6d5e9ac7093adcafb244ab1237b5b5474f4fce24d8
+  data.tar.gz: 6a376513496e154780cae375fac9aa6b897117dcd418f847e84225eacdc46b68
 SHA512:
-  metadata.gz: c31dcd43c92cd006a7cc644389b8c29993002d6c2ec4d29db92553ce56dd6d551cc11c29a572ed5b54f3ee7d126c615a8b9f9956366c804252485490d7b5fe44
-  data.tar.gz: c4f345b2bd3f5a1cc7d8b36c00a0bbcf9ed4431e1829b0ff18b8e48e4a987dd6c6e134114829a87ba825ff43f4f0948bf0d7bb6cd9f5da11e261bdb475adfcf3
+  metadata.gz: 9ba5829b5be0cda80d42b58c2f09151ccf592b3006699d49edf790aa2a6d6aea41b696293e60992055c995ad4c1ef97c8804804e50ab30ffe25f17248466ed2b
+  data.tar.gz: 3dbc221cc0f6c2bd9dbdecd96c1c539c0188e43d8bf55ce791a5854bc9766b6d8a1b0feb324bdaa91e8d19521ae3a3d85b94a02fc9acc0701034e4c7363b9dd0

data/lib/license_scout/collector.rb

@@ -35,6 +35,10 @@ module LicenseScout
       dependency_managers.each { |d| collect_licenses_from(d) }
 
       LicenseScout::Log.info("[collector] All licenses successfully collected")
+    rescue Exceptions::UpstreamFetchError => e
+      LicenseScout::Log.error("[collector] Encountered an error attempting to fetch package metadata from upstream source:")
+      LicenseScout::Log.error("[collector] #{e}")
+      raise Exceptions::FailExit.new(e)
     rescue Exceptions::PackageNotFound => e
       LicenseScout::Log.error("[collector] One of the project's transitive dependencies could not be found:")
       LicenseScout::Log.error("[collector] #{e}")

data/lib/license_scout/dependency_manager/habitat.rb

@@ -18,7 +18,7 @@
 require "license_scout/dependency_manager/base"
 require "license_scout/exceptions"
 
-require "open-uri"
+require "net/http"
 require "mixlib/shellout"
 
 module LicenseScout
@@ -74,10 +74,6 @@ module LicenseScout
         end.compact
       end
 
-      def fetched_urls
-        @fetched_urls ||= {}
-      end
-
       private
 
       def license_from_manifest(manifest_content)
@@ -144,11 +140,18 @@ module LicenseScout
         end
 
         LicenseScout::Log.debug("[habitat] Fetching pkg_info from #{base_api_uri}")
-        FFI_Yajl::Parser.parse(open(base_api_uri).read).tap do |bldr_info|
-          fetched_urls["#{origin}/#{name}"] = base_api_uri
+        response = Net::HTTP.get_response(URI(base_api_uri))
+
+        if response.is_a?(Net::HTTPSuccess)
+          FFI_Yajl::Parser.parse(response.body)
+        else
+          case response.code
+          when "404"
+            nil
+          else
+            raise LicenseScout::Exceptions::UpstreamFetchError.new("Received \"#{response.code} #{response.msg}\" when attempting to fetch package information for the #{origin}/#{name} Habitat package")
+          end
         end
-      rescue OpenURI::HTTPError
-        nil
       end
 
       def channel_for_origin(pkg_origin)

data/lib/license_scout/exceptions.rb

@@ -24,5 +24,6 @@ module LicenseScout
     class PackageNotFound < Error; end
     class HabitatPackageNotFound < PackageNotFound; end
     class FailExit < Error; end
+    class UpstreamFetchError < Error; end
   end
 end

data/lib/license_scout/version.rb

@@ -16,5 +16,5 @@
 #
 
 module LicenseScout
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: license_scout
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Serdar Sutay
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-24 00:00:00.000000000 Z
+date: 2018-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-yajl