rvm 1.0.15 → 1.0.17

data/config/md5

@@ -1,88 +1,136 @@
+GemStone-24407.Darwin-i386.tar.gz=2f293e1927b8a1c5a060fe174f7ec614
+GemStone-24407.Linux-x86_64.tar.gz=aa4436623199dba79eb5bc8652316b07
+MacRuby%200.5.zip=675454a8c7bc19d606d90a726e08427c
+MacRuby%200.6.zip=a80afd3700c88cf95c539fc63b272faf
+MacRuby%200.7.1.zip=e8245dcd03c0757dfae7e6fee913947a
+MacRuby%200.7.zip=0bb60588c9ec9b1517665743bb05132f
+MagLev-24407.Darwin-i386.tar.gz=4aa0a3c35c63c876c8f786691a20dcb5
+MagLev-24407.Linux-x86_64.tar.gz=ab6928f5a39231efb86253e8b8e00134
+curl-7.19.7.tar.gz=ecb2e37e45c9933e2a963cabe03670ab
+ironruby-1.0.zip=7a92888837b3507355ed391dbfc0ab83
+jruby-bin-1.3.1.tar.gz=4a95db8fc93ed7219663fbede98b6117
+jruby-bin-1.4.0.tar.gz=f37322c18e9134e91e064aebb4baa4c7
+jruby-bin-1.4.0.zip=3a9c8a5115a679da7d7a49a56d57d4c0
+jruby-bin-1.4.1.tar.gz=a4aa8c43d1b9ffd9dbc6cb738d55a034
+jruby-bin-1.4.tar.gz=54dba9a88b2b3f99ac86a79828d0178b
+jruby-bin-1.5.0.RC1.tar.gz=47b4ca2a21659d36a2775ade0a2534c4
+jruby-bin-1.5.0.RC3.tar.gz=9c2758600de903b8ca07cb1341f4f1b3
+jruby-bin-1.5.0.tar.gz=ee2b4e326e8b87858e5dd0c8e94102e6
+jruby-bin-1.5.1.tar.gz=0196dcfb17354f12253eaddc1166a0ee
+jruby-bin-1.5.2.tar.gz=d239deb9a108a6abbfbd6cb79cf8255b
+jruby-bin-1.5.3.tar.gz=ccb0b2dbc300d8dd4ad1bd4da48b8320
+libiconv-1.13.1.tar.gz=7ab33ebd26687c744a37264a330bbe9a
+ncurses.tar.gz=cce05daf61a64501ef6cd8da1f727ec6
+openssl-0.9.8k.tar.gz=e555c6d58d276aec7fdc53363e338ab3
+openssl-0.9.8n.tar.gz=076d8efc3ed93646bd01f04e23c07066
+pkg-config-0.23.tar.gz=d922a88782b64441d06547632fd85744
+readline-5.2.tar.gz=e39331f32ad14009b9ff49cc10c5e751
+readline-6.0.tar.gz=b7f65a48add447693be6e86f04a63019
+rubinius-1.0.0-20100514.tar.gz=b05f4e791d3712c5a50b3d210dac6eb0
 rubinius-1.0.0-rc1-20091125.tar.gz=c1cf037f05caf1bc962c09e220b435f4
 rubinius-1.0.0-rc4-20100331.tar.gz=c631131cc9542c548b4fc3791d8aa6b2
 rubinius-1.0.0-rc5-20100510.tar.gz=d4fbb5b01aaeee3948cbe1cd38236524
-rubinius-1.0.0-20100514.tar.gz=b05f4e791d3712c5a50b3d210dac6eb0
 rubinius-1.0.1-20100603.tar.gz=eb185703c7ae0c0210e8dcb7f783ee8e
 rubinius-1.1.0-20100923.tar.gz=e2ae16238b201de09975abe19da09ea9
+ruby-1.8.5-p115.tar.bz2=03955e3c367b9beb3efe144c9f00d689
 ruby-1.8.5-p115.tar.gz=20ca6cc87eb077296806412feaac0356
+ruby-1.8.5-p231.tar.bz2=327f5aa6573787432222e96195cffd1e
 ruby-1.8.5-p231.tar.gz=e900cf225d55414bffe878f00a85807c
+ruby-1.8.6-p286.tar.bz2=e6b6bf8f34370e433936adb7a7065e63
 ruby-1.8.6-p286.tar.gz=797ea136fe43e4286c9362ee4516674e
+ruby-1.8.6-p287.tar.bz2=80b5f3db12531d36e6c81fac6d05dda9
 ruby-1.8.6-p287.tar.gz=6ff3420094711266c3201a0c7c2faa38
+ruby-1.8.6-p369.tar.bz2=c3c1f3dd0dfbd2e17a04e59c2f12cfc8
 ruby-1.8.6-p369.tar.gz=8c140ae28b4c3947b92dfad69109d90b
+ruby-1.8.6-p383.tar.bz2=a48703cd982b9f0e3002700a50b0e88e
 ruby-1.8.6-p383.tar.gz=4f49544d4a4d0d34e9d86c41e853db2e
+ruby-1.8.6-p398.tar.bz2=fbd43dc44ee26be4d37e6bebbed6f8bd
 ruby-1.8.6-p398.tar.gz=736db5f56c2d9b0136e563d049249fa8
+ruby-1.8.6-p399.tar.bz2=f77c307cb72fb8808b0e85af5d05cefc
 ruby-1.8.6-p399.tar.gz=c3d16cdd3c1ee8f3b7d1c399d4884e33
+ruby-1.8.7-p160.tar.bz2=f8ddb886b8a81cf005f53e9a9541091d
 ruby-1.8.7-p160.tar.gz=945398f97e2de6dd8ab6df68d10bb1a1
