license_scout 2.0.14 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57d85e891dfcbaa756c9b16bc500c42e9fbfa0640015965f33fc08939d70c554
-  data.tar.gz: f84feb4e5c5efa5cb213b64948d27c95beb3b2ee9a0f543bf1a6e231a0f9c595
+  metadata.gz: 9424ab5a07b97ad3aae865f34272ef0929133dc59a2a2517099733b9f52b2d5d
+  data.tar.gz: 49b5eef3a1c45e5d4941ef213f58e3530151357ab832dd9c5b69014148191543
 SHA512:
-  metadata.gz: 111165550c1cf078c48bc5c1878e3e4529c9abafcb3d4731696cc51c2f779829abe6b8efd6e6269ff483c9c54c44d2647b4a70d2777cefabb0c098edcdf71d4f
-  data.tar.gz: 67cb097807cd8cbfddd5ab0bc2c2f45acb51997d4446c9520edf6fcad472703633fee290c9899f865307951ee82ee35c49423bc5106765a2577e9c2796f5a568
+  metadata.gz: 0b4e3b501de6f26ec2f01b7a99f9b27620761ba183bc14be7febb6b8a3a54830ec3f3ec064e9fab64469359d44fbc5ae6f5ae91e41ab1537da20fff29c23f1f0
+  data.tar.gz: 42310f9e3474e7b07242103e2f00295063ab87101417e89aa758a436b926959fb2dc8e297e086f9c16d755551001d745b3dd36c032ae9c4a1143b2dd894c828a

data/README.md

@@ -179,6 +179,22 @@ license_content | A URL to a file where the raw text of the license can be downl
 
 In addition to including any files Licensee identified as potential license files (but couldn't identify), License Scout will also include the Fallback License you specified in the Dependency Manifest.
 
+## Habitat Channel Configuration
+
+By default License Scout searches for Habitat package in the `stable`
+channel. If your build process publishes packages to another channel
+by default, you can use the `channel_for_origin` habitat configuration
+option:
+
+```yaml
+habitat:
+  channel_for_origin:
+    - origin: yourorigin
+      channel: dev
+    - origin: someotherorigin
+      channel: prod
+```
+
 ## Exporting a Dependency Manifest to another format
 
 By default, License Scout creates the Dependency Manifest as a JSON file. We do this because it provides a single document that can be easily processed into many different forms. License Scout has the ability to also export that JSON file into other formats.
@@ -223,4 +239,3 @@ Pull requests in this project are merged when they have two :+1:s from maintaine
 
 - [Dan DeLeo](https://github.com/danielsdeleo)
 - [Tom Duffield](https://github.com/tduffield)
-

data/lib/license_scout/config.rb

@@ -62,6 +62,10 @@ module LicenseScout
       default :ruby, []
     end
 
+    config_context :habitat do
+      default :channel_for_origin, []
+    end
+
     # Runtime Parameters - if you add any bins, make sure to update the habitat/plan.sh
     # to ensure we override the defaults to scope to the Habitat path
     default :environment, {}

data/lib/license_scout/dependency_manager/habitat.rb

@@ -23,6 +23,7 @@ require "mixlib/shellout"
 module LicenseScout
   module DependencyManager
     class Habitat < Base
+      DEFAULT_CHANNEL = "stable".freeze
 
       def name
         "habitat"
@@ -53,13 +54,14 @@ module LicenseScout
 
         tdeps.sort.map do |tdep|
           o, n, v, r = tdep.split("/")
+          c = channel_for_origin(o)
           dep_name = "#{o}/#{n}"
           dep_version = "#{v}-#{r}"
 
           dependency = new_dependency(dep_name, dep_version, nil)
 
           license_from_manifest(pkg_info(tdep)["manifest"]).each do |spdx|
-            dependency.add_license(spdx, "https://bldr.habitat.sh/v1/depot/channels/#{o}/stable/pkgs/#{n}/#{v}/#{r}")
+            dependency.add_license(spdx, "https://bldr.habitat.sh/v1/depot/channels/#{o}/#{c}/pkgs/#{n}/#{v}/#{r}")
           end
 
           dependency
@@ -94,8 +96,9 @@ module LicenseScout
         $habitat_pkg_info ||= {}
         $habitat_pkg_info[pkg_ident] ||= begin
           pkg_origin, pkg_name, pkg_version, pkg_release = pkg_ident.split("/")
+          pkg_channel = channel_for_origin(pkg_origin)
 
-          base_api_uri = "https://bldr.habitat.sh/v1/depot/channels/#{pkg_origin}/stable/pkgs/#{pkg_name}"
+          base_api_uri = "https://bldr.habitat.sh/v1/depot/channels/#{pkg_origin}/#{pkg_channel}/pkgs/#{pkg_name}"
           if pkg_version.nil? && pkg_release.nil?
             base_api_uri += "/latest"
           elsif pkg_release.nil?
@@ -110,7 +113,16 @@ module LicenseScout
           pkg_origin, pkg_name, = pkg_ident.split("/")
 
           LicenseScout::Log.warn("[habitat] Could not find pkg_info for #{pkg_ident} - trying for the latest version of #{pkg_origin}/#{pkg_name}")
-          FFI_Yajl::Parser.parse(open("https://bldr.habitat.sh/v1/depot/channels/#{pkg_origin}/stable/pkgs/#{pkg_name}/latest").read)
+          FFI_Yajl::Parser.parse(open("https://bldr.habitat.sh/v1/depot/channels/#{pkg_origin}/#{pkg_channel}/pkgs/#{pkg_name}/latest").read)
+        end
+      end
+
+      def channel_for_origin(pkg_origin)
+        override = LicenseScout::Config.habitat.channel_for_origin.find { |t| t["origin"] == pkg_origin }
+        if override
+          override["channel"]
+        else
+          DEFAULT_CHANNEL
         end
       end
 

data/lib/license_scout/version.rb

@@ -16,5 +16,5 @@
 #
 
 module LicenseScout
-  VERSION = "2.0.14"
+  VERSION = "2.1.0"
 end

metadata

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