vagrant-dns 2.2.1 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 55d0e6f7cc3427342989a00be7f483e305bf346e
-  data.tar.gz: 5736ee829fe8700bb53645e3ad8449d330277029
+SHA256:
+  metadata.gz: 79dfdc20901e6817d9acb8d2833a1be00655cd974b2d9d6afbffc5ddea2d3ff2
+  data.tar.gz: 6c4fa0e10842aee72a453b368bb535a0d450f64b2c0eb88e1479d1a4d83f2984
 SHA512:
-  metadata.gz: 5135212305291f8c7fc655545ff4dcf76a1f8c040c0aab0d70ee5d090fdee6767a0fb5f71a8391448cb72bad890b75d31840aa6483155e15e84e9b0e4c5bb794
-  data.tar.gz: a961387709f85227bcf2792f75c4913ddb666bd1620a6fbeb869ad467ed9edb5c520835ce48e7d01a71cc49c3ba39ac9e58aba77bb23a75417b7a5e1de22d4cb
+  metadata.gz: 7b55bfad4178e4dfb15fff551de3fde4ab324520ce4d4e1e2cab3acc13b67b3e9d194be2af2e0281922b9f03061540472decda0f5ca94173f1600add4fbdd9ae
+  data.tar.gz: 0cbd95cb993d9cc857838629ad7eaeb6c5708c53b337b246c685468783a3e0864bc7f1ff6e9b8afe675add2b173ef09e4e9def27d038915e503be59440d794b4

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 2.2.3
+
+### Fixes:
+
+* Workaround for a Vargant-on-Ventura issue, crashing the DNS process. [GH-72]
+
+## 2.2.2
+
+### Fixes:
+
+* Installation issue due to updated sub-dependency. [GH-69]
+
 ## 2.2.1
 
 ### Fixes:

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
-ruby(ENV['TEST_RUBY_VERSION'] || '~> 2.4.4')
+ruby(ENV['TEST_RUBY_VERSION'] || '~> 2.7.3')
 
-ENV['TEST_VAGRANT_VERSION'] ||= 'v2.1.4'
+ENV['TEST_VAGRANT_VERSION'] ||= 'v2.3.4'
 
 # Using the :plugins group causes Vagrant to automagially load auto_network
 # during acceptance tests.
@@ -23,6 +23,6 @@ group :test do
   gem 'rake'
 end
 
-if File.exists? "#{__FILE__}.local"
+if File.exist? "#{__FILE__}.local"
   eval(File.read("#{__FILE__}.local"), binding)
 end

data/lib/vagrant-dns/configurator.rb

@@ -120,11 +120,9 @@ module VagrantDNS
       end
 
       def resolver_file(port)
-        contents = <<-FILE
-# this file is generated by vagrant-dns
-nameserver 127.0.0.1
-port #{port}
-FILE
+        "# this file is generated by vagrant-dns\n" \
+        "nameserver 127.0.0.1\n" \
+        "port #{port}\n"
       end
 
       def resolver_folder

data/lib/vagrant-dns/service.rb

@@ -9,49 +9,58 @@ module VagrantDNS
     end
 
     def start!(opts = {})
-      run_options = {
-        :ARGV => ["start"],
-        :ontop => opts[:ontop]
-      }.merge!(runopts)
-      run!(run_options)
+      run!("start", { ontop: opts[:ontop] })
     end
 
     def stop!
-      run_options = {:ARGV => ["stop"]}.merge(runopts)
-      run!(run_options)
+      run!("stop")
     end
 
     def status!
-      run_options = {:ARGV => ["status"]}.merge(runopts)
-      run!(run_options)
+      run!("status")
     end
 
-    def run!(run_options)
-      Daemons.run_proc("vagrant-dns", run_options) do
+    SERVER = Proc.new do |tmp_path, skip_require_dependencies|
+      unless skip_require_dependencies
         require 'rubydns'
         require 'async/dns/system'
+      end
 
-        registry = Registry.new(tmp_path).to_hash
-        std_resolver = RubyDNS::Resolver.new(Async::DNS::System.nameservers)
-        ttl = VagrantDNS::Config.ttl
+      registry = Registry.new(tmp_path).to_hash
+      std_resolver = RubyDNS::Resolver.new(Async::DNS::System.nameservers)
+      ttl = VagrantDNS::Config.ttl
 
-        RubyDNS::run_server(VagrantDNS::Config.listen) do
-          registry.each do |pattern, ip|
-            match(pattern, Resolv::DNS::Resource::IN::A) do |transaction, match_data|
-              transaction.respond!(ip, ttl: ttl)
-            end
+      RubyDNS::run_server(VagrantDNS::Config.listen) do
+        registry.each do |pattern, ip|
+          match(pattern, Resolv::DNS::Resource::IN::A) do |transaction, match_data|
+            transaction.respond!(ip, ttl: ttl)
           end
+        end
 
-          otherwise do |transaction|
-            transaction.passthrough!(std_resolver) do |reply, reply_name|
-              puts reply
-              puts reply_name
-            end
+        otherwise do |transaction|
+          transaction.passthrough!(std_resolver) do |reply, reply_name|
+            puts reply
+            puts reply_name
           end
         end
       end
     end
 
+    def run!(cmd, opts = {})
+      # On darwin, when the running Ruby is not compiled for the running OS
+      # @see: https://github.com/BerlinVagrant/vagrant-dns/issues/72
+      use_issue_72_workround = RUBY_PLATFORM.match?(/darwin/) && !RUBY_PLATFORM.end_with?(`uname -r`[0, 2])
+
+      if cmd == "start" && use_issue_72_workround
+        require 'rubydns'
+        require 'async/dns/system'
+      end
+
+      Daemons.run_proc("vagrant-dns", run_options(cmd, opts)) do
+        SERVER.call(tmp_path, use_issue_72_workround)
+      end
+    end
+
     def restart!(start_opts = {})
       stop!
       start!(start_opts)
@@ -69,13 +78,17 @@ module VagrantDNS
       end
     end
 
-    def runopts
+    private
+
+    def run_options(cmd, extra = {})
       daemon_dir = File.join(tmp_path, "daemon")
       {
-        :dir_mode   => :normal,
-        :dir        => daemon_dir,
-        :log_output => true,
-        :log_dir    => daemon_dir
+        ARGV: [cmd],
+        dir_mode: :normal,
+        dir: daemon_dir,
+        log_output: true,
+        log_dir: daemon_dir,
+        **extra
      }
     end
   end

data/lib/vagrant-dns/version.rb

@@ -1,3 +1,3 @@
 module VagrantDNS
-  VERSION = "2.2.1"
+  VERSION = "2.2.3"
 end

data/vagrant-dns.gemspec

@@ -22,5 +22,10 @@ Gem::Specification.new do |gem|
   gem.add_dependency "rubydns", '~> 2.0.0'
   gem.add_dependency "public_suffix"
 
+  # Pinning async gem to work around an issue in vagrant, where it does not
+  # honor "required_ruby_version" while resolving sub-dependencies.
+  # see: https://github.com/hashicorp/vagrant/issues/12640
+  gem.add_dependency 'async', '< 2'
+
   gem.add_development_dependency 'rspec'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dns
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.3
 platform: ruby
 authors:
 - Florian Gilcher
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-22 00:00:00.000000000 Z
+date: 2023-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
@@ -53,6 +53,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: async
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -117,8 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.14.4
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: vagrant-dns manages DNS records of vagrant machines