rconf 0.8.1 → 0.8.2

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 (4) hide show
  1. data/bin/rconf +0 -1
  2. data/lib/rconf/configurators/ruby_configurator.rb +16 -18
  3. data/lib/rconf/version.rb +1 -1
  4. metadata +23 -4
data/bin/rconf CHANGED
@@ -12,7 +12,6 @@
12
12
 
13
13
  $stdout.sync = true
14
14
 
15
- require 'json'
16
15
  require File.join(File.dirname(__FILE__), '..', 'lib', 'rconf')
17
16
 
18
17
  module RightConf
data/lib/rconf/configurators/ruby_configurator.rb CHANGED
@@ -132,25 +132,23 @@ module RightConf
132
132
  else
133
133
  report_failure
134
134
  if out =~ /rvm ([^\s]+)/
135
- report_fatal "You have rvm #{Regexp.last_match[1]} installed which is not compatible with rconf.\n" +
136
- "Please uninstall your version of rvm and re-run rconf which will install rvm #{RVM_VERSION}.\n" +
137
- "You can uninstall rvm by running 'rvm implode' or 'rm -rf ~/.rvm'"
138
- else
139
- report_check("Installing rvm #{version}")
140
- rvm_src = File.join(ENV['HOME'] || '/root', '.rvm/src')
141
- FileUtils.mkdir_p(rvm_src)
142
- Dir.chdir(rvm_src) do
143
- Command.execute('curl', '-O', '-f',
144
- "#{RVM_RELEASES_URL}/rvm-#{version}.tar.gz",
145
- :abort_on_failure => "Failed to download rvm #{version}")
146
- Command.execute('tar', 'zxf', "rvm-#{version}.tar.gz",
147
- :abort_on_failure => "Failed to extract rvm tgz from #{File.join(Dir.getwd, 'rvm-' + version + '.tar.gz')}")
148
- end
149
- Dir.chdir(File.join(rvm_src, "rvm-#{version}")) do
150
- Command.execute('./install', :abort_on_failure => "Failed to install rvm #{version}")
151
- end
152
- report_success
135
+ report_error "WARNING!: You have rvm #{Regexp.last_match[1]} installed which may not be compatible with rconf.\n" +
136
+ "rconf will proceed and try to install rvm #{version}."
137
+ end
138
+ report_check("Installing rvm #{version}")
139
+ rvm_src = File.join(ENV['HOME'] || '/root', '.rvm/src')
140
+ FileUtils.mkdir_p(rvm_src)
141
+ Dir.chdir(rvm_src) do
142
+ Command.execute('curl', '-O', '-f',
143
+ "#{RVM_RELEASES_URL}/rvm-#{version}.tar.gz",
144
+ :abort_on_failure => "Failed to download rvm #{version}")
145
+ Command.execute('tar', 'zxf', "rvm-#{version}.tar.gz",
146
+ :abort_on_failure => "Failed to extract rvm tgz from #{File.join(Dir.getwd, 'rvm-' + version + '.tar.gz')}")
153
147
  end
148
+ Dir.chdir(File.join(rvm_src, "rvm-#{version}")) do
149
+ Command.execute('./install', :abort_on_failure => "Failed to install rvm #{version}")
150
+ end
151
+ report_success
154
152
  end
155
153
  setup_bashrc
156
154
  true
data/lib/rconf/version.rb CHANGED
@@ -13,7 +13,7 @@ module RightConf
13
13
 
14
14
  MAJOR = 0
15
15
  MINOR = 8
16
- BUILD = 1
16
+ BUILD = 2
17
17
 
18
18
  VERSION = [MAJOR, MINOR, BUILD].map(&:to_s).join('.')
19
19
 
metadata CHANGED
@@ -1,8 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rconf
3
3
  version: !ruby/object:Gem::Version
4
- prerelease:
5
- version: 0.8.1
4
+ hash: 59
5
+ prerelease: false
6
+ segments:
7
+ - 0
8
+ - 8
9
+ - 2
10
+ version: 0.8.2
6
11
  platform: ruby
7
12
  authors:
8
13
  - Raphael Simon
@@ -10,7 +15,7 @@ autorequire:
10
15
  bindir: bin
11
16
  cert_chain: []
12
17
 
13
- date: 2011-04-14 00:00:00 -07:00
18
+ date: 2011-04-16 00:00:00 -07:00
14
19
  default_executable:
15
20
  dependencies:
16
21
  - !ruby/object:Gem::Dependency
@@ -21,6 +26,10 @@ dependencies:
21
26
  requirements:
22
27
  - - ~>
23
28
  - !ruby/object:Gem::Version
29
+ hash: 9
30
+ segments:
31
+ - 2
32
+ - 5
24
33
  version: "2.5"
25
34
  type: :development
26
35
  version_requirements: *id001
@@ -32,6 +41,10 @@ dependencies:
32
41
  requirements:
33
42
  - - ~>
34
43
  - !ruby/object:Gem::Version
44
+ hash: 25
45
+ segments:
46
+ - 0
47
+ - 9
35
48
  version: "0.9"
36
49
  type: :development
37
50
  version_requirements: *id002
@@ -121,17 +134,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
121
134
  requirements:
122
135
  - - ">="
123
136
  - !ruby/object:Gem::Version
137
+ hash: 3
138
+ segments:
139
+ - 0
124
140
  version: "0"
125
141
  required_rubygems_version: !ruby/object:Gem::Requirement
126
142
  none: false
127
143
  requirements:
128
144
  - - ">="
129
145
  - !ruby/object:Gem::Version
146
+ hash: 3
147
+ segments:
148
+ - 0
130
149
  version: "0"
131
150
  requirements: []
132
151
 
133
152
  rubyforge_project: rconf
134
- rubygems_version: 1.6.2
153
+ rubygems_version: 1.3.7
135
154
  signing_key:
136
155
  specification_version: 3
137
156
  summary: Cross platform environment configuration