papers 2.4.3 → 2.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efd25a0475f3b500b0a0636f9ad4386b20dea7b2709f699cb5c707ee8f332620
-  data.tar.gz: f466828f491587392959a6e15404b0b8f194a1d57ed0885f7a5804e7d5bd88e1
+  metadata.gz: 174c6341ec833049a5cb09f89779966021a1c50b8152e96bb9be8866a4446b7e
+  data.tar.gz: f7b0dc8ef6a71ef26698f95eb9264fb66c2235c13113eacba5694c506f64946b
 SHA512:
-  metadata.gz: 8a1a07bb78d1f4f85149d2d9835524b221ba239ee3ff15d6de189468cd68a0f17dc2c28d551826052a7ba3d9587f3032097bc61a2c56f4695a5d5c876d3d9994
-  data.tar.gz: f9140eab42fe22bfd082af2e809d541d403cb3be1ba1f2767726d343444cf341b8b009f881a744e2a3da288122f215f5c6d4e56dc4db7b2493d67c62e7787f8a
+  metadata.gz: 1b187474da6f2d1d898916db86b673935618c9e3dc9fbc2c005d7363d7a45eeccce39ee1742662eb94a31097a320475e64371189df8dad0321ebfcaeb8578d87
+  data.tar.gz: f151154a7a5f36bd62acec733f17fa5d9313765d11bdddab9dce97a85643d81b0736669f0e1ea447e818676a723820e71a4735e437dd30e501259c04da48c6cf

data/.gitignore

@@ -4,3 +4,5 @@ Guardfile
 *.swp
 Gemfile.lock
 *.gem
+# Ignore coverage files
+coverage

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 2.4.4
+* Fix to not re-apply already present license change warnings.
+
 ## 2.4.3
 * Better whitespace output to avoid trailing spaces.
 

data/Gemfile

@@ -1,3 +1,9 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
-gemspec
+gemspec
+gem 'rspec', '~> 3.5'
+gem 'rubocop', group: 'development'
+
+group :test do
+  gem 'simplecov', '~> 0.21.2'
+end

data/lib/papers/dependency_specification.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 module Papers
   class DependencySpecification
     attr_accessor :name, :license, :license_url, :project_url
@@ -16,27 +18,25 @@ module Papers
 
     def acceptable_license?
       Papers.config.license_whitelist.include?(license) ||
-      Papers.config.version_whitelisted_license == license ||
-      Papers.config.package_whitelist.include?(name)
+        Papers.config.version_whitelisted_license == license ||
+        Papers.config.package_whitelist.include?(name)
     end
 
-    protected
-
-      def self.all_from_manifest(manifest)
-        (manifest[manifest_key] || []).map do |name, info|
-          license_url = info['license_url']
-          license = info['license']
-          project_url = info['project_url']
-          self.new(name: name, license: license, license_url: license_url, project_url: project_url)
-        end.sort { |a, b| a.name.downcase <=> b.name.downcase }
-      end
+    def self.all_from_manifest(manifest)
+      (manifest[manifest_key] || []).map do |name, info|
+        license_url = info['license_url']
+        license = info['license']
+        project_url = info['project_url']
+        new(name: name, license: license, license_url: license_url, project_url: project_url)
+      end.sort { |a, b| a.name.downcase <=> b.name.downcase }
+    end
 
-      def self.missing_from_manifest(manifest)
-        introspected.to_set - all_from_manifest(manifest).map(&:name).to_set
-      end
+    def self.missing_from_manifest(manifest)
+      introspected.to_set - all_from_manifest(manifest).map(&:name).to_set
+    end
 
-      def self.unknown_in_manifest(manifest)
-        all_from_manifest(manifest).map(&:name).to_set - introspected.to_set
-      end
+    def self.unknown_in_manifest(manifest)
+      all_from_manifest(manifest).map(&:name).to_set - introspected.to_set
+    end
   end
 end

data/lib/papers/manifest_updater.rb

@@ -27,9 +27,9 @@ module Papers
       result = YAML.load(original_content)
 
       update_gems(result)
-      update_javascript(result, "javascripts", get_installed_javascripts)
-      update_javascript(result, "bower_components", get_installed_bower_components)
-      update_javascript(result, "npm_packages", get_installed_npm_packages)
+      update_javascript(result, 'javascripts', get_installed_javascripts)
+      update_javascript(result, 'bower_components', get_installed_bower_components)
+      update_javascript(result, 'npm_packages', get_installed_npm_packages)
 
       manifest_content = build_header + YAML.dump(result)
 
@@ -38,7 +38,7 @@ module Papers
     end
 
     def update_gems(result)
-      result_gems = result["gems"]
+      result_gems = result['gems']
       return unless result_gems
 
       manifest_names = manifest_names(result_gems)
@@ -72,12 +72,15 @@ module Papers
 
     def update_gem(result_gems, gemspec, manifest_gem_key)
       manifest_gem = result_gems.delete(manifest_gem_key)
