rconf 0.9.20 → 0.9.21

data/.gitignore

@@ -2,3 +2,4 @@ tags
 pkg/*
 .rvmrc
 Gemfile.lock
+.idea/

data/bin/rconf

@@ -213,11 +213,16 @@ where [options] are:
         report_fatal("Validation of configuration file failed:\n  - #{lang.validation_errors.map(&:red).join("\n  - ")}") unless lang.validation_errors.empty?
         report_error(lang.warnings.join(', ').green) unless lang.warnings.empty?
         aborted = false
-        Dir.chdir(File.dirname(options[:config])) do
-          lang.configurators.each do |c|
-            c.run
-            break if aborted = c.aborting
-            c.post_process
+        if Platform.release == 'unknown'
+          report_fatal("Unable to determine platform flavor and release. You may need to install a package to enable platform detection by command line.")
+          aborted = true
+        else
+          Dir.chdir(File.dirname(options[:config])) do
+            lang.configurators.each do |c|
+              c.run
+              break if aborted = c.aborting
+              c.post_process
+            end
           end
         end
         project  = File.basename(options[:config], CONFIG_EXTENSION).blue

data/lib/rconf/configurators/cassandra_configurator.rb

@@ -25,7 +25,8 @@ module RightConf
     settings :version          => 'Cassandra version to install',
              :install_path     => 'Path to Cassandra installation directory, uses /opt/cassandra if it ' +
                                   'is writable by the current user or ~/cassandra otherwise by default',
-             :abort_on_failure => 'Whether to abort if Cassandra failed to install (false by default)'
+             :abort_on_failure => 'Whether to abort if Cassandra failed to install (false by default)',
+             :endpoint_snitch  => 'Set custom endpoint snitch for installed cassandra'
 
     validate_has_settings :version
 
@@ -75,6 +76,15 @@ module RightConf
         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_path = File.join(install_path, "apache-cassandra-#{version}", 'conf', 'cassandra.yaml.orig')
+        Command.execute('cp', config_path, backup_path)
+        Command.execute('sed', '-i', "s%^endpoint_snitch: .*$%endpoint_snitch: #{endpoint_snitch}%", config_path)
+        report_success
+        post_note "Origin config file in #{backup_path}"
+      end
     end
     alias :run_darwin :run_linux
 

data/lib/rconf/configurators/passenger_configurator.rb

@@ -169,7 +169,7 @@ module RightConf
             "alias nstart='#{install_path}/sbin/nginx'\n" +
             "alias nstop='#{install_path}/sbin/nginx -s stop'"
         end
-        post_note (post_note || '') + "\nNow open http://right-site.rightscale.local:3000 in your browser"
+        post_note (post_note || '') + "\nThe nginx settings will make right_site available at http://right-site.rightscale.local:3000"
         File.delete(File.join(ruby_dir, 'rake')) unless rake_exist
         report_success
       end
@@ -180,7 +180,11 @@ module RightConf
     # === Return
     # entry(String):: Hosts entry required to run local dev
     def hosts_entry
-      '127.0.0.1       right-site.rightscale.local  library.rightscale.local  rightscale.local'
+      "\n" +
+      "# added by rconf's passenger_configurator\n"
+      "#\n" +
+      "255.255.255.255  broadcasthost\n" +
+      "127.0.0.1        right-site.rightscale.local library.rightscale.local rightscale.local"
     end
 
     # Nginx error log path

data/lib/rconf/configurators/ruby_configurator.rb

@@ -85,7 +85,7 @@ module RightConf
           report_failure
           report_check("Creating gemset #{gemset} for #{version}")
           Command.execute('rvm', version, 'exec', 'rvm', 'gemset', 'create',  gemset,
-                          :abort_on_failure => "Failed to create gemset '#{gemset}'") 
+                          :abort_on_failure => "Failed to create gemset '#{gemset}'")
         end
         report_check("Switching to gemset #{gemset}")
         Command.execute('rvm', version, 'exec', 'rvm', 'gemset', 'use',  gemset,
@@ -164,7 +164,7 @@ module RightConf
           Command.execute('curl', '-O', '-f',
                           "#{RVM_RELEASES_URL}/rvm-#{version}.tar.gz",
                           :abort_on_failure => "Failed to download rvm #{version}")
-          Command.execute('tar', 'zxf', "rvm-#{version}.tar.gz", 
+          Command.execute('tar', 'zxf', "rvm-#{version}.tar.gz",
                           :abort_on_failure => "Failed to extract rvm tgz from #{File.join(Dir.getwd, 'rvm-' + version + '.tar.gz')}")
         end
         Dir.chdir(File.join(rvm_src, "rvm-#{version}")) do
@@ -186,7 +186,7 @@ module RightConf
     # === Return
     # true:: Always return true
     def install_ruby(ruby)
-      Platform.dispatch(ruby) { :install_ruby_prerequisites } 
+      Platform.dispatch(ruby) { :install_ruby_prerequisites }
       report_check("Installing #{ruby} (this will take a while, please be patient)")
       Command.execute('rvm', 'install', ruby, :abort_on_failure => 'Failed to install ruby')
       report_success
@@ -205,7 +205,7 @@ module RightConf
       report_check("Installing #{ruby} (this will take a while, please be patient)")
       version = `system_profiler SPDeveloperToolsDataType -xml | xpath "//*[text()='_items']/following-sibling::array/dict/child::key[text()='spdevtools_version']/following-sibling::string/text()" 2> /dev/null`
       env = {}
-      if version =~ /^4\.2\.[0-9]+/ 
+      if version =~ /^4\.2\.[0-9]+/
         if !File.executable?('/usr/bin/gcc-4.2')
           report_fatal("The C compiler included with Xcode #{version} produces buggy ruby interpreters, please install the C compilers from https://github.com/downloads/kennethreitz/osx-gcc-installer/GCC-10.7-v2.pkg and re-run rconf")
         else
@@ -218,7 +218,7 @@ module RightConf
 
     # Make sure to install all required linux packages first
     #
-    # === Return 
+    # === Return
     # true:: Always return true
     def install_ruby_prerequisites_linux_ubuntu(ruby)
       report_check("Installing required packages, this could take a while")
@@ -226,10 +226,12 @@ module RightConf
       if ruby =~ /^ree-|^ruby-/
         packages = %w(build-essential bison openssl libreadline6 libreadline6-dev curl git-core zlib1g zlib1g-dev libssl-dev libyaml-dev libsqlite3-0 libsqlite3-dev sqlite3 libxml2-dev libxslt-dev autoconf libc6-dev)
       end # TBD Define packages needed for other rubies
-      Command.sudo('apt-get', 'install', '-y', *packages) 
+      Command.sudo('apt-get', 'install', '-y', *packages)
       report_success
     end
 
+    alias install_ruby_prerequisites_linux_debian install_ruby_prerequisites_linux_ubuntu
+
     # Make sure to install all required CentOS / RedHhat packages first
     # NOTE: For centos 5.4 final iconv-devel might not be available :(
     #
@@ -237,11 +239,11 @@ module RightConf
     # true:: Always return true
     def install_ruby_prerequisites_linux_centos(ruby)
       report_check("Installing required packages, this could take a while")
-      packages = [] 
+      packages = []
       if ruby =~ /^ree-|^ruby-/
         packages = %w(gcc-c++ patch readline readline-devel zlib zlib-devel libyaml-devel libffi-devel openssl-devel iconv-devel)
       end # TBD Define packages needed for other rubies
-      Command.sudo('yum', 'install', '-y', *packages) 
+      Command.sudo('yum', 'install', '-y', *packages)
       report_success
     end
     alias :install_ruby_prerequisites_linux_redhat :install_ruby_prerequisites_linux_centos
@@ -289,14 +291,14 @@ then
   if [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]]
   then
     . "${rvm_path:-$HOME/.rvm}/hooks/after_use"
-  fi  
+  fi
 else
   # If the environment file has not yet been created, use the RVM CLI to select.
   if ! rvm --create  "$environment_id"
   then
     echo "Failed to create RVM environment '${environment_id}'."
     return 1
-  fi  
+  fi
 fi
 if [[ $- == *i* ]] # check for interactive shells
 then

data/lib/rconf/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rconf
 version: !ruby/object:Gem::Version
-  version: 0.9.20
+  version: 0.9.21
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-06 00:00:00.000000000Z
+date: 2012-08-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70209399567560 !ruby/object:Gem::Requirement
+  requirement: &70332318079960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70209399567560
+  version_requirements: *70332318079960
 - !ruby/object:Gem::Dependency
   name: flexmock
-  requirement: &70209399566940 !ruby/object:Gem::Requirement
+  requirement: &70332318079280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70209399566940
+  version_requirements: *70332318079280
 description: ! 'rconf configures the environment for a given application. rconf reads
 
   the content of an application configuration file and installs and/or