rconf 1.0.11 → 1.0.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWVjNmI0Nzc5YjZjODllNWZkMmMzOGM2N2ZlYmVmYzMwNDQxMjNlZA==
+    OTg4MDQ2NGY4ZTI1NDMzZTFiNzc5NzYwZTBmMTlkZDQ5NjhhMjM5Nw==
   data.tar.gz: !binary |-
-    YjQ5MDVjZmQ1Zjg4NGUyYjZhODU2ZDlkOGI2MzZkOGY3MDFmZjAzYw==
+    OTliZTY2MjBjMDZhOGFjZTM3ZTQ5ZmJkOWIzYTdjNGRkZDc1MzU4NA==
 SHA512:
   metadata.gz: !binary |-
-    ZTAzMTE5ZDI5NGQ5NjhkODg0OTA4YWMwNzQ3ODZlNjIwYjZkOTQ3YjBiN2M4
-    MDY0NmNhODVmMjZjMjAwNzU1ZmJiMTIyZWQwYjkxZDczYjcxNmY2OTY5MjE5
-    OTU1YmIwNDFkMWQyZGE1MWZkMmI0NjAxODk3MGIyZGNkNjhlZjY=
+    ZDNkZTUwYzAwMzMyZTk1OTBhMmI1YmVlZDYzMTI2Yzc4OTE5ODM1MDU5YTZi
+    MTcwN2Q5NWVkZmE5NzBiMzYyZGM3NjMyMWMzZTc1ZTE2YjFkODIxODA3OGU5
+    NDVhMmY5M2NlNGJlNTM2MjgwZTdlNDkyMWQ2MTZhNWFkNzMwOTY=
   data.tar.gz: !binary |-
-    ODllM2VlYmM3ZDFiMmY3ZTdkODQwMjk1MWQ2YTMwMWQxNDY1YzMyMGEzNjQz
-    NmVhYjBmYjU1ZDI4Mjk3NzM0NWQ2ZDQ0MjYwNWMwMDY2NTMzNmQyYWFlNmU1
-    YTRmNTI1Nzk5ZTcyZDJkYmI0OWY0MTY4MWVhMWUyMDdmOGNiYTI=
+    MmYwY2I0ZTRlMjRhYTBjYTM2YjdmZjU4Yjk5YzNhNTkxMTdhMGU2YjkzNDdk
+    OWUwYThiYTcyZjExODE1MzUyMmM2OWE3ZjYwMjY3NzdiMGIzZmNjOTI2Mjgy
+    MTljMThhZGU2MjJkNzk0MzY3YTBlNzQ0MjRjMWUyNGU4OWZiZjk=

data/lib/rconf/configurators/cassandra_configurator.rb

@@ -27,6 +27,7 @@ module RightConf
                                   'is writable by the current user or ~/cassandra otherwise by default'
     setting  'abort_on_failure','Whether to abort if Cassandra failed to install (false by default)'
     setting  'endpoint_snitch', 'Set custom endpoint snitch for installed cassandra'
+    setting  'partitioner', 'Set custom partitioner for installed cassandra'
 
     # Check whether Cassandra is installed
     #
@@ -54,6 +55,7 @@ module RightConf
     # === Return
     # true:: Always return true
     def run_linux
+      post_note ""
       install_path(default_install_path) if install_path.nil?
       abort_on_failure(true) if abort_on_failure.nil?
       report_check('Installing Cassandra')
@@ -61,7 +63,7 @@ module RightConf
       if File.exist?(install_path)
         FileUtils.rm_rf("#{install_path}_old")
         FileUtils.mv(install_path, "#{install_path}_old")
-        post_note "Had to move #{install_path} to #{install_path}_old"
+        post_note(post_note + "Had to move #{install_path} to #{install_path}_old\n")
       end
       FileUtils.mkdir_p(install_path)
       Dir.chdir(install_path) do
@@ -70,18 +72,11 @@ module RightConf
       end
       bin_path = File.join(install_path, "apache-cassandra-#{version}", 'bin')
       if EnvironmentUpdater.update("PATH=$PATH:#{bin_path}", ['PATH'])
-        post_note 'Cassandra was installed, please reload your shell to activate it and re-run rconf'
+        post_note(post_note + "Cassandra was installed, please reload your shell to activate it and re-run rconf\n")
         aborting(true)
       end
       report_success
-      if (endpoint_snitch)
-        report_check 'Change cassandra configuration.'
-        config_path = File.join(install_path, "apache-cassandra-#{version}", 'conf', 'cassandra.yaml')
-        backup_ext = '.orig'
-        Command.execute('sed', '-i', backup_ext, '-e', "s%^endpoint_snitch: .*$%endpoint_snitch: #{endpoint_snitch}%", config_path)
-        report_success
-        post_note "Origin config file in #{config_path}#{backup_ext}"
-      end
+      cassandra_configure({:endpoint_snitch => endpoint_snitch, :partitioner => partitioner})
     end
     alias :run_darwin :run_linux
 
@@ -137,6 +132,27 @@ module RightConf
       opts = abort_on_failure && { :abort_on_failure => message } || {}
     end
 
+    # Set custom values on the cassandra.yaml file for installed cassandra
+    #
+    # === Parameters
+    # settings(Hash):: key and value of the new settings
+    #
+    # === Return
+    # true:: Always return true
+    def cassandra_configure(settings)
+      first = true
+      report_check 'Change cassandra configuration.'
+      config_path = File.join(install_path, "apache-cassandra-#{version}", 'conf', 'cassandra.yaml')
+      settings.each do |key, value|
+        if (value)
+          backup_ext = if first then '.orig' else '' end
+          Command.execute('sed', '-i', backup_ext, '-e', "s%^#{key}: .*$%#{key}: #{value}%", config_path)
+          first = false
+        end
+      end
+      report_success
+      post_note(post_note + "Original config file in #{config_path}.orig\n")
+    end
   end
 end
 

data/lib/rconf/configurators/ruby_configurator.rb

@@ -106,10 +106,10 @@ module RightConf
         aborting(true)
       elsif rbenv_in_path
         # rbenv is installed and initialized; make sure we have a suitable version
-        res.output =~ /^rbenv ([0-9]+)\.([0-9]+)\.([0-9]+)$/
-        maj, min, build = [$1.to_i, $2.to_i, $3.to_i]
+        res.output =~ /^rbenv ([0-9]+)\.([0-9]+)\.([0-9]+)(\-.*)?$/
+        maj, min, build, subhash = [$1.to_i, $2.to_i, $3.to_i, $4]
         if maj == 0 && min < 4
-          report_fatal("rconf requires rbenv version 0.4.0 or greater, you have #{maj}.#{min}.#{build} installed, "+
+          report_fatal("rconf requires rbenv version 0.4.0 or greater, you have #{maj}.#{min}.#{build}#{subhash} installed, "+
                        "please upgrade (e.g. via 'brew upgrade rbenv') and try again")
         end
       else

data/lib/rconf/platform.rb

@@ -80,7 +80,7 @@ module RightConf
       binding = blk.binding.eval('self')
       meth = blk.call
       target = dispatch_candidates(meth).detect do |candidate|
-        binding.respond_to?(candidate)
+        binding.respond_to?(candidate, true)
       end
       raise "No platform dispatch target found in #{binding.class} for " +
             "'#{meth.inspect}', tried " + dispatch_candidates(meth).join(', ') unless target

data/lib/rconf/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rconf
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - Raphael Simon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-22 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec