rconf 0.8.18 → 0.8.19

data/lib/rconf/configurators/passenger_configurator.rb

@@ -147,24 +147,29 @@ module RightConf
       report_check('Installing passenger+nginx')
       # Grrrrr passenger installer expect rake where it's not... HACK
       ruby_dir = File.dirname(`which ruby`.chomp)
-      FileUtils.cp(`which rake`.chomp, ruby_dir) unless rake_exist = File.exist?(File.join(ruby_dir, 'rake'))
-      Command.execute_in_ruby('passenger-install-nginx-module', '--auto',
-                      '--auto-download', '--prefix', install_path,
-                      :abort_on_failure => "Failed to install nginx into #{install_path}")
-      FileUtils.mkdir_p(File.join(install_path, 'logs'))
-      File.open(File.join(install_path, 'conf', 'nginx.conf'), 'w') { |f| f.puts(nginx_config) }
-      if File.writable?('/etc/hosts') && IO.read('/etc/hosts') !~ /hosts_entry/
-        File.open('/etc/hosts', 'a') { |f| f.puts hosts_entry }
+      if ruby_dir !~ /\.rvm/
+        post_note 'Please enable rvm before passenger is installed by running ' + 'cd ..;cd -'.blue
+        report_failure
       else
-        post_note "Please add the following line to your /etc/hosts file:\n#{hosts_entry}\n" +
-                  "\nThe following aliases may help too:\n" +
-                  "alias nrestart='kill -HUP `cat #{pid_path}/nginx.pid`'\n" +
-                  "alias nstart='#{install_path}/sbin/nginx'\n" +
-                  "alias nstop='#{install_path}/sbin/nginx -s stop'"
+        FileUtils.cp(`which rake`.chomp, ruby_dir) unless rake_exist = File.exist?(File.join(ruby_dir, 'rake'))
+        Command.execute_in_ruby('passenger-install-nginx-module', '--auto',
+                                '--auto-download', '--prefix', install_path,
+                                :abort_on_failure => "Failed to install nginx into #{install_path}")
+        FileUtils.mkdir_p(File.join(install_path, 'logs'))
+        File.open(File.join(install_path, 'conf', 'nginx.conf'), 'w') { |f| f.puts(nginx_config) }
+        if File.writable?('/etc/hosts') && IO.read('/etc/hosts') !~ /hosts_entry/
+          File.open('/etc/hosts', 'a') { |f| f.puts hosts_entry }
+        else
+          post_note "Please add the following line to your /etc/hosts file:\n#{hosts_entry}\n" +
+            "\nThe following aliases may help too:\n" +
+            "alias nrestart='kill -HUP `cat #{pid_path}/nginx.pid`'\n" +
+            "alias nstart='#{install_path}/sbin/nginx'\n" +
+            "alias nstop='#{install_path}/sbin/nginx -s stop'"
+        end
+        post_note (post_note || '') + "\nNow open http://right-site.rightscale.local:3000 in your browser"
+        File.delete(File.join(ruby_dir, 'rake')) unless rake_exist
+        report_success
       end
-      post_note (post_note || '') + "\nNow open http://right-site.rightscale.local:3000 in your browser"
-      File.delete(File.join(ruby_dir, 'rake')) unless rake_exist
-      report_success
     end
 
     # Hosts entry in /etc/hosts

data/lib/rconf/version.rb

@@ -13,7 +13,7 @@ module RightConf
 
   MAJOR = 0
   MINOR = 8
-  BUILD = 18
+  BUILD = 19
 
   VERSION = [MAJOR, MINOR, BUILD].map(&:to_s).join('.')
 

data/rconf.rconf

@@ -1,7 +1,7 @@
 # Configuration settings for RightSite
 ruby do
-  version  'ruby-1.9.2-p180'
-  rubygems '1.6.2'
+  version  'ruby-1.9.2-p290'
+  rubygems '1.3.7'
   gemset   'rconf'
 end
 bundler do

metadata

@@ -1,8 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rconf
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.8.18
+  prerelease: false
+  segments: 
+  - 0
+  - 8
+  - 19
+  version: 0.8.19
 platform: ruby
 authors: 
 - Raphael Simon
@@ -10,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-20 00:00:00 -08:00
+date: 2011-12-27 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +25,9 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 5
         version: "2.5"
   type: :development
   version_requirements: *id001
@@ -32,6 +39,9 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
         version: "0.9"
   type: :development
   version_requirements: *id002
@@ -121,17 +131,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rconf
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Cross platform environment configuration