Unverified Commit 9219a43c authored by Mislav Marohnić's avatar Mislav Marohnić Committed by GitHub
Browse files

Merge pull request #1198 from yyuu/http-client-based-on-envvar 

Allow overriding HTTP client type based on environment variable of `RUBY_BUILD_HTTP_CLIENT`
parents 48be7c6d 6b4bd271

README.md

+4 −0
Original line number Diff line number Diff line
@@ -69,6 +69,10 @@ The build process may be configured through the following environment variables: 
| `TMPDIR`                 | Where temporary files are stored.                                                                |

| `RUBY_BUILD_BUILD_PATH`  | Where sources are downloaded and built. (Default: a timestamped subdirectory of `TMPDIR`)        |

| `RUBY_BUILD_CACHE_PATH`  | Where to cache downloaded package files. (Default: `~/.rbenv/cache` if invoked as rbenv plugin)  |

| `RUBY_BUILD_HTTP_CLIENT` | One of `aria2c`, `curl`, or `wget` to use for downloading. (Default: first one found in PATH)    |

| `RUBY_BUILD_ARIA2_OPTS`  | Additional options to pass to `aria2c` for downloading.                                          |

| `RUBY_BUILD_CURL_OPTS`   | Additional options to pass to `curl` for downloading.                                            |

| `RUBY_BUILD_WGET_OPTS`   | Additional options to pass to `wget` for downloading.                                            |

| `RUBY_BUILD_MIRROR_URL`  | Custom mirror URL root.                                                                          |

| `RUBY_BUILD_SKIP_MIRROR` | Always download from official sources, not mirrors. (Default: unset)                             |

| `RUBY_BUILD_ROOT`        | Custom build definition directory. (Default: `share/ruby-build`)                                 |

bin/ruby-build

+19 −14
Original line number Diff line number Diff line
@@ -300,20 +300,25 @@ verify_checksum() { 


http() {

  local method="$1"

  local url="$2"

  local file="$3"

  [ -n "$url" ] || return 1



  if type aria2c &>/dev/null; then

    "http_${method}_aria2c" "$url" "$file"

  elif type curl &>/dev/null; then

    "http_${method}_curl" "$url" "$file"

  elif type wget &>/dev/null; then

    "http_${method}_wget" "$url" "$file"

  else

    echo "error: please install \`aria2c\`, \`curl\` or \`wget\` and try again" >&2

    exit 1

  [ -n "$2" ] || return 1

  shift 1



  RUBY_BUILD_HTTP_CLIENT="${RUBY_BUILD_HTTP_CLIENT:-$(detect_http_client)}"

  [ -n "$RUBY_BUILD_HTTP_CLIENT" ] || return 1



  "http_${method}_${RUBY_BUILD_HTTP_CLIENT}" "$@"

}



detect_http_client() {

  local client

  for client in aria2c curl wget; do

    if type "$client" &>/dev/null; then

      echo "$client"

      return

    fi

  done

  echo "error: please install \`aria2c\`, \`curl\`, or \`wget\` and try again" >&2

  return 1

}



http_head_aria2c() {

test/build.bats

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ export CC=cc 
export -n RUBY_CONFIGURE_OPTS



setup() {

  ensure_not_found_in_path aria2c

  mkdir -p "$INSTALL_ROOT"

  stub md5 false

  stub curl false

test/cache.bats

+0 −2
Original line number Diff line number Diff line
@@ -3,10 +3,8 @@ 
load test_helper

export RUBY_BUILD_SKIP_MIRROR=1

export RUBY_BUILD_CACHE_PATH="$TMP/cache"

export RUBY_BUILD_CURL_OPTS=



setup() {

  ensure_not_found_in_path aria2c

  mkdir "$RUBY_BUILD_CACHE_PATH"

}

test/checksum.bats

+0 −5
Original line number Diff line number Diff line
@@ -3,11 +3,6 @@ 
load test_helper

export RUBY_BUILD_SKIP_MIRROR=1

export RUBY_BUILD_CACHE_PATH=

export RUBY_BUILD_CURL_OPTS=



setup() {

  ensure_not_found_in_path aria2c

}





@test "package URL without checksum" {