haproxy-tools 0.3.2 → 0.3.3

data/.gitignore

@@ -12,3 +12,4 @@ Gemfile.lock
 tmp
 *.orig
 .bundle
+.idea

data/.ruby-version

@@ -0,0 +1 @@
+ruby-1.9.3

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+cache: bundler
+
+rvm:
+  - "1.9"
+
+script: "bundle exec rake spec"

data/CHANGES.rdoc

@@ -1,3 +1,6 @@
+== 0.4.0
+* Added support for 1.5 "keyword-type-argument" config (@drewsonne)
+
 == 0.3.2
 * Specify the MIT license in the gemspec
 

data/README.rdoc

@@ -1,3 +1,4 @@
+{<img src="https://travis-ci.org/subakva/haproxy-tools.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/subakva/haproxy-tools]
 = haproxy-tools
 
 Tools for managing HAProxy with Ruby.
@@ -55,6 +56,5 @@ Tools for managing HAProxy with Ruby.
 
 == Copyright
 
-Copyright (c) 2011-2013 Jason Wadsworth. See LICENSE.txt for
-further details.
+Copyright (c) 2011-2015 Jason Wadsworth. See LICENSE.txt for further details.
 

data/haproxy-tools.gemspec

@@ -18,12 +18,14 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
+  gem.required_ruby_version = '1.9.3'
+
   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_dependency('treetop')
+  gem.add_development_dependency('rake')
+  gem.add_development_dependency('rspec', '~> 2.14')
+  gem.add_development_dependency('yard')
   gem.add_development_dependency('simplecov')
   gem.add_development_dependency('cane')
-  gem.add_development_dependency('pry-debugger')
+  # gem.add_development_dependency('pry-debugger')
 end

data/lib/haproxy/parser.rb

@@ -180,4 +180,4 @@ module HAProxy
     end
 
   end
-end
+end

data/lib/haproxy/treetop/config.treetop

@@ -88,7 +88,7 @@ module HAProxy::Treetop
     end
 
     rule keyword
-      [a-z\-\.]+ <Keyword>
+       (("errorfile" / "timeout") whitespace)? [a-z0-9\-\.]+ <Keyword>
     end
 
     rule server_name
@@ -186,4 +186,3 @@ module HAProxy::Treetop
 
   end
 end
-

data/lib/haproxy/version.rb

@@ -1,3 +1,3 @@
 module HAProxy
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/spec/fixtures/simple.haproxy15.cfg

@@ -0,0 +1,31 @@
+# This is a top-level comment.  It should be allowed.
+
+global
+	maxconn 4096 # Total Max Connections. This is dependent on ulimit
+	daemon
+	nbproc 4 # Number of processing cores. Dual Dual-core Opteron is 4 cores for example.
+    log 127.0.0.1 local0
+    log 127.0.0.1 local1 notice
+    user haproxy
+    group haproxy
+
+defaults
+	mode http
+	option httpclose # Disable Keepalive
+    option httplog
+    option dontlognull
+    timeout connect 5000ms
+    timeout client 5000ms
+    timeout server 5000ms
+    errorfile 400 /etc/haproxy/errors/400.http
+    errorfile 504 /etc/haproxy/errors/504.http
+
+listen http_proxy 55.55.55.55:80
+	balance roundrobin # Load Balancing algorithm
+	option httpchk
+	option forwardfor # This sets X-Forwarded-For
+
+	## Define your servers to balance
+	server web1 dnshost66: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

data/spec/haproxy/config_spec.rb

@@ -24,7 +24,7 @@ describe "HAProxy::Config" do
       new_config = HAProxy::Parser.new.parse(new_config_text)
       s = new_config.backend('www_main').servers['prd_www_1']
       s.should_not be_nil
-      s.attributes['disabled'].should be_true
+      s.attributes['disabled'].should be_truthy
     end
 
     it 'can re-render a config file with a server added' do

data/spec/haproxy/parser_spec.rb

@@ -36,6 +36,26 @@ describe "HAProxy::Parser" do
     end
   end
 
+  context 'basic 1.5 config file' do
+    before(:each) do
+      @parser = HAProxy::Parser.new
+      @config = @parser.parse_file('spec/fixtures/simple.haproxy15.cfg')
+    end
+
+    it "parses structured configs" do
+      defaults = @config.defaults.first.config
+
+      defaults['timeout connect'].should == '5000ms'
+      defaults['timeout client'].should == '5000ms'
+      defaults['timeout server'].should == '5000ms'
+
+      defaults['errorfile 400'].should == '/etc/haproxy/errors/400.http'
+      defaults['errorfile 504'].should == '/etc/haproxy/errors/504.http'
+
+    end
+
+  end
+
   context 'basic config file' do
     before(:each) do
       @parser = HAProxy::Parser.new

metadata

@@ -1,125 +1,126 @@
 --- !ruby/object:Gem::Specification
 name: haproxy-tools
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
+  prerelease: 
 platform: ruby
 authors:
 - Jason Wadsworth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-08 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
+    none: false
     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: pry-debugger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby tools for HAProxy, including config file management.
@@ -132,7 +133,9 @@ files:
 - .document
 - .gitignore
 - .rspec
+- .ruby-version
 - .simplecov
+- .travis.yml
 - CHANGES.rdoc
 - Gemfile
 - LICENSE.txt
@@ -153,6 +156,7 @@ files:
 - lib/haproxy_tools.rb
 - spec/fixtures/multi-pool.haproxy.cfg
 - spec/fixtures/simple.haproxy.cfg
+- spec/fixtures/simple.haproxy15.cfg
 - spec/haproxy/config_spec.rb
 - spec/haproxy/parser_spec.rb
 - spec/haproxy/treetop/config_parser_spec.rb
@@ -160,30 +164,32 @@ files:
 homepage: https://github.com/subakva/haproxy-tools
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - '='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: HAProxy Tools for Ruby
 test_files:
 - spec/fixtures/multi-pool.haproxy.cfg
 - spec/fixtures/simple.haproxy.cfg
+- spec/fixtures/simple.haproxy15.cfg
 - spec/haproxy/config_spec.rb
 - spec/haproxy/parser_spec.rb
 - spec/haproxy/treetop/config_parser_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 1c1d426c50dd8bf48f341ee93223736eeae6adc1
-  data.tar.gz: 0b43d53d067fc43ebb399311f71375c89f53c23d
-SHA512:
-  metadata.gz: 4b9213898f321a7375900056456811f6a9b8c932efaa4fca982749f1150cdfbac534f043352639c16a8645a5ad2b3c159ed4aba2d122f7bf01e375147241bf40
-  data.tar.gz: 75a5c499a2e002386ba18a4a3cc61eeda6d8fef689b23d1b070bf3fcc1a4a4d787241ead17ad5fe89a40d10e26899d9d29c38e07a4454c4037c10f9e4a13d307