license_scout 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b68d1311c50cda672da2ff036a9933a38d45e7a79e8a9c40352d839ba818186
-  data.tar.gz: 5efda8ed1041680fb943017f5f6015765ef33a77fffb428e0c402fb685778446
+  metadata.gz: 07f7bba2a32cc6e4697c45e42c401b7298e13a473e27e91ad42eaed08d2e8bee
+  data.tar.gz: 59c5fa80345ad053a54061901e8f6eb25458858ff0c4f4224110c43b9ba5f819
 SHA512:
-  metadata.gz: 0cfac147a17d18bba538ce8152015c9fea05c7b8956d3a9db6beb0bcea990951bd19d7fb855fef4f4a03a02f2ea71e09608192c6ea882a0b92045f8967da702e
-  data.tar.gz: c337a0bd8b8aa6906a5ed992012df0de3a42fe190dc63fce545c6a1407a4f818f5dccc6abd69304aec334c1ecb3749057605d31404720986b30169ba4ec6042c
+  metadata.gz: 4ca283049b83fa99b661622cedb194d805eb11119f2fe96e10a260a2dd638d20b103cb1186c5ca0d4721a1f29b952933abe9aa64ab123e45e66af633a437a6b6
+  data.tar.gz: e720c9970dfab3978c02be6dc85d9fb2f204c4c05553341e3a361515f4bfaab7f5159cb8cb493f7b9c019e84a266b78c31fdf9aae19e0e6afb46abef7ba97fc8

data/lib/license_scout/dependency_manager/npm.rb

@@ -55,11 +55,22 @@ module LicenseScout
 
           dependency = new_dependency(dep_name, dep_version, dep_path)
 
-          case pkg_info["license"]
+          license_info = pkg_info["license"] || pkg_info["licenses"]
+
+          case license_info
           when String
-            dependency.add_license(pkg_info["license"], "package.json")
+            dependency.add_license(license_info, "package.json")
           when Hash
-            dependency.add_license(pkg_info["license"]["type"], "package.json", pkg_info["license"]["url"])
+            dependency.add_license(license_info["type"], "package.json", license_info["url"])
+          when Array
+            license_info.each do |license|
+              case license
+              when String
+                dependency.add_license(license, "package.json")
+              when Hash
+                dependency.add_license(license["type"], "package.json", license["url"])
+              end
+            end
           end
 
           uniq_deps << dependency

data/lib/license_scout/license.rb

@@ -110,6 +110,16 @@ module LicenseScout
         rescue OpenURI::HTTPError
           LicenseScout::Log.warn("[license] Unable to download license for #{license_id} from #{new_url}")
           nil
+        rescue RuntimeError => e
+          if e.message =~ /redirection forbidden/
+            m = /redirection forbidden:\s+(.+)\s+->\s+(.+)/.match(e.message)
+            new_https_url = m[2].gsub("http://", "https://")
+
+            LicenseScout::Log.debug("[license] Retrying download of #{license_id} from #{new_https_url}")
+            license_content(license_id, new_https_url)
+          else
+            raise e
+          end
         end
       end
     end

data/lib/license_scout/version.rb

@@ -16,5 +16,5 @@
 #
 
 module LicenseScout
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: license_scout
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Serdar Sutay
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-13 00:00:00.000000000 Z
+date: 2018-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-yajl
@@ -304,15 +304,6 @@ files:
 - lib/license_scout/reporter.rb
 - lib/license_scout/spdx.rb
 - lib/license_scout/version.rb
-- native_parsers/mix_lock_json/README.md
-- native_parsers/mix_lock_json/lib/mix_lock_json.ex
-- native_parsers/mix_lock_json/mix.exs
-- native_parsers/mix_lock_json/mix.lock
-- native_parsers/rebar_lock_json/README.md
-- native_parsers/rebar_lock_json/rebar.config
-- native_parsers/rebar_lock_json/rebar.lock
-- native_parsers/rebar_lock_json/src/rebar_lock_json.app.src
-- native_parsers/rebar_lock_json/src/rebar_lock_json.erl
 homepage: https://github.com/chef/license_scout
 licenses:
 - Apache-2.0

data/native_parsers/mix_lock_json/README.md

