vagrant-dns 1.1.0 → 2.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b5a5f6e14ebc5f918008c61685cfbf769596db1
-  data.tar.gz: 2c3dfff6cf22d3960c4dcc12e783577a4e232cfe
+  metadata.gz: 6f0b5e94ce0cb174ab1d10026224ac2059870c6d
+  data.tar.gz: fc70e2dd85c4a34d7eb7a7f4b69f9993f8e95e89
 SHA512:
-  metadata.gz: 6193969e02c212e396979e3cd69be02be51b86145cea153e65acea7511db177bfe4b1c75ddc3b49a80fc4dd3f63557c49da54ec935dd792c8f8f7b060dcd6b09
-  data.tar.gz: 3fdcefc945ecbc726e58d69c967e336ede6bd5392c89c0ba6d121ec5635f55975b3641f1c9c7526fc32fcddc4e8295ac1bef5d2c5d3ed2c69505e6f3b0cce203
+  metadata.gz: b00002ae2b379f716dc25867bc5839fb572106cb3d193b6ed6d5d9a2192a350745b59b347f1e3bb2134931f8cc3dc1eef9d6f20e923cc6816aded15d4448f3c6
+  data.tar.gz: e290d49baa50b8bc9b03091bd3b091e6e1114e4bf6c21727722faceb8af41d9a14f95fa6a55bf0ea95f1a913f689fb4eb4296db9256ce7f99bbc5b81d7c14cc8

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 2.2.0.rc1
+
+* Upgrades RubyDNS to `2.0.0.pre.rc2`, which removes it's dependency on `celluloid`/`celluloid-dns` 🎉
+* Requires Vagrant >= 1.9.6 which ships with ruby 2.3.4 (RubyDNS requires ruby >= 2.2.6)
+* Development note: Upgraded to vagrant-share HEAD (d558861f)
+
 # 1.1.0
 
 * Fixes handling of networks without static IP, such as DHCP. [GH-37], [GH-39], [GH-50]

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
-ruby(ENV['TEST_RUBY_VERSION'] || '~> 2.2.5')
+ruby(ENV['TEST_RUBY_VERSION'] || '~> 2.3.4')
 
-ENV['TEST_VAGRANT_VERSION'] ||= 'v1.9.3'
+ENV['TEST_VAGRANT_VERSION'] ||= 'v1.9.6'
 
 # Using the :plugins group causes Vagrant to automagially load auto_network
 # during acceptance tests.
@@ -11,16 +11,15 @@ end
 
 group :test, :development do
   if ENV['TEST_VAGRANT_VERSION'] == 'HEAD'
-    gem 'vagrant', :github => 'mitchellh/vagrant', :branch => 'master'
+    gem 'vagrant', :git => 'https://github.com/mitchellh/vagrant', :branch => 'master'
   else
-    gem 'vagrant', :github => 'mitchellh/vagrant', :tag => ENV['TEST_VAGRANT_VERSION']
+    gem 'vagrant', :git => 'https://github.com/mitchellh/vagrant', :tag => ENV['TEST_VAGRANT_VERSION']
   end
-  gem 'rubydns', '~> 1.0.2'
+  gem 'rubydns', '~> 2.0.0.pre.rc2'
 end
 
 group :test do
-  # Pinned on 05/05/2014. Compatible with Vagrant 1.5.x and 1.6.x.
-  gem 'vagrant-spec', :github => 'mitchellh/vagrant-spec', :ref => 'aae28ee'
+  gem 'vagrant-spec', :git => 'https://github.com/mitchellh/vagrant-spec'
   gem 'rake'
 end
 

data/README.md

@@ -6,6 +6,10 @@
 
     $ vagrant plugin install vagrant-dns
 
+**Attention: As of v2.0.0, vagrant-dns requires vagrant >= 1.9.6 **(because it ships with a more modern version of ruby)  
+If you get an error like `rubydns requires Ruby version >= 2.2.6.` while installing, you probably need to upgrade vagrant.  
+Alternatively, you can install an older version of vagrant-dns like this: `vagrant plugin install --plugin-version="<2" vagrant-dns` 
+
 ## Usage
 
 In addition to your networking config, configure a toplevel domain and a `hostname` for your machine. Optionally, configure a set of free matching patterns. Global configuration options can be given through the `VagrantDNS::Config` object:

data/lib/vagrant-dns/service.rb

@@ -25,10 +25,10 @@ module VagrantDNS
     def run!(run_options)
       Daemons.run_proc("vagrant-dns", run_options) do
         require 'rubydns'
