repo_dependency_graph 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9eb02ec4a7791f157956976b1bc3556f320baeccdcd94a427061c752508aaffb
-  data.tar.gz: 50ab88bc34a1ecd98aae758e96e152517bb01add9268abefadc6e6ef383f172a
+  metadata.gz: fcae82e09e603259bf440462660251915622ca5fd5c0c09964b9dc8a32af93a9
+  data.tar.gz: 21b413b03a5d6bda6af03531cf2128560ad80c988f94eb2a499d555c184c28b2
 SHA512:
-  metadata.gz: ca3dd51e05369ba9b9dab42d6c34e3a50371d4d5fb5199b7961762ff6914775e6e38b7bdc4d357a140cb9ba43a2a70dfae0d92b6a2caf6072d0e10bb3d4b38b8
-  data.tar.gz: 824a88b4294365f3aaefc04e6d89ebb8f819fbb160f48cc42946ec53c1eef2b1020e4f50062c98d3dea11d3743522d72b41cbfcd1d51d4d4f42b047fb1ce3360
+  metadata.gz: ea7f863be8ffe68e240e75a1944bcb53a98663486b2cd660bb1086e9f24c33fc594068bd2b93916c78d1e0d21787717948c5b75b27a2b190a047c8bd9adfd58b
+  data.tar.gz: fb63dff1d601c3397d7be6203cd2c0feb25f9060df2e2b29b254bc0ae4949b4f9f2ab0929cdfd68279c6dff0afc82844a309684f0e319e47395917a4da00912f

data/lib/repo_dependency_graph.rb

@@ -11,7 +11,7 @@ module RepoDependencyGraph
         raise ArgumentError, "Map only makes sense when searching for internal repos"
       end
 
-      all = OrganizationAudit::Repo.all(options).sort_by(&:name)
+      all = OrganizationAudit::Repo.all(options.slice(:user, :organization, :token, :max_pages)).sort_by(&:name)
       all.select!(&:private?) if options[:private]
       all.select! { |r| r.name =~ options[:select] } if options[:select]
       all.reject! { |r| r.name =~ options[:reject] } if options[:reject]
@@ -41,17 +41,14 @@ module RepoDependencyGraph
       end
 
       if !options[:only] || options[:only] == "gem"
-        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
+        gems =
+          if repo.gem?
+            scan_gemspec(repo.name, repo.gemspec_content)
+          elsif content = content_from_any(repo, ["gems.locked", "Gemfile.lock"])
+            scan_gemfile_lock(repo.name, content)
+          elsif content = content_from_any(repo, ["gems.rb", "Gemfile"])
+            scan_gemfile(repo.name, content)
           end
-        elsif content = content_from_any(repo, ["gems.locked", "Gemfile.lock"])
-          scan_gemfile_lock(repo.name, content)
-        elsif content = content_from_any(repo, ["gems.rb", "Gemfile"])
-          scan_gemfile(repo.name, content)
-        end
         repos.concat gems if gems
       end
 
@@ -71,23 +68,15 @@ module RepoDependencyGraph
     end
 
     def scan_gemfile_lock(repo_name, content)
+      content = content.gsub(/BUNDLED WITH\n.*\n/, "")
       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_gemspec(repo_name, content)
-      content = 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"\'')
-      eval content
-    rescue StandardError, SyntaxError
-      $stderr.puts "Error parsing #{repo_name} gemspec:\n#{content}\n\n#{$!}"
-      nil
+    def scan_gemspec(_, content)
+      content.scan(/add(?:_runtime)?_dependency[\s(]+['"]([^'"]*)['"](?:,\s*['"]([^'"]*)['"])*/).map(&:compact)
     end
   end
 end

data/lib/repo_dependency_graph/cli.rb

@@ -39,6 +39,7 @@ module RepoDependencyGraph
             options[:map][1] = options[:map][1].to_s
           end
           opts.on("--only TYPE", String, "Only this type (chef,gem), default: all") { |t| options[:only] = t }
+          opts.on("--max-pages PAGES", Integer, "") { |p| options[:max_pages] = p }
           opts.on("--select REGEX", "Only include repos with matching names") { |regex| options[:select] = Regexp.new(regex) }
           opts.on("--reject REGEX", "Exclude repos with matching names") { |regex| options[:reject] = Regexp.new(regex) }
           opts.on("-h", "--help", "Show this.") { puts opts; exit }

data/lib/repo_dependency_graph/version.rb

@@ -1,3 +1,3 @@
 module RepoDependencyGraph
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: repo_dependency_graph
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-15 00:00:00.000000000 Z
+date: 2019-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: organization_audit