rvm 1.1.2 → 1.1.3

data/config/db

@@ -42,7 +42,7 @@ ree_1.8.6_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition.git
 ree_1.8.7_url=http://rvm.beginrescueend.com/src/
 ree_1.8.7_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition187.git
 ree_1.8.7_patch_level=2010.02
-jruby_version=1.5.5
+jruby_version=1.5.6
 jruby_repo_url=git://github.com/jruby/jruby.git
 jruby_url=http://jruby.org.s3.amazonaws.com/downloads
 macruby_version=0.7.1

data/config/known

@@ -22,10 +22,7 @@ goruby
 jruby-1.2.0
 jruby-1.3.1
 jruby-1.4.0
-jruby-1.5.1
-jruby-1.5.2
-jruby-1.5.3
-jruby[-1.5.5]
+jruby-[1.5.6]
 jruby-head
 
 # Rubinius

data/config/md5

@@ -20,6 +20,7 @@ jruby-bin-1.5.1.tar.gz=0196dcfb17354f12253eaddc1166a0ee
 jruby-bin-1.5.2.tar.gz=d239deb9a108a6abbfbd6cb79cf8255b
 jruby-bin-1.5.3.tar.gz=ccb0b2dbc300d8dd4ad1bd4da48b8320
 jruby-bin-1.5.5.tar.gz=8e00f7d40cbf221f733d6f7a15784e9a
+jruby-bin-1.5.6.tar.gz=94033a36517645b7a7ec781a3507c654
 libiconv-1.13.1.tar.gz=7ab33ebd26687c744a37264a330bbe9a
 ncurses.tar.gz=cce05daf61a64501ef6cd8da1f727ec6
 openssl-0.9.8k.tar.gz=e555c6d58d276aec7fdc53363e338ab3

data/contrib/install-system-wide

@@ -42,11 +42,12 @@ __rvm_create_user_group() {
     echo "Creating the group '$1'"
 
     case "$os_type" in
+      "OpenBSD") groupadd "$rvm_group_name";;
       "FreeBSD") pw groupadd -q "$rvm_group_name";;
       "Linux")   groupadd -f "$rvm_group_name";;
-      "Darwin")  
+      "Darwin")
         gid="501" #only gids > 500 show up in user preferences
-        
+
         #Find an open gid
         while true; do
           name=$(dscl . search /groups PrimaryGroupID $gid | cut -f1 -s)
@@ -55,7 +56,7 @@ __rvm_create_user_group() {
           fi
           gid=$[$gid +1]
         done
-        
+
         #Create the group
         dscl . -create "/Groups/$rvm_group_name"
         dscl . -create "/Groups/$rvm_group_name" gid "$gid"
@@ -70,8 +71,9 @@ __rvm_add_user_to_group() {
   [[ -z "$1" || -z "$2" ]] && return 1
 
   echo "Adding '$1' to the group '$2'"
-  
+
   case "$os_type" in
+    "OpenBSD") usermod -G "$2" "$1";;
     "FreeBSD") pw usermod "$1" -G "$2";;
     "Linux")   usermod -a -G "$2" "$1";;
     "Darwin")  dscl . -append "/Groups/$2" GroupMembership "$1";;
@@ -92,9 +94,20 @@ elif [[ -z "$(command -v git)" ]] ; then
   echo "Please ensure git is installed and available in PATH to continue." >&2
   exit 1
 
-elif [[ "$os_type" != "Linux" && "$os_type" != "FreeBSD" && "$os_type" != "Darwin" ]]; then
-  echo "The rvm system wide installer currently only supports Linux, FreeBSD, and Darwin." >&2
-  exit 1
+else
+  case "$os_type" in
+
+    OpenBSD|Linux|FreeBSD|Darwin)
+      : # All clear, proceed!
+    ;;
+
+    *)
+      echo "The rvm system wide installer currently only supports the OS types:" >&2
+      echo "Linux, FreeBSD, OpenBSD, and Darwin" >&2
+      echo "'$os_type' is currently unknown." >&2
+      exit 1
+    ;;
+  esac
 fi
 
 while [[ $# -gt 0 ]] ; do

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 1
 :minor: 1
-:patch: 2
+:patch: 3

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "1.1.2"
+  s.version = "1.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-12-01}
+  s.date = %q{2010-12-05}
   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/cli

@@ -645,9 +645,8 @@ rvm()
 
   __rvm_parse_args "$@"
 
-  result=$?
-
-  if [[ $result -gt 0 ]] ; then
+  if [[ $? -gt 0 ]] ; then
+    result=$?
     return $result
   fi
 
@@ -796,3 +795,5 @@ rvm()
   return ${result:-0}
 }
 
+__rvm_project_rvmrc
+

data/scripts/manage

@@ -1313,11 +1313,11 @@ __rvm_fetch_ruby()
         rm -rf "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
       fi
 
-      mkdir -p "/tmp/rvm_src_$$"
+      mkdir -p "${rvm_tmp_path:-/tmp}/rvm_src_$$"
 
       case "$rvm_archive_extension" in
         tar.gz|tgz)
