license_finder 0.9.4-java → 0.9.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3519eda1dd7ddf902c942bf89e24de4c961230e0
-  data.tar.gz: 453c040ae74bfb687dede2aba3c24eb7120dfd8c
+  metadata.gz: 2fc021f01e351fbaa511505a7de20f17ee80eb25
+  data.tar.gz: 890c908fb9b6178515cd2aa64c6f65974f65ea3c
 SHA512:
-  metadata.gz: fb17d88ef9ab566b058a97dcf8feccb59301ed1bd3c2dc9a59f04b74cfa9b9e06e587fb7540a4ff17816ce9a527aee1a04b68df8eaf0d37b3b9af52f67c77bd1
-  data.tar.gz: 6086821b912563945238553cd910044eeddb6f7320c230bbc754947f5fa44fbf04cdd25318eb3237482eb7d19df861b4959ffb67fa7236e4f37866dbed3cd42d
+  metadata.gz: 0c2a997be219162ec593663a6e5fb926f2c95200c93930cc2b56b9017f9a2457fedef3c872426666d0eec6b8085e728aa087d61f170bfe84b9d8fa17feed4c3f
+  data.tar.gz: 1ab32e4d30df726be733700f01a4ba5b735430f6961c4bef9891f6b8c9e41fec0b9fc3c5fa34e726188882e87efaad5d4610637345f9533c9c28c1e431226ca2

data/.gitignore

