rconf 0.6.1 → 0.6.2

data/bin/rconf

@@ -35,6 +35,7 @@ where [options] are:
         opt :configurators, 'Show available configurators'
         opt :config, 'Set path to configuration file', :type => :string
         opt :output, 'Output file (output to STDOUT by default)', :type => :string
+        opt :force, 'Run rconf even if configuration file has not changed'
         opt :verbose, 'Print debug output'
       end
       if opts[:config].nil? && !opts[:configurators]
@@ -91,6 +92,7 @@ where [options] are:
       begin
         lang = Language.load(options[:config])
         report_fatal("Validation of configuration file failed:\n  -#{lang.validation_errors.join("\n  -").map(&:red)}") unless lang.validation_errors.empty?
+        Profile.reset if options[:force]
         Dir.chdir(File.dirname(options[:config])) { lang.configurators.each(&:run) }
         report("Successfully configured #{File.basename(options[:config], '.rc').blue} for #{Platform.family.to_s.blue}")
       rescue Exception => e

data/lib/rconf/configurators/packages_configurator.rb

@@ -34,7 +34,7 @@ module RightConf
       report_check("Installing the following packages:\n#{debian.join(' ')}\nThis could take a while")
       opts = debian.dup 
       opts << { :abort_on_failure => 'Failed to install packages' } if abort_on_failure
-      Command.execute('sudo', 'aptitude', 'install', *opts)
+      Command.execute('sudo', 'apt-get', 'install', '-y', *opts)
       report_success
     end
     alias :run_linux_debian :run_linux_ubuntu

data/lib/rconf/configurators/ruby_configurator.rb

@@ -65,7 +65,7 @@ module RightConf
         if res.output =~ /^#{gemset}$/
           report_success
         else
-          report_fail
+          report_failure
           report_check("Creating gemset #{gemset} for  #{version}")
           Command.execute('rvm', version, 'gemset', 'create',  gemset,
                           :abort_on_failure => "Failed to create gemset '#{gemset}'") 

data/lib/rconf/profile.rb

@@ -51,6 +51,15 @@ module RightConf
       true
     end
 
+    # Delete profile from disk
+    #
+    # === Return 
+    # true:: Always return true
+    def reset
+      File.delete(profile_path) if File.file?(profile_path)
+      true
+    end
+
     # Entire profile with all settings
     #
     # === Return

data/lib/rconf/version.rb

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

data/spec/configurators/packages_configurator_spec.rb

@@ -27,7 +27,7 @@ describe RightConf::PackagesConfigurator do
 
   it 'should install packages on Ubuntu' do
     flexmock(RightConf::Command.instance).should_receive(:execute).once.with(
-      'sudo', 'aptitude', 'install', 'deb1', 'deb2').and_return(success_result)
+      'sudo', 'apt-get', 'install', '-y', 'deb1', 'deb2').and_return(success_result)
     @configurator.run_linux_ubuntu
   end
 

metadata

@@ -2,7 +2,7 @@
 name: rconf
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - Raphael Simon