repo_dependency_graph 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 867c9f81c167ac07086975203edbcd565d171dd4
-  data.tar.gz: 18144c302d675e4a98b7dcb1327dbbef569dd7d7
+  metadata.gz: eff75d756f350cecdf306ebbf2ef30b6c3a8325b
+  data.tar.gz: 668595d52235c97176c882a087c5fcbd34714653
 SHA512:
-  metadata.gz: bb28d18d516a6b009239733a757074995b530bd9a60713a8c4535220c372d412a294e49f35fbfddbcc02c0a1bb8127e14d4cba4a554807a3bb115b6be3d78153
-  data.tar.gz: 15f93ad1f1cdbdf72e1705f0e062c5ce282ffcd3973cdb38ce1447b7ef468fd1e077766f2d1b97c33fab1c8d36dda7f8108a07ac56e9410b850c0f157cf646d5
+  metadata.gz: 8e1ee33ae811cd7c2bc785d76e04505ac45f12d86ba0b25b80b081f4b3d66546c6b3fd2c0faa684a4960b338f497f54c7c3c11cca64972380c60d5dfa92242a7
+  data.tar.gz: 7a6c5e1580fdcb724d79283ece1db6a7d84e802f7dc3372ddc63714e7969e2ab1d53e289a326c309534937a0ee6c36ae6afafdced24588d6586c74e36d549904

data/lib/repo_dependency_graph/version.rb

@@ -1,3 +1,3 @@
 module RepoDependencyGraph
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/repo_dependency_graph.rb

@@ -34,21 +34,21 @@ module RepoDependencyGraph
 
       if !options[:only] || options[:only] == "chef"
         if content = repo.content("metadata.rb")
-          repos.concat scan_chef_metadata(content)
+          repos.concat scan_chef_metadata(repo.name, content)
         end
       end
 
       if !options[:only] || options[:only] == "gem"
-        gems = if repo.gem? && spec = load_spec(repo.gemspec_content)
+        gems = if repo.gem? && spec = load_gemspec(repo.name, repo.gemspec_content)
           spec.runtime_dependencies.map do |d|
             r = d.requirement.to_s
             r = nil if r == ">= 0"
             [d.name, r].compact
           end
         elsif content = repo.content("Gemfile.lock")
-          scan_gemfile_lock(content)
+          scan_gemfile_lock(repo.name, content)
         elsif content = repo.content("Gemfile")
-          scan_gemfile(content)
+          scan_gemfile(repo.name, content)
         end
         repos.concat gems if gems
       end
@@ -56,27 +56,30 @@ module RepoDependencyGraph
       repos
     end
 
-    def scan_chef_metadata(content)
+    def scan_chef_metadata(_, content)
       content.scan(/^\s*depends ['"](.*?)['"](?:,\s?['"](.*?)['"])?/).map(&:compact)
     end
 
-    def scan_gemfile(content)
+    def scan_gemfile(_, content)
       content.scan(/^\s*gem ['"](.*?)['"](?:,\s?['"](.*?)['"]|.*\bref(?::|\s*=>)\s*['"](.*)['"])?/).map(&:compact)
     end
 
-    def scan_gemfile_lock(content)
+    def scan_gemfile_lock(repo_name, content)
       Bundler::LockfileParser.new(content).specs.map { |d| [d.name, d.version.to_s] }
+    rescue
+      $stderr.puts "Error parsing #{repo_name} Gemfile.lock:\n#{content}\n\n#{$!}"
+      nil
     end
 
-    def load_spec(content)
+    def load_gemspec(repo_name, content)
       eval content.
         gsub(/^\s*(require|require_relative) .*$/, "").
         gsub(/([a-z\d]+::)+version(::[a-z]+)?/i){|x| x =~ /^Gem::Version$/i ? x : '"1.2.3"' }.
         gsub(/^\s*\$(:|LOAD_PATH).*/, "").
         gsub(/(File|IO)\.read\(['"]VERSION.*?\)/, '"1.2.3"').
         gsub(/(File|IO)\.read\(.*?\)/, '\'  VERSION = "1.2.3"\'')
-    rescue Exception
-      $stderr.puts "Error when parsing content:\n#{content}\n\n#{$!}"
+    rescue
+      $stderr.puts "Error parsing #{repo_name} gemspec:\n#{content}\n\n#{$!}"
       nil
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: repo_dependency_graph
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Michael Grosser