Move rbfiles_sorter to lib/; add libtest task

.travis.yml

@@ -15,4 +15,4 @@ addons:
       - gperf
 
 env: MRUBY_CONFIG=travis_config.rb
-script: "./minirake all test"
+script: "./minirake all test libtest"

Rakefile

@@ -117,6 +117,11 @@ task :all => depfiles do
   end
 end
 
+desc "run ruby lib tests"
+task :libtest do
+  sh "ruby -Ilib:test lib_test/*"
+end
+
 desc "run all mruby tests"
 task :test => ["all"] do
   MRuby.each_target do

lib/mruby/build/rbfiles_sorter.rb

@@ -0,0 +1,47 @@
+require 'tsort'
+
+module MRuby
+  class RbfilesSorter
+    include TSort
+
+    TAG_RXP = /^#\s*require:\s*['"]([\w\.\/]+)["']\s*$/
+
+    def initialize(root)
+      @root = root
+      @files = Dir.glob("#{root}/**/*.rb").sort
+      @deps = {}
+    end
+
+    def sort
+      @files.each { |f| parse_deps(f) }
+      tsort
+    end
+
+    def tsort_each_child(node, &block)
+      @deps[node].each(&block)
+    end
+
+    def tsort_each_node(&block)
+      @deps.each_key(&block)
+    end
+
+    def parse_deps(file)
+      f = File.new(file)
+
+      deps_list = @deps[File.expand_path(file)] = []
+
+      f.each_line do |line|
+        # Skip blank lines
+        next if line =~ /^\s*$/
+        # All requires should be in the beginning of the file
+        break if line !~ TAG_RXP
+
+        dep = line.match(TAG_RXP)[1]
+
+        dep += ".rb" unless dep.end_with?(".rb")
+
+        deps_list << File.expand_path(dep, File.dirname(file))
+      end
+    end
+  end
+end

lib/mruby/gem.rb

@@ -2,7 +2,7 @@
 require 'forwardable'
 require 'tsort'
 require 'shellwords'
-require_relative 'utils/rbfiles_sorter'
+require 'mruby/build/rbfiles_sorter'
 
 module MRuby
   module Gem

tasks/test/rbfiles_sorter_test.rb → lib_test/rbfiles_sorter_test.rb

@@ -1,13 +1,13 @@
 require "minitest/autorun"
 
-require_relative "../utils/rbfiles_sorter"
+require "mruby/build/rbfiles_sorter"
 
 class TestRbfilesSorter < Minitest::Test
   def test_sort
-    @sorter = RbfilesSorter.new("./support/rbfiles_sorter")
+    @sorter = MRuby::RbfilesSorter.new("#{__dir__}/support/rbfiles_sorter")
     sorted = @sorter.sort
 
-    root = File.expand_path("./support/rbfiles_sorter")
+    root = File.expand_path("#{__dir__}/support/rbfiles_sorter")
 
     assert_equal "#{root}/stuff/y.rb", sorted[0]
     assert_equal "#{root}/utils/x.rb", sorted[1]
@@ -16,10 +16,10 @@ def test_sort
   end
 
   def test_sort_without_requires
-    @sorter = RbfilesSorter.new("./support/rbfiles_sorter_2")
+    @sorter = MRuby::RbfilesSorter.new("#{__dir__}/support/rbfiles_sorter_2")
     sorted = @sorter.sort
 
-    root = File.expand_path("./support/rbfiles_sorter_2")
+    root = File.expand_path("#{__dir__}/support/rbfiles_sorter_2")
 
     assert_equal "#{root}/0_x.rb", sorted[0]
     assert_equal "#{root}/a.rb", sorted[1]