vagrant-lxd 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fef7b1d0ba6f86c3f621e843abe99b6bfcda266f
-  data.tar.gz: 2de77f085615f775deff08f65a10bdd584182647
+SHA256:
+  metadata.gz: 9cb6183072655327362dc5ffa996c3e8c47f5c830f42a00137dd54773ffe9a0b
+  data.tar.gz: ccb1553ba6250ca2db4dea858e6423a2c4bb76d0de39c572b00566bc6b042084
 SHA512:
-  metadata.gz: cc3718c25b56973c47858ad5bc7711a23d0ba1a9ae43b9ab55f42dbf10cd2e67d4730948e92dbcb1e0eddbff595eabc815e4dfd952235766a1d8bb5e69c3dca7
-  data.tar.gz: c87aa4c96a58bf9162124a6fa910cabeb9ab29c17726ef4403a88a11ec74ff9f11124f49e39ebe13bdcaae38da71427cfcaa31267c3717dc882f5385edc8a9d0
+  metadata.gz: 36e71d95e6cad74f4b08b7d434c1bce4517a0b4604d9895dcf18f2fbf07384814c40bfacf4772dc393b3d9ca520606162ef4ab4edb266e04ab0ddb2ade616ee2
+  data.tar.gz: b1c9d6b3af391533368c3a84a1d54e2b63e0d00908810a0acd922ad9ebda4cdd5a4be537b7c6e1998ed1e3d96268b189cec0e82dfdaa4babf14af51cf8591183

data/Gemfile.lock

@@ -1,8 +1,8 @@
 GIT
   remote: https://github.com/mitchellh/vagrant.git
-  revision: c6b42a04cd1ca9f0936714ee6a44b4c7c001fdeb
+  revision: d0115de80e2258c36c2ef451f26217d9ac679808
   specs:
-    vagrant (2.2.4.dev)
+    vagrant (2.2.5.dev)
       bcrypt_pbkdf (~> 1.0.0)
       childprocess (~> 0.6.0)
       ed25519 (~> 1.2.4)
@@ -27,7 +27,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-lxd (0.4.1)
+    vagrant-lxd (0.4.2)
       hyperkit (~> 1.2.0)
 
 GEM
@@ -38,23 +38,23 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
-    bcrypt_pbkdf (1.0.0)
+    bcrypt_pbkdf (1.0.1)
     builder (3.2.3)
     childprocess (0.6.3)
       ffi (~> 1.0, >= 1.0.11)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.5)
     diff-lcs (1.3)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
     ed25519 (1.2.4)
     erubis (2.7.0)
-    fakefs (0.19.1)
+    fakefs (0.20.1)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    ffi (1.10.0)
-    gssapi (1.2.0)
+    ffi (1.11.1)
+    gssapi (1.3.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
@@ -78,10 +78,10 @@ GEM
       multi_json (~> 1.10)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
+    mime-types-data (3.2019.0331)
     minitest (5.11.3)
     multi_json (1.13.1)
-    multipart-post (2.0.0)
+    multipart-post (2.1.1)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
@@ -89,7 +89,7 @@ GEM
     net-ssh (5.1.0)
     netrc (0.11.0)
     nori (2.6.0)
-    public_suffix (3.0.3)
+    public_suffix (3.1.1)
     rake (12.3.2)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
@@ -106,10 +106,10 @@ GEM
       rspec-mocks (~> 3.8.0)
     rspec-core (3.8.0)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec-expectations (3.8.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-its (1.2.0)
+    rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
     rspec-mocks (3.8.0)
@@ -118,20 +118,20 @@ GEM
     rspec-support (3.8.0)
     ruby_dep (1.3.1)
     rubyntlm (0.6.2)
-    rubyzip (1.2.2)
-    sawyer (0.8.1)
-      addressable (>= 2.3.5, < 2.6)
-      faraday (~> 0.8, < 1.0)
+    rubyzip (1.2.3)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.5)
+    unf_ext (0.0.7.6)
     vagrant_cloud (2.0.2)
       rest-client (~> 2.0.2)
     wdm (0.1.1)
-    winrm (2.3.1)
+    winrm (2.3.2)
       builder (>= 2.1.2)
       erubis (~> 2.7)
       gssapi (~> 1.2)
@@ -162,4 +162,4 @@ DEPENDENCIES
   vagrant-lxd!
 
 BUNDLED WITH
-   2.0.1
+   2.0.2

data/lib/vagrant-lxd/driver.rb

@@ -20,10 +20,12 @@
 require 'active_support/core_ext/object/deep_dup'
 require 'active_support/core_ext/hash/except'
 require 'hyperkit'
+require 'json'
+require 'monitor'
 require 'securerandom'
 require 'tempfile'
 require 'timeout'
-require 'monitor'
+require 'yaml'
 require 'vagrant/machine_state'
 require 'vagrant-lxd/driver/certificate'
 
@@ -555,6 +557,7 @@ module VagrantLXD
       lxc_dir = @machine.box.directory
       lxc_rootfs = lxc_dir / 'rootfs.tar.gz'
       lxc_fingerprint = Digest::SHA256.file(lxc_rootfs).hexdigest
+      lxc_metadata = JSON.load(File.read(lxc_dir / 'metadata.json'))
 
       lxd_dir = @machine.box.directory / '..' / 'lxd'
       lxd_rootfs = lxd_dir / 'rootfs.tar.gz'
@@ -569,6 +572,10 @@ module VagrantLXD
         SafeChdir.safe_chdir(tmpdir) do
           FileUtils.cp(lxc_rootfs, tmpdir)
 
+          File.open('metadata.json', 'w') do |metadata|
+            metadata.puts JSON.pretty_generate(lxc_metadata.merge('provider' => 'lxd'))
+          end
+
           File.open('metadata.yaml', 'w') do |metadata|
             metadata.puts 'architecture: ' << `uname -m`.strip
             metadata.puts 'creation_date: ' << Time.now.strftime('%s')
@@ -582,6 +589,7 @@ module VagrantLXD
           FileUtils.mkdir_p(lxd_dir)
           FileUtils.mv('rootfs.tar.gz', lxd_dir)
           FileUtils.mv('metadata.yaml', lxd_dir)
+          FileUtils.mv('metadata.json', lxd_dir)
         end
       end
 

data/lib/vagrant-lxd/version.rb

@@ -20,7 +20,7 @@
 module VagrantLXD
   module Version
     NAME = 'vagrant-lxd'
-    VERSION = '0.4.1'
+    VERSION = '0.4.2'
     DESCRIPTION = 'Vagrant LXD provider'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lxd
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Evan Hanson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-24 00:00:00.000000000 Z
+date: 2019-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hyperkit
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Vagrant LXD provider