rconf 0.9.19 → 0.9.20

data/lib/rconf/configurators/passenger_configurator.rb

@@ -106,7 +106,7 @@ module RightConf
     def default_install_path
       path = if File.exist?('/opt')
         if File.exist?('/opt/nginx')
-          pick_default_path(File.writable?('/opt/nginx'))
+          pick_default_path(File.writable?('/opt/nginx') && File.executable?('/opt/nginx/sbin/nginx'))
         else
           res = Command.execute('mkdir', '/opt/nginx')
           pick_default_path(res.success?)
@@ -152,9 +152,12 @@ module RightConf
         report_failure
       else
         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',
+        FileUtils.mkdir_p(install_path)
+        Dir.chdir(install_path) do
+          Command.execute_in_ruby('passenger-install-nginx-module', '--auto',
                                 '--auto-download', '--prefix', install_path,
                                 :abort_on_failure => "Failed to install nginx into #{install_path}")
+        end
         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/

data/lib/rconf/version.rb

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

data/spec/configurators/passenger_configurator_spec.rb

@@ -21,6 +21,7 @@ describe RightConf::PassengerConfigurator do
     flexmock(File).should_receive(:exist?).with('/opt/nginx').once.and_return(true)
     flexmock(File).should_receive(:exist?).with('/opt').once.and_return(true)
     flexmock(File).should_receive(:writable?).with('/opt/nginx').once.and_return(true)
+    flexmock(File).should_receive(:executable?).with('/opt/nginx/sbin/nginx').once.and_return(true)
     @configurator.__send__(:default_install_path).should == '/opt/nginx'
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rconf
 version: !ruby/object:Gem::Version
-  version: 0.9.19
+  version: 0.9.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-04 00:00:00.000000000Z
+date: 2012-07-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70217314208600 !ruby/object:Gem::Requirement
+  requirement: &70209399567560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70217314208600
+  version_requirements: *70209399567560
 - !ruby/object:Gem::Dependency
   name: flexmock
-  requirement: &70217314204080 !ruby/object:Gem::Requirement
+  requirement: &70209399566940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70217314204080
+  version_requirements: *70209399566940
 description: ! 'rconf configures the environment for a given application. rconf reads
 
   the content of an application configuration file and installs and/or