smart_proxy_dns_dnsmasq 0.5 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb1aac2f3d95b7d541050735d2459b4c32a95331
-  data.tar.gz: f4fb0328e7cbf48f03d6ea70533e92c5e237a705
+  metadata.gz: 50d4032f443de747d784de78eb8bbf0ca97b236a
+  data.tar.gz: 88ec43f74a5c58deac1d4d41b53cf6c08e848c27
 SHA512:
-  metadata.gz: ad7db5669dd48e3d3826597d45048783766d82d5826b2c17366bc65e15bd0885063346557a910da33b500d8456760fb71b41ba6f20d40337947f621b62262810
-  data.tar.gz: 2e3bc42987949e4fce223869f7e286fdc94a227d64f9326bd0a49dd2d6a6d3d316f1f76ba2d5cdb4c952431ed6f84257969ddc93e4372e19bbe6a2016272c27c
+  metadata.gz: 4ae2ab7e58dd195c8b66663f61d7abba7ca0ee2567ecd0371935855bef256b0ae57ecfd005dd9984551351556f864ac8b40b09f1a32807ab456095c1ca5040fb
+  data.tar.gz: 38a647b8bec5943708698dbc127f5f6e1d5cc88972bd34c3e4e7341e86cbe4580a8f24f97aeaa9998d49ec8fecbb79857363638356ae7d01b50f675e09194e3a

data/config/dns_dnsmasq.yml

@@ -6,4 +6,4 @@
 #
 #:backend: default
 :config_path: /etc/dnsmasq.d/foreman.conf
-:reload_cmd: systemctl reload dnsmasq
+:reload_cmd: systemctl restart dnsmasq

data/lib/smart_proxy_dns_dnsmasq/backend/default.rb

@@ -35,12 +35,13 @@ module Proxy::Dns::Dnsmasq
     end
 
     def remove_entry(type, fqdn = nil, ip = nil)
-      return true unless case type
-      when 'A', 'AAAA'
-        e = configuration.find { |entry| entry.is_a?(AddressEntry) && entry.fqdn.include?(fqdn) }
-      when 'PTR'
-        e = configuration.find { |entry| entry.is_a?(PTREntry) && entry.ip == ip }
-      end
+      e = case type
+          when 'A', 'AAAA'
+            configuration.find { |entry| entry.is_a?(AddressEntry) && entry.fqdn.include?(fqdn) }
+          when 'PTR'
+            configuration.find { |entry| entry.is_a?(PTREntry) && entry.ip.include?(ip.split('.').reverse.join('.')) }
+          end
+      return true unless e
 
       configuration.delete e
       @dirty = true
@@ -95,9 +96,8 @@ module Proxy::Dns::Dnsmasq
           data = value.split(',')
 
           entry = PTREntry.new
-          entry.ip = data.shift
-          entry.fqdn = data.shift
-
+          entry.ip = data[0]
+          entry.fqdn = data[1]
 #       TODO: Handle these properly
 #       when 'host-record'
 #         data = value.split(',')

data/lib/smart_proxy_dns_dnsmasq/dns_dnsmasq_configuration.rb

@@ -5,32 +5,34 @@ module ::Proxy::Dns::Dnsmasq
       require 'smart_proxy_dns_dnsmasq/dns_dnsmasq_main'
     end
 
-    BACKENDS = [ 'openwrt', 'default' ].freeze
+    BACKENDS = %i(openwrt default).freeze
     def load_dependency_injection_wirings(container_instance, settings)
-      backend = settings[:backend] || 'default'
+      backend = settings[:backend] || :default
+      backend = backend.to_s.downcase.to_sym
 
       unless BACKENDS.include? backend
-        raise ::Proxy::Error::ConfigurationError, 'In'
+        raise ::Proxy::Error::ConfigurationError, "Unknown DNS backend #{backend}, available backends are; #{BACKENDS}"
       end
 
       begin
         require "smart_proxy_dns_dnsmasq/backend/#{backend}"
       rescue LoadError, e
-        raise ::Proxy::Error::ConfigurationError, "Failed to load backend #{backend}: #{e}"
+        raise ::Proxy::Error::ConfigurationError, e, "Failed to load #{backend} backend"
       end
 
       klass = case backend
-      when 'openwrt'
-        ::Proxy::Dns::Dnsmasq::Openwrt
-      when 'default'
-        ::Proxy::Dns::Dnsmasq::Default
-      end
+              when :openwrt
+                ::Proxy::Dns::Dnsmasq::Openwrt
+              when :default
+                ::Proxy::Dns::Dnsmasq::Default
+              end
 
       container_instance.dependency :dns_provider, (lambda do
         klass.new(
-            settings[:config_path],
-            settings[:reload_cmd],
-            settings[:dns_ttl])
+          settings[:config_path],
+          settings[:reload_cmd],
+          settings[:dns_ttl]
+        )
       end)
     end
   end

data/lib/smart_proxy_dns_dnsmasq/dns_dnsmasq_plugin.rb

@@ -9,7 +9,7 @@ module Proxy::Dns::Dnsmasq
     # An exception will be raised if they are initialized with nil values.
     # Settings not listed under default_settings are considered optional and by default have nil value.
     default_settings :config_path => '/etc/dnsmasq.d/foreman.conf',
-                     :reload_cmd => 'systemctl reload dnsmasq'
+                     :reload_cmd  => 'systemctl restart dnsmasq'
 
     requires :dns, '>= 1.15'
 

