rconf 0.8.2 → 0.8.3

data/Gemfile

@@ -1,7 +1,5 @@
 source :gemcutter
 
-gem 'json', '> 1.1.6'
-
 #Gems needed to execute the unit specs.
 group :test do
   gem 'rspec',              '~> 2.5'

data/bin/rconf

@@ -183,7 +183,7 @@ where [options] are:
     # === Return
     # true:: Always return true
     def configure(options)
-      Profile.reset if options[:force]
+      Profile.force if options[:force]
       ProgressReporter.report_to_stdout
       ProgressReporter.report_to_file(options[:output]) if options[:output]
       begin

data/lib/rconf/configurator.rb

@@ -123,7 +123,7 @@ module RightConf
       sha = Profile.configurator_signature(key)
       sig = signature
       if sha != sig
-        if only_if.nil? || instance_eval(only_if)
+        if only_if.nil? || instance_eval(only_if) || Profile.force?
           Platform.dispatch(*args) { :run }
           Profile.set_configurator_signature(key, sig)
         end

data/lib/rconf/configurators/ruby_configurator.rb

@@ -44,6 +44,7 @@ module RightConf
       out = Command.execute('rvm', 'list').output
       if out =~ /^=> #{version.gsub('.', '\\.')}/
         report_success
+        check_rvmrc
       else
         report_failure
         report_check("Switching to #{version}")
@@ -212,20 +213,21 @@ module RightConf
     # === Return
     # true:: Always return true
     def check_rvmrc
-      return true if File.exist?('.rvmrc')
-      report_check('Setting up .rvmrc')
-      begin
-        File.open('.rvmrc', 'w') do |f|
-          f.puts "rvm #{version}@#{gemset}"
-          f.puts "type -P rconf &>/dev/null && { rconf; }"
-          f.puts "type -P rconf &>/dev/null || { echo 'rconf not installed, skipping (see .rvmrc)'; }"
+      if !File.exist?('.rvmrc') || IO.read('.rvmrc') !~ /#{version}@#{gemset}/
+        report_check('Setting up .rvmrc')
+        begin
+          File.open('.rvmrc', 'w') do |f|
+            f.puts "rvm #{version}@#{gemset}"
+            f.puts "type -P rconf &>/dev/null && { rconf; }"
+            f.puts "type -P rconf &>/dev/null || { echo 'rconf not installed, skipping (see .rvmrc)'; }"
+          end
+          report_success
+          post_note "Configuration required switching the active ruby\nPlease run " + 'cd ..;cd -'.blue + ' to activate it and finish configuration'.green
+          aborting(true)
+        rescue Exception => e
+          report_failure
+          report_error(e.message)
         end
-        report_success
-        post_note "Configuration required switching the active ruby\nPlease run " + 'cd ..;cd -'.blue + ' to activate it and finish configuration'.green
-        aborting(true)
-      rescue Exception => e
-        report_failure
-        report_error(e.message)
       end
       true
     end

data/lib/rconf/profile.rb

@@ -72,6 +72,24 @@ module RightConf
       @profile
     end
 
+    # Force re-configuration even if it was already done
+    #
+    # === Return
+    # true:: Always return true
+    def force
+      @force = true
+      reset
+    end
+
+    # Should next configuration force re-configuration?
+    #
+    # === Return
+    # true:: If re-configuration should be forced
+    # false:: Otherwise
+    def force?
+      res = @force || false
+    end
+
     protected
 
     # Retrieve profile file path

data/lib/rconf/version.rb

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

data/spec/profile_spec.rb

@@ -18,6 +18,12 @@ describe RightConf::Profile do
     RightConf::Profile.set_configurator_signature(:test, '42')
   end
 
+  it 'should reset when forcing re-configuration' do
+    flexmock(RightConf::Profile.instance).should_receive(:reset).once
+    RightConf::Profile.force
+    RightConf::Profile.force?.should be_true
+  end
+
 end
 
 

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rconf
 version: !ruby/object:Gem::Version 
-  hash: 59
-  prerelease: false
-  segments: 
-  - 0
-  - 8
-  - 2
-  version: 0.8.2
+  prerelease: 
+  version: 0.8.3
 platform: ruby
 authors: 
 - Raphael Simon
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-16 00:00:00 -07:00
+date: 2011-05-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,10 +21,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 5
         version: "2.5"
   type: :development
   version_requirements: *id001
@@ -41,10 +32,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
         version: "0.9"
   type: :development
   version_requirements: *id002
@@ -134,23 +121,17 @@ 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.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Cross platform environment configuration