license_finder 5.3.0 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f6aed769d4ad0cd9c9b6351c889ffc2ab66e2410601f2f26df043e09020889f
-  data.tar.gz: f82d12773e91b7879a46e9e6876d8056a7d901cd7005257eee3c66c1b45cba7d
+  metadata.gz: 27bf5ceddaefdfaf96e14aa2021ca620e94b5f4923983638fbfce367271143c2
+  data.tar.gz: 7e6a9f084d74919d7cbf2be27038ba3ad529ef7431b3691f33aa1d5d03822c2a
 SHA512:
-  metadata.gz: 5477a62b4d082281a806f023572e1b382927a35cae497c5fb44901b6f5652bf88df2cc8cd1762dc69637ae8b9b806b9baa13cffa1f96286aad9cdf055651dda8
-  data.tar.gz: 2208b7c87598ed2daa3aebafb70e239416f9a333e0bf80549674657b87f6cd06d77ad115325044963b4dfb7e59331cf4bdaa498c51529024e47dad2d9ce170ed
+  metadata.gz: d0e9016bfd2140a346748d7ecee8653e7f79b32a970be8ff6b82db77065c1aa355257e4ae526b930c2b2bbe15b976e19b8d5971708b258f6c61e245df49633bc
+  data.tar.gz: d008902c7f2e66e24243f805ddfef304c9861556351819f51cef627500aefbbffd6ff0a58ffb4a58a01888bb15de405433bfba98aa285b8aa8ebe9f091e20d73

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# [5.3.0] / 2018-06-05
+
+### Added
+* Experimental support for Rust dependencies with Cargo - [2ef3129](https://github.com/pivotal-legacy/LicenseFinder/commit/2ef31290f7abf51db5b7173302d1e535508bbd7a)
+* Add project roots command to list paths to scan - [b7a22ea](https://github.com/pivotal-legacy/LicenseFinder/commit/b7a22eacfac0e1b9334998de606df69ec3156f77)
+
+### Removed
+* Remove HTTParty dependency - [c52d014](https://github.com/pivotal-legacy/LicenseFinder/commit/c52d014df1ca9cd3838d03c60daa6fad954c5579) 
+
 # [5.2.3] / 2018-05-14
 
 # [5.2.1] / 2018-05-14
@@ -598,3 +607,4 @@ Bugfixes:
 [5.2.0]: https://github.com/pivotal-legacy/LicenseFinder/compare/v5.1.1...v5.2.0
 [5.2.1]: https://github.com/pivotal-legacy/LicenseFinder/compare/v5.2.0...v5.2.1
 [5.2.3]: https://github.com/pivotal-legacy/LicenseFinder/compare/v5.2.1...v5.2.3
+[5.3.0]: https://github.com/pivotal-legacy/LicenseFinder/compare/v5.2.3...v5.3.0

data/Dockerfile

@@ -1,5 +1,4 @@
-FROM ubuntu:trusty
-RUN apt-get update && apt-get install -y curl git-core build-essential wget unzip
+FROM ubuntu:xenial
 
 # Versioning
 ENV PIP_INSTALL_VERSION 10.0.1
@@ -10,6 +9,15 @@ ENV GRADLE_VERSION 4.2
 ENV RUBY_VERSION 2.5.1
 ENV MIX_VERSION 1.0
 
+# programs needed for building
+RUN apt-get update && apt-get install -y \
+  build-essential \
+  curl \
+  git-core \
+  sudo \
+  unzip \
+  wget
+
 # nodejs seems to be required for the one of the gems
 RUN curl -sL https://deb.nodesource.com/setup_8.x | bash - && \
     apt-get -y install nodejs
@@ -49,7 +57,7 @@ RUN apt-get install -y python-pip && \
     pip install --upgrade pip==$PIP_INSTALL_VERSION
 
 # install maven
-RUN curl -O http://www-us.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz && \
+RUN curl -O https://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz && \
     tar -xf apache-maven-$MAVEN_VERSION-bin.tar.gz; rm -rf apache-maven-$MAVEN_VERSION-bin.tar.gz && \
     mv apache-maven-$MAVEN_VERSION /usr/local/lib/maven && \
     ln -s /usr/local/lib/maven/bin/mvn /usr/local/bin/mvn
@@ -91,6 +99,7 @@ RUN mkdir /gopath && \
   go get github.com/golang/dep/cmd/dep
 
 # Fix the locale
+RUN apt-get install -y locales
 RUN locale-gen en_US.UTF-8
 ENV LANG=en_US.UTF-8
 ENV LANGUAGE=en_US:en
@@ -119,6 +128,15 @@ RUN apt-get install -y python-dev && \
 # install Cargo
 RUN curl -sSf https://static.rust-lang.org/rustup.sh | sh -s -- --disable-sudo
 
+# install NuGet (w. mono)
+# https://docs.microsoft.com/en-us/nuget/install-nuget-client-tools#macoslinux
+RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF &&\
+  echo "deb https://download.mono-project.com/repo/ubuntu stable-xenial main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list &&\
+  apt-get update &&\ 
+  apt-get install -y mono-complete &&\
+  curl -o /usr/local/bin/nuget.exe https://dist.nuget.org/win-x86-commandline/latest/nuget.exe &&\
+  echo "alias nuget=\"mono /usr/local/bin/nuget.exe\"" >> ~/.bash_aliases
+
 # install license_finder
 COPY . /LicenseFinder
 RUN bash -lc "cd /LicenseFinder && bundle install -j4 && rake install"

data/ci/scripts/containerize-tests.sh

@@ -10,5 +10,5 @@ pushd LicenseFinder
   docker build . -t licensefinder/license_finder
 
   docker run -v $PWD:/lf -it licensefinder/license_finder /bin/bash \
-    -exlc "cd /lf && ci/scripts/run-tests.sh $RUBY_VERSION_UNDER_TEST"
+    -exli /lf/ci/scripts/run-tests.sh "$RUBY_VERSION_UNDER_TEST"
 popd

data/ci/scripts/pushscript.sh

@@ -10,6 +10,10 @@ built_gem="pkg/license_finder-$build_version.gem"
 git config --global user.email $GIT_EMAIL
 git config --global user.name $GIT_USERNAME
 
+git config --global push.default simple
+
+git checkout master
+
 mkdir ~/.ssh
 ssh-keyscan github.com >> ~/.ssh/known_hosts
 eval "$(ssh-agent -s)"

data/ci/scripts/run-tests.sh

@@ -1,30 +1,38 @@
 #!/bin/bash -elx
+
+set -o pipefail
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+PROJECT_ROOT="$( dirname "$( dirname $DIR )" )"
+
 RUBY_VERSION_UNDER_TEST=$1
-rvm install --default $RUBY_VERSION_UNDER_TEST
-ruby --version
 
-export GOPATH=$HOME/go
-export RUBYOPT='-E utf-8'
+pushd "$PROJECT_ROOT"
 
-gem update --system
-gem install bundler
-bundle install
+  rvm install --default $RUBY_VERSION_UNDER_TEST
+  ruby --version
 
-# jruby-9 specific: requires  >= rack 2.x
-if [ "$RUBY_VERSION_UNDER_TEST" == "jruby-9.0.4.0" ]
-then
-  bundle update rack
-  apt-get -y install software-properties-common
-  add-apt-repository -y ppa:webupd8team/java
-  apt-get update
-  echo "oracle-java8-installer shared/accepted-oracle-license-v1-1 select true" | sudo debconf-set-selections
-  apt -y install oracle-java8-set-default
-fi
+  export GOPATH=$HOME/go
+  export RUBYOPT='-E utf-8'
 
+  gem update --system
+  gem install bundler
+  bundle install
 
-bundle exec rake install
-bundle exec rake spec
-bundle exec rake features
+  # jruby-9 specific: requires  >= rack 2.x
+  if [ "$RUBY_VERSION_UNDER_TEST" == "jruby-9.0.4.0" ]
+  then
+    bundle update rack
+    apt-get -y install software-properties-common
+    add-apt-repository -y ppa:webupd8team/java
+    apt-get update
+    echo "oracle-java8-installer shared/accepted-oracle-license-v1-1 select true" | sudo debconf-set-selections
+    apt-get -y install oracle-java8-set-default
+  fi
 
 
+  bundle exec rake install
+  bundle exec rake spec
+  bundle exec rake features
 
+popd

data/ci/scripts/updateChangelog.sh

@@ -8,7 +8,7 @@ CHANGELOG_FILE="CHANGELOG.md"
 COMMIT_URL="https://github.com/pivotal-legacy/LicenseFinder/commit/"
 
 TAGS=( "Added" "ADDED" "Fixed" "FIXED" "Changed" "CHANGED" "Deprecated" "DEPRECATED" "Removed" "REMOVED" "Security" "SECURITY" )
-CONTRIBUTORS=( "Shane Lattanzio" "Daniil Kouznetsov" "Andy Shen" "Li Tai" "Ryan Collins" "Vikram Yadav" )
+CONTRIBUTORS=( "Shane Lattanzio" "Li Tai" "Vikram Yadav" "Mark Fiorvanti" "Serafima Ostrovskaya" "Yoon Jean Kim"  "Tony Wong" "Parv Mital" )
 
 OLD="v$(cat ./lf-release/version)"
 VERSION="$(ruby -r ./lf-git-changed/lib/license_finder/version.rb -e "puts LicenseFinder::VERSION")"

data/lib/license_finder/package_managers/nuget.rb

@@ -5,6 +5,7 @@ module LicenseFinder
   class Nuget < PackageManager
     class Assembly
       attr_reader :name, :path
+
       def initialize(path, name)
         @path = path
         @name = name
@@ -26,7 +27,13 @@ module LicenseFinder
       path = project_path.join('vendor/*.nupkg')
       nuget_dir = Dir[path].map { |pkg| File.dirname(pkg) }.uniq
 
+      # Presence of a .sln is a good indicator for a dotnet solution
+      # cf.: https://docs.microsoft.com/en-us/nuget/tools/cli-ref-restore#remarks
+      path = project_path.join('*.sln')
+      solution_file = Dir[path].first
+
       possible_paths = [project_path.join('packages.config'), project_path.join('.nuget')]
+      possible_paths.unshift(Pathname(solution_file)) unless solution_file.nil?
       possible_paths.unshift(Pathname(nuget_dir.first)) unless nuget_dir.empty?
       possible_paths
     end
@@ -61,5 +68,29 @@ module LicenseFinder
     def dependencies
       assemblies.flat_map(&:dependencies)
     end
+
+    def self.package_management_command
+      return 'nuget' if LicenseFinder::Platform.windows?
+      'mono /usr/local/bin/nuget.exe'
+    end
+
+    def self.prepare_command
+      "#{package_management_command} restore"
+    end
+
+    def self.installed?(logger = Core.default_logger)
+      _stdout, _stderr, status = Cmd.run(nuget_check)
+      if status.success?
+        logger.debug self, 'is installed', color: :green
+      else
+        logger.info self, 'is not installed', color: :red
+      end
+      status.success?
+    end
+
+    def self.nuget_check
+      return 'where nuget' if LicenseFinder::Platform.windows?
+      'which mono && ls /usr/local/bin/nuget.exe'
+    end
   end
 end

data/lib/license_finder/package_managers/pip.rb

@@ -55,11 +55,17 @@ module LicenseFinder
     end
 
     def pypi_def(name, version)
-      uri = URI("https://pypi.org/pypi/#{name}/#{version}/json")
+      response = pypi_request("https://pypi.org/pypi/#{name}/#{version}/json")
+      response.is_a?(Net::HTTPSuccess) ? JSON.parse(response.body).fetch('info', {}) : {}
+    end
+
+    def pypi_request(location, limit = 10)
+      uri = URI(location)
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true
       response = http.get(uri.request_uri).response
-      response.is_a?(Net::HTTPSuccess) ? JSON.parse(response.body).fetch('info', {}) : {}
+
+      response.is_a?(Net::HTTPRedirection) && limit > 0 ? pypi_request(response['location'], limit - 1) : response
     end
   end
 end

data/lib/license_finder/package_utils/license_files.rb

@@ -2,7 +2,7 @@ require 'license_finder/package_utils/possible_license_file'
 
 module LicenseFinder
   class LicenseFiles
-    CANDIDATE_FILE_NAMES = %w[LICENSE License Licence COPYING README Readme ReadMe].freeze
+    CANDIDATE_FILE_NAMES = %w[LICENSE License LICENCE Licence COPYING README Readme ReadMe].freeze
     CANDIDATE_PATH_WILDCARD = "*{#{CANDIDATE_FILE_NAMES.join(',')}}*".freeze
 
     def self.find(install_path, options = {})

data/lib/license_finder/platform.rb

@@ -5,7 +5,9 @@ module LicenseFinder
     end
 
     def self.windows?
-      RUBY_PLATFORM =~ /mswin|cygwin|mingw/
+      # SO: What is the correct way to detect if ruby is running on Windows?,
+      # cf. https://stackoverflow.com/a/21468976/2592915
+      Gem.win_platform? || RUBY_PLATFORM =~ /mswin|cygwin|mingw/
     end
   end
 end

data/lib/license_finder/version.rb

@@ -1,3 +1,3 @@
 module LicenseFinder
-  VERSION = '5.3.0'.freeze
+  VERSION = '5.4.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: license_finder
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 5.4.0
 platform: ruby
 authors:
 - Ryan Collins
@@ -27,7 +27,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-05 00:00:00.000000000 Z
+date: 2018-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler