rconf 0.7.10 → 0.7.11

data/lib/rconf/configurator.rb

@@ -65,7 +65,8 @@ module RightConf
       # === Return
       # true:: Always return true
       def settings(settings)
-        @all_settings = settings
+        default_settings = { :only_if => 'Ruby code that should return true for configurator to proceed' }
+        @all_settings = settings.merge(default_settings)
         true
       end
 
@@ -97,7 +98,6 @@ module RightConf
     # nil:: If settings are valid for this configurator
     # error(String):: Error message otherwise
     def validate
-      init
       required = self.class.required_settings
       return nil unless required
       missing = required.flatten.select { |s| !@settings_values.include?(s) }
@@ -119,12 +119,14 @@ module RightConf
     # === Return
     # true:: Always return true
     def run(*args)
-      init
-      sha = Profile.configurator_signature(self.class.key)
+      key = "#{self.class.key}-#{@index}"
+      sha = Profile.configurator_signature(key)
       sig = signature
       if sha != sig
-        Platform.dispatch(*args) { :run }
-        Profile.set_configurator_signature(self.class.key, sig)
+        if only_if.nil? || instance_eval(only_if)
+          Platform.dispatch(*args) { :run }
+          Profile.set_configurator_signature(key, sig)
+        end
       end
       true
     end
@@ -157,7 +159,6 @@ module RightConf
     # value:: Value of configuration option if there is one
     # nil:: Otherwise
     def [](config_option)
-      init
       @settings_values[config_option]
     end
 
@@ -173,7 +174,6 @@ module RightConf
     # res(Object):: Configuration setting value or setter return value if
     #               arguments
     def method_missing(meth, *args)
-      init
       num_args = args.length
       res = nil
       if num_args > 0
@@ -189,11 +189,15 @@ module RightConf
       res || @settings_values[meth]
     end
 
-    # Initialize configuration settings hash
+    # Initialize configuration settings hash and index
+    #
+    # === Parameters
+    # index(Fixnum):: Unique index of configurators in rconf file
     #
     # === Return
     # true:: Always return true
-    def init
+    def initialize(index)
+      @index = index
       @settings_values ||= Hash.new
       true
     end

data/lib/rconf/configurators/build_configurator.rb

@@ -20,11 +20,12 @@ module RightConf
     description 'Builds a repository using the ./configure, make, make install commands'
 
     settings :path           => 'Path to source files',
+             :tarball_url    => 'URL to source code tarball to be downloaded, supports .tgz and .zip',
+             :tarball_dir    => 'Name of directory created when untaring tarball, required if "tarball_url" is set',
              :pre_step       => 'Command ran prior to ./configure',
              :message        => 'Progress message to display if any while building',
              :configure_opts => 'Hash of options to be given to the configure script. ' +
-                                'The keys are the platform families (:darwin, :linux or :windows)',
-             :only_if        => 'Ruby code that should return true for build to proceed'
+                                'The keys are the platform families (:darwin, :linux or :windows)'
 
     validate_has_settings :path
 
@@ -33,22 +34,46 @@ module RightConf
     # === Return
     # true:: Always return true
     def run_linux
-      if only_if.nil? || instance_eval(only_if)
-        message("Building #{path}") if message.nil?
-        report_check message
+      if tarball_url && tarball_dir.nil?
+        report_fatal("tarball_url is specified (#{tarball_url.inspect}) but tarball_dir is missing")
+      end
+      report_check message if message
+      Command.execute('mkdir', '-p', path, :abort_on_failure => "Failed to create #{path}")
+      if tarball_url
         Dir.chdir(path) do
-          Command.execute(*command_args(pre_step)) if pre_step
-          opts = configure_opts && configure_opts[Platform.family]
-          Command.execute(*command_args("./configure #{opts}"))
-          Command.execute(*command_args('make'))
-          report_success
-          report("Please enter you password to run the install step")
-          Command.sudo('echo')
-          report_check 'Installing'
-          Command.sudo(*command_args('make install'))
+          filename = File.basename(tarball_url)
+          unless File.exists?(File.join(Dir.pwd, filename))
+            Command.execute('curl', '-O', '-f', tarball_url, :abort_on_failure => "Failed to curl #{tarball_url}") 
+          end
+          abf = { :abort_on_failure => "Failed to uncompress #{filename}" }
+          case filename
+          when /\.tar\.gz$|\.tgz$/ then
+            Command.execute('tar', '-xzvf', filename, abf)
+          when /\.zip$/ then
+            Command.execute('unzip', filename, abf)
+          when /\.gzip$/ then
+            Command.execute('gunzip', filename, abf)
+          else
+            report_fatal("Unknown file extension #{File.extname(filename)}")
+          end
+          path File.join(path, tarball_dir)
+          if !File.directory?(path)
+            report_fatal("Could not find tarball dir #{tarball_dir.inspect} after untaring #{filename}")
+          end
         end
+      end
+      Dir.chdir(path) do
+        Command.execute(*command_args(pre_step)) if pre_step
+        opts = configure_opts && configure_opts[Platform.family]
+        Command.execute(*command_args("./configure #{opts}"))
+        Command.execute(*command_args('make'))
         report_success
+        report("Please enter you password to run the install step")
+        Command.sudo('echo')
+        report_check 'Installing'
+        Command.sudo(*command_args('make install'))
       end
+      report_success if message
       true
     end
     alias :run_darwin :run_linux

data/lib/rconf/language.rb

@@ -77,7 +77,7 @@ module RightConf
       if blk 
         klass = ConfiguratorRegistry[meth]
         if klass
-          configurator = klass.new(*args)
+          configurator = klass.new(@configurators.size)
           configurator.instance_eval(&blk)
           error = configurator.validate
           @validation_errors << error if error

data/lib/rconf/support/environment_updater.rb

@@ -28,7 +28,11 @@ module RightConf
     # true:: If bash resource or profile file was updated
     # false:: Otherwise
     def self.update(code, dependencies=[])
-      candidates = ['.bashrc', '.bash_profile']
+      if Platform.darwin?
+        candidates = [ '.bash_profile' ]
+      else
+        candidates = ['.bash_profile', '.bashrc']
+      end
       candidates.map! { |c| File.join(ENV['HOME'], c) }
       bashrc_path = candidates.detect { |c| File.exist?(c) }
       updated = false

data/lib/rconf/version.rb

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

data/spec/configurator_spec.rb

@@ -32,7 +32,7 @@ describe RightConf::Configurator do
   end
 
   before(:each) do
-    @configurator = TestConfigurator.new
+    @configurator = TestConfigurator.new(1)
   end
     
   it 'should register configurators' do
@@ -67,7 +67,7 @@ describe RightConf::Configurator do
   end
 
   it 'should skip configurators that have already run' do
-    flexmock(RightConf::Profile.instance).should_receive(:configurator_signature).with(:test).and_return('42')
+    flexmock(RightConf::Profile.instance).should_receive(:configurator_signature).with('test-1').and_return('42')
     flexmock(@configurator).should_receive(:signature).and_return('42')
     flexmock(RightConf::Platform.instance).should_receive(:dispatch).never
     @configurator.run

data/spec/configurators/build_configurator_spec.rb

@@ -18,12 +18,13 @@ describe RightConf::BuildConfigurator do
   end
 
   it 'should build' do
+    should_execute('mkdir', '-p', '../source', {:abort_on_failure=>"Failed to create ../source"}).once.ordered
     flexmock(Dir).should_receive(:chdir).with('../source', Proc).once.and_yield
     should_execute('./configure', {:abort_on_failure=>"Failed to run ./configure"}).once.ordered
     should_execute('make', {:abort_on_failure=>"Failed to run make"}).once.ordered
     should_sudo('echo').once.ordered
     should_sudo('make', 'install', {:abort_on_failure=>"Failed to run make install"}).once.ordered
-    @configurator.run
+    @configurator.run_linux
   end
 
   it 'should honor only_if' do

data/spec/configurators/ruby_configurator_spec.rb

@@ -62,7 +62,7 @@ end
 describe 'bashrc update' do
 
   before(:each) do
-    flexmock(File).should_receive(:exist?).with(File.join(ENV['HOME'], '.bashrc')).once.and_return(true)
+    flexmock(File).should_receive(:exist?).with(File.join(ENV['HOME'], '.bash_profile')).once.and_return(true)
     flexmock(File).should_receive(:exist?).with('.rvmrc').and_return(true)
     flexmock(FileUtils).should_receive(:mv).and_return(true)
     f = flexmock('f')

metadata

@@ -2,7 +2,7 @@
 name: rconf
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.10
+  version: 0.7.11
 platform: ruby
 authors: 
 - Raphael Simon
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-31 00:00:00 -07:00
+date: 2011-04-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency