haproxyctl 1.1.0 → 1.2.0

data/.rubocop.yml

@@ -0,0 +1 @@
+inherit_from: rubocop-todo.yml

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2010-2012 
+Copyright (C) 2010-2013
 author: Carlo Flores <github@petalphile.com>
 contributors: Scott Gonyea, John A. Barbuto, Ben Lovett, 
   Till Klampaeckel, Erik Osterman, Martin Hald, DeniedBoarding,

data/README.md

@@ -11,17 +11,20 @@ This is a simple wrapper to make life with HAProxy a little more convenient.
 
 [Here](http://scale10x.biggiantnerds.com) is a presentation about it.
 
+
 Installation
 ------------
 
 On most UNIX, assuming HAProxy is in the $PATH:
-  
-  git clone git@github.com:flores/haproxyctl.git
-  ln -s haproxyctl/haproxyctl /etc/init.d/haproxyctl
+<pre>
+git clone git@github.com:flores/haproxyctl.git
+ln -s haproxyctl/haproxyctl /etc/init.d/haproxyctl
+</pre>
 
 For chkconfig/RedHat/Centos, add:
-  
-  chkconfig --add haproxyctl
+<pre>
+chkconfig --add haproxyctl
+</pre>
 
 There is also an HAProxy source installation script.  This installs not only the steps above but latest HAProxy sources!
 
@@ -344,6 +347,14 @@ Contributors
 - [deniedboarding](https://github.com/deniedboarding)
 - [Aaron Blew aka `blewa`](https://github.com/blewa)
 - [Nick Griffiths aka `nicobrevin`](https://github.com/nicobrevin)
+- [Florian Holzhauer aka `fh`](https://github.com/fh)
+
+
+Non-current HAProxy versions 
+------------
+Be aware that HAProxy below current stable (1.4) does not support many of the 
+options of haproxyctl.
+
 
 License
 -----------------

data/bin/haproxyctl

@@ -13,7 +13,7 @@
 
 require 'pathname'
 lib = File.join(File.dirname(Pathname.new(__FILE__).realpath), '../lib')
-$:.unshift lib unless $:.include?(lib)
+$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
 
 require 'haproxyctl'
 include HAProxyCTL
@@ -23,70 +23,70 @@ argument = ARGV.join(' ')
 unless has_exec?
   puts usage if argument =~ /help/ || ARGV.length < 1
 
-  raise "Cannot find haproxy executable. Please ensure it is in your $PATH, or set $HAPROXY_BIN environment variable."
+  fail 'Cannot find haproxy executable. Please ensure it is in your $PATH, or set $HAPROXY_BIN environment variable.'
 end
 
 display_usage! if argument =~ /help/ || ARGV.length < 1
 
 begin
   case argument
-  when "start"
+  when 'start'
     if pidof
-      raise("haproxy is already running on pid #{pidof}!")
+      fail("haproxy is already running on pid #{pidof}!")
     else
       start
     end
-  when "stop"
+  when 'stop'
     stop(check_running)
-  when "restart"
+  when 'restart'
     if pidof
       stop(pidof)
-      stillpidof = check_running()
+      stillpidof = check_running
       while stillpidof == pidof
         puts "still haven't killed old pid.  waiting 3s for existing connections to die... (ctrl+c to stop)"
         sleep 3
-        stillpidof = check_running() || 0
+        stillpidof = check_running || 0
       end
-      start()
+      start
     else
-      puts "haproxy was not running.  starting..."
-      start()
+      puts 'haproxy was not running.  starting...'
+      start
     end
-  when "reload"
-    if ( pidof )
+  when 'reload'
+    if  pidof
       reload(pidof)
     else
-      puts "haproxy not running.  starting..."
-      start()
+      puts 'haproxy not running.  starting...'
+      start
     end
-  when "status"
-    if ( pidof )
+  when 'status'
+    if  pidof
       puts "haproxy is running on pid #{pidof}.\nthese ports are used and guys are connected:"
       system("lsof -ln -i |awk \'$2 ~ /#{pidof}/ {print $8\" \"$9}\'")
     else
-      puts "haproxy is not running"
+      puts 'haproxy is not running'
     end
-  when "configcheck"
+  when 'configcheck'
     puts `#{exec} -c -f #{config_path}`
-  when "nagios"
-    if ( pidof )
-      puts "OK"
+  when 'nagios'
+    if  pidof
+      puts 'OK'
       exit
     else
-      puts "CRITICAL: HAProxy is not running!"
+      puts 'CRITICAL: HAProxy is not running!'
       exit(2)
     end
-  when "cloudkick"
-    if ( pidof )
-      puts "status ok haproxy is running"
+  when 'cloudkick'
+    if  pidof
+      puts 'status ok haproxy is running'
       conn = `lsof -ln -i |grep -c #{pidof}`.chomp.to_i
       # removes the listener
       conn = conn - 1
       puts "metric connections int #{conn}"
-      status=unixsock("show stat")
+      status = unixsock('show stat')
       status.each do |line|
         line = line.split(',')
-        if (line[0] !~ /^#/)
+        if line[0] !~ /^#/
           host = "#{line[0]}_#{line[1]}"
           puts "metric #{host}_request_rate int #{line[47]}" if line[47].to_i > 0
           puts "metric #{host}_total_requests gauge #{line[49]}" if line[49].to_i > 0
@@ -95,59 +95,59 @@ begin
         end
       end
     else
-      puts "status err haproxy is not running!"
+      puts 'status err haproxy is not running!'
     end
-  when "show health"
-    status=unixsock("show stat")
+  when 'show health'
+    status = unixsock('show stat')
     status.each do |line|
       data = line.split(',')
       printf "%-30s %-30s %-7s %3s\n", data[0], data[1], data[17], data[18]
     end
   when /show backend(s?)/
-    status=unixsock("show stat").grep(/BACKEND/)
+    status = unixsock('show stat').grep(/BACKEND/)
     status.each do |line|
       data = line.split(',')
       printf "%-30s %-30s %-7s %3s\n", data[0], data[1], data[17], data[18]
     end
   when /disable all EXCEPT (.+)/
-    servername=$1
-    status=unixsock("show stat")
+    servername = Regexp.last_match[ 1]
+    status = unixsock('show stat')
     backend = status.grep(/#{servername}/)
     backend.each do |line|
       backend_group = line.split(',')
       status.each do |pool|
         data = pool.split(',')
-        if ( (data[0] == backend_group[0]) && ( data[1] !~ /#{servername}|BACKEND|FRONTEND/ ) && ( data[17] == 'UP' ) )
+        if  (data[0] == backend_group[0]) && ( data[1] !~ /#{servername}|BACKEND|FRONTEND/) && ( data[17] == 'UP')
           unixsock("disable server #{data[0]}/#{data[1]}")
         end
       end
     end
   when /disable all (.+)/
-    servername=$1
-    status=unixsock("show stat")
+    servername = Regexp.last_match[ 1]
+    status = unixsock('show stat')
     status.each do |line|
       data = line.split(',')
-      if ( ( data[1] == servername ) && ( data[17] == 'UP' ) )
+      if  ( data[1] == servername) && ( data[17] == 'UP')
         unixsock("disable server #{data[0]}/#{servername}")
       end
     end
   when /enable all EXCEPT (.+)/
-    servername=$1
-    status=unixsock("show stat")
+    servername = Regexp.last_match[ 1]
+    status = unixsock('show stat')
     backend = status.grep(/#{servername}/)
     backend.each do |line|
       backend_group = line.split(',')
       status.each do |pool|
         data = pool.split(',')
-        if ( (data[0] == backend_group[0]) && ( data[1] !~ /#{servername}|BACKEND|FRONTEND/ ) && ( data[17] =~ /Down|MAINT/i ) )
+        if  (data[0] == backend_group[0]) && ( data[1] !~ /#{servername}|BACKEND|FRONTEND/) && ( data[17] =~ /Down|MAINT/i)
           unixsock("enable server #{data[0]}/#{data[1]}")
         end
       end
     end
   when /show stat (.+)/
-    fieldnames=$1
-    status=unixsock("show stat")
-    indices = fieldnames.split(" ").map do |name|
+    fieldnames = Regexp.last_match[ 1]
+    status = unixsock('show stat')
+    indices = fieldnames.split(' ').map do |name|
       status.first.split(',').index(name) || begin
         $stderr.puts("no such field: #{name}")
         $stderr.puts("  #{status.first}")
@@ -156,15 +156,15 @@ begin
     end
     status[1..-1].each do |line|
       row = line.split(',')
-      filtered = indices.map {|index| row[index] }
+      filtered = indices.map { |index| row[index] }
       puts (row[0...2] + filtered).compact.join(',')
     end
   when /enable all (.+)/
-    servername=$1
-    status=unixsock("show stat")
+    servername = Regexp.last_match[ 1]
+    status = unixsock('show stat')
     status.each do |line|
       data = line.split(',')
-      if ( ( data[1] == servername ) && ( data[17] =~ /Down|MAINT/i ) )
+      if  ( data[1] == servername) && ( data[17] =~ /Down|MAINT/i)
         unixsock("enable server #{data[0]}/#{servername}")
       end
     end

data/haproxyctl

@@ -13,7 +13,7 @@
 
 require 'pathname'
 lib = File.join(File.dirname(Pathname.new(__FILE__).realpath), '../lib')
-$:.unshift lib unless $:.include?(lib)
+$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
 
 require 'haproxyctl'
 include HAProxyCTL
@@ -23,70 +23,70 @@ argument = ARGV.join(' ')
 unless has_exec?
   puts usage if argument =~ /help/ || ARGV.length < 1
 
-  raise "Cannot find haproxy executable. Please ensure it is in your $PATH, or set $HAPROXY_BIN environment variable."
+  fail 'Cannot find haproxy executable. Please ensure it is in your $PATH, or set $HAPROXY_BIN environment variable.'
 end
 
 display_usage! if argument =~ /help/ || ARGV.length < 1
 
 begin
   case argument
-  when "start"
+  when 'start'
     if pidof
-      raise("haproxy is already running on pid #{pidof}!")
+      fail("haproxy is already running on pid #{pidof}!")
     else
       start
     end
-  when "stop"
+  when 'stop'
     stop(check_running)
-  when "restart"
+  when 'restart'
     if pidof
       stop(pidof)
-      stillpidof = check_running()
+      stillpidof = check_running
       while stillpidof == pidof
         puts "still haven't killed old pid.  waiting 3s for existing connections to die... (ctrl+c to stop)"
         sleep 3
-        stillpidof = check_running() || 0
+        stillpidof = check_running || 0
       end
-      start()
+      start
     else
-      puts "haproxy was not running.  starting..."
-      start()
+      puts 'haproxy was not running.  starting...'
+      start
     end
-  when "reload"
-    if ( pidof )
+  when 'reload'
+    if  pidof
       reload(pidof)
     else
-      puts "haproxy not running.  starting..."
-      start()
+      puts 'haproxy not running.  starting...'
+      start
     end
-  when "status"
-    if ( pidof )
+  when 'status'
+    if  pidof
       puts "haproxy is running on pid #{pidof}.\nthese ports are used and guys are connected:"
       system("lsof -ln -i |awk \'$2 ~ /#{pidof}/ {print $8\" \"$9}\'")
     else
-      puts "haproxy is not running"
+      puts 'haproxy is not running'
     end
-  when "configcheck"
+  when 'configcheck'
     puts `#{exec} -c -f #{config_path}`
-  when "nagios"
-    if ( pidof )
-      puts "OK"
+  when 'nagios'
+    if  pidof
+      puts 'OK'
       exit
     else
-      puts "CRITICAL: HAProxy is not running!"
+      puts 'CRITICAL: HAProxy is not running!'
       exit(2)
     end
-  when "cloudkick"
-    if ( pidof )
-      puts "status ok haproxy is running"
+  when 'cloudkick'
+    if  pidof
+      puts 'status ok haproxy is running'
       conn = `lsof -ln -i |grep -c #{pidof}`.chomp.to_i
       # removes the listener
       conn = conn - 1
       puts "metric connections int #{conn}"
-      status=unixsock("show stat")
+      status = unixsock('show stat')
       status.each do |line|
         line = line.split(',')
-        if (line[0] !~ /^#/)
+        if line[0] !~ /^#/
           host = "#{line[0]}_#{line[1]}"
           puts "metric #{host}_request_rate int #{line[47]}" if line[47].to_i > 0
           puts "metric #{host}_total_requests gauge #{line[49]}" if line[49].to_i > 0
@@ -95,59 +95,59 @@ begin
         end
       end
     else
-      puts "status err haproxy is not running!"
+      puts 'status err haproxy is not running!'
     end
-  when "show health"
-    status=unixsock("show stat")
+  when 'show health'
+    status = unixsock('show stat')
     status.each do |line|
       data = line.split(',')
       printf "%-30s %-30s %-7s %3s\n", data[0], data[1], data[17], data[18]
     end
   when /show backend(s?)/
-    status=unixsock("show stat").grep(/BACKEND/)
+    status = unixsock('show stat').grep(/BACKEND/)
     status.each do |line|
       data = line.split(',')
       printf "%-30s %-30s %-7s %3s\n", data[0], data[1], data[17], data[18]
     end
   when /disable all EXCEPT (.+)/
-    servername=$1
-    status=unixsock("show stat")
+    servername = Regexp.last_match[ 1]
+    status = unixsock('show stat')
     backend = status.grep(/#{servername}/)
     backend.each do |line|
       backend_group = line.split(',')
       status.each do |pool|
         data = pool.split(',')
-        if ( (data[0] == backend_group[0]) && ( data[1] !~ /#{servername}|BACKEND|FRONTEND/ ) && ( data[17] == 'UP' ) )
+        if  (data[0] == backend_group[0]) && ( data[1] !~ /#{servername}|BACKEND|FRONTEND/) && ( data[17] == 'UP')
           unixsock("disable server #{data[0]}/#{data[1]}")
         end
       end
     end
   when /disable all (.+)/
-    servername=$1
-    status=unixsock("show stat")
+    servername = Regexp.last_match[ 1]
+    status = unixsock('show stat')
     status.each do |line|
       data = line.split(',')
-      if ( ( data[1] == servername ) && ( data[17] == 'UP' ) )
+      if  ( data[1] == servername) && ( data[17] == 'UP')
         unixsock("disable server #{data[0]}/#{servername}")
       end
     end
   when /enable all EXCEPT (.+)/
-    servername=$1
-    status=unixsock("show stat")
+    servername = Regexp.last_match[ 1]
+    status = unixsock('show stat')
     backend = status.grep(/#{servername}/)
     backend.each do |line|
       backend_group = line.split(',')
       status.each do |pool|
         data = pool.split(',')
-        if ( (data[0] == backend_group[0]) && ( data[1] !~ /#{servername}|BACKEND|FRONTEND/ ) && ( data[17] =~ /Down|MAINT/i ) )
+        if  (data[0] == backend_group[0]) && ( data[1] !~ /#{servername}|BACKEND|FRONTEND/) && ( data[17] =~ /Down|MAINT/i)
           unixsock("enable server #{data[0]}/#{data[1]}")
         end
       end
     end
   when /show stat (.+)/
-    fieldnames=$1
-    status=unixsock("show stat")
-    indices = fieldnames.split(" ").map do |name|
+    fieldnames = Regexp.last_match[ 1]
+    status = unixsock('show stat')
+    indices = fieldnames.split(' ').map do |name|
       status.first.split(',').index(name) || begin
         $stderr.puts("no such field: #{name}")
         $stderr.puts("  #{status.first}")
@@ -156,15 +156,15 @@ begin
     end
     status[1..-1].each do |line|
       row = line.split(',')
-      filtered = indices.map {|index| row[index] }
+      filtered = indices.map { |index| row[index] }
       puts (row[0...2] + filtered).compact.join(',')
     end
   when /enable all (.+)/
-    servername=$1
-    status=unixsock("show stat")
+    servername = Regexp.last_match[ 1]
+    status = unixsock('show stat')
     status.each do |line|
       data = line.split(',')
-      if ( ( data[1] == servername ) && ( data[17] =~ /Down|MAINT/i ) )
+      if  ( data[1] == servername) && ( data[17] =~ /Down|MAINT/i)
         unixsock("enable server #{data[0]}/#{servername}")
       end
     end

data/install-haproxy/haproxy_src_install.sh

@@ -6,7 +6,7 @@
 # quick and dirty (but sometimes handy) installer.
 #
 
-HAPROXYVER="1.4.23"
+HAPROXYVER="1.4.24"
 STARTINGDIR=$PWD
 
 # make sure we have make, pcre and junk

data/lib/haproxyctl.rb

@@ -6,14 +6,14 @@ module HAProxyCTL
   include Environment
 
   def start
-    puts "starting haproxy..."
+    puts 'starting haproxy...'
     system("#{exec} -f #{config_path} -D -p #{pidfile}")
-    newpid = check_running()
-    if ( newpid =~ /^\d+$/ )
+    newpid = check_running
+    if newpid =~ /^\d+$/
       puts "haproxy is running on pid #{newpid}"
       return true
     else
-      puts "error.  haproxy did not start!"
+      puts 'error. haproxy did not start!'
       return nil
     end
   end
@@ -22,39 +22,38 @@ module HAProxyCTL
     if pid
       puts "stopping haproxy on pid #{pid}..."
       system("kill #{pid}") || system("kill -9 #{pid}")
-      puts "... stopped"
+      puts '... stopped'
     else
-      puts "haproxy is not running!"
+      puts 'haproxy is not running!'
     end
   end
 
   def reload(pid)
-    if ( pid )
+    if pid
       puts "gracefully stopping connections on pid #{pid}..."
       system("#{exec} -f #{config_path} -sf #{pid}")
       puts "checking if connections still alive on #{pid}..."
-      nowpid = check_running()
-      while ( pid == nowpid )
+      nowpid = check_running
+      while  pid == nowpid
         puts "still haven't killed old pid.
                             waiting 2s for existing connections to die...
                             (ctrl+c to stop this check)"
         sleep 2
-        nowpid = check_running() || 0
+        nowpid = check_running || 0
       end
       puts "reloaded haproxy on pid #{nowpid}"
     else
-      puts "haproxy is not running!"
+      puts 'haproxy is not running!'
     end
   end
 
   def unixsock(command)
-
-    output=[]
+    output = []
     runs = 0
-      
-    begin 
-      ctl=UNIXSocket.open(socket)
-      if (ctl)
+
+    begin
+      ctl = UNIXSocket.open(socket)
+      if ctl
         ctl.write "#{command}\r\n"
       else
         puts "cannot talk to #{socket}"
@@ -63,21 +62,21 @@ module HAProxyCTL
       ctl.close
       sleep 0.5
       runs += 1
-      if ( runs < 4 )
+      if  runs < 4
         retry
       else
         puts "the unix socket at #{socket} closed before we could complete this request"
         exit
       end
     end
-    while (line = ctl.gets) do
-      unless ( line =~ /Unknown command/ )
+    while (line = ctl.gets)
+      unless  line =~ /Unknown command/
         output << line
       end
     end
     ctl.close
 
-    return output
+    output
   end
 
   def display_usage!
@@ -87,7 +86,7 @@ module HAProxyCTL
 
   def usage
     <<-USAGE
-usage: #{$0} <argument>
+usage: #{$PROGRAM_NAME} <argument>
   where <argument> can be:
     start                       : start haproxy unless it is already running
     stop                        : stop an existing haproxy

data/lib/haproxyctl/environment.rb

@@ -33,25 +33,25 @@ module HAProxyCTL
         end
       end
 
-      return(@exec)
+      (@exec)
     end
 
     def socket
       @socket ||= begin
         config.match /stats\s+socket \s*([^\s]*)/
-        $1 || raise("Expecting 'stats socket <UNIX_socket_path>' in #{config_path}")
+        Regexp.last_match[1] || fail("Expecting 'stats socket <UNIX_socket_path>' in #{config_path}")
       end
     end
 
     def pidfile
       if config.match(/pidfile \s*([^\s]*)/)
-        @pidfile = $1
+        @pidfile = Regexp.last_match[1]
       else
-        std_pid = "/var/run/haproxy.pid"
+        std_pid = '/var/run/haproxy.pid'
         if File.exists?(std_pid)
           @pidfile = std_pid
         else
-          raise("Expecting 'pidfile <pid_file_path>' in #{config_path} or a pid file in #{std_pid}")
+          fail("Expecting 'pidfile <pid_file_path>' in #{config_path} or a pid file in #{std_pid}")
         end
       end
     end
@@ -68,6 +68,6 @@ module HAProxyCTL
         return pid
       end
     end
-    alias :pidof :check_running
+    alias_method :pidof, :check_running
   end
 end

data/lib/haproxyctl/version.rb

@@ -1,3 +1,3 @@
 module HAProxyCTL
-  VERSION = "1.1.0"
+  VERSION = '1.2.0'
 end

data/rhapr/Rakefile

@@ -4,7 +4,7 @@ require 'rspec'
 require 'rspec/core'
 require 'rspec/core/rake_task'
 
-task :release => :spec
+task release: :spec
 
 desc 'Run Specs'
 RSpec::Core::RakeTask.new(:spec) do |spec|

data/rhapr/lib/rhapr/environment.rb

@@ -12,12 +12,12 @@ module Rhapr
         @config_path = ENV['HAPROXY_CONFIG']
       else
         config_paths = %w{/etc/haproxy/haproxy.cfg /etc/haproxy.cfg /usr/local/etc/haproxy.cfg}
-        config_paths.select!{|cfg| File.exists?(cfg)}
+        config_paths.select! { |cfg| File.exists?(cfg) }
 
         @config_path = config_paths.first
       end
 
-      return(@config_path)
+      (@config_path)
     end
 
     # @return [String] The raw contents of the HAProxy configuration file.
@@ -52,7 +52,7 @@ module Rhapr
         end
       end
 
-      return(@exec)
+      (@exec)
     end
 
     # @return [UNIXSocket] A connection to the HAProxy Socket
@@ -71,7 +71,7 @@ module Rhapr
     def socket_path
       @socket_path  ||= begin
                           config.match /stats\s+socket\s+([^\s]*)/
-                          $1 || raise(RuntimeError.new "Expecting 'stats socket <UNIX_socket_path>' in #{config_path}")
+                          Regexp.last_match[1] || fail(RuntimeError.new "Expecting 'stats socket <UNIX_socket_path>' in #{config_path}")
                         end
     end
 
@@ -81,7 +81,7 @@ module Rhapr
     def pid
       @pid  ||= begin
                   config.match /pidfile ([^\s]*)/
-                  $1 || '/var/run/haproxy.pid'
+                  Regexp.last_match[1] || '/var/run/haproxy.pid'
                 end
     end
 
@@ -94,6 +94,6 @@ module Rhapr
 
       return pidof unless pidof.empty?
     end
-    alias :pidof :check_running
+    alias_method :pidof, :check_running
   end
 end

data/rhapr/lib/rhapr/interface.rb

@@ -21,7 +21,7 @@ module Rhapr
       resp = send 'clear counters'
       resp == EMPTY
     end
-    alias :clear :clear_counters
+    alias_method :clear, :clear_counters
 
     # @return [Hash{String => String}] The 'show info' attributes, from HAProxy, parsed into a Hash.
     def show_info
@@ -29,38 +29,38 @@ module Rhapr
 
       attrs = resp.split("\n")
 
-      attrs.map! {|line|
+      attrs.map! do|line|
         _attr, *_val = line.split(/: /)
-        [ _attr, _val.join ]
-      }
+        [_attr, _val.join]
+      end
 
-      Hash[ attrs ]
+      Hash[ attrs]
     end
-    alias :info :show_info
+    alias_method :info, :show_info
 
     # @return [Array<Hash{String => String}>] The 'show stat' response, from HAProxy, parsed into an Array of Hashes.
     def show_stat
       resp = send 'show stat'
       resp.gsub!(/^# /, '')
 
-      csv = CSV.parse(resp, :headers => true)
+      csv = CSV.parse(resp, headers: true)
       out = csv.map(&:to_a)
 
-      out.map!{|row| Hash[ row ]}
+      out.map! { |row| Hash[ row] }
 
-      return(out)
+      (out)
     end
-    alias :stat :show_stat
+    alias_method :stat, :show_stat
 
     # @todo: Implement. I do not know the possible errors that may be present, nor how HAProxy will render them.
     def show_errors
     end
-    alias :errors :show_errors
+    alias_method :errors, :show_errors
 
     # @todo: Implement. Not sure how this should look. It's likely that I will want to 'interpret' the data that is spit out.
     def show_sess(id)
     end
-    alias :session :show_sess
+    alias_method :session, :show_sess
 
     # @return [Array<Fixnum, Fixnum>] An Array with Two Elements: the Current Weight and the Initial Weight.
     # @todo: Allow the numeric id to be used as a parameter?
@@ -68,11 +68,11 @@ module Rhapr
       resp = send "get weight #{backend}/#{server}"
 
       resp.match /([[:digit:]]+) \(initial ([[:digit:]]+)\)/
-      weight, initial = $1, $2
+      weight, initial = Regexp.last_match[1], Regexp.last_match[2]
 
       return [weight.to_i, initial.to_i] if weight and initial
 
-      raise ArgumentError.new("HAProxy did not recognize the specified Backend/Server. Response from HAProxy: #{resp}")
+      fail ArgumentError.new("HAProxy did not recognize the specified Backend/Server. Response from HAProxy: #{resp}")
     end
 
     # @todo: Implement.
@@ -88,7 +88,7 @@ module Rhapr
     def enable(backend, server)
     end
 
-   protected
+    protected
     # @param [UNIXSocket]
     # @param [String]
     # @return [nil]
@@ -105,7 +105,7 @@ module Rhapr
     # @see Rhapr::Interface#read
     def read_full(socket)
       output = []
-      output << read(socket) until(sock.eof?)
+      output << read(socket) until sock.eof?
     end
   end
 end

data/rhapr/rhapr.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path('../lib', __FILE__)
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
 require 'rhapr/version'
 
 Gem::Specification.new do |s|
@@ -17,6 +17,6 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
 end

data/rhapr/spec/quality_spec.rb

@@ -4,7 +4,7 @@ IGNORE = /\.(gitmodules|png$|tar$|gz$|rbc$|gem$|pdf$)/
 
 describe 'The application itself' do
   it 'has no malformed whitespace' do
-    files = `git ls-files`.split("\n").select {|fn| fn !~ IGNORE}
+    files = `git ls-files`.split("\n").select { |fn| fn !~ IGNORE }
 
     files.should be_well_formed
   end

data/rhapr/spec/rhapr/environment_spec.rb

@@ -49,9 +49,9 @@ describe Rhapr::Environment do
     it 'should raise an exception if it cannot read from #config_path' do
       File.should_receive(:read).and_raise(Errno::ENOENT)
 
-      lambda {
+      lambda do
         @env_test.config
-      }.should raise_error(RuntimeError)
+      end.should raise_error(RuntimeError)
     end
 
     it 'should read and return the contents of a file' do
@@ -106,9 +106,9 @@ describe Rhapr::Environment do
     it 'should raise an error if it cannot derive an io socket from the config file' do
       @env_test.should_receive(:config).and_return { config_for(:crappy_haproxy) }
 
-      lambda {
+      lambda do
         @env_test.socket_path
-      }.should raise_error(RuntimeError)
+      end.should raise_error(RuntimeError)
     end
   end
 

data/rhapr/spec/rhapr/interface_spec.rb

@@ -1,21 +1,20 @@
 require 'spec_helper'
 
 describe Rhapr::Interface do
-  let(:basic_info) {
+  let(:basic_info) do
     "Name: HAProxy\nVersion: 1.4.15\nRelease_date: 2011/04/08\nNbproc: 1\nProcess_num: 1\nPid: 97413\nUptime: 0d 18h43m53s\n"   <<
     "Uptime_sec: 67433\nMemmax_MB: 0\nUlimit-n: 2066\nMaxsock: 2066\nMaxconn: 1024\nMaxpipes: 0\nCurrConns: 1\nPipesUsed: 0\n"  <<
     "PipesFree: 0\nTasks: 7\nRun_queue: 1\nnode: skg.local\ndescription: \n"
-  }
+  end
 
-  let(:basic_stat) {
-    "# pxname,svname,qcur,qmax,scur,smax,slim,stot,bin,bout,dreq,dresp,ereq,econ,eresp,wretr,wredis,status,weight,act,bck,chkfail,"           <<
-    "chkdown,lastchg,downtime,qlimit,pid,iid,sid,throttle,lbtot,tracked,type,rate,rate_lim,rate_max,check_status,check_code,check_duration,"  <<
+  let(:basic_stat) do
+    '# pxname,svname,qcur,qmax,scur,smax,slim,stot,bin,bout,dreq,dresp,ereq,econ,eresp,wretr,wredis,status,weight,act,bck,chkfail,'           <<
+    'chkdown,lastchg,downtime,qlimit,pid,iid,sid,throttle,lbtot,tracked,type,rate,rate_lim,rate_max,check_status,check_code,check_duration,'  <<
     "hrsp_1xx,hrsp_2xx,hrsp_3xx,hrsp_4xx,hrsp_5xx,hrsp_other,hanafail,req_rate,req_rate_max,req_tot,cli_abrt,srv_abrt,\nsrv,FRONTEND,"        <<
     ",,0,0,2000,0,0,0,0,0,0,,,,,OPEN,,,,,,,,,1,1,0,,,,0,0,0,0,,,,,,,,,,,0,0,0,,,\nsrv,srv1,0,0,0,0,20,0,0,0,,0,,0,0,0,0,DOWN,1,1,0,"          <<
     "0,1,72468,72468,,1,1,1,,0,,2,0,,0,L4CON,,0,,,,,,,0,,,,0,0,\nsrv,srv2,0,0,0,0,20,0,0,0,,0,,0,0,0,0,DOWN,1,1,0,0,1,72465,72465,,"          <<
     "1,1,2,,0,,2,0,,0,L4CON,,0,,,,,,,0,,,,0,0,\n"
-  }
-
+  end
 
   subject { Rhapr::Interface.new }
 
@@ -46,7 +45,7 @@ describe Rhapr::Interface do
       stats = subject.show_stat
 
       stats.should be_a(Array)
-      stats.each{|stat| stat.should be_a(Hash) }
+      stats.each { |stat| stat.should be_a(Hash) }
     end
 
     it 'should strip the "# " from the beginning of the headers, before calling CSV.parse' do
@@ -70,9 +69,9 @@ describe Rhapr::Interface do
     it 'should raise an error if the specific backend+server is not known to HAProxy' do
       subject.should_receive(:send).with('get weight test/test9').and_return('No such server.')
 
-      lambda {
+      lambda do
         subject.get_weight('test', 'test9')
-      }.should raise_error(ArgumentError, "HAProxy did not recognize the specified Backend/Server. Response from HAProxy: No such server.")
+      end.should raise_error(ArgumentError, 'HAProxy did not recognize the specified Backend/Server. Response from HAProxy: No such server.')
     end
   end
 

data/rhapr/spec/spec_helper.rb

@@ -3,7 +3,7 @@ require 'bundler/setup'
 Bundler.require :default
 Bundler.require :development
 
-Dir[ Bundler.root.join('spec/support/**/*.rb') ].each{|f| require f}
+Dir[ Bundler.root.join('spec/support/**/*.rb')].each { |f| require f }
 
 RSpec.configure do |c|
   c.include CustomMatchers

data/rhapr/spec/support/config_fixtures.rb

@@ -8,7 +8,7 @@ module ConfigFixtures
   def fixture_for(sym)
     config_fixtures[sym][:fixture]
   end
-  alias :config_for :fixture_for
+  alias_method :config_for, :fixture_for
 
   def path_for(sym)
     config_fixtures[sym][:path]
@@ -17,20 +17,20 @@ module ConfigFixtures
   # @see ConfigFixtures#create_fixture_hash
   def config_fixtures
     @config_fixtures ||= begin
-      hash = Hash.new {|k,v| k[v] = {}}
+      hash = Hash.new { |k, v| k[v] = {} }
       hash.merge!(create_fixture_hash)
     end
   end
 
   # @return [Hash{Symbol => String}]
   def create_fixture_hash
-    Hash[ find_fixtures.map{|fpath| map_fixture(fpath) } ]
+    Hash[ find_fixtures.map { |fpath| map_fixture(fpath) }]
   end
 
   # @param [String]
   # @return [Array<Symbol, String>]
   def map_fixture(fpath)
-    [symbolize_filename(fpath), {:path => fpath, :fixture => read_file(fpath)}]
+    [symbolize_filename(fpath), { path: fpath, fixture: read_file(fpath) }]
   end
 
   # @return [Array<String>]

data/rhapr/spec/support/custom_matchers.rb

@@ -1,13 +1,13 @@
 module CustomMatchers
   class BeWellFormed
     def matches?(files)
-      @errors = files.map {|filename|
+      @errors = files.map do|filename|
                   [
                     check_for_tabs(filename),
                     excessive_spacing(filename),
                     newline_precedes_eof(filename)
                   ]
-                }.flatten.compact
+                end.flatten.compact
 
       @errors.empty?
     end
@@ -16,7 +16,7 @@ module CustomMatchers
       @errors.join("\n")
     end
 
-  private
+    private
     def check_for_tabs(filename)
       bad_lines = File.readlines(filename).each_with_index.map do |line, line_no|
                     line_no + 1 if line["\t"] and line !~ /^\s+#.*\s+\n$/

data/rubocop-todo.yml

@@ -0,0 +1,74 @@
+# This configuration was generated by `rubocop --auto-gen-config`
+# on 2014-02-04 10:23:58 +0100 using RuboCop version 0.18.1.
+# The point is for the user to remove these configuration records
+# one by one as the offences are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offence count: 3
+AmbiguousRegexpLiteral:
+  Enabled: false
+
+# Offence count: 3
+# Cop supports --auto-correct.
+AndOr:
+  Enabled: false
+
+# Offence count: 3
+BlockAlignment:
+  Enabled: false
+
+# Offence count: 8
+BlockNesting:
+  Max: 4
+
+# Offence count: 10
+Documentation:
+  Enabled: false
+
+# Offence count: 1
+EmptyLinesAroundAccessModifier:
+  Enabled: false
+
+# Offence count: 2
+IfUnlessModifier:
+  Enabled: false
+
+# Offence count: 80
+LineLength:
+  Max: 152
+
+# Offence count: 5
+# Configuration parameters: CountComments.
+MethodLength:
+  Max: 32
+
+# Offence count: 2
+ParenthesesAsGroupedExpression:
+  Enabled: false
+
+# Offence count: 2
+# Configuration parameters: NamePrefixBlacklist.
+PredicateName:
+  Enabled: false
+
+# Offence count: 3
+# Configuration parameters: SupportedStyles.
+RaiseArgs:
+  EnforcedStyle: compact
+
+# Offence count: 1
+RedundantBegin:
+  Enabled: false
+
+# Offence count: 2
+Syntax:
+  Enabled: false
+
+# Offence count: 2
+UselessAssignment:
+  Enabled: false
+
+# Offence count: 2
+Void:
+  Enabled: false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haproxyctl
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-10 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies: []
 description: This is a simple wrapper to make life with HAProxy a little more convenient.
   Acts as an init script for start, stop, reload, restart, etc. Leverages 'socket'
@@ -24,6 +24,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rubocop.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -53,6 +54,7 @@ files:
 - rhapr/spec/spec_helper.rb
 - rhapr/spec/support/config_fixtures.rb
 - rhapr/spec/support/custom_matchers.rb
+- rubocop-todo.yml
 homepage: https://github.com/flores/haproxyctl
 licenses:
 - MIT