papers 2.0.0 → 2.1.0

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
-## 2.0.0 (current release)
+## 2.0.1 (current release)
+
+* Correct validation of js.erb and coffee.erb files.
+
+## 2.0.0
 
 * Make the `version_whitelisted_license` option to apply to Bower components.
   This is a breaking change since current manifests with whitelisted licenses

data/lib/papers/configuration.rb

@@ -25,7 +25,8 @@ module Papers
         'LGPLv3',
         'Ruby',
         'Manually Reviewed',
-        'Unlicensed'
+        'Unlicensed',
+        'ISC'
       ]
 
       @version_whitelisted_license = nil

data/lib/papers/dependency_specification/javascript.rb

@@ -15,7 +15,7 @@ module Papers
 
       # TODO: add logic for determining rails. Is Rails.root better than Dir.pwd for such a case?
       root_regexp = /^#{Regexp.escape Dir.pwd.to_s}\//
-      files = dirs.map { |dir| Dir.glob("#{dir}/**/*.{js,coffee}") }.flatten.map do |name|
+      files = dirs.map { |dir| Dir.glob("#{dir}/**/*.{js,js.erb,coffee,coffee.erb}") }.flatten.map do |name|
         name = name.sub(root_regexp, '')
         name unless whitelist_dirs.any? { |dir| name.start_with?(dir) }
       end

data/lib/papers/version.rb

@@ -1,7 +1,7 @@
 module Papers
   class Version
     MAJOR = 2
-    MINOR = 0
+    MINOR = 1
     PATCH = 0
 
     def self.to_s

data/spec/npm_package_spec.rb

@@ -5,7 +5,7 @@ require_relative '../lib/papers'
 describe 'NpmPackageSpecification' do
   describe '#full_introspected_entries' do
     it 'reads dependencies from the specified file' do
