summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo khan <mo.khan@gmail.com>2020-04-12 10:25:31 -0600
committermo khan <mo.khan@gmail.com>2020-04-12 10:25:31 -0600
commit8e366bc7ff3efda43e2d2fc8e0a1155f5e4a85fa (patch)
tree1d04c9470b6fd3be2c6cfc3e710b82626d096bf9
parent53bbd7d472fa75e6d41d9603a47b7aa08334117a (diff)
Fix rubocop errors
-rw-r--r--lib/spandx/dotnet/license_plugin.rb2
-rw-r--r--lib/spandx/php/license_plugin.rb3
-rw-r--r--spec/unit/core/dependency_spec.rb4
-rw-r--r--spec/unit/dotnet/license_plugin_spec.rb6
-rw-r--r--spec/unit/php/license_plugin_spec.rb8
5 files changed, 14 insertions, 9 deletions
diff --git a/lib/spandx/dotnet/license_plugin.rb b/lib/spandx/dotnet/license_plugin.rb
index 3b64057..081d6ef 100644
--- a/lib/spandx/dotnet/license_plugin.rb
+++ b/lib/spandx/dotnet/license_plugin.rb
@@ -30,7 +30,7 @@ module Spandx
::Spandx::Core::CompositeGateway.new(
::Spandx::Core::Cache.new(:nuget),
::Spandx::Dotnet::NugetGateway.new
- )
+ )
end
end
end
diff --git a/lib/spandx/php/license_plugin.rb b/lib/spandx/php/license_plugin.rb
index 5aa7cdd..4bc82c1 100644
--- a/lib/spandx/php/license_plugin.rb
+++ b/lib/spandx/php/license_plugin.rb
@@ -9,6 +9,7 @@ module Spandx
def enhance(dependency)
return dependency unless dependency.managed_by?(:composer)
+
if dependency.meta['license']
dependency.meta['license'].each do |x|
detected_license = catalogue[x]
@@ -37,7 +38,7 @@ module Spandx
::Spandx::Core::CompositeGateway.new(
::Spandx::Core::Cache.new(:composer),
::Spandx::Php::PackagistGateway.new
- )
+ )
end
end
end
diff --git a/spec/unit/core/dependency_spec.rb b/spec/unit/core/dependency_spec.rb
index 6f65e7e..046915e 100644
--- a/spec/unit/core/dependency_spec.rb
+++ b/spec/unit/core/dependency_spec.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
RSpec.describe Spandx::Core::Dependency do
- describe "#licenses" do
+ describe '#licenses' do
[
{ package_manager: :maven, name: 'junit:junit', version: '3.8.1', expected: ['CPL-1.0'] },
{ package_manager: :npm, name: 'accepts', version: '1.3.7', expected: ['MIT'] },
@@ -121,7 +121,7 @@ RSpec.describe Spandx::Core::Dependency do
end
end
- describe "#managed_by?" do
+ describe '#managed_by?' do
subject { described_class.new(package_manager: :nuget, name: 'jive', version: '0.1.0') }
specify { expect(subject).to be_managed_by(:nuget) }
diff --git a/spec/unit/dotnet/license_plugin_spec.rb b/spec/unit/dotnet/license_plugin_spec.rb
index 82f05f6..61c8b91 100644
--- a/spec/unit/dotnet/license_plugin_spec.rb
+++ b/spec/unit/dotnet/license_plugin_spec.rb
@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
RSpec.describe Spandx::Dotnet::LicensePlugin do
subject { described_class.new }
- describe "#enhance" do
- context "when the dependency is not managed by the `nuget` package manager" do
+ describe '#enhance' do
+ context 'when the dependency is not managed by the `nuget` package manager' do
let(:dependency) { ::Spandx::Core::Dependency.new(package_manager: :rubygems, name: 'spandx', version: '0.1.0') }
specify { expect(subject.enhance(dependency)).to eql(dependency) }
diff --git a/spec/unit/php/license_plugin_spec.rb b/spec/unit/php/license_plugin_spec.rb
index 855e49d..9277888 100644
--- a/spec/unit/php/license_plugin_spec.rb
+++ b/spec/unit/php/license_plugin_spec.rb
@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
RSpec.describe Spandx::Php::LicensePlugin do
subject { described_class.new }
- describe "#enhance" do
- context "when the dependency is not managed by the `composer` package manager" do
+ describe '#enhance' do
+ context 'when the dependency is not managed by the `composer` package manager' do
let(:dependency) { ::Spandx::Core::Dependency.new(package_manager: :rubygems, name: 'spandx', version: '0.1.0') }
specify { expect(subject.enhance(dependency)).to eql(dependency) }
@@ -30,7 +32,7 @@ RSpec.describe Spandx::Php::LicensePlugin do
end
end
- context "when the metadata includes the detected license" do
+ context 'when the metadata includes the detected license' do
let(:dependency) { ::Spandx::Core::Dependency.new(package_manager: :composer, name: 'spandx/example', version: '0.1.0', meta: { 'license' => ['MIT'] }) }
let(:results) { subject.enhance(dependency).licenses }