summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authormattn <[email protected]>2013-01-08 10:37:39 +0900
committermattn <[email protected]>2013-01-08 10:37:39 +0900
commitcb158653ae4e44409edb91cbd828e69563467841 (patch)
tree049fbf90ed98a95e0aada317a4e455db814f1a76
parent6e3b2b57d392b69f595b2a2f0c9ca2b0e586b10c (diff)
parent8c31c2006be7afa8da1fd01180955b108aee868c (diff)
downloadmruby-cb158653ae4e44409edb91cbd828e69563467841.tar.gz
mruby-cb158653ae4e44409edb91cbd828e69563467841.zip
Merge branch 'master' of https://github.com/mruby/mruby
-rw-r--r--doc/mrbgems/README.md4
-rw-r--r--tasks/mruby_build.rake4
2 files changed, 8 insertions, 0 deletions
diff --git a/doc/mrbgems/README.md b/doc/mrbgems/README.md
index cc28f48f8..9e930d8b2 100644
--- a/doc/mrbgems/README.md
+++ b/doc/mrbgems/README.md
@@ -27,6 +27,10 @@ A remote GIT repository location for a GEM is also supported:
conf.gem :git => 'https://github.com/masuidrive/mrbgems-example.git', :branch => 'master'
```
+```
+conf.gem :github => 'masuidrive/mrbgems-example', :branch => 'master'
+```
+
## GEM Structure
diff --git a/tasks/mruby_build.rake b/tasks/mruby_build.rake
index 65c80ab6a..d5dc075c3 100644
--- a/tasks/mruby_build.rake
+++ b/tasks/mruby_build.rake
@@ -67,6 +67,10 @@ module MRuby
end
def load_external_gem(params)
+ if params[:github]
+ params[:git] = "[email protected]:#{params[:github]}.git"
+ end
+
if params[:git]
url = params[:git]
gemdir = "build/mrbgems/#{url.match(/([-_\w]+)(\.[-_\w]+|)$/).to_a[1]}"