codependency 2.3.0 → 2.3.1

data/Rakefile

@@ -4,3 +4,4 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new :spec
 
+task :default => :spec

data/lib/codependency/graph.rb

@@ -10,15 +10,29 @@ module Codependency
     # Any dependent files will also be recursively added to this
     # graph.
     def require( string )
-      file = path_to( string ).to_path
+      file = path_to string
+
+      return if key?( file )
 
       self[ file ] ||= parser.parse( file ).map do |short|
-        path_to( path[ short ] ).to_path
+        path_to path[ short ]
+      end
+      self[ file ].each do |dependency|
+        self.require dependency
       end
-      self[ file ].each { |f| self.require( f ) unless key?( f ) }
     end
     alias :<< :require
 
+    ##
+    # Parses all of the files in the given glob and adds their
+    # dependencies to the graph. A file in this glob is not added
+    # to the graph unless another file in the glob depends on it.
+    def scan( glob )
+      Dir[ glob ].map { |file| parser.parse( file ) }.flatten.uniq.each do |short|
+        self.require path[ short ]
+      end
+    end
+
     ##
     # Returns the sorted list of files as determined by this graph,
     # relative to the calling file.
@@ -60,18 +74,14 @@ module Codependency
     end
 
     ##
-    # Calculates the relative path from one path the `#root` path. Accepts
-    # a string, returns a Pathname object populated with the relative path.
+    # Returns the given path, relative to the `#root` path.
     def path_to( string )
       path = Pathname( string )
-      path = path.expand_path
-      path = path.relative_path_from( root )
+              .expand_path
+              .relative_path_from( root )
+              .to_path
 
-      if path.to_path.start_with?( '.' )
-        path
-      else
-        Pathname( File.join( '.', path.to_path ) )
-      end
+      path.start_with?( '.' ) ? path : File.join( '.', path )
     end
   end
 end

data/lib/codependency/version.rb

@@ -1,3 +1,3 @@
 module Codependency
-  VERSION = '2.3.0'
+  VERSION = '2.3.1'
 end

data/spec/codependency/graph_spec.rb

@@ -9,6 +9,8 @@ describe Codependency::Graph do
   end
 
   describe '#require', :fixtures => true do
+    before { subject.require file }
+
     describe 'solar_system' do
       example( 'body.rb'   ){ verify { subject } }
       example( 'earth.rb'  ){ verify { subject } }
@@ -36,6 +38,8 @@ describe Codependency::Graph do
   end
 
   describe '#tsort', :fixtures => true do
+    before { subject.require file }
+
     describe 'solar_system' do
       example( 'body.rb'   ){ verify { subject.tsort } }
       example( 'earth.rb'  ){ verify { subject.tsort } }
@@ -63,6 +67,8 @@ describe Codependency::Graph do
   end
 
   describe '#files', :fixtures => true do
+    before { subject.require file }
+
     describe 'solar_system' do
       example( 'body.rb'   ){ verify { subject.files } }
       example( 'earth.rb'  ){ verify { subject.files } }
@@ -77,9 +83,9 @@ describe Codependency::Graph do
       example( 'toast.js'    ){ verify { subject.files } }
     end
     describe 'lox' do
-      example( 'money.rb'   ){ expect { subject.tsort }.to raise_error( TSort::Cyclic ) }
-      example( 'power.rb'   ){ expect { subject.tsort }.to raise_error( TSort::Cyclic ) }
-      example( 'respect.rb' ){ expect { subject.tsort }.to raise_error( TSort::Cyclic ) }
+      example( 'money.rb'   ){ expect { subject.files }.to raise_error( TSort::Cyclic ) }
+      example( 'power.rb'   ){ expect { subject.files }.to raise_error( TSort::Cyclic ) }
+      example( 'respect.rb' ){ expect { subject.files }.to raise_error( TSort::Cyclic ) }
     end
     describe 'assets' do
       example( 'templates/account.js' ){ verify { subject.files } }
@@ -88,4 +94,19 @@ describe Codependency::Graph do
       example( 'application.js'       ){ verify { subject.files } }
     end
   end
