repo_dependency_graph 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 578cc8fe75735e91415c393a959f0aad7df3a510
-  data.tar.gz: f2201b99a11c80a5d7d8d7b870c416dc1181c99b
+  metadata.gz: 2f7e2fef071a05082e7a36ae97805147a46337b2
+  data.tar.gz: cc00557bde2101f361a08113394076aaa95f36ae
 SHA512:
-  metadata.gz: 6245f4ab5d69260041e10ec63614c78d5079eae348f19450d444f3a8bf2a7772daa8a40e5dd14791ed538cf2659766333ed4d057943257e75fd36bc928adc4c6
-  data.tar.gz: 9d3d92fe452b30a8d38cf7c23ab17345b60542dd58fafd53329883ff6107d0f1194fb3bea2fc5d64a658b68aebe27937f87e16516706a6c3603be610cd12c4e3
+  metadata.gz: 41150cb68c3c85cbe4b07b0ff113549b533a89aed9958ef354fd347f4efd9c14f5526f1106f6d27dfc6afdaada8c0fb7a0aa05db7824318a0210326bd6a632dc
+  data.tar.gz: 8c2577f04f2d56c2930181ff221ddb59bd561c101fcd1068c9f0f2f953818225b204fa42814bc819de5ee40bddfe63a4945e40dc5792aea4fa53e7e6fe3f5183

data/bin/repo-dependency-graph

@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
-require "rubygems"
 require "optparse"
 
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
-require "repo_dependency_graph"
+require "repo_dependency_graph/cli"
 
-exit RepoDependencyGraph.run(ARGV)
+exit RepoDependencyGraph::CLI.run(ARGV)

data/lib/repo_dependency_graph/cli.rb

