haproxy-tools 0.2.0 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b55425521f1c472fa1a0fcf14312fdee6d3543e6
+  data.tar.gz: a9e9263e329d00d7c158e2d20c118707b01599fd
+SHA512:
+  metadata.gz: a7653024f2b7cc685ce732a1aa89be3a80686da0c34f2071b83deabe347d768b1a0d33f2629b24856c9250d1c563e25358e044de463162c5681c15bb3c62de88
+  data.tar.gz: b1d16f62e28dc60979b26fcdc0c5c5a34036c0b9fd3af4dd20e6282a7495a793e844bc0087f476b89e45ff4ee6d75de242a1cc4db602ca4d6c203068b8379ab3

data/.gitignore

@@ -0,0 +1,14 @@
+coverage
+rdoc
+doc
+.yardoc
+pkg
+.DS_Store
+*.tmproj
+tmtags
+Gemfile.lock
+*.swp
+*~
+tmp
+*.orig
+.bundle

data/.rspec

@@ -1 +1,2 @@
 --color
+--format documentation

data/.simplecov

@@ -0,0 +1,13 @@
+class SimpleCov::Formatter::QualityFormatter
+  def format(result)
+    SimpleCov::Formatter::HTMLFormatter.new.format(result)
+    File.open('coverage/covered_percent', 'w') do |f|
+      f.puts result.source_files.covered_percent.to_f
+    end
+  end
+end
+SimpleCov.formatter = SimpleCov::Formatter::QualityFormatter
+
+SimpleCov.start do
+  add_filter '/spec/'
+end

data/CHANGES.rdoc

@@ -1,3 +1,10 @@
+== 0.3.0
+
+* Fixed: Handle server configurations that do not have any extra attributes (subakva)
+* Fixed: Allow early blanks (jessekempf)
+* Dev: Added cane and simplecov
+* Dev: switched from jeweler to bundler gem management
+
 == 0.2.0
 
 * Switched to treetop grammer for parsing (subakva)

data/Gemfile

@@ -1,12 +1,4 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
-gem 'net-scp'
-gem 'orderedhash'
-
-group :development do
-  gem "rspec", "~> 2.7.0"
-  gem "yard", "~> 0.7.0"
-  gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
-  gem "treetop"
-end
+# Gem dependencies are defined in haproxy-tools.gemspec
+gemspec

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Jason Wadsworth
+Copyright (c) 2011-2013 Jason Wadsworth
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -8,7 +8,7 @@ Tools for managing HAProxy with Ruby.
 
 == Gemfile
 
-  gem 'haproxy-tools', '~> 0.2.0'
+  gem 'haproxy-tools', '~> 0.3.0'
 
 == Basic Configuration File Parsing
 
@@ -55,6 +55,6 @@ Tools for managing HAProxy with Ruby.
 
 == Copyright
 
-Copyright (c) 2012 Jason Wadsworth. See LICENSE.txt for
+Copyright (c) 2011-2013 Jason Wadsworth. See LICENSE.txt for
 further details.
 

data/Rakefile

