rconf 0.7.11 → 0.7.12

data/Rakefile

@@ -25,7 +25,7 @@ task :build   => [ 'spec', 'gem' ]
 
 desc "Run unit tests"
 RSpec::Core::RakeTask.new do |t|
-  t.rspec_opts = ["--color"]
+  t.rspec_opts = ["--color --format=nested"]
 end
 
 namespace :spec do

data/lib/rconf/configurators/bundler_configurator.rb

@@ -37,14 +37,16 @@ module RightConf
       res = Command.execute_in_ruby('bundle', '--version')
       success = (res.output =~ /#{version}/)
       report_result(success)
-      install_bundler unless success
-      report_check('Installing gems')
-      options = [ "_#{version}_", 'install' ]
-      options << "--without=#{exclusions.delete(' ')}" unless exclusions.nil?
-      options += [ '--path', bundle_path ] unless bundle_path.nil?
-      options << { :abort_on_failure => 'Failed to install gems' }
-      res = Command.execute_in_ruby('bundle', *options)
-      report_success
+      unless success
+        install_bundler 
+        report_check('Installing gems')
+        options = [ "_#{version}_", 'install' ]
+        options << "--without=#{exclusions.delete(' ')}" unless exclusions.nil?
+        options += [ '--path', bundle_path ] unless bundle_path.nil?
+        options << { :abort_on_failure => 'Failed to install gems' }
+        res = Command.execute_in_ruby('bundle', *options)
+        report_success
+      end
       true
     end
     alias :run_darwin :run_linux

data/lib/rconf/configurators/passenger_configurator.rb

@@ -143,6 +143,7 @@ module RightConf
                   "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
@@ -210,7 +211,7 @@ http {
             
     server {
         ssi on;
-        listen 8080;
+        listen 3000;
         server_name right-site.rightscale.local;
         root #{File.join(right_site_src_path, 'public')};
         passenger_enabled on;
@@ -270,7 +271,7 @@ http {
     
         location /direct_library/
         {
-            proxy_pass http://library.rightscale.local:8081/;
+            proxy_pass http://library.rightscale.local:3001/;
             proxy_set_header   X-Relative-Root    library;
             proxy_set_header   X-Embedded         on;
             proxy_set_header   X-Core-Site-Domain    right-site.rightscale.local;
@@ -278,7 +279,7 @@ http {
     
         location ~ ^/library/users/(.+)/openid_consume
         {
-            proxy_pass http://library.rightscale.local:8081/users/$1/openid_consume?$args;
+            proxy_pass http://library.rightscale.local:3001/users/$1/openid_consume?$args;
             proxy_set_header   X-Relative-Root    library;
             proxy_set_header   X-Embedded         on;
         }
@@ -287,25 +288,25 @@ http {
         location ~ ^/library/(.*).(css|js)
         {
           # library assets get proxied directly to the library app    
-          proxy_pass http://library.rightscale.local:8081/$1.$2;
+          proxy_pass http://library.rightscale.local:3001/$1.$2;
         }
     
         location /library_images/
         {
-          proxy_pass http://library.rightscale.local:8081/library_images/;
+          proxy_pass http://library.rightscale.local:3001/library_images/;
         }
     
     
         location /library_rest/
         {
-          proxy_pass http://127.0.0.1:87/;
+          proxy_pass http://127.0.0.1:3001/;
           proxy_set_header   X-Relative-Root    library;
           proxy_set_header   X-Core-Site-Domain    right-site.rightscale.local;
         }
     }
     server {
         ssi on;
-        listen 8081;
+        listen 3001;
         server_name library.rightscale.local;
         root #{library_src_path}/public;
         passenger_enabled on;

data/lib/rconf/version.rb

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

data/spec/configurators/bundler_configurator_spec.rb

@@ -28,8 +28,6 @@ describe RightConf::BundlerConfigurator do
 
   it 'should succeed when bundler succeeds' do
     should_execute_in_ruby('bundle', '--version').once.and_return(success_result('0'))
-    should_execute_in_ruby('bundle','_0_', 'install', 
-                           {:abort_on_failure=>"Failed to install gems"}).once.and_return(success_result)
     @configurator.run_linux
   end
 

data/spec/support/package_installer_spec.rb

@@ -39,6 +39,7 @@ describe RightConf::PackageInstaller do
 
   it 'should install packages on Darwin' do
     flexmock(RightConf::Platform.instance).should_receive(:family).and_return(:darwin)
+    flexmock(RightConf::BrewInstaller).should_receive(:check_and_install).once
     should_execute('brew', 'install', 'mac1').once.and_return(success_result)
     should_execute('brew', 'install', 'mac2').once.and_return(success_result)
     RightConf::PackageInstaller.install(['mac1', 'mac2'])

metadata

@@ -2,7 +2,7 @@
 name: rconf
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.11
+  version: 0.7.12
 platform: ruby
 authors: 
 - Raphael Simon
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-05 00:00:00 -07:00
+date: 2011-04-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rconf
-rubygems_version: 1.6.2
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Cross platform environment configuration