@@ -1,21 +0,0 @@
-# MixLockJson
-
-**TODO: Add description**
-
-## Installation
-
-If [available in Hex](https://hex.pm/docs/publish), the package can be installed
-by adding `mix_lock_json` to your list of dependencies in `mix.exs`:
-
-```elixir
-def deps do
-  [
-    {:mix_lock_json, "~> 0.1.0"}
-  ]
-end
-```
-
-Documentation can be generated with [ExDoc](https://github.com/elixir-lang/ex_doc)
-and published on [HexDocs](https://hexdocs.pm). Once published, the docs can
-be found at [https://hexdocs.pm/mix_lock_json](https://hexdocs.pm/mix_lock_json).
-

data/native_parsers/mix_lock_json/lib/mix_lock_json.ex

@@ -1,20 +0,0 @@
-defmodule MixLockJson.CLI do
-  def main(mix_lock_path \\ "") do
-    mix_lock_path
-    |> parse_mix_lock
-    |> IO.puts
-  end
-
-  defp parse_mix_lock(mix_lock_path) do
-    {:ok, lockfile} = File.read(mix_lock_path)
-    {lock_deps, _} = lockfile |> Code.eval_string
-
-    Poison.encode!(Enum.reduce(lock_deps, [], fn(i, acc) ->
-      case i do
-        {name, {_, _, version, _hash, _, _child_deps, _}} -> [%{name => version} | acc]
-        {name, {:git, _path, hash, _}} -> [%{name => hash} | acc]
-        _ -> acc
-      end
-    end))
-  end
-end

data/native_parsers/mix_lock_json/mix.exs

@@ -1,31 +0,0 @@
-defmodule MixLockJson.MixProject do
-  use Mix.Project
-
-  def project do
-    [
-      app: :mix_lock_json,
-      version: "0.1.0",
-      escript: escript(),
-      deps: deps()
-    ]
-  end
-
-  def application do
-    [applications: []]
-  end
-
-  defp escript do
-    [
-      main_module: MixLockJson.CLI,
-      path: "../../bin/mix_lock_json",
-      app: nil,
-      embed_elixir: true
-    ]
-  end
-
-  defp deps do
-    [
-      {:poison, "~> 3.1"}
-    ]
-  end
-end

data/native_parsers/mix_lock_json/mix.lock

@@ -1,3 +0,0 @@
-%{
-  "poison": {:hex, :poison, "3.1.0", "d9eb636610e096f86f25d9a46f35a9facac35609a7591b3be3326e99a0484665", [:mix], [], "hexpm"},
-}

data/native_parsers/rebar_lock_json/README.md

@@ -1,17 +0,0 @@
-rebar_lock_json
-===============
-
-A minimal escript converting a rebar.lock file to json output.
-
-Should work with any version of rebar (2 or 3)'s rebar.lock file.
-
-Build
------
-
-    $ rebar3 escriptize # this also copies the escript file to bin/
-
-Run
----
-
-    $ bin/rebar_lock_json path/to/rebar.lock
-    {"amqp_client":{"type":"git","git_url":"git:\/\/github.com\/seth\/amqp_client.git","git_ref":"7622ad8093a41b7288a1aa44dd16d3e92ce8f833"}}

data/native_parsers/rebar_lock_json/rebar.config

@@ -1,19 +0,0 @@
-{erl_opts, [no_debug_info]}.
-{deps, [
-        jsone,
-        {rebar3, {git, "https://github.com/erlang/rebar3", {branch, "master"}}}
-       ]}.
-
-{escript_incl_apps,
- [rebar_lock_json]}.
-{escript_main_app, rebar_lock_json}.
-{escript_name,  rebar_lock_json}.
-{escript_emu_args, "%%! +sbtu +A0\n"}.
-
-{post_hooks, [
-              {escriptize, "cp $REBAR_BUILD_DIR/bin/rebar_lock_json ../../bin/"}
-             ]}.
-
-{profiles, [{test,
-             [{erl_opts, [debug_info]}
-            ]}]}.

data/native_parsers/rebar_lock_json/rebar.lock

@@ -1,36 +0,0 @@
-{"1.1.0",
-[{<<"bbmustache">>,{pkg,<<"bbmustache">>,<<"1.3.0">>},1},
- {<<"certifi">>,{pkg,<<"certifi">>,<<"0.4.0">>},1},
- {<<"cf">>,{pkg,<<"cf">>,<<"0.2.2">>},1},
- {<<"cth_readable">>,{pkg,<<"cth_readable">>,<<"1.2.3">>},1},
- {<<"erlware_commons">>,{pkg,<<"erlware_commons">>,<<"1.0.0">>},1},
- {<<"eunit_formatters">>,{pkg,<<"eunit_formatters">>,<<"0.3.1">>},1},
- {<<"getopt">>,{pkg,<<"getopt">>,<<"0.8.2">>},1},
- {<<"jiffy">>,{pkg,<<"jiffy">>,<<"0.14.11">>},0},
- {<<"jsone">>,{pkg,<<"jsone">>,<<"1.4.1">>},0},
- {<<"providers">>,{pkg,<<"providers">>,<<"1.6.0">>},1},
- {<<"rebar">>,
-  {git,"https://github.com/erlang/rebar3",
-       {ref,"86e883b8d8d1d16487e245fff02eba8c83da2cdd"}},
-  0},
- {<<"rebar3">>,
-  {git,"https://github.com/erlang/rebar3",
-       {ref,"cb743f76cbc26ac780066d285329e8a6c8330605"}},
-  0},
- {<<"relx">>,{pkg,<<"relx">>,<<"3.22.2">>},1},
- {<<"ssl_verify_fun">>,{pkg,<<"ssl_verify_fun">>,<<"1.1.1">>},1}]}.
-[
-{pkg_hash,[
- {<<"bbmustache">>, <<"2010ADAE78830992A4C69680115ECD7D475DD03A72C076BBADDCCBF2D4B32035">>},
- {<<"certifi">>, <<"A7966EFB868B179023618D29A407548F70C52466BF1849B9E8EBD0E34B7EA11F">>},
- {<<"cf">>, <<"7F2913FFF90ABCABD0F489896CFEB0B0674F6C8DF6C10B17A83175448029896C">>},
- {<<"cth_readable">>, <<"293120673DFF82F0768612C5282E35C40CACC1B6F94FE99077438FD3749D0E27">>},
- {<<"erlware_commons">>, <<"087467DE5833C0BB5B3CCDD387F9E9C1FB816A75B7A709629BF24B5ED3246C51">>},
- {<<"eunit_formatters">>, <<"7A6FC351EB5B873E2356B8852EB751E20C13A72FBCA03393CF682B8483509573">>},
- {<<"getopt">>, <<"B17556DB683000BA50370B16C0619DF1337E7AF7ECBF7D64FBF8D1D6BCE3109B">>},
- {<<"jiffy">>, <<"919A87D491C5A6B5E3BBC27FAFEDC3A0761CA0B4C405394F121F582FD4E3F0E5">>},
- {<<"jsone">>, <<"10ECFB2E2FD216D6451AF71CF14F276E063A096E15B685DE7535FD680466C9B5">>},
- {<<"providers">>, <<"DB0E2F9043AE60C0155205FCD238D68516331D0E5146155E33D1E79DC452964A">>},
- {<<"relx">>, <<"AEE2EF6E9AC6D21D6661133B7A0BE6E81424DE9CDCA0012FC008BC677297C469">>},
- {<<"ssl_verify_fun">>, <<"28A4D65B7F59893BC2C7DE786DEC1E1555BD742D336043FE644AE956C3497FBE">>}]}
-].

data/native_parsers/rebar_lock_json/src/rebar_lock_json.app.src

@@ -1,17 +0,0 @@
-{application, rebar_lock_json,
- [{description, "An escript util returning json representation of rebar.lock"},
-  {vsn, "0.1.0"},
-  {registered, []},
-  {applications,
-   [kernel,
-    stdlib,
-    rebar,
-    jsone
-   ]},
-  {env,[]},
-  {modules, []},
-
-  {maintainers, []},
-  {licenses, []},
-  {links, []}
- ]}.

data/native_parsers/rebar_lock_json/src/rebar_lock_json.erl

@@ -1,20 +0,0 @@
--module(rebar_lock_json).
-
--export([main/1]).
-
-main([LockPath|_]) ->
-    Deps = rebar_config:consult_lock_file(LockPath),
-    Ejson = lists:map(fun dep_to_ejson/1, Deps),
-    io:format("~s~n", [jsone:encode({Ejson})]).
-
-dep_to_ejson({Name, {pkg, PkgName, PkgVersion, Hash}, Lvl}) ->
-    {Name, {[{<<"type">>, <<"pkg">>},
-             {<<"level">>, Lvl},
-             {<<"pkg_name">>, PkgName},
-             {<<"pkg_version">>, PkgVersion},
-             {<<"pkg_hash">>, Hash}]}};
-dep_to_ejson({Name, {git, GitUrl, {ref, GitRef}}, Lvl}) ->
-    {Name, {[{<<"type">>, <<"git">>},
-             {<<"level">>, Lvl},
-             {<<"git_url">>, erlang:iolist_to_binary(GitUrl)},
-             {<<"git_ref">>, erlang:iolist_to_binary(GitRef)}]}}.