haproxyctl 1.2.0 → 1.3.0

data/README.md

@@ -348,6 +348,7 @@ Contributors
 - [Aaron Blew aka `blewa`](https://github.com/blewa)
 - [Nick Griffiths aka `nicobrevin`](https://github.com/nicobrevin)
 - [Florian Holzhauer aka `fh`](https://github.com/fh)
+- [Jonas Genannt aka `hggh`](https://github.com/hggh)
 
 
 Non-current HAProxy versions 

data/haproxyctl.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |gem|
   gem.rubyforge_project = "haproxyctl"
   gem.license       = "MIT"
   gem.files         = `git ls-files`.split($\)
+  gem.files.reject! { |fn| fn.include? "rhapr" }
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "haproxyctl"

data/lib/haproxyctl/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haproxyctl
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-02-14 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'
@@ -36,24 +36,6 @@ files:
 - lib/haproxyctl.rb
 - lib/haproxyctl/environment.rb
 - lib/haproxyctl/version.rb
-- rhapr/.gitignore
-- rhapr/.rspec
-- rhapr/Gemfile
-- rhapr/Rakefile
-- rhapr/lib/rhapr.rb
-- rhapr/lib/rhapr/environment.rb
-- rhapr/lib/rhapr/interface.rb
-- rhapr/lib/rhapr/version.rb
-- rhapr/rhapr.gemspec
-- rhapr/spec/config_fixtures/basic_haproxy.cfg
-- rhapr/spec/config_fixtures/crappy_haproxy.cfg
-- rhapr/spec/config_fixtures/pid_test_haproxy.cfg
-- rhapr/spec/quality_spec.rb
-- rhapr/spec/rhapr/environment_spec.rb
-- rhapr/spec/rhapr/interface_spec.rb
-- 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:

data/rhapr/.gitignore

@@ -1,4 +0,0 @@
-*.gem
-.bundle
-Gemfile.lock
-pkg/*

data/rhapr/.rspec

@@ -1 +0,0 @@
--cfs

data/rhapr/Gemfile

@@ -1,4 +0,0 @@
-source 'http://rubygems.org'
-
-# Specify your gem's dependencies in rhapr.gemspec
-gemspec

data/rhapr/Rakefile

@@ -1,14 +0,0 @@
-require 'bundler/gem_tasks'
-
-require 'rspec'
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
-task release: :spec
-
-desc 'Run Specs'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern    = 'spec/**/*_spec.rb'
-  spec.verbose    = true
-  spec.rspec_opts = ['--color']
-end

data/rhapr/lib/rhapr.rb

@@ -1,6 +0,0 @@
-require 'rhapr/version'
-require 'rhapr/environment'
-
-module Rhapr
-  autoload :Interface, 'rhapr/interface'
-end

data/rhapr/lib/rhapr/environment.rb

@@ -1,99 +0,0 @@
-require 'socket'
-
-module Rhapr
-  module Environment
-    attr_reader :haproxy_pid, :config_path, :config, :exec, :socket_path
-
-    # @return [String, nil] The path to the HAProxy configuration file, or nil if not found. Set the ENV variable $HAPROXY_CONFIG to override defaults.
-    def config_path
-      return(@config_path) if @config_path
-
-      if ENV['HAPROXY_CONFIG']
-        @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_path = config_paths.first
-      end
-
-      (@config_path)
-    end
-
-    # @return [String] The raw contents of the HAProxy configuration file.
-    # @raise [RuntimeError] If it cannot read the contents of #config_path.
-    def config
-      @config ||= begin
-                    File.read(config_path)
-                  rescue Errno::ENOENT => e
-                    raise RuntimeError.new("Error openning file '#{config_path}'. Exception from File.read: #{e.exception}")
-                  end
-    end
-
-    # @return [true, false] Whether or not the HAProxy executable can be found.
-    # @see Rhapr::Environment#exec
-    def has_exec?
-      !exec.nil?
-    end
-
-    # @return [String, nil] The path to the HAProxy executable will be returned, if found. Set ENV variable $HAPROXY_BIN to override
-    def exec
-      return(@exec) if @exec
-
-      @exec   = ENV['HAPROXY_BIN']
-      @exec ||= `which haproxy`
-
-      if @exec.empty?
-        begin
-          `haproxy -v`
-          @exec = 'haproxy'
-        rescue Errno::ENOENT => e
-          @exec = nil
-        end
-      end
-
-      (@exec)
-    end
-
-    # @return [UNIXSocket] A connection to the HAProxy Socket
-    # @raise [RuntimeError] Raised if a socket connection could not be established
-    def socket
-      begin
-        UNIXSocket.open(socket_path)
-      rescue Errno::EACCES => e
-        raise RuntimeError.new("Could not open a socket with HAProxy. Error message: #{e.message}")
-      end
-    end
-
-    # @return [String] The path to the HAProxy stats socket.
-    # @raise [RuntimeError] Raised if no stats socket has been specified, in the HAProxy configuration.
-    # @todo: Should there be an ENV var for this? Perhaps allow config-less runs of rhapr?
-    def socket_path
-      @socket_path  ||= begin
-                          config.match /stats\s+socket\s+([^\s]*)/
-                          Regexp.last_match[1] || fail(RuntimeError.new "Expecting 'stats socket <UNIX_socket_path>' in #{config_path}")
-                        end
-    end
-
-    # @return [String] Returns the path to the pidfile, specified in the HAProxy configuration. Returns an assumption, if not found.
-    # @todo: Should there even be an assumption? Does HAProxy create a pid file, if not told to by the configuration?
-    # @todo: Should there be an ENV var for this? Perhaps allow config-less runs of rhapr?
-    def pid
-      @pid  ||= begin
-                  config.match /pidfile ([^\s]*)/
-                  Regexp.last_match[1] || '/var/run/haproxy.pid'
-                end
-    end
-
-    # @return [String, nil] Returns the PID of HAProxy as a string, if running. Nil otherwise.
-    # @todo: Look for something other than pidof, for searching the process list.
-    #   Could read from the pid file, but there's potential that it will go stale.
-    def check_running
-      pidof = `pidof haproxy`
-      pidof.strip!
-
-      return pidof unless pidof.empty?
-    end
-    alias_method :pidof, :check_running
-  end
-end

data/rhapr/lib/rhapr/interface.rb

@@ -1,111 +0,0 @@
-require 'csv'
-
-module Rhapr
-  class Interface
-    include Rhapr::Environment
-
-    EMPTY = "\n"
-
-    # @param [String, #to_s] message The message to be sent to HAProxy
-    # return [Array<String>] All of the output from HAProxy, read in.
-    # @see Rhapr::Interface#write, Rhapr::Interface#read_full
-    def send(message)
-      sock = socket
-
-      write(sock, message)
-      read_full(sock)
-    end
-
-    # @return [true, false] Whether or not the 'clear counters' command was successful
-    def clear_counters
-      resp = send 'clear counters'
-      resp == EMPTY
-    end
-    alias_method :clear, :clear_counters
-
-    # @return [Hash{String => String}] The 'show info' attributes, from HAProxy, parsed into a Hash.
-    def show_info
-      resp = send 'show info'
-
-      attrs = resp.split("\n")
-
-      attrs.map! do|line|
-        _attr, *_val = line.split(/: /)
-        [_attr, _val.join]
-      end
-
-      Hash[ attrs]
-    end
-    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)
-      out = csv.map(&:to_a)
-
-      out.map! { |row| Hash[ row] }
-
-      (out)
-    end
-    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_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_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?
-    def get_weight(backend, server)
-      resp = send "get weight #{backend}/#{server}"
-
-      resp.match /([[:digit:]]+) \(initial ([[:digit:]]+)\)/
-      weight, initial = Regexp.last_match[1], Regexp.last_match[2]
-
-      return [weight.to_i, initial.to_i] if weight and initial
-
-      fail ArgumentError.new("HAProxy did not recognize the specified Backend/Server. Response from HAProxy: #{resp}")
-    end
-
-    # @todo: Implement.
-    # @todo: Allow the numeric id to be used as a parameter?
-    def set_weight(backend, server, weight)
-    end
-
-    # @todo: Implement.
-    def disable(backend, server)
-    end
-
-    # @todo: Implement.
-    def enable(backend, server)
-    end
-
-    protected
-    # @param [UNIXSocket]
-    # @param [String]
-    # @return [nil]
-    def write(socket, message)
-      socket.puts message
-    end
-
-    # @return [String]
-    def read(socket)
-      socket.gets
-    end
-
-    # @return [Array<String>] All of the output from HAProxy, read in.
-    # @see Rhapr::Interface#read
-    def read_full(socket)
-      output = []
-      output << read(socket) until sock.eof?
-    end
-  end
-end

data/rhapr/lib/rhapr/version.rb

@@ -1,3 +0,0 @@
-module Rhapr
-  VERSION = '0.0.1'
-end

data/rhapr/rhapr.gemspec

@@ -1,22 +0,0 @@
-# -*- encoding: utf-8 -*-
-$LOAD_PATH.push File.expand_path('../lib', __FILE__)
-require 'rhapr/version'
-
-Gem::Specification.new do |s|
-  s.name        = 'rhapr'
-  s.version     = Rhapr::VERSION
-  s.authors     = ['Scott Gonyea']
-  s.email       = ['me@sgonyea.com']
-  s.homepage    = 'https://github.com/sgonyea/rhapr'
-  s.summary     = %q{Rhapr wraps around HAProxy}
-  s.description = %q{Rhapr is a ruby lib that wraps around HAProxy, enabling you to sanely decomission a process.}
-
-  s.add_dependency 'yard', '~>0.6'
-
-  s.add_development_dependency 'rspec', '~>2.4'
-
-  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.require_paths = ['lib']
-end

data/rhapr/spec/config_fixtures/basic_haproxy.cfg

@@ -1,34 +0,0 @@
-global
-    daemon
-    maxconn 1024
-    # quiet
-    pidfile /var/run/haproxy.pid
-    stats socket /tmp/haproxy level admin uid 501 group staff
-
-defaults
-    log global
-    mode http
-    option httplog
-    option dontlognull
-    stats enable
-    stats uri /proxystats     # and this guy for statistics
-    stats auth webreport:areallysecretsupersecurepassword
-    stats refresh 5s
-
-listen thrift :9090
-    mode    tcp
-    balance roundrobin
-    option  tcplog
-    option  redispatch
-    retries 3
-
-    contimeout  5000
-    clitimeout  40000
-    srvtimeout  7000
-
-    server thrift1 localhost:9091 maxconn 20 check inter 20000
-    server thrift2 localhost:9092 maxconn 20 check inter 20000
-    server thrift3 localhost:9093 maxconn 20 check inter 20000
-    server thrift4 localhost:9094 maxconn 20 check inter 20000
-    server thrift5 localhost:9095 maxconn 20 check inter 20000
-    server thrift6 localhost:9096 maxconn 20 check inter 20000

data/rhapr/spec/config_fixtures/crappy_haproxy.cfg

@@ -1,4 +0,0 @@
-global
-    daemon
-    maxconn 100
-    quiet

data/rhapr/spec/config_fixtures/pid_test_haproxy.cfg

@@ -1,6 +0,0 @@
-global
-    daemon
-    maxconn 1024
-    # quiet
-    pidfile /some/other/run/haproxy.pid
-    stats socket /tmp/haproxy level admin

data/rhapr/spec/quality_spec.rb

@@ -1,11 +0,0 @@
-require 'spec_helper'
-
-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.should be_well_formed
-  end
-end

data/rhapr/spec/rhapr/environment_spec.rb

@@ -1,132 +0,0 @@
-require 'spec_helper'
-
-describe Rhapr::Environment do
-  class EnvTest
-    include Rhapr::Environment
-  end
-
-  before(:each) do
-    @env_test = EnvTest.new
-  end
-
-  describe '#config_path' do
-    it 'should set to the ENV variable, if present' do
-      ENV['HAPROXY_CONFIG'] = '/some/path.cfg'
-
-      @env_test.config_path.should == '/some/path.cfg'
-
-      # Clean up.
-      ENV.delete 'HAPROXY_CONFIG'
-    end
-
-    it 'should go down a list of pre-defined file names' do
-      File.stub!(:exists?).and_return(false)
-      File.should_receive(:exists?).with('/etc/haproxy.cfg').and_return(true)
-
-      @env_test.config_path.should == '/etc/haproxy.cfg'
-    end
-
-    it 'should select the first configuration found, from the pre-defined list' do
-      File.stub!(:exists?).and_return(false)
-      File.should_receive(:exists?).with('/etc/haproxy/haproxy.cfg').and_return(true)
-      File.should_receive(:exists?).with('/etc/haproxy.cfg').and_return(true)
-
-      @env_test.config_path.should == '/etc/haproxy/haproxy.cfg'
-    end
-
-    it 'should be nil if config files do not exist and $HAPROXY_CONFIG is not set' do
-      File.stub!(:exists?).and_return(false)
-      @env_test.config_path.should be_nil
-    end
-  end
-
-  describe '#config' do
-    before(:each) do
-      File.stub!(:exists?).and_return(false)
-      File.should_receive(:exists?).with('/etc/haproxy.cfg').and_return(true)
-    end
-
-    it 'should raise an exception if it cannot read from #config_path' do
-      File.should_receive(:read).and_raise(Errno::ENOENT)
-
-      lambda do
-        @env_test.config
-      end.should raise_error(RuntimeError)
-    end
-
-    it 'should read and return the contents of a file' do
-      File.should_receive(:read).and_return { "I can haz cfg ?\n" }
-
-      @env_test.config.should == "I can haz cfg ?\n"
-    end
-  end
-
-  describe '#exec' do
-    it 'should set to the ENV variable, if present' do
-      ENV['HAPROXY_BIN'] = '/usr/local/bin/haproxy'
-
-      @env_test.exec.should == '/usr/local/bin/haproxy'
-
-      # Clean up.
-      ENV.delete 'HAPROXY_BIN'
-    end
-
-    it 'should call out to the `which` command to find haproxy, if the ENV var is not set' do
-      @env_test.should_receive(:`).with('which haproxy').and_return('/opt/bin/haproxy')
-
-      @env_test.exec.should == '/opt/bin/haproxy'
-    end
-
-    it 'should call out to haproxy directly, if all else fails' do
-      @env_test.should_receive(:`).with('which haproxy').and_return('')
-      @env_test.should_receive(:`).with('haproxy -v').and_return("HA-Proxy version 1.4.15 2011/04/08\nCopyright 2000-2010 Willy Tarreau <w@1wt.eu>\n\n")
-
-      @env_test.exec.should == 'haproxy'
-    end
-
-    it 'should be nil if none of the above worked' do
-      @env_test.should_receive(:`).with('which haproxy').and_return('')
-      @env_test.should_receive(:`).with('haproxy -v').and_raise(Errno::ENOENT)
-
-      @env_test.exec.should be_nil
-    end
-  end
-
-  describe '#socket' do
-    it 'should establish a socket connection with HAProxy'
-  end
-
-  describe '#socket_path' do
-    it 'should parse out the io socket from the config file' do
-      @env_test.should_receive(:config).and_return { config_for(:basic_haproxy) }
-
-      @env_test.socket_path.should == '/tmp/haproxy'
-    end
-
-    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 do
-        @env_test.socket_path
-      end.should raise_error(RuntimeError)
-    end
-  end
-
-  describe '#pid' do
-    it 'should parse out the pidfile from the config file' do
-      @env_test.should_receive(:config).and_return { config_for(:pid_test_haproxy) }
-
-      @env_test.pid.should == '/some/other/run/haproxy.pid'
-    end
-
-    it 'should return a default path if it cannot derive an io socket from the config file' do
-      @env_test.should_receive(:config).and_return { config_for(:crappy_haproxy) }
-
-      @env_test.pid.should == '/var/run/haproxy.pid'
-    end
-  end
-
-  describe '#check_running, #pidof' do
-    pending 'TBD'
-  end
-end

data/rhapr/spec/rhapr/interface_spec.rb

@@ -1,81 +0,0 @@
-require 'spec_helper'
-
-describe Rhapr::Interface do
-  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) 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 }
-
-  describe '#clear_counters' do
-    it 'should send the "clear counters" message to HAProxy' do
-      subject.should_receive(:send).with('clear counters').and_return("\n")
-
-      subject.clear_counters.should be_true
-    end
-  end
-
-  describe '#show_info' do
-    it 'should parse and return a Hash of HAProxy\'s info attributes' do
-      subject.should_receive(:send).with('show info').and_return(basic_info)
-
-      subject.show_info.should be_a(Hash)
-    end
-
-    it 'should normalize the attribute names into lower-case and underscore-ized form'
-  end
-
-  describe '#show_stat' do
-    before(:each) do
-      subject.should_receive(:send).with('show stat').and_return(basic_stat)
-    end
-
-    it 'should return an Array of Hashes, returned from HAProxy\'s "show stats" request' do
-      stats = subject.show_stat
-
-      stats.should be_a(Array)
-      stats.each { |stat| stat.should be_a(Hash) }
-    end
-
-    it 'should strip the "# " from the beginning of the headers, before calling CSV.parse' do
-      stats = subject.show_stat
-
-      stats.first.should_not  have_key('# pxname')
-      stats.first.should      have_key('pxname')
-    end
-  end
-
-  describe '#show_errors'
-  describe '#show_sess'
-
-  describe '#get_weight' do
-    it 'should parse the weight into an Array, with two elements: The weight and the initial weight' do
-      subject.should_receive(:send).with('get weight test/test1').and_return('1 (initial 1)')
-
-      subject.get_weight('test', 'test1').should == [1, 1]
-    end
-
-    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 do
-        subject.get_weight('test', 'test9')
-      end.should raise_error(ArgumentError, 'HAProxy did not recognize the specified Backend/Server. Response from HAProxy: No such server.')
-    end
-  end
-
-  describe '#set_weight'
-  describe '#disable'
-  describe '#enable'
-end

data/rhapr/spec/spec_helper.rb

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

data/rhapr/spec/support/config_fixtures.rb

@@ -1,53 +0,0 @@
-require 'bundler'
-
-module ConfigFixtures
-  attr_reader :config_fixtures
-
-  # @param [Symbol]
-  # @return [String]
-  def fixture_for(sym)
-    config_fixtures[sym][:fixture]
-  end
-  alias_method :config_for, :fixture_for
-
-  def path_for(sym)
-    config_fixtures[sym][:path]
-  end
-
-  # @see ConfigFixtures#create_fixture_hash
-  def config_fixtures
-    @config_fixtures ||= begin
-      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) }]
-  end
-
-  # @param [String]
-  # @return [Array<Symbol, String>]
-  def map_fixture(fpath)
-    [symbolize_filename(fpath), { path: fpath, fixture: read_file(fpath) }]
-  end
-
-  # @return [Array<String>]
-  def find_fixtures
-    Dir.glob Bundler.root.join('spec/config_fixtures/**.cfg')
-  end
-
-  # @param [String]
-  # @return [Symbol]
-  def symbolize_filename(fpath)
-    fname = File.basename(fpath)
-    fname.split(/\W/).shift.to_sym
-  end
-
-  # @param [String]
-  # @return [String]
-  def read_file(fpath)
-    File.read(fpath)
-  end
-end

data/rhapr/spec/support/custom_matchers.rb

@@ -1,44 +0,0 @@
-module CustomMatchers
-  class BeWellFormed
-    def matches?(files)
-      @errors = files.map do|filename|
-                  [
-                    check_for_tabs(filename),
-                    excessive_spacing(filename),
-                    newline_precedes_eof(filename)
-                  ]
-                end.flatten.compact
-
-      @errors.empty?
-    end
-
-    def failure_message_for_should
-      @errors.join("\n")
-    end
-
-    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$/
-                  end.flatten.compact
-
-      "#{filename} has tab characters on lines #{bad_lines.join(', ')}" if bad_lines.any?
-    end
-
-    def excessive_spacing(filename)
-      bad_lines = File.readlines(filename).each_with_index.map do |line, line_no|
-                    line_no + 1 if line =~ /\s+\n$/ and line !~ /^\s+#.*\s+\n$/
-                  end.flatten.compact
-
-      "#{filename} has spaces on the EOL on lines #{bad_lines.join(', ')}" if bad_lines.any?
-    end
-
-    def newline_precedes_eof(filename)
-      "#{filename} does not have a newline (\\n) before EOF" if File.read(filename) !~ /\n$/
-    end
-  end
-
-  def be_well_formed
-    BeWellFormed.new
-  end
-end