gem-licenses 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e25c2c59d98ae5182e7d558f673a20736a83001c
-  data.tar.gz: 72a3c6587573bd014d345eacc3417c945fc76005
+SHA256:
+  metadata.gz: 822e6db6df0f53b90818db751e9476cbf6b5b5bfde69673c54b0444b5761c0b7
+  data.tar.gz: f090d8718658f5b3f95a0ec6aae9cbdb8c67955b9bd10e6f7fe146db794e404c
 SHA512:
-  metadata.gz: 867c045c697593fe444bfee464d3efca397d36e68125e31fa527fbf7f0b2dc1ec3bbc6c557b33e62f3e492ad25d3ab348fcdf1d9e8835d555281d14f27a4f1cb
-  data.tar.gz: e61205a3e28641d52b5c2f252a51fc3a0cd0e01a74bcd14a283a820920a5366e8de0502a698d7b2b3cb5bcf32e62534330bbb0c17547ed1392a89f335e367a18
+  metadata.gz: b3a7e50d6f28af9e98f7ff8967b5e828182a13340ef979ae169cb984382e015619a051eb2bd4e3f93e0bfeffc077f62d9d4fd6963a5339905d9d4431e920e584
+  data.tar.gz: 560bceec5cc8a43e52df4a368a01b40d8a95f7a10f0c1bb3f3751a39a01a2841ff2f4df97cf4f69cfb914e58851d701e15f755a850803d94dffda86ddcc34a52

data/.rubocop.yml

@@ -1,5 +1,12 @@
 AllCops:
+  TargetRubyVersion: 2.2
+  DisplayCopNames: true
+  DisplayStyleGuide: true
   Exclude:
     - vendor/**/*
 
