cobradeps 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 995be0ba3bdb1d3cdcae0a097b800a46534db785
-  data.tar.gz: c338653327cf27c0ae37d6e683d53744f5b4ce18
+  metadata.gz: 6a9c8b4c793f5ec42669a805a30f7009afe7b21d
+  data.tar.gz: e1a3483db3d315cf506d9f8f8e4bcda2c2ddcc62
 SHA512:
-  metadata.gz: 5efcc9f3c41d77dfa4a04a0a9361c01f2b6b7ea4025b913be9b4556c1840b4e45b380b6983b8f868f2dab8c6d009a8f38797a27167e46e537f3ee7d9fa6657a6
-  data.tar.gz: bd4b369f022a5999f61f9c7507155baec464dbfd511fd92848b56369e614c241eb254054e31e8c7e26dc583974aff862537800a5c63729a9f7f8915ff6dcd79a
+  metadata.gz: c409d6abcc223fb5ac10b74bc034a2c73d3b7e7b4509bc8f513bae0c9a333fbc6bcdcb044c682099e5ef7d7cde1b143e3f9d835c0d3fcb7f053c1fdf73522e4f
+  data.tar.gz: d488aa0db1af3ac1a164eec3b675fa1d21d2eeb0d5a80c30bb92c7d723482999e1a31eae33bbd1d4c2a6dbd648cce05ac89c3bf3b19312a3590a72f33401e8e1

data/README.md

@@ -1,6 +1,6 @@
 # cobradeps [![Build Status](https://travis-ci.org/shageman/cobradeps.svg?branch=master)](https://travis-ci.org/shageman/cobradeps) [![Gem Version](https://badge.fury.io/rb/cobradeps.svg)](http://badge.fury.io/rb/cobradeps) [![Code Climate](https://codeclimate.com/github/shageman/cobradeps.png)](https://codeclimate.com/github/shageman/cobradeps) [![Dependency Status](https://gemnasium.com/shageman/cobradeps.svg)](https://gemnasium.com/shageman/cobradeps)
 