@@ -1,13 +1,6 @@
 pkg/*
-*.gem
-.bundle
 Gemfile.lock
 .rvmrc
 .idea/*
 tmp/
-dependencies.*
-doc/dependencies.*
-db/schema.rb
-config/
 .pairs
-*.swp

data/.travis.yml

@@ -2,15 +2,13 @@ rvm:
   - 2.1.0
   - 2.0.0
   - 1.9.3
-  - 1.9.2
   - jruby-19mode
-  - rbx-19mode
+  - jruby-20mode
   - ruby-head
   - jruby-head
 
 matrix:
   allow_failures:
-    - rvm: rbx-19mode
     - rvm: ruby-head
     - rvm: jruby-head
 

data/CHANGELOG.rdoc

@@ -1,3 +1,16 @@
+=== 0.9.5 / 2014-01-30
+
+* Features
+
+  * Add more aliases for known licenses
+  * Drop support for ruby 1.9.2
+  * Large refactoring to simply things, and make it easier to add new package managers
+  
+* Bugfixes
+
+  * Make node dependency json parsing more robust
+  * Clean up directories created during test runs
+
 === 0.9.4 / 2014-01-05
 
 * Features

data/db/migrate/201307251004_data_fix_manual_licenses.rb

@@ -1,6 +1,6 @@
 Sequel.migration do
   up do
-  DB << <<EOS
+    LicenseFinder::DB << <<-SQL
 UPDATE dependencies
 SET license_manual = 1
 WHERE id
@@ -10,6 +10,6 @@ IN
   INNER JOIN license_aliases l
     ON d.license_id = l.id
   WHERE l.manual = 1)
-EOS
+    SQL
   end
 end

data/db/migrate/201307251107_reassociate_license.rb

@@ -1,23 +1,23 @@
 Sequel.migration do
   up do
-  DB << <<EOS
-UPDATE dependencies
-SET license_id =
-(SELECT la.id
-FROM
-  license_aliases la,
-  license_aliases la_orig
-WHERE
-  la.name = la_orig.name AND
-  la_orig.id = license_id
-LIMIT 1)
-EOS
+    LicenseFinder::DB << <<-SQL
+      UPDATE dependencies
+      SET license_id =
+      (SELECT la.id
+      FROM
+        license_aliases la,
+        license_aliases la_orig
+      WHERE
+        la.name = la_orig.name AND
+        la_orig.id = license_id
+      LIMIT 1)
+    SQL
 
-  DB << <<CLEANUP
-DELETE
-FROM license_aliases
-WHERE
-id NOT IN (SELECT license_id FROM dependencies)
-CLEANUP
+    LicenseFinder::DB << <<-SQL
+      DELETE
+      FROM license_aliases
+      WHERE
+      id NOT IN (SELECT license_id FROM dependencies)
+    SQL
   end
 end

data/db/migrate/201311192002_add_manually_approved_to_dependencies.rb

@@ -0,0 +1,7 @@
+Sequel.migration do
+  change do
+    alter_table(:dependencies) do
+      add_column :manually_approved, TrueClass
+    end
+  end
+end

data/db/migrate/201311192003_reassociate_manual_approval.rb

@@ -0,0 +1,14 @@
+Sequel.migration do
+  up do
+    LicenseFinder::DB << <<-EOS
+        UPDATE dependencies
+        SET manually_approved =
+        (SELECT state
+        FROM
+          approvals
+        INNER JOIN
+          dependencies
+            ON approvals.id = dependencies.approval_id)
+    EOS
+  end
+end

data/db/migrate/201311192010_drop_approvals.rb

@@ -0,0 +1,5 @@
+Sequel.migration do
+  change do
+    drop_table(:approvals)
+  end
+end

data/features/cli.feature

@@ -16,7 +16,7 @@ Feature: License Finder command line executable
 
   Scenario: Auditing an application with whitelisted licenses
     Given I have an app with license finder that depends on a MIT licensed gem
-    When I whitelist MIT and 'other' and New BSD and Apache 2.0 licenses
+    When I whitelist MIT, New BSD, Apache 2.0, Ruby, and other licenses
     Then it should exit with status code 0
     And I should see all dependencies approved for use
 

data/features/html_report.feature

@@ -20,5 +20,5 @@ Feature: HTML Report
 
   Scenario: Dependency summary
     And my app depends on MIT and GPL licensed gems
-    When I whitelist MIT and 'other' and New BSD and Apache 2.0 licenses
+    When I whitelist MIT, New BSD, Apache 2.0, Ruby, and other licenses
     Then I should see only see GPL liceneses as unapproved in the html

data/features/{non_bundler_dependencies.feature → manually_managed_dependencies.feature}

@@ -1,19 +1,19 @@
-Feature: Tracking non-Bundler Dependencies
-  So that I can track JS and other dependencies not tracked by Bundler
+Feature: Tracking Unmanaged Dependencies
+  So that I can track dependencies not managed by Bundler, NPM, etc.
   As an application developer using license finder
-  I want to be able to manually manage non-Bundler dependencies
+  I want to be able to manually track unmanaged dependencies
 
-  Scenario: Adding a non-Bundler dependency
+  Scenario: Adding a manually managed dependency
     Given I have an app with license finder
     When I add my JS dependency
     Then I should see the JS dependency in the console output
 
-  Scenario: Auto approving a non-Bundler dependency I add
+  Scenario: Auto approving a manually managed dependency I add
     Given I have an app with license finder
     When I add my JS dependency with an approval flag
     Then I should not see the JS dependency in the console output since it is approved
 
-  Scenario: Removing a non-Bundler dependency
+  Scenario: Removing a manually managed dependency
     Given I have an app with license finder and a JS dependency
     When I remove my JS dependency
     Then I should not see the JS dependency in the console output

data/features/step_definitions/html_report_steps.rb

@@ -49,16 +49,9 @@ end
 Then(/^I should see only see GPL liceneses as unapproved in the html$/) do
   html = File.read(@user.dependencies_html_path)
   page = Capybara.string(html)
-  page.should have_content '12 total'
-  page.should have_content '1 unapproved'
   page.should have_content '1 GPL'
-  page.should have_content '1 other'
-  if @user.jruby?
-    page.should have_content '9 MIT'
-    page.should have_content '1 Apache 2.0'
-  else
-    page.should have_content '10 MIT'
-  end
+  action_items = page.find('.action-items')
+  action_items.should have_content '(GPL)'
 end
 
 def is_html_status?(gem, approval)

data/features/step_definitions/shared_steps.rb

@@ -14,8 +14,8 @@ When(/^I run license_finder$/) do
   @output = @user.execute_command "license_finder --quiet"
 end
 
-When(/^I whitelist MIT and 'other' and New BSD and Apache 2.0 licenses$/) do
-  @user.configure_license_finder_whitelist ["MIT","other","New BSD","Apache 2.0"]
+When(/^I whitelist MIT, New BSD, Apache 2.0, Ruby, and other licenses$/) do
+  @user.configure_license_finder_whitelist ["MIT","other","New BSD","Apache 2.0","Ruby"]
   @output = @user.execute_command "license_finder --quiet"
 end
 
@@ -139,7 +139,7 @@ module DSL
     end
 
     def execute_command(command)
-      Bundler.with_clean_env do
+      ::Bundler.with_clean_env do
         @output = `cd #{app_path} && bundle exec #{command}`
       end
 
@@ -192,7 +192,7 @@ module DSL
     end
 
     def bundle_app
-      Bundler.with_clean_env do
+      ::Bundler.with_clean_env do
         `bundle install --gemfile=#{File.join(app_path, "Gemfile")} --path=#{bundle_path}`
       end
     end
@@ -210,10 +210,6 @@ module DSL
       File.open(dependencies_file_path, 'w+') { |f| yield f }
     end
 
-    def jruby?
-      `ruby -v`.match /^jruby/
-    end
-
     private
 
     def add_to_gemfile(line)

data/lib/license_finder.rb

@@ -7,32 +7,36 @@ module LicenseFinder
 
   Error = Class.new(StandardError)
 
-  autoload :Bundle,               'license_finder/bundle'
-  autoload :PackageSaver,         'license_finder/package_saver'
-  autoload :Bower,                'license_finder/bower'
   autoload :CLI,                  'license_finder/cli'
-  autoload :Configuration,        'license_finder/configuration'
   autoload :DependencyManager,    'license_finder/dependency_manager'
+  autoload :PackageSaver,         'license_finder/package_saver'
   autoload :License,              'license_finder/license'
   autoload :LicenseUrl,           'license_finder/license_url'
+  autoload :PossibleLicenseFile,  'license_finder/possible_license_file'
+  autoload :PossibleLicenseFiles, 'license_finder/possible_license_files'
+  autoload :Configuration,        'license_finder/configuration'
+  autoload :Platform,             'license_finder/platform'
+
+  autoload :Bower,                'license_finder/bower'
+  autoload :Bundler,              'license_finder/bundler'
   autoload :NPM,                  'license_finder/npm'
   autoload :Pip,                  'license_finder/pip'
   autoload :Package,              'license_finder/package'
-  autoload :Platform,             'license_finder/platform'
-  autoload :PossibleLicenseFile,  'license_finder/possible_license_file'
-  autoload :PossibleLicenseFiles, 'license_finder/possible_license_files'
-  autoload :YmlToSql,             'license_finder/yml_to_sql'
+  autoload :BowerPackage,         'license_finder/bower_package'
+  autoload :BundlerPackage,       'license_finder/bundler_package'
+  autoload :PipPackage,           'license_finder/pip_package'
+  autoload :NpmPackage,           'license_finder/npm_package'
 
-  autoload :Approval,     'license_finder/tables/approval'
-  autoload :BundlerGroup, 'license_finder/tables/bundler_group'
-  autoload :Dependency,   'license_finder/tables/dependency'
-  autoload :LicenseAlias, 'license_finder/tables/license_alias'
+  autoload :BundlerGroup,         'license_finder/tables/bundler_group'
+  autoload :Dependency,           'license_finder/tables/dependency'
+  autoload :LicenseAlias,         'license_finder/tables/license_alias'
+  autoload :YmlToSql,             'license_finder/yml_to_sql'
 
-  autoload :DependencyReport, 'license_finder/reports/dependency_report'
-  autoload :HtmlReport,       'license_finder/reports/html_report'
-  autoload :MarkdownReport,   'license_finder/reports/markdown_report'
-  autoload :Reporter,         'license_finder/reports/reporter'
-  autoload :TextReport,       'license_finder/reports/text_report'
+  autoload :DependencyReport,     'license_finder/reports/dependency_report'
+  autoload :HtmlReport,           'license_finder/reports/html_report'
+  autoload :MarkdownReport,       'license_finder/reports/markdown_report'
+  autoload :Reporter,             'license_finder/reports/reporter'
+  autoload :TextReport,           'license_finder/reports/text_report'
   autoload :DetailedTextReport,   'license_finder/reports/detailed_text_report'
 
   def self.config

data/lib/license_finder/bower.rb

@@ -1,32 +1,19 @@
 require 'json'
-require 'license_finder/package'
 
 module LicenseFinder
   class Bower
 
     def self.current_packages
-      return @packages if @packages
-
       output = `bower list --json`
 
       json = JSON(output)
 
-      @packages = json.fetch("dependencies",[]).map do |package|
-        package = package[1]
-        pkg_meta = package.fetch("pkgMeta", Hash.new)
-
-        Package.new(OpenStruct.new(
-          :name => pkg_meta.fetch("name", nil),
-          :version => pkg_meta.fetch("version", nil),
-          :full_gem_path => package.fetch("canonicalDir", nil),
-          :license => self.harvest_license(pkg_meta),
-          :summary => pkg_meta.fetch("description", nil),
-          :description => pkg_meta.fetch("readme", nil)
-        ))
+      json.fetch("dependencies",[]).map do |package|
+        BowerPackage.new(package[1])
       end
     end
 
-    def self.has_package_file?
+    def self.active?
       File.exists?(package_path)
     end
 
@@ -35,23 +22,5 @@ module LicenseFinder
     def self.package_path
       Pathname.new('bower.json').expand_path
     end
-
-    def self.harvest_license(package)
-      license = package.fetch("licenses", []).first
-
-      if license.is_a? Hash
-        license = license.fetch("type", nil)
-      end
-
-      if license.nil?
-        license = package.fetch("license", nil)
-
-        if license.is_a? Hash
-          license = license.fetch("type", nil)
-        end
-      end
-
-      license
-    end
   end
 end

data/lib/license_finder/bower_package.rb

@@ -0,0 +1,63 @@
+module LicenseFinder
+  class BowerPackage < Package
+    def initialize(bower_module)
+      @bower_module = bower_module
+      @module_metadata = bower_module.fetch("pkgMeta", Hash.new)
+    end
+
+    def name
+      module_metadata.fetch("name", nil)
+    end
+
+    def version
+      module_metadata.fetch("version", nil)
+    end
+
+    def summary
+      module_metadata.fetch("description", nil)
+    end
+
+    def description
+      module_metadata.fetch("readme", nil)
+    end
+
+    def children
+      [] # no way to determine child deps from bower (maybe?)
+    end
+
+    def groups
+      [] # no concept of dev/test groups in bower (maybe?)
+    end
+
+    def homepage
+      nil # no way to extract homepage from bower (maybe?)
+    end
+
+    private
+
+    attr_reader :bower_module
+    attr_reader :module_metadata
+
+    def install_path
+      bower_module.fetch("canonicalDir", nil)
+    end
+
+    def license_from_spec
+      license = module_metadata.fetch("licenses", []).first
+
+      if license.is_a? Hash
+        license = license.fetch("type", nil)
+      end
+
+      if license.nil?
+        license = module_metadata.fetch("license", nil)
+
+        if license.is_a? Hash
+          license = license.fetch("type", nil)
+        end
+      end
+
+      license
+    end
+  end
+end

data/lib/license_finder/bundler.rb

@@ -0,0 +1,73 @@
+require "bundler"
+
+module LicenseFinder
+  class Bundler
+    attr_writer :ignore_groups
+
+    class << self
+      def current_packages(config = LicenseFinder.config, bundler_definition=nil)
+        new(config, bundler_definition).packages
+      end
+
+      def active?
+        File.exists?(gemfile_path)
+      end
+
+      def gemfile_path
+        Pathname.new("Gemfile").expand_path
+      end
+    end
+
+    def initialize(config, bundler_definition=nil)
+      @definition = bundler_definition || ::Bundler::Definition.build(self.class.gemfile_path, lockfile_path, nil)
+      @config = config
+    end
+
+    def packages
+      return @packages if @packages
+
+      top_level_gems = Set.new
+
+      @packages ||= definition.specs_for(included_groups).map do |gem_def|
+        bundler_def = bundler_defs.detect { |bundler_def| bundler_def.name == gem_def.name }
+
+        top_level_gems << format_name(gem_def)
+
+        BundlerPackage.new(gem_def, bundler_def)
+      end
+
+      @packages.each do |gem|
+        gem.children = children_for(gem, top_level_gems)
+      end
+
+      @packages
+    end
+
+    private
+    attr_reader :definition
+
+    def ignore_groups
+      @ignore_groups ||= @config.ignore_groups
+    end
+
+    def bundler_defs
+      @bundler_defs ||= definition.dependencies
+    end
+
+    def included_groups
+      definition.groups - ignore_groups.map(&:to_sym)
+    end
+
+    def lockfile_path
+      self.class.gemfile_path.dirname.join('Gemfile.lock')
+    end
+
+    def children_for(gem, top_level_gems)
+      gem.gem_def.dependencies.map(&:name).select { |name| top_level_gems.include? name }
+    end
+
+    def format_name(gem)
+      gem.name.split(" ")[0]
+    end
+  end
+end