-      if gemspec.license && gemspec.license != manifest_gem["license"]
+      if gemspec.license && gemspec.license != manifest_gem['license']
         new_licenses = gemspec.licenses || []
         new_licenses << gemspec.license
         new_licenses.uniq!
 
-        manifest_gem["license"] = "License Change! Was '#{manifest_gem["license"]}', is now #{new_licenses}"
+        # license key could be an array to_s to protect against that
+        unless manifest_gem['license'].to_s.match(/^License Change! Was '.+', is now .+$/)
+          manifest_gem['license'] = "License Change! Was '#{manifest_gem['license']}', is now #{new_licenses}"
+        end
       end
 
       name = gem_name_and_version(gemspec)
@@ -99,7 +102,7 @@ module Papers
     end
 
     def name_from_key(key)
-      key.include?("-") ? key.rpartition("-").first : key
+      key.include?('-') ? key.rpartition('-').first : key
     end
 
     def manifest_names(result_gems)

data/lib/papers/version.rb

@@ -2,7 +2,7 @@ module Papers
   class Version
     MAJOR = 2
     MINOR = 4
-    PATCH = 3
+    PATCH = 4
 
     def self.to_s
       [MAJOR, MINOR, PATCH].join('.')

data/spec/manifest_updater_spec.rb

@@ -45,6 +45,77 @@ EOS
 EOS
     }
 
+    let(:foo_license) { <<EOS
+      signed_payload-2.0.1:
+        license: License Change! Was 'New Relic', is now ["Nonstandard"]
+      license_url:
+        project_url: https://source.datanerd.us/account-auth-and-access/signed_payload
+EOS
+    }
+
+    it 'should avoid nesting license change messages' do
+      gemspec = double(name: 'foo', version: '1.2.3', license: "some License Change! Was 'New Relic', is now [\"Nonstandard\"]", licenses: [], homepage: 'foo.com')
+
+      result_gems = {}
+      manifest_gem_key = 'foo'
+      allow(result_gems).to receive(:delete).with(manifest_gem_key).and_return({
+        'name' => 'foo',
+        'version' => '1.2.3',
+        'license' => "License Change! Was 'New Relic', is now [\"Nonstandard\"]",
+        'homepage' => 'foo.com'
+      })
+
+      updater.update_gem(result_gems, gemspec, manifest_gem_key)
+      expect(result_gems['foo']).to eq({
+        'name' => 'foo',
+        'version' => '1.2.3',
+        'license' => "License Change! Was 'New Relic', is now [\"Nonstandard\"]",
+        'homepage' => 'foo.com'
+      })
+    end
+
+    it 'should work as normal for non nested changes' do
+      gemspec = double(name: 'foo', version: '1.2.3', license: "asdf", licenses: [], homepage: 'foo.com')
+
+      result_gems = {}
+      manifest_gem_key = 'foo'
+      allow(result_gems).to receive(:delete).with(manifest_gem_key).and_return({
+        'name' => 'foo',
+        'version' => '1.2.3',
+        'license' => "ldkadfaldfjalkdsfj",
+        'homepage' => 'foo.com'
+      })
+
+      updater.update_gem(result_gems, gemspec, manifest_gem_key)
+      expect(result_gems['foo']).to eq({
+        'name' => 'foo',
+        'version' => '1.2.3',
+        'license' => "License Change! Was 'ldkadfaldfjalkdsfj', is now [\"asdf\"]",
+        'homepage' => 'foo.com'
+      })
+    end
+
+    # We don't want to support it fully, but don't bomb out if we find an array
+    it 'should handle array in manifest' do
+      gemspec = double(name: 'foo', version: '1.2.3', license: "asdf", licenses: ["asdf", "new"], homepage: 'foo.com')
+
+      result_gems = {}
+      manifest_gem_key = 'foo'
+      allow(result_gems).to receive(:delete).with(manifest_gem_key).and_return({
+        'name' => 'foo',
+        'version' => '1.2.3',
+        'license' => ["asdf", "old"],
+        'homepage' => 'foo.com'
+      })
+
+      updater.update_gem(result_gems, gemspec, manifest_gem_key)
+      expect(result_gems['foo']).to eq({
+        'name' => 'foo',
+        'version' => '1.2.3',
+        'license' => "License Change! Was '[\"asdf\", \"old\"]', is now [\"asdf\", \"new\"]",
+        'homepage' => 'foo.com'
+      })
+    end
 
     it "avoids unnecessary updates" do
       allow(updater).to receive(:gemspecs).and_return([

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
 require 'bundler/setup'
 require 'rspec'
 require_relative '../lib/papers'
+require "simplecov"
+SimpleCov.start

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: papers
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.4.4
 platform: ruby
 authors:
 - Ralph Bodenner
@@ -9,10 +9,10 @@ authors:
 - Andrew Bloomgarden
 - Lucas Charles
 - David Celis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-09 00:00:00.000000000 Z
+date: 2022-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -84,7 +84,7 @@ homepage: http://github.com/newrelic/papers
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -99,8 +99,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Validate the licenses of software dependencies you use
 test_files: