cobradeps 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91612869e6480102fae1ee41e86e0a53ad032611
-  data.tar.gz: 383dd457b87e46449a9524cce92635c52465ff54
+  metadata.gz: bf2c4837ace66225c6e94b21c8643bf11a64045f
+  data.tar.gz: 580a100ed62e22ad60b55d8450007e2d3d0bc32e
 SHA512:
-  metadata.gz: 8bd9dee59ff53b56a1cde3cef22f4b534a5b88745cbea19b3609b989e88f1a691bfd2087650049e45b694d1aa4c3213319c16c44973dae225f3b68158b97d82a
-  data.tar.gz: 359a48a0107352082208c4f22d147ed361c2c195fd261d36819c5e4e608dd3f0dde0d848168322b003192428bc62c739af73aa7a18b7e9c2a743333ac26f68c5
+  metadata.gz: 3adaac7210c40843bac63c77126a7e33b490b071818e0b06e0d3d255121ae25819c5051b95a7ce963bf8161406b35b11a8a2f69831d369ed945206f9c9d9b4ef
+  data.tar.gz: 0974dee6bc1ab9019c9c5c1905e74c61b8d9709097c2f2ad036678df91f83579939ab1aa3d0cf8ad8edd0d614f6ae78d6f33a64af8c1032ad67af373132def7d

data/README.md

@@ -73,13 +73,17 @@ unclear which gems it really directly depends on. That's why all dependencies of
 
 To include direct dependencies of an application, add an additional option to the `gem` line from the Gemfile like so:
 
-    gem "B", path: "../B", direct: true
+    gem "B", path: "../B", group: :direct
     gem "C", path: "../C"
     gem "D", path: "../D"
     gem "E1", path: "../E1"
     gem "E2", path: "../E2"
     gem "F", path: "../F"
 
