license_finder 0.9.4-java → 0.9.5-java

data/lib/license_finder/package_saver.rb

@@ -3,19 +3,13 @@ require 'forwardable'
 module LicenseFinder
   class PackageSaver
     extend Forwardable
-    def_delegators :spec, :name, :version, :homepage
-    def_delegators :package, :bundler_dependency, :license, :children, :groups, :summary, :description
+    def_delegators :package, :license, :children, :groups, :summary, :description, :version, :homepage
 
     attr_reader :dependency, :package
 
-    def self.find_or_create_by_name(package)
-      dependency = Dependency.named(package.spec.name)
-      new(dependency, package)
-    end
-
-    def self.save_packages(current_packages)
-      current_packages.map do |package|
-        PackageSaver.find_or_create_by_name(package).save
+    def self.save_all(packages)
+      packages.map do |package|
+        find_or_create_by_name(package).save
       end
     end
 
@@ -26,79 +20,23 @@ module LicenseFinder
 
     def save
       DB.transaction do
-        apply_dependency_definition
-        sync_bundler_groups
-        sync_children
-        apply_better_license
-      end
-      dependency
-    end
-
-    private
-
-    def spec
-      package.spec
-    end
-
-    def apply_dependency_definition
-      if values_have_changed?
         dependency.version = version.to_s
         dependency.summary = summary
         dependency.description = description
         dependency.homepage = homepage
-        dependency.save
-      end
-    end
-
-    def values_have_changed?
-      return dependency.version != version.to_s ||
-        dependency.summary != summary ||
-        dependency.description != description ||
-        dependency.homepage != homepage
-    end
-
-    def sync_bundler_groups
-      existing_groups = dependency.bundler_groups
-      new_groups = groups.map(&:to_s)
-
-      existing_groups.reverse.each do |group|
-        unless new_groups.include?(group.name)
-          dependency.remove_bundler_group(group)
-        end
-      end
-
-      new_groups.each do |group|
-        unless existing_groups.map(&:name).include? group
-          dependency.add_bundler_group BundlerGroup.find_or_create(name: group)
-        end
+        dependency.bundler_group_names = groups.map(&:to_s)
+        dependency.children_names = children
+        dependency.apply_better_license license
+        dependency.save_changes
       end
+      dependency
     end
 
-    def sync_children
-      existing_children = dependency.children
-      new_children = children
-
-      existing_children.reverse.each do |child|
-        unless new_children.include?(child.name)
-          dependency.remove_child(child)
-        end
-      end
-
-      new_children.each do |child|
-        unless existing_children.map(&:name).include?(child)
-          dependency.add_child Dependency.named(child)
-        end
-      end
-    end
+    private
 
-    def apply_better_license
-      if !dependency.license_manual
-        bundled_license = license
-        if dependency.license.nil? || bundled_license != dependency.license.name
-          dependency.license = LicenseAlias.find_or_create(name: bundled_license)
-          dependency.save
-        end
-      end
+    def self.find_or_create_by_name(package)
+      dependency = Dependency.named(package.name)
+      new(dependency, package)
     end
   end
 end

data/lib/license_finder/pip.rb

@@ -1,10 +1,9 @@
 require 'json'
 require 'httparty'
-require 'license_finder/package'
 
 module LicenseFinder
   class Pip
-    GET_DEPENDENCIES_PY = <<-PYTHON
+    GET_DEPENDENCIES_PY = <<-PYTHON.gsub(/\n+/, ";")
 from pip.util import get_installed_distributions
 
 dists = [(x.project_name, x.version, x.location) for x in get_installed_distributions()]
@@ -13,47 +12,36 @@ dists = ["[\\\"{0}\\\", \\\"{1}\\\", \\\"{2}\\\"]".format(*dist) for dist in dis
 print "[" + ",".join(dists) + "]"
     PYTHON
 
-    def self.current_dists
-      return @dists if @dists
+    def self.current_packages
+      output = `python -c '#{GET_DEPENDENCIES_PY}'`
 
-      command = GET_DEPENDENCIES_PY.gsub(/\n+/, ";")
-
-      output = `python -c '#{command}'`
-
-      @dists = JSON(output).map do |dist_ary|
-        PythonPackage.new(OpenStruct.new(
-          :name => dist_ary[0],
-          :version => dist_ary[1],
-          :full_gem_path => File.join(dist_ary[2], dist_ary[0]),
-          :python? => true
-        ))
+      JSON(output).map do |(name, version, install_dir)|
+        PipPackage.new(
+          name,
+          version,
+          File.join(install_dir, name),
+          pypi_def(name, version)
+        )
       end
     end
 
-    def self.has_requirements?
+    def self.active?
       File.exists?(requirements_path)
     end
 
-    def self.license_for(package)
-      info = package.json
-      license = info.fetch("license", "UNKNOWN")
-
-      if license == "UNKNOWN"
-        classifiers = info.fetch("classifiers", [])
-        license = classifiers.map do |c|
-          if c.start_with?("License")
-            c.gsub(/^License.*::\s*(.*)$/, '\1')
-          end
-        end.compact.first
-      end
-
-      license || "other"
-    end
-
     private
 
     def self.requirements_path
       Pathname.new('requirements.txt').expand_path
     end
+
+    def self.pypi_def(name, version)
+      response = HTTParty.get("https://pypi.python.org/pypi/#{name}/#{version}/json")
+      if response.code == 200
+        JSON.parse(response.body).fetch("info", {})
+      else
+        {}
+      end
+    end
   end
-end
+end

data/lib/license_finder/pip_package.rb

@@ -0,0 +1,51 @@
+module LicenseFinder
+  class PipPackage < Package
+    def initialize(name, version, install_path, pypi_def)
+      @name = name
+      @version = version
+      @install_path = install_path
+      @pypi_def = pypi_def
+    end
+
+    attr_reader :name, :version
+
+    def summary
+      pypi_def.fetch("summary", "")
+    end
+
+    def description
+      pypi_def.fetch("description", "")
+    end
+
+    def children
+      [] # no way to determine child deps from pip (maybe?)
+    end
+
+    def groups
+      [] # no concept of dev/test groups in pip (maybe?)
+    end
+
+    def homepage
+      nil # no way to extract homepage from pip (maybe?)
+    end
+
+    private
+
+    attr_reader :install_path, :pypi_def
+
+    def license_from_spec
+      license = pypi_def.fetch("license", "UNKNOWN")
+
+      if license == "UNKNOWN"
+        classifiers = pypi_def.fetch("classifiers", [])
+        license = classifiers.map do |c|
+          if c.start_with?("License")
+            c.gsub(/^License.*::\s*(.*)$/, '\1')
+          end
+        end.compact.first
+      end
+
+      license
+    end
+  end
+end

data/lib/license_finder/platform.rb

@@ -1,27 +1,15 @@
 module LicenseFinder
   module Platform
     def self.sqlite_adapter
-      if java?
-        'jdbc:sqlite'
-      else
-        'sqlite'
-      end
+      java? ? 'jdbc:sqlite' : 'sqlite'
     end
 
     def self.sqlite_gem
-      if java?
-        'jdbc-sqlite3'
-      else
-        'sqlite3'
-      end
+      java? ? 'jdbc-sqlite3' : 'sqlite3'
     end
 
     def self.sqlite_load_path
-      if java?
-        'jdbc/sqlite3'
-      else
-        'sqlite3'
-      end
+      java? ? 'jdbc/sqlite3' : 'sqlite3'
     end
 
     def self.java?

data/lib/license_finder/possible_license_file.rb

@@ -9,10 +9,6 @@ module LicenseFinder
       @file_path.relative_path_from(@install_path).to_s
     end
 
-    def full_file_path
-      Pathname.new(@file_path).realpath.to_s
-    end
-
     def file_name
       @file_path.basename.to_s
     end

data/lib/license_finder/possible_license_files.rb

@@ -2,6 +2,10 @@ module LicenseFinder
   class PossibleLicenseFiles
     LICENSE_FILE_NAMES = %w(LICENSE License Licence COPYING README Readme ReadMe)
 
+    def self.find(install_path)
+      new(install_path).find
+    end
+
     def initialize(install_path)
       @install_path = install_path
     end

data/lib/license_finder/tables.rb

@@ -2,6 +2,6 @@ require 'rubygems'
 require 'sequel'
 require LicenseFinder::Platform.sqlite_load_path
 
-DB = Sequel.connect("#{LicenseFinder::Platform.sqlite_adapter}://#{LicenseFinder.config.database_uri}")
+LicenseFinder::DB = Sequel.connect("#{LicenseFinder::Platform.sqlite_adapter}://#{LicenseFinder.config.database_uri}")
 Sequel.extension :migration, :core_extensions
-Sequel::Migrator.run(DB, LicenseFinder::ROOT_PATH.join('../db/migrate'))
+Sequel::Migrator.run(LicenseFinder::DB, LicenseFinder::ROOT_PATH.join('../db/migrate'))

data/lib/license_finder/tables/bundler_group.rb

@@ -1,4 +1,7 @@
 module LicenseFinder
   class BundlerGroup < Sequel::Model
+    def self.named(name)
+      find_or_create(name: name)
+    end
   end
 end

data/lib/license_finder/tables/dependency.rb

@@ -2,18 +2,17 @@ module LicenseFinder
   class Dependency < Sequel::Model
     plugin :boolean_readers
     many_to_one :license, class: LicenseAlias
-    many_to_one :approval
     many_to_many :children, join_table: :ancestries, left_key: :parent_dependency_id, right_key: :child_dependency_id, class: self
     many_to_many :parents, join_table: :ancestries, left_key: :child_dependency_id, right_key: :parent_dependency_id, class: self
     many_to_many :bundler_groups
 
     dataset_module do
-      def bundler
-        exclude(manual: true)
+      def managed
+        manually_managed.invert
       end
 
-      def non_bundler
-        bundler.invert
+      def manually_managed
+        where(manual: true)
       end
 
       def obsolete(current)
@@ -26,32 +25,58 @@ module LicenseFinder
     end
 
     def self.named(name)
-      d = find_or_create(name: name.to_s)
-      d.ensure_approval_exists!
-      d
+      find_or_create(name: name.to_s)
+    end
+
+    def bundler_group_names=(names)
+      current_groups = names.map { |name| BundlerGroup.named(name) }
+
+      remove, add = set_diff(bundler_groups, current_groups)
+
+      remove.each { |g| remove_bundler_group(g) }
+      add.each { |g| add_bundler_group(g) }
+    end
+
+    def children_names=(names)
+      current_children = names.map { |name| Dependency.named(name) }
+
+      remove, add = set_diff(children, current_children)
+
+      remove.each { |c| remove_child(c) }
+      add.each { |c| add_child(c) }
     end
 
     def approve!
-      approval.state = true
-      approval.save
+      self.manually_approved = true
+      save
     end
 
     def approved?
-      # jruby adapter receives approval.state as Fixnum '0', which ruby evaluates
-      # as truthy, so we catch this here for jruby support.
-      (license && license.whitelisted?) || (approval.state && approval.state != 0)
+      (license && license.whitelisted?) || manually_approved?
     end
 
     def set_license_manually!(license_name)
-      self.license = LicenseAlias.find_or_create(name: license_name)
+      self.license = LicenseAlias.named(license_name)
       self.license_manual = true
       save
     end
 
-    def ensure_approval_exists!
-      return if approval
-      self.approval = Approval.create
-      save
+    def apply_better_license(license_name)
+      return if license_manual
+      if license.nil? || license.name != license_name
+        self.license = LicenseAlias.named(license_name)
+      end
+    end
+
+    private
+
+    # Foreign method, belongs on Set
+    #
+    # Returns a pair of sets, which contain the elements that would have to be
+    # removed from (and respectively added to) the first set in order to obtain
+    # the second set.
+    def set_diff(older, newer)
+      return older - newer, newer - older
     end
   end
 end

data/lib/license_finder/tables/license_alias.rb

@@ -1,5 +1,9 @@
 module LicenseFinder
   class LicenseAlias < Sequel::Model
+    def self.named(name)
+      find_or_create(name: name)
+    end
+
     def initialize(*args)
       super
       self.url = LicenseUrl.find_by_name name

data/lib/license_finder/yml_to_sql.rb

@@ -40,8 +40,7 @@ module LicenseFinder
     def convert
       @dep = create_dependency
       @dep.license = create_license
-      @dep.approval = create_approval
-      @dep.manual = non_bundler_source?
+      @dep.manual = manually_managed?
       associate_bundler_groups
       @dep.save
     end
@@ -58,8 +57,8 @@ module LicenseFinder
       end
     end
 
-    def non_bundler_source?
-      @legacy_attrs['source'] == "bundle" ? false : true
+    def manually_managed?
+      @legacy_attrs['source'] != "bundle"
     end
 
     def create_dependency
@@ -70,10 +69,6 @@ module LicenseFinder
       LicenseAlias.find_or_create(name: legacy_attrs['license'])
     end
 
-    def create_approval
-      Sql::Approval.convert(legacy_attrs)
-    end
-
     def find_children
       Sql::Dependency.where(name: legacy_attrs['children'])
     end
@@ -85,38 +80,35 @@ module LicenseFinder
     end
 
     module Sql
-      module Convertable
-        def convert(attrs)
+      class Dependency < Sequel::Model
+        plugin :boolean_readers
+
+        many_to_one :license, class: LicenseAlias
+        many_to_many :children, join_table: :ancestries, left_key: :parent_dependency_id, right_key: :child_dependency_id, class: self
+        many_to_many :bundler_groups
+
+        VALID_ATTRIBUTES = {
+          'name' => 'name',
+          'version' => 'version',
+          'summary' => 'summary',
+          'description' => 'description',
+          'homepage' => 'homepage',
+          'approved' => 'manually_approved'
+        }
+
+        def self.convert(attrs)
           create remap_attrs(attrs)
         end
 
-        def remap_attrs(legacy_attrs)
-          self::VALID_ATTRIBUTES.each_with_object({}) do |(legacy_key, new_key), new_attrs|
+        def self.remap_attrs(legacy_attrs)
+          VALID_ATTRIBUTES.each_with_object({}) do |(legacy_key, new_key), new_attrs|
             new_attrs[new_key] = legacy_attrs[legacy_key]
           end
         end
       end
 
-      class Dependency < Sequel::Model
-        extend Convertable
-        VALID_ATTRIBUTES = Hash[*%w[name version summary description homepage].map { |k| [k, k] }.flatten]
-
-        many_to_one :license, class: LicenseAlias
-        many_to_one :approval
-        many_to_many :children, join_table: :ancestries, left_key: :parent_dependency_id, right_key: :child_dependency_id, class: self
-        many_to_many :bundler_groups
-      end
-
       class BundlerGroup < Sequel::Model
       end
-
-      class Approval < Sequel::Model
-        extend Convertable
-
-        VALID_ATTRIBUTES = {
-          'approved' => 'state'
-        }
-      end
     end
   end
 end