+Metrics/BlockLength:
+  Exclude:
+    - tasks/*.rake
+
 inherit_from: .rubocop_todo.yml

data/.rubocop_todo.yml

@@ -1,5 +1,6 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-02-20 11:26:16 -0500 using RuboCop version 0.29.1.
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2017-11-02 19:09:46 +0100 using RuboCop version 0.51.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -7,35 +8,40 @@
 
 # Offense count: 1
 Lint/HandleExceptions:
-  Enabled: false
+  Exclude:
+    - 'lib/gem/specification.rb'
 
 # Offense count: 1
 Metrics/AbcSize:
-  Max: 26
+  Max: 21
 
 # Offense count: 1
 Metrics/CyclomaticComplexity:
   Max: 7
 
-# Offense count: 8
-# Configuration parameters: AllowURI, URISchemes.
+# Offense count: 11
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
 Metrics/LineLength:
   Max: 107
 
 # Offense count: 3
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 24
+  Max: 16
 
 # Offense count: 1
-Metrics/PerceivedComplexity:
-  Max: 9
+# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
+# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
+Naming/FileName:
+  Exclude:
+    - 'lib/gem-licenses.rb'
 
-# Offense count: 4
+# Offense count: 3
 Style/Documentation:
-  Enabled: false
-
-# Offense count: 1
-# Configuration parameters: Exclude.
-Style/FileName:
-  Enabled: false
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'lib/gem-licenses/install_tasks.rb'
+    - 'lib/gem/licenses.rb'
+    - 'lib/gem/specification.rb'

data/.travis.yml

@@ -1,9 +1,9 @@
+language: ruby
 sudo: false
 
 rvm:
-  - 2.1.2
-  - 2.3.1
-
-language: ruby
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
 
 cache: bundler

data/CHANGELOG.md

@@ -1,6 +1,6 @@
-#### 0.2.2 (Next)
+#### 0.2.2 (2/16/2018)
 
-* Your contribution here.
+* [#18](https://github.com/dblock/gem-licenses/pull/18): Make order of rake gem:licenses deterministic - [@edennis](https://github.com/edennis).
 
 #### 0.2.1 (5/31/2016)
 

data/CONTRIBUTING.md

@@ -10,7 +10,7 @@ In the examples below, substitute your Github username for `contributor` in URLs
 
 Fork the [project on Github](https://github.com/dblock/gem-licenses) and check out your copy.
 
-```
+```shell
 git clone https://github.com/contributor/gem-licenses.git
 cd gem-licenses
 git remote add upstream https://github.com/dblock/gem-licenses.git
@@ -20,7 +20,7 @@ git remote add upstream https://github.com/dblock/gem-licenses.git
 
 Make sure your fork is up-to-date and create a topic branch for your feature or bug fix.
 
-```
+```shell
 git checkout master
 git pull upstream master
 git checkout -b my-feature-branch
@@ -30,7 +30,7 @@ git checkout -b my-feature-branch
 
 Ensure that you can build the project and run tests.
 
-```
+```shell
 bundle install
 bundle exec rake
 ```
@@ -59,13 +59,13 @@ Make it look like every other line, including your name and link to your Github
 
 ## Push
 
-```
+```shell
 git push origin my-feature-branch
 ```
 
 ## Make a Pull Request
 
-Go to https://github.com/contributor/grape and select your feature branch.
+Go to https://github.com/contributor/gem-licenses and select your feature branch.
 Click the 'Pull Request' button and fill out the form. Pull requests are usually reviewed within a few days.
 
 ## Update CHANGELOG Again
@@ -78,14 +78,16 @@ Update the [CHANGELOG](CHANGELOG.md) with the pull request number. A typical ent
 
 Amend your previous commit and force push the changes.
 
-```
+```shell
 git commit --amend
 git push origin my-feature-branch -f
+```
+
 ## Rebase
 
 If you've been working on a change for a while, rebase with upstream/master.
 
-```
+```shell
 git fetch upstream
 git rebase upstream/master
 git push origin my-feature-branch -f

data/Gemfile

@@ -4,6 +4,6 @@ gemspec
 
 group :development do
   gem 'rake'
-  gem 'rspec', '~> 3.1'
-  gem 'rubocop', '0.29.1'
+  gem 'rspec', '~> 3.7'
+  gem 'rubocop', '0.51.0'
 end

data/README.md

@@ -19,7 +19,7 @@ Usage
 
 Include gem-licenses in your project's Gemfile.
 
-```
+```ruby
 group :development, :test do
   gem 'gem-licenses'
 end
@@ -27,19 +27,20 @@ end
 
 Install Rake tasks from Rakefile.
 
-```
+```ruby
+require 'gem-licenses'
 Gem::GemLicenses.install_tasks
 ```
 
 To list licenses try the following Rake task.
 
-```
+```shell
 rake gem:licenses
 ```
 
 To write a CSV file of gems + licenses.
 
-```
+```shell
 rake gem:licenses:csv['licenses.csv']
 ```
 

data/Rakefile

@@ -11,7 +11,7 @@ RSpec::Core::RakeTask.new(:spec)
 require 'rubocop/rake_task'
 RuboCop::RakeTask.new(:rubocop)
 
-task default: [:rubocop, :spec]
+task default: %i[rubocop spec]
 
 require 'rake'
 

data/lib/gem-licenses/version.rb

@@ -1,5 +1,5 @@
 module Gem
   module GemLicenses
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'.freeze
   end
 end

data/lib/gem/licenses.rb

@@ -2,8 +2,8 @@ module Gem
   def self.licenses
     licenses = {}
     config_path = File.expand_path('../../licenses/config.yml', __FILE__)
-    config = YAML.load(File.read(config_path))
-    Gem.loaded_specs.each do |_key, spec|
+    config = YAML.safe_load(File.read(config_path))
+    Gem.loaded_specs.each_value do |spec|
       spec.licenses.map(&:downcase).each do |license|
         license_name = config[license] || license
         licenses[license_name] ||= []

data/lib/gem/specification.rb

@@ -1,6 +1,6 @@
 module Gem
   class Specification
-    alias_method :__licenses, :licenses
+    alias __licenses licenses
 
     LICENSE_REFERENCES = [
       /released under the (?<l>[\s\w]*) license/i,
@@ -13,11 +13,11 @@ module Gem
       /license: (?<l>[\s\w]*)$/i,
       /^same as (?<l>[\s\w]*)/i,
       /license of (?<l>[\s\w]*)/i
-    ]
+    ].freeze
 
     def licenses
-      ary = (__licenses || []).keep_if { |l| l.length > 0 }
-      ary.length == 0 ? guess_licenses : ary
+      ary = (__licenses || []).keep_if { |l| !l.empty? }
+      ary.empty? ? guess_licenses : ary
     end
 
     def guess_licenses
@@ -31,9 +31,9 @@ module Gem
         when /copying|readme/
           licenses = guess_licenses_from_file File.join(full_gem_path, filename)
         end
-        break if licenses.length > 0
+        break unless licenses.empty?
       end
-      licenses << 'unknown' if licenses.length == 0
+      licenses << 'unknown' if licenses.empty?
       licenses
     rescue Errno::ENOENT
       # TODO: warning
@@ -73,7 +73,7 @@ module Gem
             return [res['l']] if res
           end
         end
-      rescue
+      rescue StandardError
         # TODO: warning
       ensure
         file_handle.close
@@ -84,7 +84,7 @@ module Gem
     def guess_licenses_from_contents(path)
       File.open(path, 'r') do |file|
         contents = file.read
-        match, _ = self.class.common_licenses.detect do |_key, lic|
+        match, = self.class.common_licenses.detect do |_key, lic|
           normalized = self.class.normalize_text(contents)
           normalized.include?(lic) if normalized
         end

data/lib/licenses/config.yml

@@ -8,8 +8,9 @@ bsd: BSD
 bsd-2-clause: BSD 2-Clause
 2-clause bsdl: BSD 2-Clause
 bsd 2-clause: BSD 2-Clause
-gpl2: GPLv2
+gpl-2.0+: GPLv2
 gpl-2: GPLv2
+gpl2: GPLv2
 gplv2: GPLv2
 apache 2.0: Apache 2.0
 apache license 2.0: Apache 2.0

data/spec/gem/licenses_spec.rb

@@ -13,6 +13,7 @@ describe Gem do
     gem_licenses_mit_spec = subject['MIT'].detect { |spec| spec == gem_licenses_spec }
     expect(gem_licenses_spec).to eq gem_licenses_mit_spec
   end
+
   it 'normalizes known license names' do
     expect(subject['GPLv2'].size).to be > 0
   end

data/tasks/licenses.rake

@@ -1,8 +1,8 @@
 desc 'Gather open-source licenses.'
 namespace :gem do
   task :licenses do
-    Gem.licenses.each do |license, gems|
-      puts "#{license}"
+    Gem.licenses.sort_by { |k, v| [-v.count, k] }.each do |license, gems|
+      puts license.to_s
       puts '=' * license.length
       gems.sort_by(&:name).each do |gem|
         puts "* #{gem.name} #{gem.version} (#{gem.homepage}) - #{gem.summary.strip}"
@@ -20,7 +20,7 @@ namespace :gem do
       licenses = Gem.licenses
       total = 0
       CSV.open(filename, 'w') do |csv|
-        csv << %w(name version homepage summary license)
+        csv << %w[name version homepage summary license]
         licenses.each do |license, gems|
           total += gems.count
           gems.sort_by(&:name).each do |gem|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gem-licenses
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-31 00:00:00.000000000 Z
+date: 2018-02-16 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: dblock@dblock.org
@@ -28,7 +28,6 @@ files:
 - README.md
 - RELEASING.md
 - Rakefile
-- VERSION
 - common_licenses/bsd
 - common_licenses/bsd-2-clause
 - common_licenses/isc
@@ -72,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Attempts to figure out what licenses various gems use.

data/VERSION

@@ -1 +0,0 @@
-0.2.1