rconf 0.8.5 → 0.8.8

data/lib/rconf/configurator.rb

@@ -131,11 +131,12 @@ module RightConf
         key = "#{self.class.key}-#{@index}"
         sha = Profile.configurator_signature(key)
         sig = signature
-        if Profile.force_reconfigure? || 
-            (Profile.force_check? || sha != sig && (only_if.nil? || instance_eval(only_if)) && !check)
-          Platform.dispatch(*args) { :run }
-          Profile.set_configurator_signature(key, sig)
+        must_configure = Profile.force_reconfigure?
+        if !must_configure && (only_if.nil? || instance_eval(only_if))
+          must_configure = (Profile.force_check? || sha != sig) && !check
         end
+        Platform.dispatch(*args) { :run } if must_configure
+        Profile.set_configurator_signature(key, sig)
       true
     end
 

data/lib/rconf/configurators/passenger_configurator.rb

@@ -42,7 +42,7 @@ module RightConf
       set_defaults
       report_check("Checking for passenger gem #{gem_version}")
       res = Command.execute_in_ruby('gem', 'list', 'passenger')
-      success = (res.output =~ /^passenger \(#{gem_version}\)$/)
+      success = (res.output =~ /#{gem_version}/)
       report_result(success)
       if success
         report_check('Checking for passenger+nginx')

data/lib/rconf/version.rb

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

data/spec/configurator_spec.rb

@@ -59,7 +59,7 @@ describe RightConf::Configurator do
   end
 
   it 'should check' do
-    flexmock(@configurator).should_receive(:check).and_return(true).once
+    flexmock(RightConf::Profile.instance).should_receive(:configurator_signature).and_return(@configurator.signature)
     flexmock(RightConf::Platform.instance).should_receive(:dispatch).never
     @configurator.run
   end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rconf
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.8.5
+  hash: 47
+  prerelease: false
+  segments: 
+  - 0
+  - 8
+  - 8
+  version: 0.8.8
 platform: ruby
 authors: 
 - Raphael Simon
@@ -21,6 +26,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 5
         version: "2.5"
   type: :development
   version_requirements: *id001
@@ -32,6 +41,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
         version: "0.9"
   type: :development
   version_requirements: *id002
@@ -121,17 +134,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      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