repo_dependency_graph 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b747f1f7904582008138cbceb30e2a2a3806b58
-  data.tar.gz: 53d83c779792695eabc1779a1e92a4abc7683234
+  metadata.gz: 7df4826f35d89bded36eb7421532eff9ce3767c8
+  data.tar.gz: 91da00f83ba12d978cbeaf6fb869c6e013bbf2de
 SHA512:
-  metadata.gz: 6924b8148a9526cc05989c9a2ec1077a51dd234060949da5fc84db943c85a80c2aad08a7685ad392cbec3bd24d08ed3d5fffcbeda42d03c9d77b042787ca6d29
-  data.tar.gz: 66d0bdcdc628b3ed70289b31e99294062e237e340620380ff7afc9e93ee7e16147bcc109bd0b5dfd682228209f3621653d737354568c28f204b9b853701839ed
+  metadata.gz: c92fe571e36fe8d8e7b2c966f244e5337fe84cb67cae60eae1285b6fdea2bfd6fe93638aa8b556c6a78d62705e5b3832c5db2259117d7c9e2aeb770dd43ff2fc
+  data.tar.gz: 3b2a3ceb6ff041a123919b3fec2a69e9a5f7b3bc254641dde781349a559828a188f110da87d844a33ff29ed76f2d01b76085685fc0e6247cd5e3e5adeb26f2ae

data/bin/repo-dependency-graph

@@ -5,37 +5,4 @@ require "optparse"
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 require "repo_dependency_graph"
 
-def git_config(thing)
-  result = `git config #{thing}`.strip
-  result.empty? ? nil : result
-end
-
-options = {
-  :user => git_config("github.user")
-}
-OptionParser.new do |opts|
-  opts.banner = <<BANNER
-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("--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])
-  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!
-
-exit RepoDependencyGraph.run(options)
+exit RepoDependencyGraph.run(ARGV)

data/lib/repo_dependency_graph.rb

@@ -6,13 +6,50 @@ module RepoDependencyGraph
   class << self
     MAX_HEX = 255
 
-    def run(options)
-      draw(dependencies(options))
+    def run(argv)
+      draw(dependencies(parse_options(argv)))
       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("--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
+    end
+
+    def git_config(thing)
+      result = `git config #{thing}`.strip
+      result.empty? ? nil : result
+    end
+
     def draw(dependencies)
       require 'graphviz'
 
@@ -64,8 +101,8 @@ module RepoDependencyGraph
           content.scan(/^\s*depends ['"](.*?)['"]/).flatten
         end
       else
-        if repo.gem?
-          load_spec(repo.gemspec_content).runtime_dependencies.map(&:name)
+        if repo.gem? && spec = load_spec(repo.gemspec_content)
+          spec.runtime_dependencies.map(&:name)
         elsif content = repo.content("Gemfile.lock")
           Bundler::LockfileParser.new(content).specs.map(&:name)
         elsif content = repo.content("Gemfile")
@@ -77,9 +114,13 @@ module RepoDependencyGraph
     def load_spec(content)
       eval content.
         gsub(/^\s*require .*$/, "").
-        gsub(/([a-z\d]+::)+version/i, '"1.2.3"').
+        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\(.*?\)/, '"1.2.3"')
+        gsub(/(File|IO)\.read\(['"]VERSION.*?\)/, '"1.2.3"').
+        gsub(/(File|IO)\.read\(.*?\)/, '\'  VERSION = "1.2.3"\'')
+    rescue Exception
+      puts "Error when parsing content:\n#{content}\n\n#{$!}"
+      nil
     end
 
     def color(value, range)

data/lib/repo_dependency_graph/version.rb

@@ -1,3 +1,3 @@
 module RepoDependencyGraph
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: repo_dependency_graph
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Michael Grosser
@@ -29,7 +29,7 @@ cert_chain:
   y0kCSWmK6D+x/SbfS6r7Ke07MRqziJdB9GuE1+0cIRuFh8EQ+LN6HXCKM5pon/GU
   ycwMXfl0
   -----END CERTIFICATE-----
-date: 2013-08-18 00:00:00.000000000 Z
+date: 2013-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler-organization_audit