+ruby-1.8.7-p174.tar.bz2=88c45aaf627b4404e5e4273cb03ba2ee
 ruby-1.8.7-p174.tar.gz=18dcdfef761a745ac7da45b61776afa5
+ruby-1.8.7-p248.tar.bz2=37e19d46b7d4b845f57d3389084b94a6
 ruby-1.8.7-p248.tar.gz=60a65374689ac8b90be54ca9c61c48e3
+ruby-1.8.7-p249.tar.bz2=37200cc956a16996bbfd25bb4068f242
 ruby-1.8.7-p249.tar.gz=d7db7763cffad279952eb7e9bbfc221c
+ruby-1.8.7-p299.tar.bz2=244439a87d75ab24170a9c2b451ce351
 ruby-1.8.7-p299.tar.gz=43533980ee0ea57381040d4135cf9677
+ruby-1.8.7-p302.tar.bz2=a6a9e37079ed8cf8726b455dad3de939
 ruby-1.8.7-p302.tar.gz=a6a9e37079ed8cf8726b455dad3de939
+ruby-1.9.0.tar.bz2=17eb66ac3721340d21db352d8f5dec76
+ruby-1.9.1-p129.tar.bz2=6fa62b20f72da471195830dec4eb2013
 ruby-1.9.1-p129.tar.gz=c71f413514ee6341c627be2957023a5c
+ruby-1.9.1-p243.tar.bz2=66d4f8403d13623051091347764881a0
 ruby-1.9.1-p243.tar.gz=515bfd965814e718c0943abf3dde5494
+ruby-1.9.1-p376.tar.bz2=e019ae9c643c5efe91be49e29781fb94
 ruby-1.9.1-p376.tar.gz=ebb20550a11e7f1a2fbd6fdec2a3e0a3
-ruby-1.9.1-p376.tar.gz=ebb20550a11e7f1a2fbd6fdec2a3e0a3
+ruby-1.9.1-p378.tar.bz2=5922459622a23612eb9b68a3586cb5f8
 ruby-1.9.1-p378.tar.gz=9fc5941bda150ac0a33b299e1e53654c
+ruby-1.9.1-p429.tar.bz2=09df32ae51b6337f7a2e3b1909b26213
 ruby-1.9.1-p429.tar.gz=0f6d7630f26042e00bc59875755cf879
-ruby-1.9.2-preview1.tar.gz=e2b8cdbf300f53472be09699a5837fd1
-ruby-1.9.2-preview3.tar.gz=209e59f3495a5503fa948c2732f1d705
-ruby-1.9.2-rc1.tar.gz=fdedd5b42ae89a9a46797823ad2d9acf
-ruby-1.9.2-rc2.tar.gz=d12cd39eee4d99bc54b52aba5a0ba4e1
+ruby-1.9.2-p0.tar.bz2=d8a02cadf57d2571cd4250e248ea7e4b
 ruby-1.9.2-p0.tar.gz=755aba44607c580fddc25e7c89260460
-ruby-1.8.5-p115.tar.bz2=03955e3c367b9beb3efe144c9f00d689
-ruby-1.8.5-p231.tar.bz2=327f5aa6573787432222e96195cffd1e
-ruby-1.8.6-p286.tar.bz2=e6b6bf8f34370e433936adb7a7065e63
-ruby-1.8.6-p287.tar.bz2=80b5f3db12531d36e6c81fac6d05dda9
-ruby-1.8.6-p369.tar.bz2=c3c1f3dd0dfbd2e17a04e59c2f12cfc8
-ruby-1.8.6-p383.tar.bz2=a48703cd982b9f0e3002700a50b0e88e
-ruby-1.8.6-p398.tar.bz2=fbd43dc44ee26be4d37e6bebbed6f8bd
-ruby-1.8.6-p399.tar.bz2=f77c307cb72fb8808b0e85af5d05cefc
-ruby-1.8.7-p160.tar.bz2=f8ddb886b8a81cf005f53e9a9541091d
-ruby-1.8.7-p174.tar.bz2=88c45aaf627b4404e5e4273cb03ba2ee
-ruby-1.8.7-p248.tar.bz2=37e19d46b7d4b845f57d3389084b94a6
-ruby-1.8.7-p249.tar.bz2=37200cc956a16996bbfd25bb4068f242
-ruby-1.8.7-p299.tar.bz2=244439a87d75ab24170a9c2b451ce351
-ruby-1.8.7-p302.tar.bz2=a6a9e37079ed8cf8726b455dad3de939
-ruby-1.9.1-p129.tar.bz2=6fa62b20f72da471195830dec4eb2013
-ruby-1.9.1-p243.tar.bz2=66d4f8403d13623051091347764881a0
-ruby-1.9.1-p376.tar.bz2=e019ae9c643c5efe91be49e29781fb94
-ruby-1.9.1-p376.tar.bz2=e019ae9c643c5efe91be49e29781fb94
-ruby-1.9.1-p378.tar.bz2=5922459622a23612eb9b68a3586cb5f8
-ruby-1.9.1-p429.tar.bz2=09df32ae51b6337f7a2e3b1909b26213
 ruby-1.9.2-preview1.tar.bz2=0b8f27ea78afcdc54d5d23e569aa0150
+ruby-1.9.2-preview1.tar.gz=e2b8cdbf300f53472be09699a5837fd1
 ruby-1.9.2-preview3.tar.bz2=19225dceacaac49ddc1664e593af54ac
+ruby-1.9.2-preview3.tar.gz=209e59f3495a5503fa948c2732f1d705
 ruby-1.9.2-rc1.tar.bz2=242dcfaed8359a6918941b55d0806bf0
