gemsets in rvm-1.1.1

- old
+ new

@@ -596,24 +596,30 @@
     mkdir -p "$rvm_gems_cache_path" # Ensure the base cache dir is initialized.
   fi
 
   if [[ -s "$rvm_file_name" ]] ; then
 
-    echo "Importing  $rvm_file_name file..."
+    printf "\nInstalling gems listed in $rvm_file_name file...\n\n"
 
-    rvm_ruby_gem_list=$(builtin cd "$rvm_ruby_gem_home/specifications/" ; find . -maxdepth 1 -mindepth 1 -type f -print 2> /dev/null | sed -e 's#.gems.*$##' 2> /dev/null)
-    rvm_ruby_gem_list="${rvm_ruby_gem_list//.\/}"
+    rvm_ruby_gem_list=$(
+      builtin cd "$rvm_ruby_gem_home/specifications/" ;
+      find . -maxdepth 1 -mindepth 1 -type f -print 2> /dev/null | \
+        sed -e 's#.gems.*$##' -e 's#^./##g' 2> /dev/null
+    )
+    # rvm_ruby_gem_list="${rvm_ruby_gem_list//.\/}"
 
     while read -r line
     do # Keep this on 2nd line :(
 
       if [[ -n "${line// /}" ]] ; then
         gems_args="$line" ; gem_install
       fi
 
     done < <(awk '/^[^#]+/{print}' "${rvm_file_name}")
 
+    printf "\nProcessing of $rvm_file_name is complete.\n\n"
+
   else
     "$rvm_path/scripts/log" "error" \
       "${rvm_file_name} does not exist to import from."
   fi
 }
@@ -673,12 +679,11 @@
 
   # Now we determine if a .gem cache file is already installed
   if [[ ${rvm_force_flag:-0} -eq 0 && -f "${rvm_ruby_gem_home}/specifications/$(basename "$gem_file_name")spec" ]] ; then
     gem=""
 
-    "$rvm_path/scripts/log" "info" \
-      "$gem_name $gem_version exists, skipping (--force to re-install)"
+    "$rvm_path/scripts/log" "info" "$gem_name $gem_version is already installed."
 
   else
     if [[ -s "$gem" ]] ; then
       cache_file="$gem"
 
@@ -737,11 +742,10 @@
 
       command="GEM_HOME='$rvm_ruby_gem_home' GEM_PATH='$rvm_ruby_gem_home' $gem_prefix gem install $gems_args $rvm_gem_options $gem_postfix $vars"
 
     else
 
-      #--ignore-dependencies
       command="$gem_prefix gem install --ignore-dependencies $gems_args $rvm_gem_options -q $gem $gem_postfix $vars"
 
     fi
 
     unset -f gem
@@ -751,16 +755,16 @@
     result=$?
 
     if [[ $result -eq 0 ]] ; then
 
       "$rvm_path/scripts/log" "info" \
-        "$gem_name $gem_version installed ( output logged to: $rvm_path/log/$rvm_ruby_string/gem.install.log )"
+        "$gem_name $gem_version installed."
 
     else
 
       "$rvm_path/scripts/log" "error" \
-        "$gem_name $gem_version failed to install ( output logged to: $rvm_path/log/$rvm_ruby_string/gem.install.error.log )"
+        "$gem_name $gem_version failed to install ( output logged to: $rvm_path/log/$rvm_ruby_string/gem.install.log )"
 
     fi
   fi
 
   return $result
@@ -768,22 +772,28 @@
 
 # Output the user's current gem directory.
 gemset_info()
 {
   if [[ ${rvm_user_flag:-0} -eq 1 ]] ; then
+
     echo $(rvm system ; gem env | grep "\- $HOME" | awk '{print $NF}')
 
   elif [[ ${rvm_system_flag:-0} -eq 1 ]] ; then
+
     echo $(rvm system ; gem env $action system)
 
   elif [[ -n "${rvm_ruby_string:-""}" ]] ; then
+
     echo $(rvm "$rvm_ruby_string" ; gem env $action)
 
   elif [[ -n "${GEM_HOME:-""}" ]] ; then
+
     echo "$GEM_HOME"
 
   else
+
     gem env $action
+
   fi
 
   return $?
 }
 