diff --git a/include/source.h b/include/source.h index d4ea0c3..b2805e3 100644 --- a/include/source.h +++ b/include/source.h @@ -110,9 +110,6 @@ MirrorSite // 开源社区 MirrorSite - RubyChina = {"rubychina", "RubyChina", "Ruby China 社区", "https://gems.ruby-china.com/", - "https://gems.ruby-china.com/rubygems/gems/nokogiri-1.15.0-java.gem"}, // 9.9 MB - NpmMirror = {"npmmirror", "npmmirror", "npmmirror (阿里云赞助)", "https://npmmirror.com/", // 注意，这个是跳转后的地址，不确定未来会不会改变 "https://cdn.npmmirror.com/packages/%40tensorflow/tfjs/4.10.0/tfjs-4.10.0.tgz"}, // 29MB @@ -142,34 +139,6 @@ typedef struct { } SourceInfo; -/** - * 2024-05-25 更新 - * - * @note - * 下面的源，并非都实现正确， - * BFSU 和 Tuna 以及 阿里的镜像都有问题，会循环遍历一个gem的所有版本，导致安装时间相当长 - * - * @note 网络情况 - * 若实现正确: - * 1. 目前北外最快最稳定 - * 2. 腾讯挺快，个别时候不稳定，但稳定时能达到4.5MB甚至以上 - * 3. tuna 有时快有时慢，不稳定，一般在3MB以下 - * 4. rubychina 有时快有时慢，快时一般在 2MB以下，慢时一般在1MB以下 - * 5. 阿里云最不稳定，经常最慢 - */ -static SourceInfo -pl_ruby_sources[] = { - {&Upstream, "https://rubygems.org"}, - {&Huawei, "https://mirrors.huaweicloud.com/repository/rubygems/"}, - {&Tencent, "https://mirrors.tencent.com/rubygems/"}, - {&RubyChina, "https://gems.ruby-china.com/"} - - // {&Bfsu, "https://mirrors.bfsu.edu.cn/rubygems/"}, - // {&Tuna, "https://mirrors.tuna.tsinghua.edu.cn/rubygems/"}, - // {&Ali, "https://mirrors.aliyun.com/rubygems/"}, -}, - - /** * 2024-04-18 更新 @@ -178,6 +147,7 @@ pl_ruby_sources[] = { * * @note 腾讯软件源虽然有npm的名，但名存实亡 */ +SourceInfo pl_nodejs_sources[] = { {&Upstream, NULL}, {&NpmMirror, "https://registry.npmmirror.com"}, @@ -904,7 +874,7 @@ wr_tex_sources[] = { #define def_sources_n(t) const size_t t##_sources_n = xy_arylen(t##_sources) -def_sources_n(pl_ruby); def_sources_n(pl_nodejs); +def_sources_n(pl_nodejs); def_sources_n(pl_perl); def_sources_n(pl_php); def_sources_n(pl_lua); def_sources_n(pl_go); def_sources_n(pl_rust); def_sources_n(pl_java); def_sources_n(pl_clojure); diff --git a/src/chsrc.c b/src/chsrc.c index 261ca5e..4aebbf0 100644 --- a/src/chsrc.c +++ b/src/chsrc.c @@ -22,71 +22,7 @@ #include "chsrc.h" -void -pl_ruby_getsrc (char *option) -{ - chsrc_run ("gem sources", RunOpt_Default); - chsrc_run ("bundle config get mirror.https://rubygems.org", RunOpt_Default); -} - -void -pl_ruby_remove_gem_source (const char *source) -{ - char *cmd = NULL; - if (is_url (source)) - { - cmd = xy_str_delete_suffix (source, "\n"); - cmd = xy_2strjoin ("gem sources -r ", cmd); - chsrc_run (cmd, RunOpt_Default); - } -} - -/** - * Ruby换源，参考：https://gitee.com/RubyMetric/rbenv-cn - */ -void -pl_ruby_setsrc (char *option) -{ - char *chsrc_type = xy_streql (option, ChsrcTypeReset) ? ChsrcTypeReset : ChsrcTypeAuto; - - chsrc_ensure_program ("gem"); - - SourceInfo source; - chsrc_yield_source (pl_ruby); - chsrc_confirm_source (&source); - - char *cmd = NULL; - - xy_run ("gem sources -l", 0, pl_ruby_remove_gem_source); - - cmd = xy_2strjoin ("gem source -a ", source.url); - chsrc_run (cmd, RunOpt_Default); - - - chsrc_ensure_program ("bundle"); - - char *where = " --global "; - if (CliOpt_Locally==true) - { - where = " --local "; - } - - cmd = xy_strjoin (4, "bundle config", where, "'mirror.https://rubygems.org' ", source.url); - chsrc_run (cmd, RunOpt_No_Last_New_Line); - - chsrc_say_lastly (&source, chsrc_type); - // puts (""); - // chsrc_note2 ("维护者提醒您: Ruby的镜像源目前仅有 腾讯软件源，RubyChina，华为开源镜像站 实现正确"); - // chsrc_note2 ("而其它如Tuna,Bfsu,Ali目前都实现的有问题，请勿使用"); -} - -void -pl_ruby_resetsrc (char *option) -{ - pl_ruby_setsrc (ChsrcTypeReset); -} - - +#include "recipe/lang/ruby.c" #include "recipe/lang/python.c" void @@ -2204,7 +2140,6 @@ wr_anaconda_setsrc (char *option) /************************************** Begin Target Matrix ****************************************/ -def_target_full(pl_ruby); def_target(pl_nodejs); def_target(pl_perl); def_target(pl_php); def_target(pl_lua); def_target(pl_rust); def_target(pl_go); def_target(pl_java); def_target(pl_dart); def_target(pl_ocaml); diff --git a/src/recipe/lang/ruby.c b/src/recipe/lang/ruby.c new file mode 100644 index 0000000..b92f77c --- /dev/null +++ b/src/recipe/lang/ruby.c @@ -0,0 +1,109 @@ +/** ------------------------------------------------------------ + * SPDX-License-Identifier: GPL-3.0-or-later + * ------------------------------------------------------------- + * Contributors : Aoran Zeng + * Created on : <2023-09-01> + * Last modified : <2024-08-09> + * ------------------------------------------------------------*/ + + +static MirrorSite +RubyChina = {"rubychina", "RubyChina", "Ruby China 社区", "https://gems.ruby-china.com/", + "https://gems.ruby-china.com/rubygems/gems/nokogiri-1.15.0-java.gem"}; // 9.9 MB + + + +/** + * 2024-05-25 更新 + * + * @note + * 下面的源，并非都实现正确， + * BFSU 和 Tuna 以及 阿里的镜像都有问题，会循环遍历一个gem的所有版本，导致安装时间相当长 + * + * @note 网络情况 + * 若实现正确: + * 1. 目前北外最快最稳定 + * 2. 腾讯挺快，个别时候不稳定，但稳定时能达到4.5MB甚至以上 + * 3. tuna 有时快有时慢，不稳定，一般在3MB以下 + * 4. rubychina 有时快有时慢，快时一般在 2MB以下，慢时一般在1MB以下 + * 5. 阿里云最不稳定，经常最慢 + */ +static SourceInfo +pl_ruby_sources[] = { + {&Upstream, "https://rubygems.org"}, + {&Huawei, "https://mirrors.huaweicloud.com/repository/rubygems/"}, + {&Tencent, "https://mirrors.tencent.com/rubygems/"}, + {&RubyChina, "https://gems.ruby-china.com/"} + + // {&Bfsu, "https://mirrors.bfsu.edu.cn/rubygems/"}, + // {&Tuna, "https://mirrors.tuna.tsinghua.edu.cn/rubygems/"}, + // {&Ali, "https://mirrors.aliyun.com/rubygems/"}, +}; +def_sources_n(pl_ruby); + + +void +pl_ruby_getsrc (char *option) +{ + chsrc_run ("gem sources", RunOpt_Default); + chsrc_run ("bundle config get mirror.https://rubygems.org", RunOpt_Default); +} + +void +pl_ruby_remove_gem_source (const char *source) +{ + char *cmd = NULL; + if (is_url (source)) + { + cmd = xy_str_delete_suffix (source, "\n"); + cmd = xy_2strjoin ("gem sources -r ", cmd); + chsrc_run (cmd, RunOpt_Default); + } +} + +/** + * Ruby换源，参考：https://gitee.com/RubyMetric/rbenv-cn + */ +void +pl_ruby_setsrc (char *option) +{ + char *chsrc_type = xy_streql (option, ChsrcTypeReset) ? ChsrcTypeReset : ChsrcTypeAuto; + + chsrc_ensure_program ("gem"); + + SourceInfo source; + chsrc_yield_source (pl_ruby); + chsrc_confirm_source (&source); + + char *cmd = NULL; + + xy_run ("gem sources -l", 0, pl_ruby_remove_gem_source); + + cmd = xy_2strjoin ("gem source -a ", source.url); + chsrc_run (cmd, RunOpt_Default); + + + chsrc_ensure_program ("bundle"); + + char *where = " --global "; + if (CliOpt_Locally==true) + { + where = " --local "; + } + + cmd = xy_strjoin (4, "bundle config", where, "'mirror.https://rubygems.org' ", source.url); + chsrc_run (cmd, RunOpt_No_Last_New_Line); + + chsrc_say_lastly (&source, chsrc_type); + // puts (""); + // chsrc_note2 ("维护者提醒您: Ruby的镜像源目前仅有 腾讯软件源，RubyChina，华为开源镜像站 实现正确"); + // chsrc_note2 ("而其它如Tuna,Bfsu,Ali目前都实现的有问题，请勿使用"); +} + +void +pl_ruby_resetsrc (char *option) +{ + pl_ruby_setsrc (ChsrcTypeReset); +} + +def_target_full(pl_ruby);