-          __rvm_run "extract" "gunzip < \"${rvm_archives_path:-"$rvm_path/archives"}/$rvm_ruby_package_file.$rvm_archive_extension\" | tar xf - -C /tmp/rvm_src_$$" "$rvm_ruby_string - #extracting $rvm_ruby_package_file to ${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
+          __rvm_run "extract" "gunzip < \"${rvm_archives_path:-"$rvm_path/archives"}/$rvm_ruby_package_file.$rvm_archive_extension\" | tar xf - -C ${rvm_tmp_path:-/tmp}/rvm_src_$$" "$rvm_ruby_string - #extracting $rvm_ruby_package_file to ${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
           result=$?
 
           if [[ "$result" -gt 0 ]] ; then
@@ -1328,7 +1328,7 @@ __rvm_fetch_ruby()
           fi
           ;;
         zip)
-          __rvm_run "extract" "unzip -q -o ${rvm_archives_path:-"$rvm_path/archives"}/$rvm_ruby_package_file -d /tmp/rvm_src_$$"
+          __rvm_run "extract" "unzip -q -o ${rvm_archives_path:-"$rvm_path/archives"}/$rvm_ruby_package_file -d ${rvm_tmp_path:-/tmp}/rvm_src_$$"
           result=$?
 
           if [[ "$result" -gt 0 ]] ; then
@@ -1339,7 +1339,7 @@ __rvm_fetch_ruby()
           fi
           ;;
         tar.bz2)
-          __rvm_run "extract" "bunzip2 < '${rvm_archives_path:-"$rvm_path/archives"}/$rvm_ruby_package_file.$rvm_archive_extension' | tar xf - -C /tmp/rvm_src_$$" "$rvm_ruby_string - #extracting $rvm_ruby_package_file to ${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
+          __rvm_run "extract" "bunzip2 < '${rvm_archives_path:-"$rvm_path/archives"}/$rvm_ruby_package_file.$rvm_archive_extension' | tar xf - -C ${rvm_tmp_path:-/tmp}/rvm_src_$$" "$rvm_ruby_string - #extracting $rvm_ruby_package_file to ${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
           result=$?
 
           if [[ "$result" -gt 0 ]] ; then
@@ -1360,7 +1360,7 @@ __rvm_fetch_ruby()
       if [[ -d "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string" ]] ; then
         rm -rf "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"
       fi
-      mv "/tmp/rvm_src_$$/$(builtin cd /tmp/rvm_src_$$ ; ls)" "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string" ; rm -rf "/tmp/rvm_src_$$"
+      mv "${rvm_tmp_path:-/tmp}/rvm_src_$$/$(builtin cd ${rvm_tmp_path:-/tmp}/rvm_src_$$ ; ls)" "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string" ; rm -rf "${rvm_tmp_path:-/tmp}/rvm_src_$$"
 
       if [[ -n "${rvm_ruby_name:-""}" && -d "${rvm_src_path:-"$rvm_path/src"}/$(echo $rvm_ruby_string | sed -e 's/-n.*//')" ]] ; then
         mv "${rvm_src_path:-"$rvm_path/src"}/$(echo "$rvm_ruby_string" | sed -e 's/-n.*//')" "${rvm_src_path:-"$rvm_path/src"}/$rvm_ruby_string"

data/scripts/rvm

@@ -82,7 +82,7 @@ if ! declare -f rvm > /dev/null || [[ ${rvm_reload_flag:-0} -eq 1 ]] ; then
 
   if [[ -d "$rvm_path" ]] ; then
 
-    for script in array utility initialize version selector cli cd override_gem ; do
+    for script in array utility initialize version selector cd cli override_gem ; do
 
       if [[ -f "$rvm_path/scripts/$script" ]] ; then
 
@@ -124,5 +124,5 @@ if ! declare -f rvm > /dev/null || [[ ${rvm_reload_flag:-0} -eq 1 ]] ; then
 fi
 
 if [[ ${rvm_interactive_flag:-0} -gt 0 ]]; then
-  cd .
+  __rvm_project_rvmrc
 fi

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-01 00:00:00 -05:00
+date: 2010-12-05 00:00:00 -05:00
 default_executable: rvm-install
 dependencies: []