Commit d536fa7a authored by Mislav Marohnić's avatar Mislav Marohnić
Browse files

Merge branch 'duplicate-versions' 

Closes #646, fixes #641
parents 194e007e ffcb7ed6

bin/ruby-build

+1 −1
Changes for bin/ruby-build: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -969,7 +969,7 @@ list_definitions() { 
  { for DEFINITION_DIR in "${RUBY_BUILD_DEFINITIONS[@]}"; do

      [ -d "$DEFINITION_DIR" ] && ls "$DEFINITION_DIR"

    done

  } | sort_versions

  } | sort_versions | uniq

}



sort_versions() {

test/definitions.bats

+15 −0
Changes for test/definitions.bats: 15 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -94,3 +94,18 @@ jruby-9000" 
  run ruby-build --definitions

  assert_success "$expected"

}



@test "removing duplicate Ruby versions" {

  export RUBY_BUILD_ROOT="$TMP"

  export RUBY_BUILD_DEFINITIONS="${RUBY_BUILD_ROOT}/share/ruby-build"

  mkdir -p "$RUBY_BUILD_DEFINITIONS"

  touch "${RUBY_BUILD_DEFINITIONS}/1.9.3"

  touch "${RUBY_BUILD_DEFINITIONS}/2.2.0"



  run ruby-build --definitions

  assert_success

  assert_output <<OUT

1.9.3

2.2.0

OUT

}