@@ -0,0 +1,62 @@
+require 'repo_dependency_graph'
+require 'repo_dependency_graph/output'
+
+module RepoDependencyGraph
+  module CLI
+    class << self
+      def run(argv)
+        options = parse_options(argv)
+        RepoDependencyGraph::Output.draw(
+          RepoDependencyGraph.dependencies(options), options
+        )
+        0
+      end
+
+      private
+
+      def parse_options(argv)
+        options = {
+          :user => git_config("github.user")
+        }
+        OptionParser.new do |opts|
+          opts.banner = <<-BANNER.gsub(/^          /, "")
+            Draw repo dependency graph from your organization
+
+            Usage:
+                repo-dependency-graph
+
+            Options:
+          BANNER
+          opts.on("--token TOKEN", "Use token") { |token| options[:token] = token }
+          opts.on("--user USER", "Use user") { |user| options[:user] = user }
+          opts.on("--draw TYPE", "png, html, table (default: png)") { |draw| options[:draw] = draw }
+          opts.on("--organization ORGANIZATION", "Use organization") { |organization| options[:organization] = organization }
+          opts.on("--private", "Only show private repos") { options[:private] = true }
+          opts.on("--external", "Also include external projects in graph (can get super-messy)") { options[:external] = true }
+          opts.on("--map SEARCH=REPLACE", "Replace in project name to find them as internal: 'foo=bar' -> replace foo in repo names to bar") do |map|
+            options[:map] = map.split("=")
+            options[:map][0] = Regexp.new(options[:map][0])
+            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("--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 }
+          opts.on("-v", "--version", "Show Version"){ puts RepoDependencyGraph::VERSION; exit}
+        end.parse!(argv)
+
+        options[:token] ||= begin
+          token = `git config github.token`.strip
+          token if $?.success?
+        end
+
+        options
+      end
+
+      def git_config(thing)
+        result = `git config #{thing}`.strip
+        result.empty? ? nil : result
+      end
+    end
+  end
+end

data/lib/repo_dependency_graph/output.rb

@@ -0,0 +1,155 @@
+module RepoDependencyGraph
+  module Output
+    MAX_HEX = 255
+
+    class << self
+      def draw(dependencies, options)
+        case options[:draw]
+        when "html"
+          draw_js(dependencies)
+        when "table"
+          draw_table(dependencies)
+        else
+          draw_png(dependencies)
+        end
+      end
+
+      private
+
+      def draw_js(dependencies)
+        nodes, edges = convert_to_graphviz(dependencies)
+        html = <<-HTML.gsub(/^          /, "")
+          <!doctype html>
+          <html>
+            <head>
+              <title>Network</title>
+            <style>
+              #mynetwork {
+                width: 2000px;
+                height: 2000px;
+                border: 1px solid lightgray;
+                background: #F3F3F3;
+              }
+            </style>
+
+            <script type="text/javascript" src="http://visjs.org/dist/vis.js"></script>
+            <link href="http://visjs.org/dist/vis.css" rel="stylesheet" type="text/css" />
+
+            <script type="text/javascript">
+              var nodes = null;
+              var edges = null;
+              var network = null;
+
+              function draw() {
+                nodes = #{nodes.values.to_json};
+                edges = #{edges.to_json};
+
+                var container = document.getElementById('mynetwork');
+                var data = {
+                  nodes: nodes,
+                  edges: edges
+                };
+                var options = {stabilize: false};
+
+                new vis.Network(container, data, options);
+              }
+            </script>
+          </head>
+
+          <body onload="draw()">
+            <div id="mynetwork"></div>
+          </body>
+        </html>
+        HTML
+        File.write("out.html", html)
+      end
+
+      def draw_table(dependencies)
+        tables = dependencies.map do |name, uses|
+          used = dependencies.map do |d, uses|
+            used = uses.detect { |d| d.first == name }
+            [d, used.last] if used
+          end.compact
+          size = [used.size, uses.size, 1].max
+          table = []
+          size.times do |i|
+            table[i] = [
+              (used[i] || []).join(": "),
+              (name if i == 0),
+              (uses[i] || []).join(": ")
+            ]
+          end
+          table.unshift ["Used", "", "Uses"]
+          table
+        end
+        tables.map! { |t| "<table>\n#{t.map { |t| "<tr>#{t.map { |t| "<td>#{t}</td>" }.join("")}</tr>" }.join("\n")}\n</table>" }
+
+        html = <<-HTML.gsub(/^          /, "")
+          <!doctype html>
+          <html>
+            <head>
+              <title>Network</title>
+              <style>
+                table { width: 600px; }
+              </style>
+            </head>
+            <body>
+              #{tables.join("<br>\n<br>\n")}
+            </body>
+          </html>
+        HTML
+        File.write("out.html", html)
+      end
+
+      def draw_png(dependencies)
+        nodes, edges = convert_to_graphviz(dependencies)
+        require 'graphviz'
+        g = GraphViz.new(:G, :type => :digraph)
+
+        nodes = Hash[nodes.map do |_, data|
+          node = g.add_node(data[:id], :color => data[:color], :style => "filled")
+          [data[:id], node]
+        end]
+
+        edges.each do |edge|
+          g.add_edge(nodes[edge[:from]], nodes[edge[:to]], :label => edge[:label])
+        end
+
+        g.output(:png => "out.png")
+      end
+
+      def convert_to_graphviz(dependencies)
+        counts = dependency_counts(dependencies)
+        range = counts.values.min..counts.values.max
+        nodes = Hash[counts.each_with_index.map do |(name, count), i|
+          [name, {:id => name, :color => color(count, range)}]
+        end]
+        edges = dependencies.map do |name, dependencies|
+          dependencies.map do |dependency, version|
+            {:from => nodes[name][:id], :to => nodes[dependency][:id], :label => (version || '')}
+          end
+        end.flatten
+        [nodes, edges]
+      end
+
+
+      def color(value, range)
+        value -= range.min # lowest -> green
+        max = range.max - range.min
+
+        i = (value * MAX_HEX / max);
+        i *= 0.6 # green-blue gradient instead of green-green
+        half = MAX_HEX * 0.5
+        values = [0,2,4].map { |v| (Math.sin(0.024 * i + v) * half + half).round.to_s(16).rjust(2, "0") }
+        "##{values.join}"
+      end
+
+      def dependency_counts(dependencies)
+        all = (dependencies.keys + dependencies.values.map { |v| v.map(&:first) }).flatten.uniq
+        Hash[all.map do |k|
+          [k, dependencies.values.map(&:first).count { |name, _| name ==  k } ]
+        end]
+      end
+    end
+  end
+end

data/lib/repo_dependency_graph/version.rb

@@ -1,3 +1,3 @@
 module RepoDependencyGraph
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

data/lib/repo_dependency_graph.rb

@@ -4,175 +4,6 @@ require "bundler" # get all dependency for lockfile_parser
 
 module RepoDependencyGraph
   class << self
-    MAX_HEX = 255
-
-    def run(argv)
-      options = parse_options(argv)
-      draw(dependencies(options), options)
-      0
-    end
-
-    private
-
-    def parse_options(argv)
-      options = {
-        :user => git_config("github.user")
-      }
-      OptionParser.new do |opts|
-        opts.banner = <<-BANNER.gsub(/^ {10}/, "")
-          Draw repo dependency graph from your organization
-
-          Usage:
-              repo-dependency-graph
-
-          Options:
-        BANNER
-        opts.on("--token TOKEN", "Use token") { |token| options[:token] = token }
-        opts.on("--user USER", "Use user") { |user| options[:user] = user }
-        opts.on("--draw TYPE", "png, html, table (default: png)") { |draw| options[:draw] = draw }
-        opts.on("--organization ORGANIZATION", "Use organization") { |organization| options[:organization] = organization }
-        opts.on("--private", "Only show private repos") { options[:private] = true }
-        opts.on("--external", "Also include external projects in graph (can get super-messy)") { options[:external] = true }
-        opts.on("--map SEARCH=REPLACE", "Replace in project name to find them as internal: 'foo=bar' -> replace foo in repo names to bar") do |map|
-          options[:map] = map.split("=")
-          options[:map][0] = Regexp.new(options[:map][0])
-          options[:map][1] = options[:map][1].to_s
-        end
-        opts.on("--chef", "Parse chef metadata.rb files") { options[:chef] = true }
-        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 }
-        opts.on("-v", "--version", "Show Version"){ puts RepoDependencyGraph::VERSION; exit}
-      end.parse!(argv)
-
-      options[:token] ||= begin
-        token = `git config github.token`.strip
-        token if $?.success?
-      end
-
-      options
-    end
-
-    def git_config(thing)
-      result = `git config #{thing}`.strip
-      result.empty? ? nil : result
-    end
-
-    def draw(dependencies, options)
-      case options[:draw]
-      when "html"
-        nodes, edges = convert_to_graphviz(dependencies)
-        html = <<-HTML.gsub(/^          /, "")
-          <!doctype html>
-          <html>
-            <head>
-              <title>Network</title>
-            <style>
-              #mynetwork {
-                width: 2000px;
-                height: 2000px;
-                border: 1px solid lightgray;
-                background: #F3F3F3;
-              }
-            </style>
-
-            <script type="text/javascript" src="http://visjs.org/dist/vis.js"></script>
-            <link href="http://visjs.org/dist/vis.css" rel="stylesheet" type="text/css" />
-
-            <script type="text/javascript">
-              var nodes = null;
-              var edges = null;
-              var network = null;
-
-              function draw() {
-                nodes = #{nodes.values.to_json};
-                edges = #{edges.to_json};
-
-                var container = document.getElementById('mynetwork');
-                var data = {
-                  nodes: nodes,
-                  edges: edges
-                };
-                var options = {stabilize: false};
-
-                new vis.Network(container, data, options);
-              }
-            </script>
-          </head>
-
-          <body onload="draw()">
-            <div id="mynetwork"></div>
-          </body>
-        </html>
-        HTML
-        File.write("out.html", html)
-      when "table"
-        tables = dependencies.map do |name, uses|
-          used = dependencies.map do |d, uses|
-            used = uses.detect { |d| d.first == name }
-            [d, used.last] if used
-          end.compact
-          size = [used.size, uses.size, 1].max
-          table = []
-          size.times do |i|
-            table[i] = [
-              (used[i] || []).join(": "),
-              (name if i == 0),
-              (uses[i] || []).join(": ")
-            ]
-          end
-          table.unshift ["Used", "", "Uses"]
-          table
-        end
-        tables.map!{ |t| "<table>\n#{t.map{|t| "<tr>#{t.map{|t| "<td>#{t}</td>" }.join("")}</tr>"  }.join("\n")}\n</table>" }
-
-        html = <<-HTML.gsub(/^          /, "")
-          <!doctype html>
-          <html>
-            <head>
-              <title>Network</title>
-              <style>
-                table { width: 600px; }
-              </style>
-            </head>
-            <body>
-              #{tables.join("<br>\n<br>\n")}
-            </body>
-          </html>
-        HTML
-        File.write("out.html", html)
-      else
-        nodes, edges = convert_to_graphviz(dependencies)
-        require 'graphviz'
-        g = GraphViz.new(:G, :type => :digraph)
-
-        nodes = Hash[nodes.map do |_, data|
-          node = g.add_node(data[:id], :color => data[:color], :style => "filled")
-          [data[:id], node]
-        end]
-
-        edges.each do |edge|
-          g.add_edge(nodes[edge[:from]], nodes[edge[:to]], :label => edge[:label])
-        end
-
-        g.output(:png => "out.png")
-      end
-    end
-
-    def convert_to_graphviz(dependencies)
-      counts = dependency_counts(dependencies)
-      range = counts.values.min..counts.values.max
-      nodes = Hash[counts.each_with_index.map do |(name, count), i|
-        [name, {:id => name, :color => color(count, range)}]
-      end]
-      edges = dependencies.map do |name, dependencies|
-        dependencies.map do |dependency, version|
-          {:from => nodes[name][:id], :to => nodes[dependency][:id], :label => (version || '')}
-        end
-      end.flatten
-      [nodes, edges]
-    end
-
     def dependencies(options)
       if options[:map] && options[:external]
         raise ArgumentError, "Map only makes sense when searching for internal repos"
@@ -187,7 +18,7 @@ module RepoDependencyGraph
       possible.map! { |p| p.sub(options[:map][0], options[:map][1].to_s) } if options[:map]
 
       dependencies = all.map do |repo|
-        found = dependent_repos(repo, options) || []
+        found = dependent_repos(repo, options)
         found.select! { |f| possible.include?(f.first) } unless options[:external]
         next if found.empty?
         puts "#{repo.name}: #{found.map { |n,v| "#{n}: #{v}" }.join(", ")}"
@@ -196,13 +27,19 @@ module RepoDependencyGraph
       Hash[dependencies]
     end
 
+    private
+
     def dependent_repos(repo, options)
-      if options[:chef]
+      repos = []
+
+      if !options[:only] || options[:only] == "chef"
         if content = repo.content("metadata.rb")
-          scan_chef_metadata(content)
+          repos.concat scan_chef_metadata(content)
         end
-      else
-        if repo.gem? && spec = load_spec(repo.gemspec_content)
+      end
+
+      if !options[:only] || options[:only] == "gem"
+        gems = if repo.gem? && spec = load_spec(repo.gemspec_content)
           spec.runtime_dependencies.map do |d|
             r = d.requirement.to_s
             r = nil if r == ">= 0"
@@ -213,7 +50,10 @@ module RepoDependencyGraph
         elsif content = repo.content("Gemfile")
           scan_gemfile(content)
         end
+        repos.concat gems if gems
       end
+
+      repos
     end
 
     def scan_chef_metadata(content)
@@ -239,23 +79,5 @@ module RepoDependencyGraph
       $stderr.puts "Error when parsing content:\n#{content}\n\n#{$!}"
       nil
     end
-
-    def color(value, range)
-      value -= range.min # lowest -> green
-      max = range.max - range.min
-
-      i = (value * MAX_HEX / max);
-      i *= 0.6 # green-blue gradient instead of green-green
-      half = MAX_HEX * 0.5
-      values = [0,2,4].map { |v| (Math.sin(0.024 * i + v) * half + half).round.to_s(16).rjust(2, "0") }
-      "##{values.join}"
-    end
-
-    def dependency_counts(dependencies)
-      all = (dependencies.keys + dependencies.values.map { |v| v.map(&:first) }).flatten.uniq
-      Hash[all.map do |k|
-        [k, dependencies.values.map(&:first).count { |name, _| name ==  k } ]
-      end]
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: repo_dependency_graph
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-06 00:00:00.000000000 Z
+date: 2014-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: organization_audit
@@ -33,6 +33,8 @@ extra_rdoc_files: []
 files:
 - bin/repo-dependency-graph
 - lib/repo_dependency_graph.rb
+- lib/repo_dependency_graph/cli.rb
+- lib/repo_dependency_graph/output.rb
 - lib/repo_dependency_graph/version.rb
 homepage: http://github.com/grosser/repo_dependency_graph
 licenses: