vagrant-lxd 0.4.1 → 0.4.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +5 -5
  2. data/Gemfile.lock +21 -21
  3. data/lib/vagrant-lxd/driver.rb +9 -1
  4. data/lib/vagrant-lxd/version.rb +1 -1
  5. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: fef7b1d0ba6f86c3f621e843abe99b6bfcda266f
4
- data.tar.gz: 2de77f085615f775deff08f65a10bdd584182647
2
+ SHA256:
3
+ metadata.gz: 9cb6183072655327362dc5ffa996c3e8c47f5c830f42a00137dd54773ffe9a0b
4
+ data.tar.gz: ccb1553ba6250ca2db4dea858e6423a2c4bb76d0de39c572b00566bc6b042084
5
5
  SHA512:
6
- metadata.gz: cc3718c25b56973c47858ad5bc7711a23d0ba1a9ae43b9ab55f42dbf10cd2e67d4730948e92dbcb1e0eddbff595eabc815e4dfd952235766a1d8bb5e69c3dca7
7
- data.tar.gz: c87aa4c96a58bf9162124a6fa910cabeb9ab29c17726ef4403a88a11ec74ff9f11124f49e39ebe13bdcaae38da71427cfcaa31267c3717dc882f5385edc8a9d0
6
+ metadata.gz: 36e71d95e6cad74f4b08b7d434c1bce4517a0b4604d9895dcf18f2fbf07384814c40bfacf4772dc393b3d9ca520606162ef4ab4edb266e04ab0ddb2ade616ee2
7
+ data.tar.gz: b1c9d6b3af391533368c3a84a1d54e2b63e0d00908810a0acd922ad9ebda4cdd5a4be537b7c6e1998ed1e3d96268b189cec0e82dfdaa4babf14af51cf8591183
data/Gemfile.lock CHANGED
@@ -1,8 +1,8 @@
1
1
  GIT
2
2
  remote: https://github.com/mitchellh/vagrant.git
3
- revision: c6b42a04cd1ca9f0936714ee6a44b4c7c001fdeb
3
+ revision: d0115de80e2258c36c2ef451f26217d9ac679808
4
4
  specs:
5
- vagrant (2.2.4.dev)
5
+ vagrant (2.2.5.dev)
6
6
  bcrypt_pbkdf (~> 1.0.0)
7
7
  childprocess (~> 0.6.0)
8
8
  ed25519 (~> 1.2.4)
@@ -27,7 +27,7 @@ GIT
27
27
  PATH
28
28
  remote: .
29
29
  specs:
30
- vagrant-lxd (0.4.1)
30
+ vagrant-lxd (0.4.2)
31
31
  hyperkit (~> 1.2.0)
32
32
 
33
33
  GEM
@@ -38,23 +38,23 @@ GEM
38
38
  i18n (>= 0.7, < 2)
39
39
  minitest (~> 5.1)
40
40
  tzinfo (~> 1.1)
41
- addressable (2.5.2)
41
+ addressable (2.6.0)
42
42
  public_suffix (>= 2.0.2, < 4.0)
43
- bcrypt_pbkdf (1.0.0)
43
+ bcrypt_pbkdf (1.0.1)
44
44
  builder (3.2.3)
45
45
  childprocess (0.6.3)
46
46
  ffi (~> 1.0, >= 1.0.11)
47
- concurrent-ruby (1.1.4)
47
+ concurrent-ruby (1.1.5)
48
48
  diff-lcs (1.3)
49
49
  domain_name (0.5.20180417)
50
50
  unf (>= 0.0.5, < 1.0.0)
51
51
  ed25519 (1.2.4)
52
52
  erubis (2.7.0)
53
- fakefs (0.19.1)
53
+ fakefs (0.20.1)
54
54
  faraday (0.15.4)
55
55
  multipart-post (>= 1.2, < 3)
56
- ffi (1.10.0)
57
- gssapi (1.2.0)
56
+ ffi (1.11.1)
57
+ gssapi (1.3.0)
58
58
  ffi (>= 1.0.1)
59
59
  gyoku (1.3.1)
60
60
  builder (>= 2.1.2)
@@ -78,10 +78,10 @@ GEM
78
78
  multi_json (~> 1.10)
79
79
  mime-types (3.2.2)
80
80
  mime-types-data (~> 3.2015)
81
- mime-types-data (3.2018.0812)
81
+ mime-types-data (3.2019.0331)
82
82
  minitest (5.11.3)
83
83
  multi_json (1.13.1)
84
- multipart-post (2.0.0)
84
+ multipart-post (2.1.1)
85
85
  net-scp (1.2.1)
86
86
  net-ssh (>= 2.6.5)
87
87
  net-sftp (2.1.2)
@@ -89,7 +89,7 @@ GEM
89
89
  net-ssh (5.1.0)
90
90
  netrc (0.11.0)
91
91
  nori (2.6.0)
92
- public_suffix (3.0.3)
92
+ public_suffix (3.1.1)
93
93
  rake (12.3.2)
94
94
  rb-fsevent (0.10.3)
95
95
  rb-inotify (0.10.0)
