Merge pull request #2846 from take-cheeze/mgem_mrbgem

Add :mgem gem loading.

1 files changed, 13 insertions, 2 deletions

diff --git a/tasks/mrbgem_spec.rake b/tasks/mrbgem_spec.rake
index e6e17e182..e22a39e19 100644
--- a/tasks/mrbgem_spec.rake
+++ b/tasks/mrbgem_spec.rake
@@ -304,7 +304,14 @@ module MRuby
         default_gems = []
         each do |g|
           g.dependencies.each do |dep|
-            default_gems << dep if dep[:default] and not gem_table.key? dep[:gem]
+            unless gem_table.key? dep[:gem]
+              if dep[:default]; default_gems << dep
+              elsif File.exist? "#{root}/mrbgems/#{dep[:gem]}" # check core
+                default_gems << { :gem => dep[:gem], :default => { :core => dep[:gem] } }
+              else # fallback to mgem-list
+                default_gems << { :gem => dep[:gem], :default => { :mgem => dep[:gem] } }
+              end
+            end
           end
         end
 
@@ -316,7 +323,11 @@ module MRuby
           spec.setup
 
           spec.dependencies.each do |dep|
-            default_gems << dep if dep[:default] and not gem_table.key? dep[:gem]
+            unless gem_table.key? dep[:gem]
+              if dep[:default]; default_gems << dep
+              else default_gems << { :gem => dep[:gem], :default => { :mgem => dep[:gem] } }
+              end
+            end
           end
           gem_table[spec.name] = spec
         end