haproxy-tools 0.1.0 → 0.2.0

data/spec/haproxy/parser_spec.rb

@@ -1,31 +1,32 @@
 require 'spec_helper'
 
 describe "HAProxy::Parser" do
+
   context 'multi-pool config file' do
     before(:each) do
       @parser = HAProxy::Parser.new
-      @config = @parser.parse('spec/fixtures/multi-pool.haproxy.cfg')
+      @config = @parser.parse_file('spec/fixtures/multi-pool.haproxy.cfg')
     end
 
-    it "parses a named backends from a config file" do
-      @config.backends.size.should == 3
+    it "parses a named backend from a config file" do
+      @config.backends.size.should == 2
       logs_backend = @config.backend('logs')
 
       logs_backend.servers.size.should == 3
 
       server1 = logs_backend.servers['prd_log_1']
       server1.name.should == 'prd_log_1'
-      server1.ip.should   == '10.245.174.75'
+      server1.host.should   == '10.245.174.75'
       server1.port.should == '8000'
 
       server2 = logs_backend.servers['fake_logger']
       server2.name.should == 'fake_logger'
-      server2.ip.should   == '127.0.0.1'
+      server2.host.should   == '127.0.0.1'
       server2.port.should == '9999'
 
       server3 = logs_backend.servers['prd_log_2']
       server3.name.should == 'prd_log_2'
-      server3.ip.should   == '10.215.157.10'
+      server3.host.should   == '10.215.157.10'
       server3.port.should == '8000'
     end
   end
@@ -33,48 +34,68 @@ describe "HAProxy::Parser" do
   context 'basic config file' do
     before(:each) do
       @parser = HAProxy::Parser.new
-      @config = @parser.parse('spec/fixtures/simple.haproxy.cfg')
+      @config = @parser.parse_file('spec/fixtures/simple.haproxy.cfg')
     end
 
     it "parses global variables from a config file" do
       @config.global.size.should == 3
-      @config.global['maxconn'].should == ['4096']
-      @config.global['daemon'].should == []
-      @config.global['nbproc'].should == ['4']
+      @config.global['maxconn'].should == '4096'
+      @config.global['daemon'].should == nil
+      @config.global['nbproc'].should == '4'
     end
 
-    it "parses default variables from a config file" do
-      @config.defaults.size.should == 7
-      @config.defaults['mode'].should == ['http']
-      @config.defaults['clitimeout'].should == ['60000']
-      @config.defaults['srvtimeout'].should == ['30000']
-      @config.defaults['contimeout'].should == ['4000']
-      @config.defaults['listen'].should == [['http_proxy', '55.55.55.55:80']]
-      @config.defaults['balance'].should == ['roundrobin']
-      @config.defaults['option'].should == ['httpclose','httpchk','forwardfor']
+    it "parses a default set from a config file" do
+      @config.defaults.size.should == 1
+
+      defaults = @config.defaults.first
+      defaults.config['mode'].should == 'http'
+      defaults.config['clitimeout'].should == '60000'
+      defaults.config['srvtimeout'].should == '30000'
+      defaults.config['contimeout'].should == '4000'
+
+      defaults.options.size.should == 1
+      defaults.options.should include('httpclose')
     end
 
-    it "parses a default backends from a config file" do
-      @config.backends.size.should == 1
+    it 'parses a listener from a config file' do 
+      @config.listeners.size.should == 1
 
-      pool = @config.backends.first
+      listener = @config.listener('http_proxy')
+      listener.name.should == 'http_proxy'
+      listener.host.should == '55.55.55.55'
+      listener.port.should == '80'
+      listener.config['balance'].should == 'roundrobin'
 
-      pool.servers.size.should == 3
+      listener.options.size.should == 2
+      listener.options.should include('httpchk')
+      listener.options.should include('forwardfor')
 
-      server1 = pool.servers['web1']
+      listener.servers.size.should == 3
+
+      server1 = listener.servers['web1']
       server1.name.should == 'web1'
-      server1.ip.should   == '66.66.66.66'
+      server1.host.should   == '66.66.66.66'
       server1.port.should == '80'
+      server1.attributes['weight'].should == '1'
+      server1.attributes['maxconn'].should == '512'
+      server1.attributes['check'].should == true
 
-      server2 = pool.servers['web2']
+      server2 = listener.servers['web2']
       server2.name.should == 'web2'
-      server2.ip.should   == '77.77.77.77'
+      server2.host.should   == '77.77.77.77'
       server2.port.should == '80'
+      server2.attributes['weight'].should == '1'
+      server2.attributes['maxconn'].should == '512'
+      server2.attributes['check'].should == true
 
-      server3 = pool.servers['web3']
+      server3 = listener.servers['web3']
       server3.name.should == 'web3'
-      server3.ip.should   == '88.88.88.88'
+      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
     end
   end
 end