@@ -106,10 +106,10 @@ GEM
106
106
  rspec-mocks (~> 3.8.0)
107
107
  rspec-core (3.8.0)
108
108
  rspec-support (~> 3.8.0)
109
- rspec-expectations (3.8.2)
109
+ rspec-expectations (3.8.3)
110
110
  diff-lcs (>= 1.2.0, < 2.0)
111
111
  rspec-support (~> 3.8.0)
112
- rspec-its (1.2.0)
112
+ rspec-its (1.3.0)
113
113
  rspec-core (>= 3.0.0)
114
114
  rspec-expectations (>= 3.0.0)
115
115
  rspec-mocks (3.8.0)
@@ -118,20 +118,20 @@ GEM
118
118
  rspec-support (3.8.0)
119
119
  ruby_dep (1.3.1)
120
120
  rubyntlm (0.6.2)
121
- rubyzip (1.2.2)
122
- sawyer (0.8.1)
123
- addressable (>= 2.3.5, < 2.6)
124
- faraday (~> 0.8, < 1.0)
121
+ rubyzip (1.2.3)
122
+ sawyer (0.8.2)
123
+ addressable (>= 2.3.5)
124
+ faraday (> 0.8, < 2.0)
125
125
  thread_safe (0.3.6)
126
126
  tzinfo (1.2.5)
127
127
  thread_safe (~> 0.1)
128
128
  unf (0.1.4)
129
129
  unf_ext
130
- unf_ext (0.0.7.5)
130
+ unf_ext (0.0.7.6)
131
131
  vagrant_cloud (2.0.2)
132
132
  rest-client (~> 2.0.2)
133
133
  wdm (0.1.1)
134
- winrm (2.3.1)
134
+ winrm (2.3.2)
135
135
  builder (>= 2.1.2)
136
136
  erubis (~> 2.7)
137
137
  gssapi (~> 1.2)
@@ -162,4 +162,4 @@ DEPENDENCIES
162
162
  vagrant-lxd!
163
163
 
164
164
  BUNDLED WITH
165
- 2.0.1
165
+ 2.0.2
data/lib/vagrant-lxd/driver.rb CHANGED
@@ -20,10 +20,12 @@
20
20
  require 'active_support/core_ext/object/deep_dup'
21
21
  require 'active_support/core_ext/hash/except'
22
22
  require 'hyperkit'
23
+ require 'json'
24
+ require 'monitor'
23
25
  require 'securerandom'
24
26
  require 'tempfile'
25
27
  require 'timeout'
26
- require 'monitor'
28
+ require 'yaml'
27
29
  require 'vagrant/machine_state'
28
30
  require 'vagrant-lxd/driver/certificate'
29
31
 
@@ -555,6 +557,7 @@ module VagrantLXD
555
557
  lxc_dir = @machine.box.directory
556
558
  lxc_rootfs = lxc_dir / 'rootfs.tar.gz'
557
559
  lxc_fingerprint = Digest::SHA256.file(lxc_rootfs).hexdigest
560
+ lxc_metadata = JSON.load(File.read(lxc_dir / 'metadata.json'))
558
561
 
559
562
  lxd_dir = @machine.box.directory / '..' / 'lxd'
560
563
  lxd_rootfs = lxd_dir / 'rootfs.tar.gz'
@@ -569,6 +572,10 @@ module VagrantLXD
569
572
  SafeChdir.safe_chdir(tmpdir) do
570
573
  FileUtils.cp(lxc_rootfs, tmpdir)
571
574
 
575
+ File.open('metadata.json', 'w') do |metadata|
576
+ metadata.puts JSON.pretty_generate(lxc_metadata.merge('provider' => 'lxd'))
577
+ end
578
+
572
579
  File.open('metadata.yaml', 'w') do |metadata|
573
580
  metadata.puts 'architecture: ' << `uname -m`.strip
574
581
  metadata.puts 'creation_date: ' << Time.now.strftime('%s')
@@ -582,6 +589,7 @@ module VagrantLXD
582
589
  FileUtils.mkdir_p(lxd_dir)
583
590
  FileUtils.mv('rootfs.tar.gz', lxd_dir)
584
591
  FileUtils.mv('metadata.yaml', lxd_dir)
592
+ FileUtils.mv('metadata.json', lxd_dir)
585
593
  end
586
594
  end
587
595
 
data/lib/vagrant-lxd/version.rb CHANGED
@@ -20,7 +20,7 @@
20
20
  module VagrantLXD
21
21
  module Version
22
22
  NAME = 'vagrant-lxd'
23
- VERSION = '0.4.1'
23
+ VERSION = '0.4.2'
24
24
  DESCRIPTION = 'Vagrant LXD provider'
25
25
  end
26
26
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vagrant-lxd
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.1
4
+ version: 0.4.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Evan Hanson
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-04-24 00:00:00.000000000 Z
11
+ date: 2019-07-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: hyperkit
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
72
72
  version: '0'
73
73
  requirements: []
74
74
  rubyforge_project:
75
- rubygems_version: 2.6.12
75
+ rubygems_version: 2.7.6
76
76
  signing_key:
77
77
  specification_version: 4
78
78
  summary: Vagrant LXD provider