@@ -1,43 +1,25 @@
-# encoding: utf-8
+#!/usr/bin/env rake
 
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "haproxy-tools"
-  gem.homepage = "http://github.com/subakva/haproxy-tools"
-  gem.license = "MIT"
-  gem.summary = %Q{HAProxy Tools for Ruby}
-  gem.description = %Q{Ruby tools for HAProxy, including config file management.}
-  gem.email = "jdwadsworth@gmail.com"
-  gem.authors = ["Jason Wadsworth"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
+require 'bundler/gem_tasks'
 
-require 'rspec/core'
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
-
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :default => :spec
+RSpec::Core::RakeTask.new(:spec)
 
 require 'yard'
 YARD::Rake::YardocTask.new
 
+begin
+  require 'cane/rake_task'
+
+  desc "Run cane to check quality metrics"
+  Cane::RakeTask.new(:cane) do |cane|
+    cane.abc_max = 15
+    cane.style_measure = 100
+    cane.style_glob = '{lib}/**/*.rb'
+    cane.gte = {'coverage/covered_percent' => 95}
+  end
+rescue LoadError
+  warn "cane not available, quality task not provided."
+end
+
+task :default => [:spec, :cane]

data/haproxy-tools.gemspec

@@ -1,83 +1,28 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'haproxy/version'
 
-Gem::Specification.new do |s|
-  s.name = %q{haproxy-tools}
-  s.version = "0.2.0"
+Gem::Specification.new do |gem|
+  gem.name          = 'haproxy-tools'
+  gem.version       = HAProxy::VERSION
+  gem.authors       = ['Jason Wadsworth']
+  gem.email         = ['jdwadsworth@gmail.com']
+  gem.description   = %q{Ruby tools for HAProxy, including config file management.}
+  gem.summary       = %q{HAProxy Tools for Ruby}
+  gem.homepage      = 'https://github.com/subakva/haproxy-tools'
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jason Wadsworth"]
-  s.date = %q{2012-04-24}
-  s.description = %q{Ruby tools for HAProxy, including config file management.}
-  s.email = %q{jdwadsworth@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc",
-    "TODO"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    "CHANGES.rdoc",
-    "Gemfile",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "TODO",
-    "VERSION",
-    "docs/haproxy-1.3-configuration.txt",
-    "docs/haproxy-1.4-configuration.txt",
-    "haproxy-tools.gemspec",
-    "lib/haproxy-tools.rb",
-    "lib/haproxy/config.rb",
-    "lib/haproxy/parser.rb",
-    "lib/haproxy/renderer.rb",
-    "lib/haproxy/treetop/config.treetop",
-    "lib/haproxy/treetop/nodes.rb",
-    "lib/haproxy_tools.rb",
-    "spec/fixtures/multi-pool.haproxy.cfg",
-    "spec/fixtures/simple.haproxy.cfg",
-    "spec/haproxy/config_spec.rb",
-    "spec/haproxy/parser_spec.rb",
-    "spec/haproxy/treetop/config_parser_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/subakva/haproxy-tools}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.2}
-  s.summary = %q{HAProxy Tools for Ruby}
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ['lib']
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<net-scp>, [">= 0"])
-      s.add_runtime_dependency(%q<orderedhash>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.7.0"])
-      s.add_development_dependency(%q<yard>, ["~> 0.7.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<treetop>, [">= 0"])
-    else
-      s.add_dependency(%q<net-scp>, [">= 0"])
-      s.add_dependency(%q<orderedhash>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.7.0"])
-      s.add_dependency(%q<yard>, ["~> 0.7.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<treetop>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<net-scp>, [">= 0"])
-    s.add_dependency(%q<orderedhash>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.7.0"])
-    s.add_dependency(%q<yard>, ["~> 0.7.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<treetop>, [">= 0"])
-  end
+  gem.add_dependency('net-scp')
+  gem.add_dependency("treetop")
+  gem.add_development_dependency("rake")
+  gem.add_development_dependency("rspec")
+  gem.add_development_dependency("yard")
+  gem.add_development_dependency('simplecov')
+  gem.add_development_dependency('cane')
+  gem.add_development_dependency('pry-debugger')
 end
-

data/lib/haproxy/config.rb

@@ -5,6 +5,9 @@ module HAProxy
   Frontend  = Struct.new(:name, :host, :port, :options, :config)
   Server    = Struct.new(:name, :host, :port, :attributes)
 
+  # Contains shared methods for config objects that contain a list of servers. The including class
+  # is expected to have an instance variable called :servers that contains a hash of server
+  # configurations.
   module ServerList
     def add_server(name, host, options)
       options ||= {}
@@ -18,17 +21,21 @@ module HAProxy
     end
   end
 
+
+  # Represents a listener configuration block.
   class Listener
     include ServerList
   end
 
+  # Represents a backend configuration block.
   class Backend
     include ServerList
   end
 
+  # Represents an haproxy configuration file.
   class Config
     attr_accessor :original_parse_tree, :listeners, :backends, :frontends, :global, :defaults
-    
+
     def initialize(parse_tree)
       self.original_parse_tree = parse_tree
       self.backends   = []

data/lib/haproxy/parser.rb

@@ -1,14 +1,17 @@
 module HAProxy
-	class Parser
-    class Error < Exception; end
+  # Responsible for reading an HAProxy config file and building an HAProxy::Config instance.
+  class Parser
+    # Raised when an error occurs during parsing.
+    Error = Class.new(StandardError)
 
     # haproxy 1.3
-    SERVER_ATTRIBUTE_NAMES = %w{
+    SERVER_ATTRIBUTE_NAMES_1_3 = %w{
       addr backup check cookie disabled fall id inter fastinter downinter
       maxconn maxqueue minconn port redir rise slowstart source track weight
     }
     # Added in haproxy 1.4
-    SERVER_ATTRIBUTE_NAMES += %w{error-limit observe on-error}
+    SERVER_ATTRIBUTE_NAMES_1_4 = %w{error-limit observe on-error}
+    SERVER_ATTRIBUTE_NAMES = SERVER_ATTRIBUTE_NAMES_1_3 + SERVER_ATTRIBUTE_NAMES_1_4
 
     attr_accessor :verbose, :options, :parse_result
 
@@ -26,62 +29,91 @@ module HAProxy
     end
 
     def parse(config_text)
+      result = parse_config_text(config_text)
+      self.parse_result = result
+      build_config(result)
+    end
+
+    protected
+
+    def parse_config_text(config_text)
       parser = HAProxy::Treetop::ConfigParser.new
       result = parser.parse(config_text)
       raise HAProxy::Parser::Error.new(parser.failure_reason) if result.nil?
+      result
+    end
 
-      config = HAProxy::Config.new(result)
-      config.global = config_hash_from_config_section(result.global)
+    def build_config(result)
+      HAProxy::Config.new(result).tap do |config|
+        config.global = config_hash_from_config_section(result.global)
 
-      result.frontends.each do |fs|
-        f = Frontend.new
-        f.name        = try(fs.frontend_header, :proxy_name, :content)
-        f.host        = try(fs.frontend_header, :service_address, :host, :content)
-        f.port        = try(fs.frontend_header, :service_address, :port, :content)
+        config.frontends  += collect_frontends(result)
+        config.backends   += collect_backends(result)
+        config.listeners  += collect_listeners(result)
+        config.defaults   += collect_defaults(result)
+      end
+    end
+
+    def build_frontend(fs)
+      Frontend.new.tap do |f|
+        f.name        = try_send(fs.frontend_header, :proxy_name, :content)
+        f.host        = try_send(fs.frontend_header, :service_address, :host, :content)
+        f.port        = try_send(fs.frontend_header, :service_address, :port, :content)
         f.options     = options_hash_from_config_section(fs)
         f.config      = config_hash_from_config_section(fs)
-        config.frontends << f
       end
+    end
 
-      result.backends.each do |bs|
-        b = Backend.new
-        b.name        = try(bs.backend_header, :proxy_name, :content)
+    def build_backend(bs)
+      Backend.new.tap do |b|
+        b.name        = try_send(bs.backend_header, :proxy_name, :content)
         b.options     = options_hash_from_config_section(bs)
         b.config      = config_hash_from_config_section(bs)
         b.servers     = server_hash_from_config_section(bs)
-        config.backends << b
       end
+    end
 
-      result.listeners.each do |ls|
-        l = Listener.new
-        l.name        = try(ls.listen_header, :proxy_name, :content)
-        l.host        = try(ls.listen_header, :service_address, :host, :content)
-        l.port        = try(ls.listen_header, :service_address, :port, :content)
+    def build_listener(ls)
+      Listener.new.tap do |l|
+        l.name        = try_send(ls.listen_header, :proxy_name, :content)
+        l.host        = try_send(ls.listen_header, :service_address, :host, :content)
+        l.port        = try_send(ls.listen_header, :service_address, :port, :content)
         l.options     = options_hash_from_config_section(ls)
         l.config      = config_hash_from_config_section(ls)
         l.servers     = server_hash_from_config_section(ls)
-        config.listeners << l
       end
+    end
 
-      result.defaults.each do |ds|
-        d = Default.new
-        d.name        = try(ds.defaults_header, :proxy_name, :content)
+    def build_default(ds)
+      Default.new.tap do |d|
+        d.name        = try_send(ds.defaults_header, :proxy_name, :content)
         d.options     = options_hash_from_config_section(ds)
         d.config      = config_hash_from_config_section(ds)
-        config.defaults << d
       end
+    end
 
-      self.parse_result = result
-      config
+    def collect_frontends(result)
+      result.frontends.map { |fs| build_frontend(fs) }
     end
 
-    protected
+    def collect_backends(result)
+      result.backends.map { |bs| build_backend(bs) }
+    end
 
-    def try(node, *method_names)
+    def collect_listeners(result)
+      result.listeners.map { |ls| build_listener(ls) }
+    end
+
+    def collect_defaults(result)
+      result.defaults.map { |ds| build_default(ds) }
+    end
+
+
+    def try_send(node, *method_names)
       method_name = method_names.shift
       if node.respond_to?(method_name)
         next_node = node.send(method_name)
-        method_names.empty? ? next_node : try(next_node, *method_names)
+        method_names.empty? ? next_node : try_send(next_node, *method_names)
       else
         nil
       end
@@ -89,23 +121,24 @@ module HAProxy
 
     def server_hash_from_config_section(cs)
       cs.servers.inject({}) do |ch, s|
-        value = try(s, :value, :content)
+        value = try_send(s, :value, :content)
         ch[s.name] = Server.new(s.name, s.host, s.port, parse_server_attributes(value))
         ch
       end
     end
 
-    # Parses server attributes from the server value. I couldn't get manage to get treetop to do this.
-    # 
+    # Parses server attributes from the server value. I couldn't manage to get treetop to do
+    # this.
+    #
     # Types of server attributes to support:
     # ipv4, boolean, string, integer, time (us, ms, s, m, h, d), url, source attributes
-    # 
-    # BUG: If an attribute value matches an attribute name, the parser will assume that a new attribute value
-    # has started. I don't know how haproxy itself handles that situation.
+    #
+    # BUG: If an attribute value matches an attribute name, the parser will assume that a new
+    # attribute value has started. I don't know how haproxy itself handles that situation.
     def parse_server_attributes(value)
-      parts = value.split(/\s/)
+      parts = value.to_s.split(/\s/)
       current_name = nil
-      pairs = parts.inject(OrderedHash.new) do |pairs, part|
+      pairs = parts.inject({}) do |pairs, part|
         if SERVER_ATTRIBUTE_NAMES.include?(part)
           current_name  = part
           pairs[current_name] = []
@@ -120,7 +153,8 @@ module HAProxy
       return clean_parsed_server_attributes(pairs)
     end
 
-    # Converts attributes with no values to true, and combines everything else into space-separated strings.
+    # Converts attributes with no values to true, and combines everything else into space-
+    # separated strings.
     def clean_parsed_server_attributes(pairs)
       pairs.each do |k,v|
         if v.empty?
@@ -147,4 +181,3 @@ module HAProxy
 
   end
 end
-

data/lib/haproxy/renderer.rb

@@ -1,4 +1,5 @@
 module HAProxy
+  # Responsible for rendering an HAProxy::Config instance to a string.
   class Renderer
 
     attr_accessor :config, :source_tree
@@ -32,7 +33,8 @@ module HAProxy
         end
 
         if e.class == HAProxy::Treetop::ServerLine
-          # Use a custom rendering method for servers, since we allow them to be added/removed/changed.
+          # Use a custom rendering method for servers, since we allow them to be
+          # added/removed/changed.
           render_server_element(e)
         elsif e.elements && e.elements.size > 0
           render_node(e)

data/lib/haproxy/treetop/config.treetop

@@ -4,7 +4,7 @@ module HAProxy::Treetop
 
   grammar Config
     rule configuration
-      (comment_line / global_section / defaults_section / userlist_section / listen_section / frontend_section / backend_section)* <ConfigurationFile>
+      (comment_line / blank_line / global_section / defaults_section / userlist_section / listen_section / frontend_section / backend_section)* <ConfigurationFile>
     end
 
     rule global_section

data/lib/haproxy/treetop/nodes.rb

@@ -2,12 +2,14 @@ module HAProxy
   module Treetop
     extend self
 
+    # Include this module to always strip whitespace from the text_value
     module StrippedTextContent
       def content
         self.text_value.strip
       end
     end
 
+    # Include this module if the node contains a config element.
     module ConfigBlockContainer
       def option_lines
         self.config_block.elements.select {|e| e.class == OptionLine}
@@ -18,6 +20,7 @@ module HAProxy
       end
     end
 
+    # Include this module if the node contains a service address element.
     module ServiceAddressContainer
       def service_address
         self.elements.find {|e| e.class == ServiceAddress }
@@ -32,12 +35,14 @@ module HAProxy
       end
     end
 
+    # Include this module if the node contains a server elements.
     module ServerContainer
       def servers
-         self.config_block.elements.select {|e| e.class == ServerLine}
+        self.config_block.elements.select {|e| e.class == ServerLine}
       end
     end
 
+    # Include this module if the value is optional for the node.
     module OptionalValueElement
       def value
         self.elements.find {|e| e.class == Value}
@@ -49,22 +54,54 @@ module HAProxy
         self.text_value
       end
     end
-    class LineBreak < ::Treetop::Runtime::SyntaxNode; end
-    class Char < ::Treetop::Runtime::SyntaxNode; include StrippedTextContent; end
-    class Keyword < ::Treetop::Runtime::SyntaxNode; include StrippedTextContent; end
-    class ProxyName < ::Treetop::Runtime::SyntaxNode; include StrippedTextContent; end
-    class ServerName < ::Treetop::Runtime::SyntaxNode; include StrippedTextContent; end
-    class Host < ::Treetop::Runtime::SyntaxNode; include StrippedTextContent; end
-    class Port < ::Treetop::Runtime::SyntaxNode; include StrippedTextContent; end
-    class Value < ::Treetop::Runtime::SyntaxNode; include StrippedTextContent; end
-    class CommentText < ::Treetop::Runtime::SyntaxNode; include StrippedTextContent; end
+
+    class LineBreak < ::Treetop::Runtime::SyntaxNode
+    end
+
+    class Char < ::Treetop::Runtime::SyntaxNode
+      include StrippedTextContent
+    end
+
+    class Keyword < ::Treetop::Runtime::SyntaxNode
+      include StrippedTextContent
+    end
+
+    class ProxyName < ::Treetop::Runtime::SyntaxNode
+      include StrippedTextContent
+    end
+
+    class ServerName < ::Treetop::Runtime::SyntaxNode
+      include StrippedTextContent
+    end
+
+    class Host < ::Treetop::Runtime::SyntaxNode
+      include StrippedTextContent
+    end
+
+    class Port < ::Treetop::Runtime::SyntaxNode
+      include StrippedTextContent
+    end
+
+    class Value < ::Treetop::Runtime::SyntaxNode
+      include StrippedTextContent
+    end
+
+    class CommentText < ::Treetop::Runtime::SyntaxNode
+      include StrippedTextContent
+    end
 
     class ServiceAddress < ::Treetop::Runtime::SyntaxNode
       include StrippedTextContent
     end
 
-    class CommentLine < ::Treetop::Runtime::SyntaxNode; include StrippedTextContent; end
-    class BlankLine < ::Treetop::Runtime::SyntaxNode; include StrippedTextContent; end
+    class CommentLine < ::Treetop::Runtime::SyntaxNode
+      include StrippedTextContent
+    end
+
+    class BlankLine < ::Treetop::Runtime::SyntaxNode
+      include StrippedTextContent
+    end
+
     class ConfigLine < ::Treetop::Runtime::SyntaxNode
       include StrippedTextContent
       include OptionalValueElement
@@ -85,7 +122,9 @@ module HAProxy
       end
     end
 
-    class GlobalHeader < ::Treetop::Runtime::SyntaxNode; include StrippedTextContent; end
+    class GlobalHeader < ::Treetop::Runtime::SyntaxNode
+      include StrippedTextContent
+    end
 
     class DefaultsHeader < ::Treetop::Runtime::SyntaxNode
       include StrippedTextContent
@@ -94,8 +133,13 @@ module HAProxy
       end
     end
 
-    class UserlistHeader < ::Treetop::Runtime::SyntaxNode; include StrippedTextContent; end
-    class BackendHeader < ::Treetop::Runtime::SyntaxNode; include StrippedTextContent; end
+    class UserlistHeader < ::Treetop::Runtime::SyntaxNode
+      include StrippedTextContent
+    end
+
+    class BackendHeader < ::Treetop::Runtime::SyntaxNode
+      include StrippedTextContent
+    end
 
     class FrontendHeader < ::Treetop::Runtime::SyntaxNode
       include ServiceAddressContainer
@@ -105,7 +149,8 @@ module HAProxy
       include ServiceAddressContainer
     end
 
-    class ConfigBlock < ::Treetop::Runtime::SyntaxNode; end
+    class ConfigBlock < ::Treetop::Runtime::SyntaxNode
+    end
 
     class DefaultsSection < ::Treetop::Runtime::SyntaxNode
       include ConfigBlockContainer
@@ -141,7 +186,7 @@ module HAProxy
       def defaults
         self.elements.select {|e| e.class == DefaultsSection}
       end
-         
+
       def listeners
         self.elements.select {|e| e.class == ListenSection}
       end
@@ -171,4 +216,3 @@ module HAProxy
     end
   end
 end
-

data/lib/haproxy/version.rb

@@ -0,0 +1,3 @@
+module HAProxy
+  VERSION = "0.3.0"
+end

data/lib/haproxy_tools.rb

@@ -1,12 +1,5 @@
-require 'polyglot'
 require 'treetop'
-require 'orderedhash'
 require 'haproxy/treetop/config'
 require 'haproxy/config'
 require 'haproxy/renderer'
 require 'haproxy/parser'
-
-module HAProxy
-  VERSION = File.read(File.join(File.dirname(__FILE__), '..', 'VERSION')).strip
-end
-

data/spec/fixtures/simple.haproxy.cfg

@@ -1,4 +1,5 @@
 # This is a top-level comment.  It should be allowed.
+
 global
 	maxconn 4096 # Total Max Connections. This is dependent on ulimit
 	daemon
@@ -19,4 +20,4 @@ listen http_proxy 55.55.55.55:80
 	## Define your servers to balance
 	server web1 66.66.66.66:80 weight 1 maxconn 512 check
 	server web2 77.77.77.77:80 weight 1 maxconn 512 check
-	server web3 88.88.88.88:80 weight 1 maxconn 512 check
+	server web3 88.88.88.88:80

data/spec/haproxy/parser_spec.rb

@@ -57,7 +57,7 @@ describe "HAProxy::Parser" do
       defaults.options.should include('httpclose')
     end
 
-    it 'parses a listener from a config file' do 
+    it 'parses a listener from a config file' do
       @config.listeners.size.should == 1
 
       listener = @config.listener('http_proxy')
@@ -92,9 +92,7 @@ describe "HAProxy::Parser" do
       server3.name.should == 'web3'
       server3.host.should   == '88.88.88.88'
       server3.port.should == '80'
-      server3.attributes['weight'].should == '1'
-      server3.attributes['maxconn'].should == '512'
-      server3.attributes['check'].should == true
+      server3.attributes.should be_empty
     end
   end
 end

data/spec/haproxy/treetop/config_parser_spec.rb

@@ -52,17 +52,21 @@ describe HAProxy::Treetop::ConfigParser do
   it 'can parse a file with a listen section' do
     parse_single_pool
 
+    @result.elements
     @result.class.should == HAProxy::Treetop::ConfigurationFile
-    @result.elements.size.should == 4
+    @result.elements.size.should == 5
+
+    @result.elements[0].class.should == HAProxy::Treetop::CommentLine
+    @result.elements[1].class.should == HAProxy::Treetop::BlankLine
 
-    @result.global.should == @result.elements[1]
-    @result.elements[1].class.should == HAProxy::Treetop::GlobalSection
+    @result.global.should == @result.elements[2]
+    @result.elements[2].class.should == HAProxy::Treetop::GlobalSection
 
-    @result.defaults[0].should == @result.elements[2]
-    @result.elements[2].class.should == HAProxy::Treetop::DefaultsSection
+    @result.defaults[0].should == @result.elements[3]
+    @result.elements[3].class.should == HAProxy::Treetop::DefaultsSection
 
-    @result.listeners[0].should == @result.elements[3]
-    @result.elements[3].class.should == HAProxy::Treetop::ListenSection
+    @result.listeners[0].should == @result.elements[4]
+    @result.elements[4].class.should == HAProxy::Treetop::ListenSection
   end
 
   it 'can parse a file with frontend/backend sections' do

data/spec/spec_helper.rb

@@ -1,12 +1,24 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rspec'
-require 'haproxy-tools'
+
+require 'bundler'
+Bundler.require(:default, :development)
+
+require 'haproxy_tools'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-  
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+
 end

metadata

@@ -1,147 +1,144 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: haproxy-tools
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+version: !ruby/object:Gem::Version
+  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Jason Wadsworth
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-24 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+date: 2013-08-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: net-scp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: orderedhash
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: treetop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 7
-        - 0
-        version: 2.7.0
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 7
-        - 0
-        version: 0.7.0
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: jeweler
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
-        version: 1.6.4
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rcov
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cane
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: treetop
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-debugger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id007
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby tools for HAProxy, including config file management.
-email: jdwadsworth@gmail.com
+email:
+- jdwadsworth@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE.txt
-- README.rdoc
-- TODO
-files: 
+extra_rdoc_files: []
+files:
 - .document
+- .gitignore
 - .rspec
+- .simplecov
 - CHANGES.rdoc
 - Gemfile
 - LICENSE.txt
 - README.rdoc
 - Rakefile
 - TODO
-- VERSION
 - docs/haproxy-1.3-configuration.txt
 - docs/haproxy-1.4-configuration.txt
 - haproxy-tools.gemspec
@@ -151,6 +148,7 @@ files:
 - lib/haproxy/renderer.rb
 - lib/haproxy/treetop/config.treetop
 - lib/haproxy/treetop/nodes.rb
+- lib/haproxy/version.rb
 - lib/haproxy_tools.rb
 - spec/fixtures/multi-pool.haproxy.cfg
 - spec/fixtures/simple.haproxy.cfg
@@ -158,39 +156,34 @@ files:
 - spec/haproxy/parser_spec.rb
 - spec/haproxy/treetop/config_parser_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
-homepage: http://github.com/subakva/haproxy-tools
-licenses: 
-- MIT
+homepage: https://github.com/subakva/haproxy-tools
+licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: HAProxy Tools for Ruby
-test_files: []
-
+test_files:
+- spec/fixtures/multi-pool.haproxy.cfg
+- spec/fixtures/simple.haproxy.cfg
+- spec/haproxy/config_spec.rb
+- spec/haproxy/parser_spec.rb
+- spec/haproxy/treetop/config_parser_spec.rb
+- spec/spec_helper.rb
+has_rdoc: 

data/VERSION

@@ -1 +0,0 @@
-0.2.0