dependence 0.0.91 → 0.0.92

data/lib/dependence/concatenator.rb

@@ -1,5 +1,6 @@
 require 'fileutils'
 require "dependence/colors"
+require "dependence/dependency_resolver"
 
 module Dependence
   # Take a load path + file glob and concat them into 1 file per directory
@@ -36,7 +37,7 @@ module Dependence
     end
 
     def get_files_in_dependency_order(dir, files)
-      resolver = DependencyResolver.new(files, dir)
+      resolver = DependencyResolver.new(files, dir, @options[:source_type])
       resolver.sorted_files
     end
 

data/lib/dependence/dependency_list.rb

@@ -0,0 +1,31 @@
+module Dependence
+  class DependencyList
+
+    def initialize(file_path, file_type)
+      @file_path = file_path
+      @file_type = file_type
+      @dependencies = []
+    end
+
+    def add_dependency(path)
+      (Dir.exists?(path))? add_multiple_dependencies(path) : add_single_dependency(path)
+    end
+
+    def get
+      @dependencies
+    end
+
+    private
+
+    def add_multiple_dependencies(directory)
+      glob = File.join(directory, @file_type).gsub("**/", "")
+      Dir.glob(glob).each { |file|  add_single_dependency(file) }
+    end
+
+    def add_single_dependency(file)
+      p(file)
+      @dependencies << file 
+    end
+
+  end
+end

data/lib/dependence/dependency_resolver.rb

@@ -1,33 +1,39 @@
 require 'rgl/adjacency'
 require 'rgl/topsort'
+require "dependence/dependency_list"
 
-class DependencyResolver
-  def initialize(file_list, file_path)
-    @files = file_list
-    @file_path = file_path
-    @graph = RGL::DirectedAdjacencyGraph.new
-  end
+module Dependence
+  class DependencyResolver
+    def initialize(file_list, file_path, file_type)
+      @files = file_list
+      @file_type = file_type
+      @file_path = file_path
+      @graph = RGL::DirectedAdjacencyGraph.new
+    end
 
-  def sorted_files
-    @files.each do |file|
-      @graph.add_vertex(file)
-      dependencies = get_dependencies_in(file)
-      dependencies.each {|dependency| @graph.add_edge(dependency,file) }
+    def sorted_files
+      @files.each do |file|
+        @graph.add_vertex(file)
+        dependencies = get_dependencies_in(file)
+        dependencies.each {|dependency| @graph.add_edge(dependency,file) }
+      end
+      @graph.topsort_iterator.to_a
     end
-    @graph.topsort_iterator.to_a
-  end
 
-  private
-  def get_dependencies_in(file)
-    dependencies = []
+    private
+
+    def get_dependencies_in(file)
+      dependency_list = DependencyList.new(@file_path, @file_type)
+      File.foreach(file) { |s| add_dependency_if_imported(dependency_list, s) }
+      dependency_list.get()
+    end
+
+    def add_dependency_if_imported(dep_list, file_content)
+      return unless file_content.include?("@import")
+      path = file_content.match(/@import (.*)/)[1].strip
+      dep_list.add_dependency File.join(@file_path, path) 
+    end
 
-    File.foreach(file) do |s|
-      if s.include?("@import")
-        file_name = s.match(/@import (.*)/)[1].strip
-        dependencies << File.join(@file_path, file_name) 
-      end
-    end 
-    return dependencies
   end
-end
 
+end

data/lib/dependence.rb

@@ -1,3 +1,4 @@
+require "dependence/dependency_list.rb"
 require "dependence/dependency_resolver.rb"
 require "dependence/module_injector.rb"
 require "dependence/js_compiler.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependence
 version: !ruby/object:Gem::Version
-  version: 0.0.91
+  version: 0.0.92
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgl
-  requirement: &2153688040 !ruby/object:Gem::Requirement
+  requirement: &2166268120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153688040
+  version_requirements: *2166268120
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &2153687600 !ruby/object:Gem::Requirement
+  requirement: &2166267680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153687600
+  version_requirements: *2166267680
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &2153687180 !ruby/object:Gem::Requirement
+  requirement: &2166267260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153687180
+  version_requirements: *2166267260
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &2153686760 !ruby/object:Gem::Requirement
+  requirement: &2166266840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153686760
+  version_requirements: *2166266840
 description: 
 email: jcarver989@gmail.com
 executables:
@@ -66,6 +66,7 @@ files:
 - compiler/compiler.jar
 - lib/dependence/colors.rb
 - lib/dependence/concatenator.rb
+- lib/dependence/dependency_list.rb
 - lib/dependence/dependency_resolver.rb
 - lib/dependence/file_watcher.rb
 - lib/dependence/js_compiler.rb