haproxy-tools 0.4.1 → 0.4.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8fed60d3c4f99736c6769b45e93493707bd84fa9
+  data.tar.gz: 7b569498dc1b5a98313472ab52ba2720801065fb
+SHA512:
+  metadata.gz: cb2dd7af439b9d698128e44f177bb29375161542798454beee4441088ef64769f86fb22fcaea63f2f4d54ccc9cddddb3944aff43353e98087f6d2d6463a18ee8
+  data.tar.gz: 35be4c064d1a62665289c25b43065e993bdac6e861a9b3310aa9a68373193cdb407975f4d0aec467b52751889e88250501e9cf55cf6da4a61c2c0b8ac7960021

data/.ruby-version

@@ -1 +1 @@
-1.9.3
+2.2.1

data/CHANGES.rdoc

@@ -1,3 +1,7 @@
+== 0.4.2
+* [#11] Added functionality to allow addition of new configs (@drewsonne)
+* [#12] Support symbols as server attributes
+
 == 0.4.0
 * Added support for 1.5 "keyword-type-argument" config (@drewsonne)
 

data/lib/haproxy/config.rb

@@ -15,7 +15,7 @@ module HAProxy
       new_server.name       = name
       new_server.host       = host
       new_server.port       = options[:port] if options[:port]
-      new_server.attributes ||= options[:attributes] || []
+      new_server.attributes ||= options[:attributes] || {}
       self.servers[name] = new_server
       new_server
     end
@@ -57,7 +57,7 @@ module HAProxy
       self.frontends.find { |f| f.name == name }
     end
 
-    def default(name)
+    def default(name=nil)
       self.defaults.find { |d| d.name == name }
     end
 

data/lib/haproxy/renderer.rb

@@ -8,6 +8,7 @@ module HAProxy
       self.config       = config
       self.source_tree  = source_tree
       @server_list      = {}
+      @config_list      = {}
       @context          = self.config
       @prev_context     = self.config
       @config_text      = ''
@@ -32,10 +33,21 @@ module HAProxy
           next if @context.servers[e.name].nil?
         end
 
+        if e.class == HAProxy::Treetop::ConfigLine and @context.class == HAProxy::Default
+          # Keep track of the configs in this config block we've seen, so that we can detect and render new ones.
+          @config_list[e.key] = e
+          # Don't render the config *if* it's been removed from the config block.
+          next if @context.config[e.key].nil?
+        end
+
         if e.class == HAProxy::Treetop::ServerLine
           # Use a custom rendering method for servers, since we allow them to be
           # added/removed/changed.
           render_server_element(e)
+        elsif e.class== HAProxy::Treetop::ConfigLine and @context.class == HAProxy::Default
+          # Use a custom rendering method for configs, since we allow them to be
+          # added/removed/changed.
+          render_config_line_element(e)
         elsif e.elements && e.elements.size > 0
           render_node(e)
         else
@@ -51,6 +63,17 @@ module HAProxy
       @context != @prev_context
     end
 
+    def render_config_line_element(e)
+      config_key = e.key.gsub(/\s+/, ' ')
+      config_value = @context.config[e.key]
+      config_value = config_value.gsub(/\s+/, ' ') if not config_value.nil?
+      render_config_line(config_key, config_value)
+    end
+
+    def render_config_line(key, value)
+      @config_text << "\t#{key} #{value}\n"
+    end
+
     def render_server_element(e)
       server = @context.servers[e.name]
       render_server(server)
@@ -62,6 +85,16 @@ module HAProxy
     end
 
     def handle_context_change
+      if [HAProxy::Default].include?(@prev_context.class)
+        # Render any configs which were added
+        new_configs = @prev_context.config.keys - @config_list.keys
+
+        new_configs.each do |config_name|
+          config_value = @prev_context.config[config_name]
+          render_config_line(config_name, config_value)
+        end
+      end
+
       if [HAProxy::Listener, HAProxy::Backend].include?(@prev_context.class)
         # Render any servers that were added
         new_servers = @prev_context.servers.keys - @server_list.keys
@@ -77,10 +110,10 @@ module HAProxy
     def render_server_attributes(attributes)
       attribute_string = ""
       attributes.each do |name, value|
-        attribute_string << name
+        attribute_string << name.to_s
         attribute_string << " "
         if value && value != true
-          attribute_string << value
+          attribute_string << value.to_s
           attribute_string << " "
         end
       end

data/lib/haproxy/treetop/nodes.rb

@@ -105,6 +105,15 @@ module HAProxy
     class ConfigLine < ::Treetop::Runtime::SyntaxNode
       include StrippedTextContent
       include OptionalValueElement
+
+      def key
+        self.keyword.content
+      end
+
+      def attribute
+        self.value.content
+      end
+
     end
 
     class OptionLine < ::Treetop::Runtime::SyntaxNode

data/lib/haproxy/version.rb

@@ -1,3 +1,3 @@
 module HAProxy
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/spec/haproxy/config_spec.rb

@@ -29,7 +29,7 @@ describe "HAProxy::Config" do
 
     it 'can re-render a config file with a server added' do
       b = @config.backend('www_main')
-      b.add_server('prd_www_4', '99.99.99.99', :port => '8000')
+      b.add_server('prd_www_4', '99.99.99.99', :port => '8000', attributes: { :weight => 128 })
 
       new_config_text = @config.render
 
@@ -39,7 +39,7 @@ describe "HAProxy::Config" do
       s.name.should == 'prd_www_4'
       s.host.should == '99.99.99.99'
       s.port.should == '8000'
-      s.attributes.to_a.should == []
+      s.attributes.to_a.should == [['weight', '128']]
     end
 
     it 'can re-render a config file with a server added based on template' do
@@ -65,11 +65,50 @@ describe "HAProxy::Config" do
     end
   end
 
+  describe 'render simple 1.5 config' do
+    before(:each) do
+      @config = HAProxy::Config.parse_file('spec/fixtures/simple.haproxy15.cfg')
+    end
+
+    it 'cen re-render a config file with an error page removed' do
+      @config.default.config.should have_key('errorfile 400')
+      @config.default.config.delete('errorfile 400')
+
+      new_config_text = @config.render
+
+      new_config = HAProxy::Parser.new.parse(new_config_text)
+      new_config.default.config.should_not have_key('errorfile 400')
+    end
+
+    it 'can re-render a config file with an error page added' do
+      @config.default.config.should_not have_key('errorfile 401')
+      @config.default.config['errorfile 401'] = '/etc/haproxy/errors/401.http'
+
+      new_config_text = @config.render
+
+      new_config = HAProxy::Parser.new.parse(new_config_text)
+      new_config.default.config.should have_key('errorfile 401')
+      new_config.default.config['errorfile 401'].should == '/etc/haproxy/errors/401.http'
+    end
+
+  end
+
   describe 'render simple config' do
     before(:each) do
       @config = HAProxy::Config.parse_file('spec/fixtures/simple.haproxy.cfg')
     end
 
+    it 'can re-render a config file with a config removed' do
+      @config.default.config.should have_key('clitimeout')
+      @config.default.config.delete('clitimeout')
+
+      new_config_text = @config.render
+
+      new_config = HAProxy::Parser.new.parse(new_config_text)
+      new_config.default.config.should_not have_key('clitimeout')
+
+    end
+
     it 'can re-render a config file with a server removed' do
       l = @config.listener('http_proxy')
       l.servers.delete('web1')

metadata

@@ -1,126 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: haproxy-tools
 version: !ruby/object:Gem::Version
-  version: 0.4.1
-  prerelease: 
+  version: 0.4.2
 platform: ruby
 authors:
 - Jason Wadsworth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-03-29 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: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         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
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby tools for HAProxy, including config file management.
@@ -130,12 +115,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
-- .rspec
-- .ruby-version
-- .simplecov
-- .travis.yml
+- ".document"
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
+- ".simplecov"
+- ".travis.yml"
 - CHANGES.rdoc
 - Gemfile
 - LICENSE.txt
@@ -164,27 +149,26 @@ 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: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: HAProxy Tools for Ruby
 test_files:
 - spec/fixtures/multi-pool.haproxy.cfg