data/lib/smart_proxy_dns_dnsmasq/dns_dnsmasq_version.rb

@@ -1,7 +1,7 @@
 module Proxy
   module Dns
     module Dnsmasq
-      VERSION = '0.5'
+      VERSION = '0.6'.freeze
     end
   end
 end

data/test/dns_dnsmasq_default_settings_test.rb

@@ -5,7 +5,7 @@ require 'smart_proxy_dns_dnsmasq/dns_dnsmasq_plugin'
 class DnsDnsmasqDefaultSettingsTest < Test::Unit::TestCase
   def test_default_settings
     Proxy::Dns::Dnsmasq::Plugin.load_test_settings({})
-    assert_equal "default_value", Proxy::Dns::Dnsmasq::Plugin.settings.required_setting
-    assert_equal "/must/exist", Proxy::Dns::Dnsmasq::Plugin.settings.required_path
+    assert_equal '/etc/dnsmasq.d/foreman.conf', Proxy::Dns::Dnsmasq::Plugin.settings[:config_path]
+    assert_equal 'systemctl restart dnsmasq', Proxy::Dns::Dnsmasq::Plugin.settings[:reload_cmd]
   end
 end

data/test/dns_dnsmasq_production_wiring_test.rb

@@ -9,7 +9,8 @@ class DnsDnsmasqProductionWiringTest < Test::Unit::TestCase
   end
 
   def test_dns_provider_initialization_default
-    @config.load_dependency_injection_wirings(@container, :dns_ttl => 999,
+    @config.load_dependency_injection_wirings(@container,
+                                              :dns_ttl => 999,
                                               :config_path => '/etc/dnsmasq.conf',
                                               :reload_cmd => 'systemctl reload dnsmasq')
 
@@ -23,7 +24,8 @@ class DnsDnsmasqProductionWiringTest < Test::Unit::TestCase
   end
 
   def test_dns_provider_initialization
-    @config.load_dependency_injection_wirings(@container, :dns_ttl => 999,
+    @config.load_dependency_injection_wirings(@container,
+                                              :dns_ttl => 999,
                                               :backend => 'openwrt',
                                               :config_path => '/etc/config/dhcp',
                                               :reload_cmd => '/etc/init.d/dnsmasq reload')

data/test/dns_dnsmasq_record_default_test.rb

@@ -18,8 +18,8 @@ class DnsDnsmasqRecordDefaultTest < Test::Unit::TestCase
 
     @configuration.expects(:<<).with { |val|
       val.is_a?(Proxy::Dns::Dnsmasq::Default::AddressEntry) &&
-      val.fqdn == [fqdn] &&
-      val.ip == ip
+        val.fqdn == [fqdn] &&
+        val.ip == ip
     }.returns(true)
     assert @provider.do_create(fqdn, ip, 'A')
   end
@@ -31,8 +31,8 @@ class DnsDnsmasqRecordDefaultTest < Test::Unit::TestCase
 
     @configuration.expects(:<<).with { |val|
       val.is_a?(Proxy::Dns::Dnsmasq::Default::AddressEntry) &&
-      val.fqdn == [fqdn] &&
-      val.ip == ip
+        val.fqdn == [fqdn] &&
+        val.ip == ip
     }.returns(true)
     assert @provider.do_create(fqdn, ip, 'AAAA')
   end
@@ -44,8 +44,8 @@ class DnsDnsmasqRecordDefaultTest < Test::Unit::TestCase
 
     @configuration.expects(:<<).with { |val|
       val.is_a?(Proxy::Dns::Dnsmasq::Default::PTREntry) &&
-      val.fqdn == fqdn &&
-      val.ip == ip
+        val.fqdn == fqdn &&
+        val.ip == ip
     }.returns(true)
     assert @provider.do_create(ip, fqdn, 'PTR')
   end
@@ -57,8 +57,8 @@ class DnsDnsmasqRecordDefaultTest < Test::Unit::TestCase
 
     @configuration.expects(:<<).with { |val|
       val.is_a?(Proxy::Dns::Dnsmasq::Default::PTREntry) &&
-      val.fqdn == fqdn &&
-      val.ip == ip
+        val.fqdn == fqdn &&
+        val.ip == ip
     }.returns(true)
     assert @provider.do_create(ip, fqdn, 'PTR')
   end
@@ -71,8 +71,8 @@ class DnsDnsmasqRecordDefaultTest < Test::Unit::TestCase
     @configuration.expects(:find).returns(nil)
     @configuration.expects(:<<).with { |val|
       val.is_a?(Proxy::Dns::Dnsmasq::Default::CNAMEEntry) &&
-      val.name == name &&
-      val.target == target
+        val.name == name &&
+        val.target == target
     }.returns(true)
     assert @provider.do_create(name, target, 'CNAME')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dns_dnsmasq
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
 platform: ruby
 authors:
 - Alexander Olofsson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-17 00:00:00.000000000 Z
+date: 2017-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -96,14 +96,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: dnsmasq DNS provider plugin for Foreman's smart proxy
 test_files:
-- test/test_helper.rb
-- test/dns_dnsmasq_default_settings_test.rb
 - test/dns_dnsmasq_production_wiring_test.rb
-- test/testdata.openwrt
-- test/dns_dnsmasq_record_openwrt_test.rb
 - test/dns_dnsmasq_record_default_test.rb
+- test/dns_dnsmasq_record_openwrt_test.rb
+- test/test_helper.rb
+- test/testdata.openwrt
+- test/dns_dnsmasq_default_settings_test.rb