-        require 'rubydns/system'
+        require 'async/dns/system'
 
         registry = YAML.load(File.read(config_file))
-        std_resolver = RubyDNS::Resolver.new(RubyDNS::System::nameservers)
+        std_resolver = RubyDNS::Resolver.new(Async::DNS::System.nameservers)
 
         RubyDNS::run_server(:listen => VagrantDNS::Config.listen) do
           registry.each do |pattern, ip|

data/lib/vagrant-dns/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Dns
-    VERSION = "1.1.0"
+    VERSION = "2.0.0.rc1"
   end
 end

data/tasks/acceptance.rake

@@ -1,25 +1,38 @@
 namespace :acceptance do
+  def tmp_dir_path
+    @tmp_dir_path ||= ENV["VS_TEMP"] || Dir.mktmpdir('vagrant-dns-spec')
+  end
+
   ARTIFACT_DIR = File.join('test', 'acceptance', 'artifacts')
+
   TEST_BOXES = {
     :virtualbox => 'http://files.vagrantup.com/precise32.box'
   }
 
-  directory ARTIFACT_DIR
-  TEST_BOXES.each do |(provider, box_url)|
-    file File.join(ARTIFACT_DIR, "#{provider}.box") => ARTIFACT_DIR do |path|
-      puts 'Downloading: ' + box_url
-      Kernel.system 'curl', '-L', '-o', path.to_s, box_url
+  TEST_BOXES.each do |provider, box_url|
+    # Declare file download tasks
+    directory ARTIFACT_DIR do
+      file File.join(ARTIFACT_DIR, "#{provider}.box") => ARTIFACT_DIR do |path|
+        puts 'Downloading: ' + box_url
+        Kernel.system 'curl', '-L', '-o', path.to_s, box_url
+      end
     end
-  end
 
-  desc 'downloads test boxes and other artifacts'
-  task :setup => TEST_BOXES.map { |(provider, box_url)| File.join(ARTIFACT_DIR, "#{provider}.box") }
+    desc "Run acceptance tests for #{provider}"
+    task provider => :"setup:#{provider}" do |task|
+      box_path = File.expand_path(File.join('..', '..', ARTIFACT_DIR, "#{provider}.box"), __FILE__)
+      puts "TMPDIR: " + tmp_dir_path
+      Kernel.system(
+        {
+          "VS_PROVIDER" => provider.to_s,
+          "VS_BOX_PATH" => box_path,
+          "TMPDIR" => tmp_dir_path
+        },
+        "bundle", "exec", "vagrant-spec", "test"
+      )
+    end
 
-  desc 'runs acceptance tests'
-  task :run => :setup do
-    command = 'vagrant-spec test'
-    puts command
-    puts
-    exec(command)
+    desc "downloads test boxes and other artifacts for #{provider}"
+    task :"setup:#{provider}" => File.join(ARTIFACT_DIR, "#{provider}.box")
   end
 end

data/vagrant-dns.gemspec

@@ -15,8 +15,10 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Vagrant::Dns::VERSION
 
+  gem.required_ruby_version = '>= 2.2.6'
+
   gem.add_dependency "daemons"
-  gem.add_dependency "rubydns", '~> 1.0.2'
+  gem.add_dependency "rubydns", '~> 2.0.0.pre.rc2'
 
-  gem.add_development_dependency 'rspec', '~> 2.14.0'
+  gem.add_development_dependency 'rspec', '~> 2.14.0' # pin for vagrant-spec
 end

data/vagrant-spec.config.rb

@@ -7,9 +7,11 @@ Vagrant::Spec::Acceptance.configure do |c|
   c.component_paths = [acceptance_dir.to_s]
   c.skeleton_paths = [(acceptance_dir + 'skeletons').to_s]
 
-  c.provider 'virtualbox',
-    box: (acceptance_dir + 'artifacts' + 'virtualbox.box').to_s,
-    env_vars: {
-      'VBOX_USER_HOME' => '{{homedir}}',
-    }
+  c.provider ENV['VS_PROVIDER'],
+    box: ENV['VS_BOX_PATH'],
+    skeleton_path: c.skeleton_paths
+
+  # there seems no other way to set additional environment variables
+  # see: https://github.com/mitchellh/vagrant-spec/pull/17
+  c.instance_variable_set(:@env, c.env.merge('VBOX_USER_HOME' => "{{homedir}}"))
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dns
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Florian Gilcher
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-19 00:00:00.000000000 Z
+date: 2017-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 2.0.0.pre.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 2.0.0.pre.rc2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -91,15 +91,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: vagrant-dns manages DNS records of vagrant machines