+Why do I need to add _group: :direct?_? In the first release, cobradeps was checking for direct: true, until some time ago this year, the extraneous option `direct:` worked, but then a check was added to not allow extra options and the feature has been broken ever since. (as stated by @shageman on his [merge commit](https://github.com/shageman/cobradeps/commit/6ccf345ab3a34d5f415bb2f381911a3143bb3fd5)).
+
+So the hack to allow cobradeps check for direct dependency was use one of the possible options that bundler allows on Gemfile, and as group is used to group gems, normally only used with common values (:production, :development and :test) what makes possible for cobradeps checks for _group: :direct_
+
 This is the [Gemfile of app A](https://github.com/shageman/cobradeps/blob/master/spec/examples/letters/A/Gemfile)
 from the letters example of which you see the graph above.
 

data/bin/cobradeps

@@ -9,11 +9,13 @@ cobradeps [OPTION] [application path]
 Component-based Ruby/Rails dependency grapher.
 
 Options are...
-    -t, --text                       DEFAULT Outputs a textual representation of the dependencies
-    -g, --graph                      Outputs graph.png to the current directory
-    -d, --dot                        Outputs graph.dot to the current directory
+    -t, --text                     DEFAULT Outputs a textual representation of the dependencies
+    -g FILENAME, --graph FILENAME  Outputs FILENAME.png to the current directory
+    -d FILENAME, --dot FILENAME    Outputs FILENAME.dot to the current directory
 
-    -h, -H, --help                   Display this help message.
+                                   Leave off the extensions of filenames. They will be added for you.
+
+    -h, -H, --help                 Display this help message.
   USAGE
 end
 
@@ -28,9 +30,10 @@ case ARGV.size
     else
       path = ARGV[0]
     end
-  when 2
+  when 3
     option = ARGV[0]
-    path = ARGV[1]
+    filename = ARGV[1]
+    path = ARGV[2]
   else
     puts "Incorrect invocation. Please see help:\n\n"
     puts help_text
@@ -41,9 +44,9 @@ if option
   if %w(--help -h -H).include? option
     puts help_text
   elsif %w(-g --graph).include? option
-    Cbradeps.output_graph path
+    Cbradeps.output_graph path, filename
   elsif %w(-d --dot).include? option
-    Cbradeps.output_dot path
+    Cbradeps.output_dot path, filename
   elsif %w(-t --text).include? option
     Cbradeps.output_text path
   end

data/cobradeps.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'cobradeps'
-  spec.version       = '0.3.1'
+  spec.version       = '0.4.0'
   spec.authors       = ['Stephan Hagemann']
   spec.email         = ['stephan.hagemann@gmail.com']
   spec.summary       = %q{Prints and exports the dependencies within component-based Ruby/Rails applications}

data/lib/cobradeps.rb

@@ -30,14 +30,14 @@ module Cbradeps
     outputs cobra_deps.to_a
   end
 
-  def self.output_graph(root_path = nil)
+  def self.output_graph(root_path = nil, filename)
     path = root_path || current_path
-    graph(path).output(:png => "graph.png")
+    graph(path).output(:png => "#{filename}.png")
   end
 
-  def self.output_dot(root_path = nil)
+  def self.output_dot(root_path = nil, filename)
     path = root_path || current_path
-    graph(path).output(:dot => "graph.dot")
+    graph(path).output(:dot => "#{filename}.dot")
   end
 
   def self.current_path
@@ -52,21 +52,33 @@ module Cbradeps
 
     app = GemfileScraper.new(path)
 
-    app_node = g.add_nodes(app.name)
-    gem_nodes[app.name] = app_node
-    outputs "Added #{app.name} app"
-
     cobra_deps = app.cobra_dependencies.to_a
-
+    around_g = g.add_graph("cluster0", label: app.name)
+    start_g = around_g.add_graph("cluster1", { label: "", style: "invis", margin: "0,0" })
+    
+    i = 0
     cobra_deps.each do |dep|
       gem = GemfileScraper.new(dep[:options][:path])
       gem_nodes[gem.name] = g.add_nodes(gem.name)
       outputs "Added #{gem.name} node"
       if dep[:options][:direct]
-        if !has_edge?(g, app_node, gem_nodes[gem.name])
-          g.add_edges(app_node, gem_nodes[gem.name])
-          outputs "Added edge from #{app.name} to #{gem.name}"
+        app_node = start_g.add_nodes(app.name + i.to_s)
+        i  += 1
+        gem_nodes[app.name] = app_node
+        app_node.set do |node|
+          node.shape = "box"
+          node.fixedsize = true;
+          node.height = 0
+          node.margin = "0,0"
+          node.label = ""
+          node.style = "invis"
         end
+        outputs "Added #{app.name} app"
+
+        # if !has_edge?(g, app_node, gem_nodes[gem.name])
+          around_g.add_edges(app_node, gem_nodes[gem.name])
+          outputs "Added edge from #{app.name} to #{gem.name}"
+        # end
         
       end
     end
@@ -76,7 +88,7 @@ module Cbradeps
       dep = cobra_deps[i]
       gem = GemfileScraper.new(dep[:options][:path])
       if !gem_nodes.has_key? gem.name
-          gem_nodes[gem.name] = g.add_nodes(gem.name)
+          gem_nodes[gem.name] = around_g.add_nodes(gem.name)
           outputs "Added #{gem.name} node"
       end
 
@@ -84,11 +96,11 @@ module Cbradeps
       gem_cobra_deps.each do |nest_dep|
         nest_gem = GemfileScraper.new(nest_dep[:options][:path])
         if !gem_nodes.has_key? nest_gem.name
-          gem_nodes[nest_gem.name] = g.add_nodes(nest_gem.name)
+          gem_nodes[nest_gem.name] = around_g.add_nodes(nest_gem.name)
           outputs "Added to #{nest_gem.name} node"
         end
         if !has_edge?(g, gem_nodes[gem.name], gem_nodes[nest_gem.name])
-          g.add_edges(gem_nodes[gem.name], gem_nodes[nest_gem.name]) 
+          around_g.add_edges(gem_nodes[gem.name], gem_nodes[nest_gem.name]) 
           outputs "Added edge from #{gem.name} to #{nest_gem.name}"
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cobradeps
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Stephan Hagemann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-25 00:00:00.000000000 Z
+date: 2017-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-graphviz
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Prints and exports the dependencies within component-based Ruby/Rails applications