+ruby-1.9.2-rc1.tar.gz=fdedd5b42ae89a9a46797823ad2d9acf
 ruby-1.9.2-rc2.tar.bz2=4e4906d0aab711286b31f5a834860cc3
-ruby-1.9.2-p0.tar.bz2=d8a02cadf57d2571cd4250e248ea7e4b
+ruby-1.9.2-rc2.tar.gz=d12cd39eee4d99bc54b52aba5a0ba4e1
+ruby-enterprise-1.8.6-20080507.tar.gz=17e3c52e73e42809f57ad0000a6cb4ab
+ruby-enterprise-1.8.6-20080621.tar.gz=626fc3811eee2dc92ac27ea63d37a8b2
+ruby-enterprise-1.8.6-20080623.tar.gz=0bf8a3a93c6b37bb1260cc09b05e81fd
+ruby-enterprise-1.8.6-20080624.tar.gz=de58b97128aa65209f291c66eab7c4a7
+ruby-enterprise-1.8.6-20080709.tar.gz=f0ded08cec64959fa388ec6a237b9c47
+ruby-enterprise-1.8.6-20080810.tar.gz=bfdcf06f437af825cd9f2d321f9d1896
+ruby-enterprise-1.8.6-20081205.tar.gz=50206bec9be2e08a862e5ec2e70fa693
+ruby-enterprise-1.8.6-20081215.tar.gz=aab57b7d5061c1980bec5dbe311ec9b2
+ruby-enterprise-1.8.6-20090113.tar.gz=e8d796a5bae0ec1029a88ba95c5d901d
+ruby-enterprise-1.8.6-20090201.tar.gz=a965e6789b553efaed72191825b13713
+ruby-enterprise-1.8.6-20090421.tar.gz=c777b361aadccda7988be16ede7ab15f
+ruby-enterprise-1.8.6-20090520.tar.gz=156572a8296bd0440970a6bb95018a13
 ruby-enterprise-1.8.6-20090610.tar.gz=0bf66ee626918464a6eccdd83c99d63a
 ruby-enterprise-1.8.7-2009.10.tar.gz=3727eef7b6b1b2f31db7d091328d966e
 ruby-enterprise-1.8.7-20090928.tar.gz=ae00018ce89d95419dfde370fcd485ac
+ruby-enterprise-1.8.7-2010.01.tar.gz=587aaea02c86ddbb87394a340a25e554
 ruby-enterprise-1.8.7-2010.02.tar.gz=4df7b09c01adfd711b0ab76837611542
+rubygems-0.4.0.tgz=86a64616548a793e1a5f825f0dd385b9
+rubygems-0.5.0.tgz=80d151edd94a06bcd2452a7e272b4d96
+rubygems-0.6.0.tgz=5df803f5a04654833690dd32283de741
+rubygems-0.6.1.tgz=c4a0faa9f876ad805ae80d1396a29d97
+rubygems-0.7.0.tgz=ede9b55343219e8b3491793aa12c46f3
+rubygems-0.8.0.tgz=9ef6e3c34dcb54e295c8e57321ddc079
+rubygems-0.8.1.tgz=6276d268b420c0d61796cdbf6d28dae4
+rubygems-0.8.10.tgz=d26592e280c0fb24c51f2837c3f48e67
+rubygems-0.8.11.tgz=aa363b428c4c1fc2e076a4ff77b957d7
+rubygems-0.8.3.tgz=6e6da80f61d6e77d0ad9e531767f6fd5
+rubygems-0.8.4.tgz=a2ad2d03dae8a98002c2a7cd6c3ed352
+rubygems-0.8.5.tgz=b917c084e1e6e99d8e102af8dd687ddb
+rubygems-0.8.6.tgz=9de98d2f62e3f91521b0207a4dcdeb5b
+rubygems-0.8.7.tgz=7fc04b9f9acc0c18cbbe6222be8d0bd3
+rubygems-0.8.8.tgz=a8535e9c35a4c215d6ef9268d4bc69ed
+rubygems-0.9.0.tgz=5d496e1f415b8b4033ab867f01d1161f
+rubygems-0.9.1.tgz=a62314cdb174ccc88a27b8924fa79e4a
+rubygems-0.9.2.tgz=cc525053dd465ab6e33af382166fa808
+rubygems-0.9.3.tgz=600940a22ecd79e28e0fd37ad1f1d871
+rubygems-0.9.4.tgz=b5680acaa019c80ea44fe87cc2e227da
+rubygems-0.9.5.tgz=91f7036a724e34cc66dd8d09348733d9
+rubygems-1.0.0.tgz=b0b74eac0cbfc5a13f895ab6f803edc1
+rubygems-1.0.1.tgz=0d5851084955c327ee1dc9cbd631aa5f
+rubygems-1.1.0.tgz=85f994904c5b4045f0a859b29d0be717
+rubygems-1.1.1.tgz=1a77c5b6b293a3ccd5261dc120641ccc
+rubygems-1.2.0.tgz=b77a4234360735174d1692e6fc598402
+rubygems-1.3.0.tgz=63d3dfc038710eaf532b6a133225115a
+rubygems-1.3.1.tgz=a04ee6f6897077c5b75f5fd1e134c5a9
+rubygems-1.3.2.tgz=6204d0a4c526a1d8fdbce746647b179a
+rubygems-1.3.3.tgz=0e9697db44d812712350baf28016b4a7
+rubygems-1.3.4.tgz=b17b398503253bf36a101c58f02a226f
 rubygems-1.3.5.tgz=6e317335898e73beab15623cdd5f8cff
 rubygems-1.3.6.tgz=789ca8e9ad1d4d3fe5f0534fcc038a0d
 rubygems-1.3.7.tgz=e85cfadd025ff6ab689375adbf344bbe