-      Papers::Configuration.any_instance.stub(:npm_package_json_path).and_return('spec/support/package.json')
+      allow_any_instance_of(Papers::Configuration).to receive(:npm_package_json_path).and_return('spec/support/package.json')
 
       expect(Papers::NpmPackage.full_introspected_entries).to eq([
         {"name"=>"prod_dependency", "version"=>"3.2.0"},
@@ -18,14 +18,15 @@ describe 'NpmPackageSpecification' do
     end
 
     it "raises an error when package.json does not parse properly" do
-      Papers::Configuration.any_instance.stub(:npm_package_json_path).and_return('spec/support/package_with_error.json')
+      allow_any_instance_of(Papers::Configuration).to receive(:npm_package_json_path).and_return('spec/support/package_with_error.json')
       expect { Papers::NpmPackage.full_introspected_entries }.to raise_error JSON::ParserError
     end
 
     it 'combines dependencies and devDependencies' do
-      Papers::NpmPackage.stub(:package)
-                    .and_return({'dependencies' => {'prod_package' => '~> 1.2.3'},
-                                 'devDependencies' => {'dev_package' => '~> 1.2.0'}})
+      allow(Papers::NpmPackage).to receive(:package).and_return({
+        'dependencies'    => { 'prod_package' => '~> 1.2.3' },
+        'devDependencies' => {'dev_package' => '~> 1.2.0'}
+      })
 
 
       expect(Papers::NpmPackage.full_introspected_entries).to eq([
@@ -35,8 +36,9 @@ describe 'NpmPackageSpecification' do
     end
 
     it 'returns dependencies when devDependencies is not defined' do
-      Papers::NpmPackage.stub(:package)
-                    .and_return({'dependencies' => {'npm_package' => '1.2.3'}})
+      allow(Papers::NpmPackage).to receive(:package).and_return({
+        'dependencies' => { 'npm_package' => '1.2.3' }
+      })
 
       expect(Papers::NpmPackage.full_introspected_entries).to eq([{
         'name' => 'npm_package',
@@ -45,8 +47,9 @@ describe 'NpmPackageSpecification' do
     end
 
     it 'returns devDependencies when dependencies is not defined' do
-      Papers::NpmPackage.stub(:package)
-                    .and_return({'devDependencies' => {'npm_package' => '1.2.3'}})
+      allow(Papers::NpmPackage).to receive(:package).and_return({
+        'devDependencies' => { 'npm_package' => '1.2.3' }
+      })
 
       expect(Papers::NpmPackage.full_introspected_entries).to eq([{
         'name' => 'npm_package',
@@ -55,8 +58,9 @@ describe 'NpmPackageSpecification' do
     end
 
     it 'removes leading non-digits from the version' do
-      Papers::NpmPackage.stub(:package)
-                    .and_return({'dependencies' => {'npm_package' => '~> 1.2.3'}})
+      allow(Papers::NpmPackage).to receive(:package).and_return({
+        'dependencies' => { 'npm_package' => '~> 1.2.3' }
+      })
 
       expect(Papers::NpmPackage.full_introspected_entries).to eq([{
         'name' => 'npm_package',
@@ -65,8 +69,7 @@ describe 'NpmPackageSpecification' do
     end
 
     it 'returns an empty array when the dependencies and devDependencies keys are not defined' do
-      Papers::NpmPackage.stub(:package)
-                    .and_return({})
+      allow(Papers::NpmPackage).to receive(:package).and_return({})
 
       expect(Papers::NpmPackage.full_introspected_entries).to eq([])
     end
@@ -74,18 +77,18 @@ describe 'NpmPackageSpecification' do
 
   describe "#introspected" do
     it "returns an array of name-version strings" do
-      Papers::NpmPackage.stub(:full_introspected_entries)
-                           .and_return([{
-                                          'name' => 'npm_package',
-                                          'version' => '1.2.3'
-                                        }])
+      allow(Papers::NpmPackage).to receive(:full_introspected_entries).and_return([
+        {
+          'name' => 'npm_package',
+          'version' => '1.2.3'
+        }
+      ])
 
       expect(Papers::NpmPackage.introspected).to eq(["npm_package-1.2.3"])
     end
 
     it "returns an empty array when the dependencies key is not defined" do
-      Papers::NpmPackage.stub(:full_introspected_entries)
-                           .and_return([])
+      allow(Papers::NpmPackage).to receive(:full_introspected_entries).and_return([])
 
       expect(Papers::NpmPackage.introspected).to eq([])
     end

data/spec/papers_spec.rb

@@ -7,24 +7,25 @@ describe 'Papers' do
   let(:validator) { Papers::LicenseValidator.new }
 
   it 'validates a manifest with empty values and set of dependencies' do
-    Papers::LicenseValidator.any_instance.stub(:manifest).and_return({
+    allow_any_instance_of(Papers::LicenseValidator).to receive(:manifest).and_return({
       'javascripts' => {},
       'gems' => {}
     })
-    Papers::Gem.stub(:introspected).and_return([])
+    allow(Papers::Gem).to receive(:introspected).and_return([])
 
     expect(validator.valid?).to be_truthy
   end
 
   it 'detects mismatched gems' do
-    Papers::LicenseValidator.any_instance.stub(:manifest).and_return({
+    allow_any_instance_of(Papers::LicenseValidator).to receive(:manifest).and_return({
       'javascripts' => {},
       'gems' => {
         'foo-1.2' => { 'license' => 'MIT' },
         'baz-1.3' => { 'license' => 'BSD' }
       }
     })
-    Bundler.stub_chain(:load, :specs).and_return([
+
+    allow(Bundler).to receive_message_chain(:load, :specs).and_return([
       double(name: 'bar', version: '1.2', licenses: ['MIT']),
       double(name: 'baz', version: '1.3', licenses: ['BSD'])
     ])
@@ -40,16 +41,15 @@ describe 'Papers' do
   end
 
   it 'detects mismatched gem versions' do
-    Papers::Configuration.any_instance.stub(:validate_javascript?).and_return(false)
-
-    Papers::LicenseValidator.any_instance.stub(:manifest).and_return({
+    allow_any_instance_of(Papers::Configuration).to receive(:validate_javascript?).and_return(false)
+    allow_any_instance_of(Papers::LicenseValidator).to receive(:manifest).and_return({
       'javascripts' => {},
       'gems' => {
         'foo-1.2' => { 'license' => 'MIT' },
         'baz-1.3' => { 'license' => 'BSD' }
       }
     })
-    Bundler.stub_chain(:load, :specs).and_return([
+    allow(Bundler).to receive_message_chain(:load, :specs).and_return([
       double(name: 'foo', version: '1.2', licenses: ['MIT']),
       double(name: 'baz', version: '1.2', licenses: ['BSD'])
     ])
@@ -64,16 +64,15 @@ describe 'Papers' do
   end
 
   it 'detects omitted gem versions' do
-    Papers::Configuration.any_instance.stub(:validate_javascript?).and_return(false)
-
-    Papers::LicenseValidator.any_instance.stub(:manifest).and_return({
+    allow_any_instance_of(Papers::Configuration).to receive(:validate_javascript?).and_return(false)
+    allow_any_instance_of(Papers::LicenseValidator).to receive(:manifest).and_return({
       'javascripts' => {},
       'gems' => {
         'foo' => { 'license' => 'MIT' },
         'baz-1.2' => { 'license' => 'BSD' }
       }
     })
-    Bundler.stub_chain(:load, :specs).and_return([
+    allow(Bundler).to receive_message_chain(:load, :specs).and_return([
       double(name: 'foo', version: '1.2', licenses: ['MIT']),
       double(name: 'baz', version: '1.2', licenses: ['BSD'])
     ])
@@ -88,14 +87,14 @@ describe 'Papers' do
   end
 
   it 'is OK with matching gem sets' do
-    Papers::LicenseValidator.any_instance.stub(:manifest).and_return({
+    allow_any_instance_of(Papers::LicenseValidator).to receive(:manifest).and_return({
       'javascripts' => {},
       'gems' => {
         'foo-1.2' => { 'license' => 'MIT' },
         'baz-1.2' => { 'license' => 'BSD' }
       }
     })
-    Bundler.stub_chain(:load, :specs).and_return([
+    allow(Bundler).to receive_message_chain(:load, :specs).and_return([
       double(name: 'foo', version: '1.2', licenses: ['MIT']),
       double(name: 'baz', version: '1.2', licenses: ['BSD'])
     ])
@@ -104,18 +103,18 @@ describe 'Papers' do
   end
 
   it 'is OK with whitelisting gem versions on a specific license' do
-    Papers::LicenseValidator.any_instance.stub(:manifest).and_return({
+    allow_any_instance_of(Papers::LicenseValidator).to receive(:manifest).and_return({
       'javascripts' => {},
       'gems' => {
         'foo' => { 'license' => 'MIT' },
         'baz' => { 'license' => 'BSD' }
       }
     })
-    Bundler.stub_chain(:load, :specs).and_return([
+    allow(Bundler).to receive_message_chain(:load, :specs).and_return([
       double(name: 'foo', version: '1.2', licenses: ['MIT']),
       double(name: 'baz', version: '1.2', licenses: ['BSD'])
     ])
-    Papers::Configuration.any_instance.stub(:version_whitelisted_license).and_return('MIT')
+    allow_any_instance_of(Papers::Configuration).to receive(:version_whitelisted_license).and_return('MIT')
 
     expect(validator).not_to be_valid
     expect(validator.errors).to eq([
@@ -125,14 +124,14 @@ describe 'Papers' do
   end
 
   it 'is OK with matching gem sets but complain about a license issue' do
-    Papers::LicenseValidator.any_instance.stub(:manifest).and_return({
+    allow_any_instance_of(Papers::LicenseValidator).to receive(:manifest).and_return({
       'javascripts' => {},
       'gems' => {
         'foo-1.2' => { 'license' => 'MIT' },
         'baz-1.3' => { 'license' => 'GPL' }
       }
     })
-    Bundler.stub_chain(:load, :specs).and_return([
+    allow(Bundler).to receive_message_chain(:load, :specs).and_return([
       double(name: 'foo', version: '1.2', licenses: ['MIT']),
       double(name: 'baz', version: '1.3', licenses: ['GPL'])
     ])
@@ -145,7 +144,7 @@ describe 'Papers' do
   end
 
   it 'displays gem licenses in a pretty format without versions' do
-    Papers::LicenseValidator.any_instance.stub(:manifest).and_return({
+    allow_any_instance_of(Papers::LicenseValidator).to receive(:manifest).and_return({
       'javascripts' => {},
       'gems' => {
         'foo-1.2'          => { 'license' => 'MIT' },
@@ -177,14 +176,24 @@ describe 'Papers' do
   end
 
   it 'displays JS libraries in a pretty format without versions' do
-    Papers::LicenseValidator.any_instance.stub(:manifest).and_return({
+    allow_any_instance_of(Papers::LicenseValidator).to receive(:manifest).and_return({
       'javascripts' => {
         '/path/to/foo.js' => {
           'license' => 'MIT',
           'license_url' => nil,
           'project_url' => nil
         },
-        '/path/to/newrelic.js' => {
+        '/path/to/bar.coffee' => {
+          'license' => 'MIT',
+          'license_url' => nil,
+          'project_url' => nil
+        },
+        '/path/to/newrelic.js.erb' => {
+          'license' => 'New Relic',
+          'license_url' => nil,
+          'project_url' => nil
+        },
+        '/path/to/newrelic.js.coffee' => {
           'license' => 'New Relic',
           'license_url' => nil,
           'project_url' => nil
@@ -193,7 +202,7 @@ describe 'Papers' do
       'gems' => {}
     })
 
-    expect(validator.pretty_js_list).to eq([
+    expect(validator.pretty_js_list).to contain_exactly(
       {
         :name =>'/path/to/foo.js',
         :license =>'MIT',
@@ -201,18 +210,30 @@ describe 'Papers' do
         :project_url => nil
       },
       {
-        :name =>'/path/to/newrelic.js',
+        :name =>'/path/to/bar.coffee',
+        :license =>'MIT',
+        :license_url => nil,
+        :project_url => nil
+      },
+      {
+        :name =>'/path/to/newrelic.js.erb',
+        :license =>'New Relic',
+        :license_url => nil,
+        :project_url => nil
+      },
+      {
+        :name =>'/path/to/newrelic.js.coffee',
         :license =>'New Relic',
         :license_url => nil,
         :project_url => nil
       }
-    ])
+    )
   end
 
   it 'displays bower component licenses in a pretty format without versions' do
-    Papers::Configuration.any_instance.stub(:validate_bower_components?).and_return(true)
+    allow_any_instance_of(Papers::Configuration).to receive(:validate_bower_components?).and_return(true)
 
-    Papers::LicenseValidator.any_instance.stub(:manifest).and_return({
+    allow_any_instance_of(Papers::LicenseValidator).to receive(:manifest).and_return({
       'javascripts' => {},
       'gems' => {},
       'bower_components' => {
@@ -257,9 +278,9 @@ describe 'Papers' do
   end
 
   it 'skips bower versions for whitelisted licenses' do
-    Papers::Configuration.any_instance.stub(:version_whitelisted_license).and_return('Whitelist')
+    allow_any_instance_of(Papers::Configuration).to receive(:version_whitelisted_license).and_return('Whitelist')
 
-    Papers::BowerComponent.stub(:bower_json_entries).and_return([
+    allow(Papers::BowerComponent).to receive(:bower_json_entries).and_return([
       {
         'name' => 'foo',
         '_release' => '1.2',
@@ -286,9 +307,9 @@ describe 'Papers' do
   end
 
   it 'displays npm package licenses in a pretty format without versions' do
-    Papers::Configuration.any_instance.stub(:validate_npm_packages?).and_return(true)
+    allow_any_instance_of(Papers::Configuration).to receive(:validate_npm_packages?).and_return(true)
 
-    Papers::LicenseValidator.any_instance.stub(:manifest).and_return({
+    allow_any_instance_of(Papers::LicenseValidator).to receive(:manifest).and_return({
       'javascripts' => {},
       'gems' => {},
       'npm_packages' => {
@@ -339,13 +360,14 @@ describe 'Papers' do
 
   it 'is OK with whitelisting javascript javascript_paths' do
     # contents of javascript dir and no gems
-    Dir.stub(:glob){[
+    allow(Dir).to receive(:glob).and_return([
       'app/javascripts/node_modules/should_be_whitelisted.js',
       'app/javascripts/test.js'
-    ]}
-    Papers::Gem.stub(:introspected).and_return([])
+    ])
+
+    allow(Papers::Gem).to receive(:introspected).and_return([])
 
-    Papers::LicenseValidator.any_instance.stub(:manifest).and_return({
+    allow_any_instance_of(Papers::LicenseValidator).to receive(:manifest).and_return({
       'javascripts' => {
         'app/javascripts/test.js' => {
           'license' => 'MIT',
@@ -355,10 +377,10 @@ describe 'Papers' do
       },
       'gems' => {}
     })
-    Papers::Configuration.any_instance.stub(:javascript_paths).and_return(['app/javascripts/'])
+    allow_any_instance_of(Papers::Configuration).to receive(:javascript_paths).and_return(['app/javascripts/'])
 
     # whitelist this directory
-    Papers::Configuration.any_instance.stub(:whitelist_javascript_paths).and_return(['app/javascripts/node_modules'])
+    allow_any_instance_of(Papers::Configuration).to receive(:whitelist_javascript_paths).and_return(['app/javascripts/node_modules'])
 
     expect(Papers::Javascript.introspected).to_not include('app/javascripts/node_modules/should_be_whitelisted.js')
     expect(validator).to be_valid

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: papers
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Ralph Bodenner
@@ -12,36 +13,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
   prerelease: false
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
+  type: :development
   prerelease: false
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
-  type: :development
 description: ! 'Validate that the licenses used by your Ruby project''s dependencies
   (both gems
 
@@ -83,26 +88,27 @@ files:
 homepage: http://github.com/newrelic/papers
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Validate the licenses of software dependencies you use
 test_files:
 - spec/npm_package_spec.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjQ2MjU3NGM4OTljMjA2MGVlYjhiNzg5ZTk5YzZjOWM3NDZlMTBhMQ==
-  data.tar.gz: !binary |-
-    OWQ1OGJkY2FlMzQ0OTJmZDNkMGM1Y2FiZDE4M2JhYjc5MTY0ZDk3Mw==
-SHA512:
-  metadata.gz: !binary |-
-    MzA3ZWM0ZWRlOGZlYTE2MTVkMjA3YTc3ZDNhODI1ZDY0NDk4M2UxN2E5OGM5
-    MjUwNDU1ZjA0ZTZiMzVmMDUxZGU0NjQ5ZGNiYmE1ZmNhMzIxYzMxYTA1NjBm
-    YzJiZWIxMDFlNzMzMmMwYzdlOGQyYWFlZmMyODJmMzU4NzFiOTE=
-  data.tar.gz: !binary |-
-    MDNiMjVjNjc2OTAwZjlmOTQ3OTk1MzJhOTRmZDY1OTY0ZDRjNjVjNDBjZDAw
-    MzgwYmRlNDYxYjk0N2E4ZWMyYjIwZmQwNzM1YTc2YjAyNDdiODE3ZDgwODNi
-    YWZjY2NhYTE5MTlhOWU4MWJlNDg1M2YyNjUxNmM0OTQ0ZGM4MDE=