+
+  describe '#scan', :fixtures => true do
+    before { subject.scan file }
+
+    describe 'solar_system' do
+      example( '*.rb' ){ verify { subject.files } }
+    end
+    describe 'breakfast' do
+      example( '*.js' ){ verify { subject.files } }
+    end
+    describe 'assets' do
+      example( '*.js' ){ verify { subject.files } }
+      example( 'templates/*.js' ){ verify { subject.files } }
+    end
+  end
 end

data/spec/codependency/graph_spec/codependency_graph/scan/assets/js.txt

@@ -0,0 +1,5 @@
+[
+  [0] "./spec/fixtures/assets/templates/history.js",
+  [1] "./spec/fixtures/assets/templates/account.js",
+  [2] "./spec/fixtures/assets/templates/user.js"
+]

data/spec/codependency/graph_spec/codependency_graph/scan/assets/templates_js.txt

@@ -0,0 +1,4 @@
+[
+  [0] "./spec/fixtures/assets/templates/history.js",
+  [1] "./spec/fixtures/assets/templates/account.js"
+]

data/spec/codependency/graph_spec/codependency_graph/scan/breakfast/js.txt

@@ -0,0 +1,5 @@
+[
+  [0] "./spec/fixtures/breakfast/butter.js",
+  [1] "./spec/fixtures/breakfast/egg.js",
+  [2] "./spec/fixtures/breakfast/toast.js"
+]

data/spec/codependency/graph_spec/codependency_graph/scan/solar_system/rb.txt

@@ -0,0 +1,5 @@
+[
+  [0] "./spec/fixtures/solar_system/body.rb",
+  [1] "./spec/fixtures/solar_system/planet.rb",
+  [2] "./spec/fixtures/solar_system/mars.rb"
+]

data/spec/support/approvals.rb

@@ -1,5 +1,9 @@
 require 'rspec/approvals'
 
+module Approvals
+
+end
+
 ##
 # Simple shared context for allowing fixture-based examples to be
 # declared by using the example and example group names.
@@ -10,5 +14,4 @@ shared_context 'fixtures', :fixtures => true do
   let( :file ){ File.join './spec/fixtures', dirname, basename }
 
   before { subject.path << './spec/fixtures' }
-  before { subject.require file }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: codependency
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -125,6 +125,10 @@ files:
 - spec/codependency/graph_spec/codependency_graph/require/solar_system/mars_rb.txt
 - spec/codependency/graph_spec/codependency_graph/require/solar_system/phobos_rb.txt
 - spec/codependency/graph_spec/codependency_graph/require/solar_system/planet_rb.txt
+- spec/codependency/graph_spec/codependency_graph/scan/assets/js.txt
+- spec/codependency/graph_spec/codependency_graph/scan/assets/templates_js.txt
+- spec/codependency/graph_spec/codependency_graph/scan/breakfast/js.txt
+- spec/codependency/graph_spec/codependency_graph/scan/solar_system/rb.txt
 - spec/codependency/graph_spec/codependency_graph/tsort/assets/application_js.txt
 - spec/codependency/graph_spec/codependency_graph/tsort/assets/templates_account_js.txt
 - spec/codependency/graph_spec/codependency_graph/tsort/assets/templates_history_js.txt
@@ -214,6 +218,10 @@ test_files:
 - spec/codependency/graph_spec/codependency_graph/require/solar_system/mars_rb.txt
 - spec/codependency/graph_spec/codependency_graph/require/solar_system/phobos_rb.txt
 - spec/codependency/graph_spec/codependency_graph/require/solar_system/planet_rb.txt
+- spec/codependency/graph_spec/codependency_graph/scan/assets/js.txt
+- spec/codependency/graph_spec/codependency_graph/scan/assets/templates_js.txt
+- spec/codependency/graph_spec/codependency_graph/scan/breakfast/js.txt
+- spec/codependency/graph_spec/codependency_graph/scan/solar_system/rb.txt
 - spec/codependency/graph_spec/codependency_graph/tsort/assets/application_js.txt
 - spec/codependency/graph_spec/codependency_graph/tsort/assets/templates_account_js.txt
 - spec/codependency/graph_spec/codependency_graph/tsort/assets/templates_history_js.txt