-Prints and exports the dependencies within component-based Ruby/Rails applications (#cobra)
+Prints and exports the dependencies within component-based Ruby/Rails applications (#cbra)
 
 ## Installation
 
@@ -15,6 +15,22 @@ And then execute:
 Or install it yourself as:
 
     $ gem install cobradeps
+    
+### Dependencies
+
+You need [Graphviz](http://graphviz.org/) to generate the graph.png
+
+#### OS X
+
+If you're using OS X and homebrew, you just need to:
+
+```bash
+brew install graphviz
+```
+
+#### Other Operating Systems
+
+For more information about installation on other operating systems, just check [Graphviz Download Page](http://graphviz.org/Download..php)
 
 ## Usage
 
@@ -35,6 +51,20 @@ There are sample #cobra folder structures in `spec/examples`. Here is the graph
 
 ![Letters graph](https://raw.githubusercontent.com/shageman/cobradeps/master/spec/examples/letters.png)
 
+## Using `path "..." do` blocks
+The preferred method of referencing #cbra dependencies is via the path block syntax supported by bundler(http://teotti.com/gemfiles-hierarchy-in-ruby-on-rails-component-based-architecture/):
+
+    path "../" do
+      gem "B"
+      gem "C"
+      gem "D"
+      gem "E1"
+      gem "E2"
+      gem "F"
+    end
+
+Note, that you only need to add direct dependencies when using the block syntax (and not transitive dependencies as discussed below).
+
 ## #cobra extension to Gemfile
 
 The :path option used for #cobras is typically a relative path. Because of that all gems and apps transitively including a

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.1.1'
+  spec.version       = '0.2.1'
   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

@@ -13,14 +13,17 @@ module Cbradeps
     outputs app.to_s
 
     outputs "\n\nDEPENDENCIES"
-    cobra_deps = app.transitive_cobra_dependencies.to_set
+    cobra_deps = app.cobra_dependencies.to_a
 
-    cobra_deps.each do |dep|
+    i = 0
+    while (i < cobra_deps.size) do
+      dep = cobra_deps[i]
       outputs "\n#{dep[:options][:path]}"
       gem = GemfileScraper.new(dep[:options][:path])
       outputs gem.to_s
 
-      cobra_deps = cobra_deps.merge gem.cobra_dependencies
+      cobra_deps += gem.cobra_dependencies
+      i+=1
     end
 
     outputs "\n\n ALL PARTS"
@@ -45,36 +48,47 @@ module Cbradeps
 
   def self.graph(path)
     g = GraphViz.new(:G, :type => :digraph, concentrate: true)
+    gem_nodes = {}
 
     app = GemfileScraper.new(path)
 
     app_node = g.add_nodes(app.name)
-    outputs "Added #{app.name} node"
+    gem_nodes[app.name] = app_node
+    outputs "Added #{app.name} app"
 
-    cobra_deps = app.transitive_cobra_dependencies.to_set
-    gem_nodes = {}
+    cobra_deps = app.cobra_dependencies.to_a
 
     cobra_deps.each do |dep|
       gem = GemfileScraper.new(dep[:options][:path])
-      gem_node = g.add_nodes(gem.name)
-      gem_nodes[gem.name] = gem_node
+      gem_nodes[gem.name] = g.add_nodes(gem.name)
       outputs "Added #{gem.name} node"
       if dep[:options][:direct]
         outputs "Added edge from #{app.name} to #{gem.name}"
-        g.add_edges(app_node, gem_node)
+        g.add_edges(app_node, gem_nodes[gem.name])
       end
     end
 
-    cobra_deps.each do |dep|
+    i = 0
+    while (i < cobra_deps.size) do
+      dep = cobra_deps[i]
       gem = GemfileScraper.new(dep[:options][:path])
-      gem_node = gem_nodes[gem.name]
+      if !gem_nodes.has_key? gem.name
+          gem_nodes[gem.name] = g.add_nodes(gem.name)
+          outputs "Added #{gem.name} node"
+      end
 
       gem_cobra_deps = gem.cobra_dependencies
       gem_cobra_deps.each do |nest_dep|
         nest_gem = GemfileScraper.new(nest_dep[:options][:path])
-        g.add_edges(gem_node, gem_nodes[nest_gem.name])
+        if !gem_nodes.has_key? nest_gem.name
+          gem_nodes[nest_gem.name] = g.add_nodes(nest_gem.name)
+          outputs "Added to #{nest_gem.name} node"
+        end
+        g.add_edges(gem_nodes[gem.name], gem_nodes[nest_gem.name])
         outputs "Added edge from #{gem.name} to #{nest_gem.name}"
       end
+      cobra_deps += gem.cobra_dependencies
+      i+=1
     end
     g
   end

data/lib/cobradeps/gemfile_scraper.rb

@@ -19,6 +19,8 @@ module Cbradeps
       end
     end
 
+    private
+
     def transitive_cobra_dependencies
       gem_dependencies.inject([]) do |memo, dep|
         if !!dep[:options][:path]
@@ -30,8 +32,6 @@ module Cbradeps
       end
     end
 
-    private
-
     def raw_gemspec
       path = File.expand_path(File.join(@root_path, "#{underscore(name)}.gemspec"))
       File.exist?(path) ? File.read(path) : ""
@@ -51,10 +51,20 @@ module Cbradeps
     end
 
     def gem_dependencies
+      in_path_block_dir = nil
       raw_gemfile.split("\n").inject([]) do |memo, line|
-        match = line.match(/gem\s+["']([^'"]+)["'](.*)/)
-        if match
-          memo << {name: match[1], options: OptionParser.new(match[2]).parse}
+        if in_path_block_dir
+          if match = line.match(/gem\s+["']([^'"]+)["'](.*)/)
+            memo << {name: match[1], options: {path: "#{in_path_block_dir}/#{match[1]}", direct: true}}
+          elsif line.match(/end/)
+            in_path_block_dir = nil
+          end
+        else
+          if match = line.match(/gem\s+["']([^'"]+)["'](.*)/)
+            memo << {name: match[1], options: NonBlockOptionParser.new(match[2]).parse}
+          elsif match = line.match(/path\s+[\"\'\:]?([^\"\']*)[\"\']?\s+do/)
+            in_path_block_dir = match[1]
+          end
         end
         memo
       end
@@ -68,7 +78,7 @@ module Cbradeps
           downcase
     end
 
-    class OptionParser
+    class NonBlockOptionParser
       def initialize(options)
         @options = options
       end
@@ -85,7 +95,7 @@ module Cbradeps
       end
 
       def direct
-        match = @options.match(/direct(?:\s*=>|:)\s+true/)
+        match = @options.match(/group(?:\s*=>|:)\s+:direct/)
         match ? {direct: true} : {}
       end
     end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: cobradeps
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Stephan Hagemann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-graphviz
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |
@@ -76,14 +76,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/cobradeps
-- cobradeps.gemspec
 - Gemfile
-- lib/cobradeps/gemfile_scraper.rb
-- lib/cobradeps.rb
 - LICENSE
-- Rakefile
 - README.md
+- Rakefile
+- bin/cobradeps
+- cobradeps.gemspec
+- lib/cobradeps.rb
+- lib/cobradeps/gemfile_scraper.rb
 homepage: https://github.com/shageman/cobradeps
 licenses:
 - MIT
@@ -94,17 +94,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Prints and exports the dependencies within component-based Ruby/Rails applications