+

data/spec/haproxy/treetop/config_parser_spec.rb

@@ -0,0 +1,95 @@
+require 'spec_helper'
+
+describe HAProxy::Treetop::ConfigParser do
+  before(:each) do
+    @parser = HAProxy::Treetop::ConfigParser.new
+  end
+
+  def parse_file(filename)
+    @result = @parser.parse(File.read(filename))
+    if @result.nil?
+      puts
+      puts "Failure Reason:  #{@parser.failure_reason}"
+    end
+
+    # HAProxy::Treetop.print_node(@result, 0, :max_depth => 3)
+  end
+
+  def parse_single_pool
+    parse_file('spec/fixtures/simple.haproxy.cfg')
+  end
+
+  def parse_multi_pool
+    parse_file('spec/fixtures/multi-pool.haproxy.cfg')
+  end
+
+  it "can parse servers from a backend server block" do
+    parse_multi_pool
+
+    backend = @result.backends.first
+    backend.servers.size.should == 4
+    backend.servers[0].name.should == 'prd_www_1'
+    backend.servers[0].host.should == '10.214.78.95'
+    backend.servers[0].port.should == '8000'
+  end
+
+  it 'can parse a service address from a frontend header' do
+    parse_multi_pool
+
+    frontend = @result.frontends.first
+    frontend.frontend_header.service_address.host.content.should == '*'
+    frontend.frontend_header.service_address.port.content.should == '85'
+  end
+
+  it 'can parse a service address from a listen header' do
+    parse_single_pool
+
+    listener = @result.listeners.first
+    listener.listen_header.service_address.host.content.should == '55.55.55.55'
+    listener.listen_header.service_address.port.content.should == '80'
+  end
+
+  it 'can parse a file with a listen section' do
+    parse_single_pool
+
+    @result.class.should == HAProxy::Treetop::ConfigurationFile
+    @result.elements.size.should == 4
+
+    @result.global.should == @result.elements[1]
+    @result.elements[1].class.should == HAProxy::Treetop::GlobalSection
+
+    @result.defaults[0].should == @result.elements[2]
+    @result.elements[2].class.should == HAProxy::Treetop::DefaultsSection
+
+    @result.listeners[0].should == @result.elements[3]
+    @result.elements[3].class.should == HAProxy::Treetop::ListenSection
+  end
+
+  it 'can parse a file with frontend/backend sections' do
+    parse_multi_pool
+
+    @result.class.should == HAProxy::Treetop::ConfigurationFile
+    @result.elements.size.should == 5
+
+    @result.global.should == @result.elements[0]
+    @result.elements[0].class.should == HAProxy::Treetop::GlobalSection
+
+    @result.defaults[0].should == @result.elements[1]
+    @result.elements[1].class.should == HAProxy::Treetop::DefaultsSection
+
+    @result.frontends[0].should == @result.elements[2]
+    @result.elements[2].class.should == HAProxy::Treetop::FrontendSection
+
+    @result.backends[0].should == @result.elements[3]
+    @result.backends[1].should == @result.elements[4]
+    @result.elements[3].class.should == HAProxy::Treetop::BackendSection
+    @result.elements[4].class.should == HAProxy::Treetop::BackendSection
+  end
+
+  it 'can parse userlist sections'
+  it 'can parse valid units of time'
+  it 'can parse strings with escaped spaces'
+  it 'can parse files with escaped quotes'
+  it 'can parse keywords with hyphens'
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: haproxy-tools
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jason Wadsworth
@@ -15,62 +15,74 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-23 00:00:00 -05:00
+date: 2012-04-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rspec
-  type: :development
+  name: net-scp
+  type: :runtime
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 3
         segments: 
-        - 2
-        - 7
         - 0
-        version: 2.7.0
+        version: "0"
   requirement: *id001
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: yard
-  type: :development
+  name: orderedhash
+  type: :runtime
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
         - 0
-        - 7
-        - 0
-        version: 0.7.0
+        version: "0"
   requirement: *id002
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: bundler
+  name: rspec
   type: :development
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 19
         segments: 
-        - 1
-        - 0
+        - 2
+        - 7
         - 0
-        version: 1.0.0
+        version: 2.7.0
   requirement: *id003
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: jeweler
+  name: yard
   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
+  type: :development
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -81,12 +93,12 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  requirement: *id004
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: rcov
   type: :development
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -95,7 +107,21 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: treetop
+  type: :development
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id007
 description: Ruby tools for HAProxy, including config file management.
 email: jdwadsworth@gmail.com
 executables: []
@@ -105,22 +131,32 @@ extensions: []
 extra_rdoc_files: 
 - LICENSE.txt
 - README.rdoc
+- TODO
 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
 has_rdoc: true
 homepage: http://github.com/subakva/haproxy-tools