-MacRuby%200.5.zip=675454a8c7bc19d606d90a726e08427c
-MacRuby%200.6.zip=a80afd3700c88cf95c539fc63b272faf
-MacRuby%200.7.zip=0bb60588c9ec9b1517665743bb05132f
-MacRuby%200.7.1.zip=e8245dcd03c0757dfae7e6fee913947a
-jruby-bin-1.3.1.tar.gz=4a95db8fc93ed7219663fbede98b6117
-jruby-bin-1.4.0.tar.gz=f37322c18e9134e91e064aebb4baa4c7
-jruby-bin-1.5.0.RC1.tar.gz=47b4ca2a21659d36a2775ade0a2534c4
-jruby-bin-1.5.0.RC3.tar.gz=9c2758600de903b8ca07cb1341f4f1b3
-jruby-bin-1.5.0.tar.gz=ee2b4e326e8b87858e5dd0c8e94102e6
-jruby-bin-1.5.1.tar.gz=0196dcfb17354f12253eaddc1166a0ee
-jruby-bin-1.5.2.tar.gz=d239deb9a108a6abbfbd6cb79cf8255b
-jruby-bin-1.5.3.tar.gz=ccb0b2dbc300d8dd4ad1bd4da48b8320
-libiconv-1.13.1.tar.gz=7ab33ebd26687c744a37264a330bbe9a
-ncurses.tar.gz=cce05daf61a64501ef6cd8da1f727ec6
-openssl-0.9.8k.tar.gz=e555c6d58d276aec7fdc53363e338ab3
-readline-5.2.tar.gz=e39331f32ad14009b9ff49cc10c5e751
-readline-6.0.tar.gz=b7f65a48add447693be6e86f04a63019
 zlib-1.2.3.tar.gz=debc62758716a169df9f62e6ab2bc634
-curl-7.19.7.tar.gz=ecb2e37e45c9933e2a963cabe03670ab
-pkg-config-0.23.tar.gz=d922a88782b64441d06547632fd85744
-ironruby-1.0.zip=7a92888837b3507355ed391dbfc0ab83
-GemStone-24407.Darwin-i386.tar.gz=2f293e1927b8a1c5a060fe174f7ec614
-GemStone-24407.Linux-x86_64.tar.gz=aa4436623199dba79eb5bc8652316b07
-MagLev-24407.Darwin-i386.tar.gz=4aa0a3c35c63c876c8f786691a20dcb5
-MagLev-24407.Linux-x86_64.tar.gz=ab6928f5a39231efb86253e8b8e00134
+zlib-1.2.5.tar.gz=c735eab2d659a96e5a594c9e8541ad63

data/install

@@ -126,7 +126,7 @@ andand_return_warning()
 thank_you()
 {
   printf "
-${name:-"$(whoami)"},
+${name:-"$USER"},
 
 Thank you very much for using RVM! I sincerely hope that RVM helps to
 make your work both easier and more enjoyable.
@@ -599,7 +599,9 @@ if [[ $upgrade_flag -eq 0 ]] ; then
   ./scripts/notes
 fi
 
-name="$(awk -F= '/^[[:space:]]*name/{print $2}' ~/.gitconfig 2>/dev/null)"
+if command -v git > /dev/null 2>&1 ; then
+  name="$(git config user.name 2>/dev/null)"
+fi
 
 if [[ ${upgrade_flag:-0} -eq 1 ]] ; then
 

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 1
 :minor: 0
-:patch: 15
+:patch: 17

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "1.0.15"
+  s.version = "1.0.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-10-19}
+  s.date = %q{2010-10-29}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}

data/scripts/cd

@@ -45,41 +45,46 @@ if [[ ${rvm_project_rvmrc:-1} -ne 0 ]] ; then
       return $result
     }
 
-    _rvm_cd_complete ()
-    {
-      local directory current matches item index
+    #
+    # Can someone please explain to me what this was meant to accomplish?
+    # telemachus was encountering issues when he had CDPATH set.
+    # Namely comletion stopped working.
+    #
+    # _rvm_cd_complete ()
+    # {
+    #   local directory current matches item index
 
-      COMPREPLY=()
+    #   COMPREPLY=()
 
-      current="${COMP_WORDS[COMP_CWORD]}"
+    #   current="${COMP_WORDS[COMP_CWORD]}"
 
-      if [[ -n "$CDPATH" ]] ; then
+    #   if [[ -n "$CDPATH" ]] ; then
 
-        index=${#COMPREPLY[@]}
+    #     index=${#COMPREPLY[@]}
 
-        for directory in $(echo "$CDPATH" | tr -s ':' ' ') ; do
+    #     for directory in $(printf "$CDPATH" | tr -s ':' ' ') ; do
 
-          for item in $( compgen -d "$directory/$current" ) ; do
+    #       for item in $( compgen -d "$directory/$current" ) ; do
 
-            item="${item}/"
+    #         item="${item}/"
 
-            COMPREPLY[index++]=${item#$directory/}
+    #         COMPREPLY[index++]=${item#$directory/}
 
-          done
+    #       done
 
-        done
+    #     done
 
-        COMPREPLY=( $(echo ${COMPREPLY} | uniq | sort) )
+    #     COMPREPLY=( $(echo ${COMPREPLY} | uniq | sort) )
 
-      else
+    #   else
 
-        COMPREPLY=( $(compgen -d ${current}) )
+    #     COMPREPLY=( $(compgen -d ${current}) )
 
-      fi
+    #   fi
 
-      complete -o filenames -o nospace -F _rvm_cd_complete cd
+    # }
 
-    }
+    # complete -o filenames -o dirnames -o nospace -F _rvm_cd_complete cd
 
   fi
 

data/scripts/cli

@@ -272,8 +272,16 @@ __rvm_parse_args()
         fi
       ;;
 
+      --branch)
+        rvm_ruby_repo_branch="$next_token"
+        next_token="${1:-""}"
+        shift
+      ;;
+
       --repository|--repo|--url)
