dependency_spy 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f030500e1a11360c755835f62e47553281b984e
-  data.tar.gz: b0ae90d2d68163339e1ce192bc985ece81c8c7a6
+  metadata.gz: 4fd249e65300f9e7f1e49970446831638f66d54e
+  data.tar.gz: f2f0ebc11c4b96b704d27e13c94a05f0497bd5ac
 SHA512:
-  metadata.gz: 411c49d84c1cde518b6e4aa16171ab99a8b6fcfc3bd7fb0e225015396df9815217465038ca2fa25eaf2aa0b526fc0614632cf89973228a6b243d99acada45b45
-  data.tar.gz: 92470f0a04d0c663d0126b08123cad76b43c22a8640d8e5372f7897ddc419caa10fb779ed795124304d0b1ded5a4159a16e0504ee8bbd64044c4274fdb1638d7
+  metadata.gz: ef6365eaa9e9155dce4cd67b61bc9227f2231e39a9a1a7b2c77c38780243bdabd93d9cc84e2621a67dec3cd8b16d83539734e16200781480c6e99c7ef761f91f
+  data.tar.gz: 21277d4f3760c7abe502695be22e3ac7ee7a42b90079c1bab8daf67568a43966bdec6648646c3560fda2397d1b8962b51206ef2f7b69e9ac148ad416ae9bbd8b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dependency_spy (0.2.1)
+    dependency_spy (0.2.2)
       bibliothecary (~> 6.3)
       semantic_range (~> 2.1)
       thor (~> 0.20)
@@ -23,15 +23,15 @@ GEM
     citrus (3.0.2)
     codacy-coverage (2.1.0)
       simplecov
-    commander (4.4.6)
-      highline (~> 1.7.2)
+    commander (4.4.7)
+      highline (~> 2.0.0)
     deb_control (0.0.1)
     diff-lcs (1.3)
     docile (1.3.1)
     ethon (0.11.0)
       ffi (>= 1.3.0)
     ffi (1.9.25)
-    highline (1.7.10)
+    highline (2.0.0)
     jaro_winkler (1.5.1)
     json (2.1.0)
     kramdown (1.17.0)
@@ -61,14 +61,14 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rubocop (0.59.2)
+    rubocop (0.60.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
+      unicode-display_width (~> 1.4.0)
     rubocop-rspec (1.30.0)
       rubocop (>= 0.58.0)
     ruby-ll (2.1.2)
@@ -89,7 +89,7 @@ GEM
     typhoeus (1.3.0)
       ethon (>= 0.9.0)
     unicode-display_width (1.4.0)
-    yavdb (0.4.0)
+    yavdb (0.4.1)
       json (~> 2.1)
       kramdown (~> 1.17)
       oga (~> 2.15)

data/lib/dependency_spy/cli.rb

@@ -62,7 +62,7 @@ module DependencySpy
       end
 
       has_vulnerabilities =
-        manifests.any? { |manifest| manifest.dependencies.any? { |dependency| dependency.vulnerabilities.any? } }
+        manifests.any? { |manifest| manifest[:dependencies]&.any? { |dependency| dependency[:vulnerabilities]&.any? } }
 
       exit(1) if has_vulnerabilities
     end

data/lib/dependency_spy/dtos/dependency.rb

@@ -26,21 +26,25 @@ module DependencySpy
     def to_map
       map = {}
       members.each do |m|
-        next unless self[m] && (
-        (self[m].is_a?(String) && !self[m].empty?) ||
-          (self[m].is_a?(Array) && self[m].any?))
-
-        map[m.to_s] = self[m] if self[m]
+        if !self[m] ||
+           (self[m].is_a?(String) && self[m].empty?) ||
+           (self[m].is_a?(Array) && self[m].none?)
+          next
+        elsif self[m].is_a?(Struct)
+          map[m.to_s] = self[m].to_map
+        else
+          map[m.to_s] = self[m]
+        end
       end
       map
     end
 
-    def to_json(*attrs)
-      to_map.to_json(*attrs)
+    def to_json(*args)
+      to_map.to_json(*args)
     end
 
-    def to_yaml(*attrs)
-      to_map.to_yaml(*attrs)
+    def to_yaml(*args)
+      to_map.to_yaml(*args)
     end
 
   end
@@ -55,11 +59,15 @@ module DependencySpy
     def to_map
       map = {}
       members.each do |m|
-        next unless self[m] && (
-        (self[m].is_a?(String) && !self[m].empty?) ||
-          (self[m].is_a?(Array) && self[m].any?))
-
-        map[m.to_s] = self[m] if self[m]
+        if !self[m] ||
+           (self[m].is_a?(String) && self[m].empty?) ||
+           (self[m].is_a?(Array) && self[m].none?)
+          next
+        elsif self[m].is_a?(Struct)
+          map[m.to_s] = self[m].to_map
+        else
+          map[m.to_s] = self[m]
+        end
       end
       map
     end

data/lib/dependency_spy/formatters/json.rb

@@ -20,18 +20,15 @@ module DependencySpy
 
       def self.format(manifests)
         filtered_manifests = manifests.map do |manifest|
-          manifest[:dependencies] = manifest[:dependencies].map do |dependency|
-            next unless dependency[:vulnerabilities].any?
-
-            dependency[:vulnerabilities] = dependency[:vulnerabilities].map(&:to_map)
-            dependency
-          end.reject(&:nil?).map(&:to_map)
-          manifest
+          vulnerable_dependencies      = manifest[:dependencies]
+                                           .select { |dependency| dependency[:vulnerabilities].any? }
+          manifest_copy                = Marshal.load(Marshal.dump(manifest))
+          manifest_copy[:dependencies] = vulnerable_dependencies
+          manifest_copy
         end
 
         filtered_manifests
           .reject { |m| m[:dependencies].nil? }
-          .map(&:to_map)
           .map(&:to_json)
       end
 

data/lib/dependency_spy/formatters/yaml.rb

@@ -20,19 +20,16 @@ module DependencySpy
 
       def self.format(manifests)
         filtered_manifests = manifests.map do |manifest|
-          manifest[:dependencies] = manifest[:dependencies].map do |dependency|
-            next unless dependency[:vulnerabilities].any?
-
-            dependency[:vulnerabilities] = dependency[:vulnerabilities].map(&:to_map)
-            dependency
-          end.reject(&:nil?).map(&:to_map)
-          manifest
+          vulnerable_dependencies      = manifest[:dependencies]
+                                           .select { |dependency| dependency[:vulnerabilities].any? }
+          manifest_copy                = Marshal.load(Marshal.dump(manifest))
+          manifest_copy[:dependencies] = vulnerable_dependencies
+          manifest_copy
         end
 
         filtered_manifests
           .reject { |m| m[:dependencies].nil? }
-          .map(&:to_map)
-          .map(&:to_yaml)
+          .map(&:to_json)
       end
 
     end

data/lib/dependency_spy/version.rb

@@ -16,6 +16,6 @@
 
 module DependencySpy
 
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependency_spy
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Rodrigo Fernandes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-21 00:00:00.000000000 Z
+date: 2018-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler