rvm 0.0.33 → 0.0.34

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. data/scripts/rvm +15 -5
  2. metadata +1 -2
  3. data/rvm.gemspec +0 -47
data/scripts/rvm CHANGED
@@ -11,7 +11,7 @@ function __rvm_meta {
11
11
  rvm_meta_author="Wayne E. Seguin"
12
12
  rvm_meta_author_email="wayneeseguin@gmail.com"
13
13
  rvm_meta_website="http://rvm.beginrescueend.com/"
14
- rvm_meta_version="0.0.33"
14
+ rvm_meta_version="0.0.34"
15
15
  rvm_meta_updated="2009.09.04"
16
16
  }
17
17
 
@@ -164,13 +164,23 @@ function __rvm_set-defaults {
164
164
  if [ -s $rvm_install_path/default_user_gem_path ] ; then
165
165
  rvm_default_user_gem_path=`cat $rvm_install_path/default_user_gem_path`
166
166
  else
167
- ruby -r rubygems -e "puts Gem::default_path.compact.first" > $rvm_install_path/default_user_gem_path
167
+ which ruby > /dev/null
168
+ if [ $? -ne 0 ] ; then
169
+ __rvm_log "info" "System ruby not found, assuming no system installed ruby."
170
+ else
171
+ ruby -r rubygems -e "puts Gem::default_path.compact.first" > $rvm_install_path/default_user_gem_path
172
+ fi
168
173
  fi
169
174
 
170
175
  if [ -s $rvm_install_path/default_system_gem_path ] ; then
171
176
  rvm_default_system_gem_path=`cat $rvm_install_path/default_system_gem_path`
172
177
  else
173
- ruby -r rubygems -e "puts Gem::default_path.compact[1] || Gem::default_path.compact.first" > $rvm_install_path/default_system_gem_path
178
+ which ruby > /dev/null
179
+ if [ $? -ne 0 ] ; then
180
+ __rvm_log "info" "System ruby not found, assuming no system installed ruby."
181
+ else
182
+ ruby -r rubygems -e "puts Gem::default_path.compact[1] || Gem::default_path.compact.first" > $rvm_install_path/default_system_gem_path
183
+ fi
174
184
  fi
175
185
 
176
186
  if [ -s $rvm_install_path/default_system_ruby ] ; then
@@ -249,8 +259,8 @@ function __rvm_run {
249
259
  log_file_name="1" ; shift
250
260
  command="$*"
251
261
  if [ $rvm_debug ] ; then __rvm_log "debug" "Executing: $command" ; fi
252
- eval "nice -n $rvm_niceness $command" > $rvm_ruby_log_path/log_file_name.log 2> $rvm_ruby_log_path/log_file_name.error.log
253
- if [ $? -gt 0 ] ; then __rvm_log "error" "There was an error, please check $rvm_ruby_log_path/log_file_name.error.log" ; popd 2> /dev/null ; return 1 ; fi
262
+ eval "nice -n $rvm_niceness $command" > $rvm_ruby_log_path/$log_file_name.log 2> $rvm_ruby_log_path/$log_file_name.error.log
263
+ if [ $? -gt 0 ] ; then __rvm_log "error" "There was an error, please check $rvm_ruby_log_path/$log_file_name.error.log" ; popd 2> /dev/null ; return 1 ; fi
254
264
  unset log_file command
255
265
  }
256
266
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rvm
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.33
4
+ version: 0.0.34
5
5
  platform: ruby
6
6
  authors:
7
7
  - Wayne E. Seguin
@@ -29,7 +29,6 @@ files:
29
29
  - config/cache
30
30
  - examples/rvmrc
31
31
  - lib/rvm.rb
32
- - rvm.gemspec
33
32
  - scripts/rvm
34
33
  - scripts/rvm-install
35
34
  - scripts/rvm-update
data/rvm.gemspec DELETED
@@ -1,47 +0,0 @@
1
- # Generated by jeweler
2
- # DO NOT EDIT THIS FILE
3
- # Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
4
- # -*- encoding: utf-8 -*-
5
-
6
- Gem::Specification.new do |s|
7
- s.name = %q{rvm}
8
- s.version = "0.0.33"
9
-
10
- s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
- s.authors = ["Wayne E. Seguin"]
12
- s.date = %q{2009-09-04}
13
- s.description = %q{Manages Ruby interpreter installations and switching between them.}
14
- s.email = %q{wayneeseguin@gmail.com}
15
- s.executables = ["rvm-install", "rvm-update"]
16
- s.extra_rdoc_files = [
17
- "README"
18
- ]
19
- s.files = [
20
- "INSTALL",
21
- "LICENCE",
22
- "README",
23
- "config/cache",
24
- "examples/rvmrc",
25
- "lib/rvm.rb",
26
- "rvm.gemspec",
27
- "scripts/rvm",
28
- "scripts/rvm-install",
29
- "scripts/rvm-update"
30
- ]
31
- s.homepage = %q{http://github.com/wayneeseguin/rvm}
32
- s.rdoc_options = ["--inline-source", "--charset=UTF-8"]
33
- s.require_paths = ["lib"]
34
- s.rubyforge_project = %q{dynamicreports}
35
- s.rubygems_version = %q{1.3.5}
36
- s.summary = %q{Ruby Version Manager (rvm)}
37
-
38
- if s.respond_to? :specification_version then
39
- current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
40
- s.specification_version = 3
41
-
42
- if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
43
- else
44
- end
45
- else
46
- end
47
- end