-        rvm_ruby_repo_url=$rvm_token
+        rvm_ruby_repo_url="$next_token"
+        next_token="${1:-""}"
+        shift
       ;;
 
       --ree-options)
@@ -641,7 +649,7 @@ rvm()
 
   rvm_action="${rvm_action:-usage}"
 
-  export BUNDLE_PATH GEM_HOME GEM_PATH rvm_action rvm_archflags rvm_bin_flag rvm_bin_path rvm_clang_flag rvm_configure_flags rvm_debug_flag rvm_delete_flag rvm_docs_type rvm_dump_environment_flag rvm_error_message rvm_file_name rvm_gemdir_flag rvm_gemset_name rvm_head_flag rvm_install_arguments rvm_install_on_use_flag rvm_interactive_flag rvm_llvm_flag rvm_loaded_flag rvm_make_flags rvm_niceness rvm_only_path_flag rvm_parse_break rvm_patch_names rvm_patch_original_pwd rvm_pretty_print_flag rvm_prior_cc rvm_proxy rvm_quiet_flag rvm_ree_options rvm_reload_flag rvm_remove_flag rvm_ruby_alias rvm_ruby_aliases rvm_ruby_args rvm_ruby_file rvm_ruby_gem_home rvm_ruby_interpreter rvm_ruby_load_path rvm_ruby_make rvm_ruby_make_install rvm_ruby_patch_level rvm_ruby_repo_url rvm_ruby_require rvm_ruby_string rvm_ruby_strings rvm_ruby_version rvm_script_name rvm_sdk rvm_silent_flag rvm_system_flag rvm_token rvm_trace_flag rvm_use_flag rvm_user_flag rvm_verbose_flag rvm_wrapper_name
+  __rvm_export_if_set BUNDLE_PATH GEM_HOME GEM_PATH rvm_action rvm_archflags rvm_bin_flag rvm_bin_path rvm_clang_flag rvm_configure_flags rvm_debug_flag rvm_delete_flag rvm_docs_type rvm_dump_environment_flag rvm_error_message rvm_file_name rvm_gemdir_flag rvm_gemset_name rvm_head_flag rvm_install_arguments rvm_install_on_use_flag rvm_interactive_flag rvm_llvm_flag rvm_loaded_flag rvm_make_flags rvm_niceness rvm_only_path_flag rvm_parse_break rvm_patch_names rvm_patch_original_pwd rvm_pretty_print_flag rvm_prior_cc rvm_proxy rvm_quiet_flag rvm_ree_options rvm_reload_flag rvm_remove_flag rvm_ruby_alias rvm_ruby_aliases rvm_ruby_args rvm_ruby_file rvm_ruby_gem_home rvm_ruby_interpreter rvm_ruby_load_path rvm_ruby_make rvm_ruby_make_install rvm_ruby_patch_level rvm_ruby_repo_url rvm_ruby_repo_branch rvm_ruby_require rvm_ruby_string rvm_ruby_strings rvm_ruby_version rvm_script_name rvm_sdk rvm_silent_flag rvm_system_flag rvm_token rvm_trace_flag rvm_use_flag rvm_user_flag rvm_verbose_flag rvm_wrapper_name
 
   case "$rvm_action" in
     use)             __rvm_use        ;;

data/scripts/install

@@ -126,7 +126,7 @@ andand_return_warning()
 thank_you()
 {
   printf "
-${name:-"$(whoami)"},
+${name:-"$USER"},
 
 Thank you very much for using RVM! I sincerely hope that RVM helps to
 make your work both easier and more enjoyable.
@@ -599,7 +599,9 @@ if [[ $upgrade_flag -eq 0 ]] ; then
   ./scripts/notes
 fi
 
-name="$(awk -F= '/^[[:space:]]*name/{print $2}' ~/.gitconfig 2>/dev/null)"
+if command -v git > /dev/null 2>&1 ; then
+  name="$(git config user.name 2>/dev/null)"
+fi
 
 if [[ ${upgrade_flag:-0} -eq 1 ]] ; then
 

data/scripts/irbrc

@@ -5,5 +5,9 @@
 # ruby then edit this file. It will only be deleted if you do
 # an "rvm install" over this ruby version.
 
-require File.join(ENV["rvm_path"], "scripts", "irbrc")
+if ENV["rvm_path"].nil?
+  require File.join(ENV["HOME"], "irbrc")
+else
+  require File.join(ENV["rvm_path"], "scripts", "irbrc")
+end
 

data/scripts/manage

@@ -546,7 +546,7 @@ RubyWrapper
 
       builtin hash -r
 
-      if [[ -n "$(printf $rvm_ruby_version | awk '/^1\./')" \
+      if [[ -n "$(printf "${rvm_ruby_version:-""}" | awk '/^1\./')" \
         && ${rvm_head_flag:-0} -eq 0 ]] ; then
 
         "$rvm_path/scripts/log" "info" \
@@ -993,8 +993,8 @@ RubyWrapper
 
         unzip -o  -d "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string" \
           "${rvm_archives_path:-"$rvm_path/archives"}/${rvm_ruby_package_file}" >> \
-          "${rvm_log_path:-"$rvm_path/log"}$rvm_ruby_string/extract.log" 2>> \
-          "${rvm_log_path:-"$rvm_path/log"}$rvm_ruby_string/extract.error.log"
+          "${rvm_log_path:-"$rvm_path/log"}/$rvm_ruby_string/extract.log" 2>> \
+          "${rvm_log_path:-"$rvm_path/log"}/$rvm_ruby_string/extract.error.log"
         result=$?
 
         if [[ "$result" -gt 1 ]] ; then
@@ -1352,7 +1352,7 @@ __rvm_fetch_ruby()
 
     mkdir -p "${rvm_repo_path:-"$rvm_path/repos"}"
 
-    if [[ -n "$(echo "$rvm_ruby_url" | awk '/^git/')" ]] ; then
+    if [[ -n "$(echo "$rvm_ruby_url" | awk '/git/')" ]] ; then
 
       if [[ -d "${rvm_repos_path:-"$rvm_path/repos"}/$rvm_ruby_string/.git" ]] ; then
 
@@ -1419,6 +1419,31 @@ __rvm_fetch_ruby()
         fi
       fi
 
+      if [[ -z "$rvm_ruby_repo_branch" ]]; then
+        rvm_ruby_repo_branch="master"
+      fi
+
+      (
+        remote="origin"
+
+        cd "${rvm_repos_path:-"$rvm_path/repos"}/$rvm_ruby_string"
+
+        if [[ -z "$(git branch | awk "/$rvm_ruby_repo_branch$/")" ]] ; then
+
+          git checkout -b "$rvm_ruby_repo_branch" --track "$remote/$rvm_ruby_repo_branch" 2>/dev/null
+
+        elif [[ -z "$(git branch | awk "/\* $rvm_ruby_repo_branch$/")" ]] ; then
+
+          if ! git checkout $rvm_ruby_repo_branch 2>/dev/null ; then
+
+            "$rvm_path/scripts/log" "error" \
+              "Branch $remote/$rvm_ruby_repo_branch not found."
+
+          fi
+
+        fi
+      )
+
     else
       if [[ -n "${rvm_ruby_tag:-""}" ]] ; then
         # TODO: Check if tag v is valid

data/scripts/notes

@@ -14,12 +14,21 @@ if [[ "Linux" = "$system" ]] ; then
   rvm_yum_binary="$(command -v yum)"
 
   printf "
-# NOTE: MRI stands for Matz's Ruby Interpreter (1.8.X, 1.9.X), ree stands for Ruby Enterprise Edition and rbx stands for Rubinius.
-# curl is required.
-# git is required.
-# patch is required (for ree, some ruby head's).
-# If you wish to install rbx and/or any MRI head (eg. 1.9.2-head) then you must install and use rvm 1.8.7 first.
-# If you wish to have the 'pretty colors' again, set 'export rvm_pretty_print_flag=1' in ~/.rvmrc.
+NOTE: 'ruby' represents Matz's Ruby Interpreter (MRI) (1.8.X, 1.9.X)
+             This is the *original* / standard Ruby Language Interpreter
+      'ree'  represents Ruby Enterprise Edition
+      'rbx'  represents Rubinius
+
+bash >= 3.2 is required
+curl is required
+git is required (>= 1.7 recommended)
+patch is required (for ree and some ruby-head's).
+
+If you wish to install rbx and/or Ruby 1.9 head (MRI) (eg. 1.9.2-head),
+then you must install and use rvm 1.8.7 first.
+
+If you wish to have the 'pretty colors' again,
+  set 'export rvm_pretty_print_flag=1' in ~/.rvmrc.
 "
 
   if [[ ! -z "$rvm_aptitude_binary" ]] ; then
@@ -31,8 +40,9 @@ dependencies:
 # For JRuby (if you wish to use it) you will need:
   jruby: aptitude install curl sun-java6-bin sun-java6-jre sun-java6-jdk
 
-# For MRI & ree (if you wish to use it) you will need (depending on what you are installing):
-  ruby: aptitude install build-essential bison openssl libreadline5 libreadline-dev curl git zlib1g zlib1g-dev libssl-dev libsqlite3-0 libsqlite3-dev sqlite3 libxml2-dev
+# For Ruby (MRI & ree)  you should install the following OS dependencies:
+  ruby: aptitude install build-essential bison openssl libreadline5 libreadline5-dev curl git zlib1g zlib1g-dev libssl-dev libsqlite3-0 libsqlite3-dev sqlite3 libxml2-dev
+
   ruby-head: git subversion autoconf
 
 # For IronRuby (if you wish to use it) you will need:
@@ -46,8 +56,8 @@ dependencies:
   rvm: bash curl git
 
   # For MRI based rubies you will need:
-  ruby: # TODO: tell Wayne what goes here :)
-  ruby-head: # TODO: tell Wayne what goes here :)
+  ruby: # TODO: tell Wayne what goes here if you use Gentoo :)
+  ruby-head: # TODO: tell Wayne what goes here if you use Gentoo :)
 
   # For JRuby (if you wish to use it) you will need:
   jruby: emerge dev-java/sun-jdk dev-java/sun-jre-bin
@@ -62,7 +72,7 @@ dependencies:
   # For RVM itself
   rvm: bash curl git
 
-  # For MRI based rubies you will need:
+  # For Ruby (MRI & Ree) you should install the following OS dependencies:
   ruby: pacman -Sy --noconfirm patch curl bison zlib readline libxml2 git make
   ruby-head: pacman -Sy --noconfirm subversion autoconf diffutils patch bison make
 
@@ -79,8 +89,8 @@ dependencies:
   # For RVM
   rvm: yum install -y bash curl git
 
-  # For MRI/ree (if you wish to use it) you will need:
-  ruby: yum install -y gcc-c++ patch readline readline-devel zlib zlib-devel libyaml-devel libffi-devel ; \\
+  # For Ruby (MRI & Ree) you should install the following OS dependencies:
+  ruby: yum install -y gcc-c++ patch readline readline-devel zlib zlib-devel libyaml-devel libffi-devel ;
         yum install -y iconv-devel # NOTE: For centos 5.4 final iconv-devel might not be available :(
 
   # For JRuby (if you wish to use it) you will need:
@@ -93,11 +103,11 @@ dependencies:
   # RVM
   rvm: bash curl git
 
-  # FOR MRI Ruby, recommended system packages are
+  # For Ruby (MRI & Ree) you should install the following OS dependencies:
   ruby: # gcc-c++ patch readline zlib libyaml iconv libxml2 libxslt
 
   # For JRuby (if you wish to use it) you will need:
-  jruby: #The SUN java runtime environment and development kit.
+  jruby: # The SUN java runtime environment and development kit.
 
   # For IronRuby (if you wish to use it) you will need:
   ironruby: #The Mono Runtime and Development Platform (version 2.6 or greater is recommended).
@@ -109,11 +119,13 @@ elif [[ "Darwin" = "$system"  ]] ; then
 
   printf "
   Notes for ${system} $release
-    # For Snow Leopard be sure to have Xcode Tools Version 3.2.1 (1613) or later (there were bugs with the dvd release version).
-    # You should download the latest Xcode tools from developer.apple.com. This is necessary since the dvd install for Snow Leopard has bugs.
-    # If you intend on installing MacRuby you must install LLVM first.
-    # If you intend on installing JRuby you must install the JDK.
-    # If you intend on installing IronRuby you must install Mono (version 2.6 or greater is recommended).
+    For Snow Leopard be sure to have Xcode Tools Version 3.2.1 (1613) or later
+    You should download the latest Xcode tools from developer.apple.com.
+      (This is since the dvd install for Snow Leopard contained bugs).
+
+    If you intend on installing MacRuby you must install LLVM first.
+    If you intend on installing JRuby you must install the JDK.
+    If you intend on installing IronRuby you must install Mono (version 2.6 or greater is recommended).
   "
 fi
 

data/scripts/rvm

@@ -119,5 +119,6 @@ if [[ $? -gt 0 || ${rvm_reload_flag:-0} -eq 1 ]] ; then
 
 fi
 
-cd .
-
+if [[ ${rvm_interactive_flag:-0} -gt 0 ]]; then
+  cd .
+fi

data/scripts/rvm-install

@@ -126,7 +126,7 @@ andand_return_warning()
 thank_you()
 {
   printf "
-${name:-"$(whoami)"},
+${name:-"$USER"},
 
 Thank you very much for using RVM! I sincerely hope that RVM helps to
 make your work both easier and more enjoyable.
@@ -599,7 +599,9 @@ if [[ $upgrade_flag -eq 0 ]] ; then
   ./scripts/notes
 fi
 
-name="$(awk -F= '/^[[:space:]]*name/{print $2}' ~/.gitconfig 2>/dev/null)"
+if command -v git > /dev/null 2>&1 ; then
+  name="$(git config user.name 2>/dev/null)"
+fi
 
 if [[ ${upgrade_flag:-0} -eq 1 ]] ; then
 

data/scripts/selector

@@ -4,7 +4,7 @@
 __rvm_select()
 {
   # Set Variable Defaults
-  export GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION
+  __rvm_export_if_set GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION
 
   if [[ -z "${rvm_ruby_string:-""}" ]] ; then
     [[ -n "${rvm_ruby_interpreter:-""}" ]] && rvm_ruby_string="$rvm_ruby_interpreter"
@@ -462,9 +462,14 @@ __rvm_ruby_string()
   # Stash the ruby string.
   ruby_string=${rvm_ruby_string:-""}
   gemset_name=${rvm_gemset_name:-""}
+  repo_url=${rvm_ruby_repo_url:-""}
+  branch_name=${rvm_ruby_repo_branch:-""}
 
   __rvm_unset_ruby_variables
 
+  rvm_ruby_repo_url=${repo_url:-""}
+  rvm_ruby_repo_branch=${branch_name:-""}
+
   if [[ ! -z "$gemset_name" ]] ; then
     rvm_gemset_name="$gemset_name"
     rvm_sticky_flag=1 # <- not sold on this.

data/scripts/update

@@ -126,7 +126,7 @@ andand_return_warning()
 thank_you()
 {
   printf "
-${name:-"$(whoami)"},
+${name:-"$USER"},
 
 Thank you very much for using RVM! I sincerely hope that RVM helps to
 make your work both easier and more enjoyable.
@@ -599,7 +599,9 @@ if [[ $upgrade_flag -eq 0 ]] ; then
   ./scripts/notes
 fi
 
-name="$(awk -F= '/^[[:space:]]*name/{print $2}' ~/.gitconfig 2>/dev/null)"
+if command -v git > /dev/null 2>&1 ; then
+  name="$(git config user.name 2>/dev/null)"
+fi
 
 if [[ ${upgrade_flag:-0} -eq 1 ]] ; then
 

data/scripts/utility

@@ -48,7 +48,7 @@ __rvm_teardown()
 
   fi
 
-  unset rvm_ruby_strings rvm_head_flag rvm_prior_cc next_token rvm_bin_path rvm_error_message rvm_gems_cache_path rvm_gems_path rvm_gemset_name rvm_interactive_flag rvm_man_path rvm_parse_break rvm_rc_files rvm_ruby_binary rvm_ruby_gem_home rvm_ruby_gem_path rvm_ruby_home rvm_ruby_interpreter rvm_ruby_irbrc rvm_ruby_log_path rvm_ruby_major_version rvm_ruby_minor_version rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_release_version rvm_ruby_repo_url rvm_ruby_revision rvm_ruby_selected_flag rvm_ruby_tag rvm_ruby_version rvm_selfcontained rvm_token rvm_ruby_load_path rvm_path_flag rvm_ruby_require rvm_action
+  unset rvm_ruby_strings rvm_head_flag rvm_prior_cc next_token rvm_bin_path rvm_error_message rvm_gems_cache_path rvm_gems_path rvm_gemset_name rvm_interactive_flag rvm_man_path rvm_parse_break rvm_rc_files rvm_ruby_binary rvm_ruby_gem_home rvm_ruby_gem_path rvm_ruby_home rvm_ruby_interpreter rvm_ruby_irbrc rvm_ruby_log_path rvm_ruby_major_version rvm_ruby_minor_version rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_release_version rvm_ruby_repo_url rvm_ruby_repo_branch rvm_ruby_revision rvm_ruby_selected_flag rvm_ruby_tag rvm_ruby_version rvm_selfcontained rvm_token rvm_ruby_load_path rvm_path_flag rvm_ruby_require rvm_action
 
   [[ ${rvm_dump_environment_flag:-0} -eq 1 ]] && __rvm_dump_environment
 
@@ -243,7 +243,7 @@ __rvm_remove_rvm_from_path()
 # Run a specified command and log it.
 __rvm_run()
 {
-  local name log path command message
+  local name log temp_log_path command message
 
   name="${1:-""}"
   command="${2:-""}"
@@ -258,12 +258,12 @@ __rvm_run()
   fi
 
   if [[ -n "${rvm_ruby_string:-""}" ]] ; then
-    path="${rvm_log_path:-"$rvm_path/log"}/$rvm_ruby_string"
+    temp_log_path="${rvm_log_path:-"$rvm_path/log"}/$rvm_ruby_string"
   else
-    path="${rvm_log_path:-"$rvm_path/log"}"
+    temp_log_path="${rvm_log_path:-"$rvm_path/log"}"
   fi
 
-  log="$path/$name.log"
+  log="$temp_log_path/$name.log"
 
   if [[ ! -d "${log%\/*}" ]] ; then
     \mkdir -p "${log%\/*}"
@@ -363,7 +363,8 @@ __rvm_nuke_rvm_variables()
 # Unset ruby-specific variables
 __rvm_unset_ruby_variables()
 {
-  unset rvm_ruby_flag $(env | awk -F= '/^rvm_ruby_/{printf $1" "}')
+  # unset rvm_ruby_flag $(env | awk -F= '/^rvm_ruby_/{printf $1" "}')
+  unset rvm_ruby_strings rvm_ruby_binary rvm_ruby_gem_home rvm_ruby_gem_path rvm_ruby_home rvm_ruby_interpreter rvm_ruby_irbrc rvm_ruby_log_path rvm_ruby_major_version rvm_ruby_minor_version rvm_ruby_package_name rvm_ruby_patch_level rvm_ruby_release_version rvm_ruby_repo_url rvm_ruby_repo_branch rvm_ruby_revision rvm_ruby_selected_flag rvm_ruby_tag rvm_ruby_version rvm_ruby_load_path rvm_ruby_require rvm_head_flag
 }
 
 # TODO: Should be able to...
@@ -824,19 +825,15 @@ __rvm_update_rvm()
       stable_version="$(curl -s $version_url)"
 
       __rvm_run "fetch" \
-        "$rvm_path/scripts/fetch \
-        'http://rvm.beginrescueend.com/releases/rvm-${stable_version}.tar.gz'" \
+        "$rvm_path/scripts/fetch 'http://rvm.beginrescueend.com/releases/rvm-${stable_version}.tar.gz'" \
         "fetching rvm-${stable_version}.tar.gz"
 
       __rvm_run "extract" \
-        "gunzip < \
-        \"${rvm_archives_path:-"$rvm_path/archives"}/rvm-${stable_version}.tar.gz\" \
-        | tar xf - -C ${rvm_src_path:-"$rvm_path/src"}" \
+        "gunzip < \"${rvm_archives_path:-"$rvm_path/archives"}/rvm-${stable_version}.tar.gz\" | tar xf - -C ${rvm_src_path:-"$rvm_path/src"}" \
         "Extracting rvm-${stable_version}.tar.gz ..."
 
       __rvm_run "install" \
-        "builtin cd ${rvm_src_path:-"$rvm_path/src"}/rvm-${stable_version}/;\
-        ./install" \
+        "builtin cd ${rvm_src_path:-"$rvm_path/src"}/rvm-${stable_version}/; ./install" \
         "Installing rvm-${stable_version}..."
     fi
   )
@@ -1555,3 +1552,22 @@ __rvm_expand_ruby_string()
 
   return $?
 }
+
+# My concern here is that this will slow things down quite a bit.
+# This is originally from
+# http://github.com/teleological/rvm/commit/21d6083db3fffc5fa92b9ea8814f3f28f7e48c7f#commitcomment-178001
+# Is there a zsh setting to counter the issue instead of this?
+__rvm_export_if_set()
+{
+  local parameter value
+
+  for parameter in $* ; do
+    eval "value=\${$parameter:-\"\"}"
+
+    if [[ -n "$value" ]] ; then
+      export $parameter
+    fi
+  done
+
+  return 0
+}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 53
   prerelease: false
   segments: 
   - 1
   - 0
-  - 15
-  version: 1.0.15
+  - 17
+  version: 1.0.17
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-19 00:00:00 -04:00
+date: 2010-10-29 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []