vagrant-nixos-plugin 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c911867561067b8671b40f4b276be48f34cb9370
-  data.tar.gz: 226ab372bd8459b6bc873ab2b6c468d530598895
+  metadata.gz: 1b888301e9de12a3856d4300228926f0f1364744
+  data.tar.gz: 20deffa245d0c4e9013f2d4bed593362a8ef3a5e
 SHA512:
-  metadata.gz: 4c27a65d2dd4fd2c4c109854ca62bb4d359b54e536648be0deb5ef4ae4a3ee102a251ebf0b414d30480cb7868e749be4336e1108d90771d448dfba664ced096d
-  data.tar.gz: a7ffeadd3f6495e5bc8caf29ce45d710e2614407d5c66bdcdb03d499a8d182506006c2364fcd87c9ba0bc521560d0495417c8be24e3e8392e4985d8d56de5cc0
+  metadata.gz: 3a6b9a4375edfa85a0b9b4f445462fe758a42dbd43cdff71db8800a7297c76f99d0c320fb3d1e5283a5a4535fba44ca8cdf7c82ee50b4f6b208c3acea8e7e1bf
+  data.tar.gz: bea6a48fd6bb2f463f10d72fcaa6fb5b590463a303d6c41b73956ba06e8e6ab442acae6d2b785c0a549a1f525552577d789a41d515bce990333fa26c1867eee2

data/History.md

@@ -1,4 +1,15 @@
 
+0.2.0 / 2015-10-27
+==================
+
+This release changes how import works.
+
+They are no-longer a configuration option but are automatically detected from
+the content of /etc/nixos/vagrant-*.nix
+
+On top of that /etc/nixos/vagrant-{network,hostname}.nix are automatically
+removed if not defined in the Vagrantfile.
+
 0.1.1 / 2015-10-18
 ==================
 

data/README.md

@@ -35,11 +35,13 @@ Vagrant.configure("2") do |config|
   config.vm.network "private_network", ip: "172.16.16.16"
 
   # Add the htop package
-  config.vm.provision :nixos, expression: {
-    environment: {
-      systemPackages: [ :htop ]
+  config.vm.provision :nixos,
+    run: 'always',
+    expression: {
+      environment: {
+        systemPackages: [ :htop ]
+      }
     }
-  }
 
 end
 ```
@@ -52,12 +54,13 @@ method.
 
 ```ruby
 config.vm.provision :nixos,
+  run: 'always',
   inline: %{
 {config, pkgs, ...}: with pkgs; {
   environment.systemPackages = [ htop ];
 }
   },
-  NIX_PATH: "/custom/path/to/nixpkgs"
+  NIX_PATH: '/vagrant/nixpkgs'
 ```
 
 The above example also shows the optional setting of a custom `NIX_PATH` path.
@@ -65,13 +68,14 @@ The above example also shows the optional setting of a custom `NIX_PATH` path.
 You can also use an external nix configuration file:
 
 ```ruby
-config.vm.provision :nixos, path: "configuration.nix"
+config.vm.provision :nixos, run: 'always', path: "configuration.nix"
 ```
 
 If you need provisioning to be included explicitly during rebuild use:
 
 ```ruby
 config.vm.provision :nixos,
+  run: 'always',
   path: “configuration.nix”,
   include: true
 ```
@@ -80,6 +84,7 @@ You can enable verbose provision output during rebuild process with:
 
 ```ruby
 config.vm.provision :nixos,
+  run: 'always',
   path: “configuration.nix”,
   verbose: true
 ```
@@ -116,7 +121,13 @@ clean and provisioning possible.
 
 Box creators should ensure that their `configuration.nix` file imports an nix
 module `/etc/nixos/vagrant.nix` which will be overwritten by
-`vagrant-nixos-plugin` during `vagrant up` or `vagrant provision`.
+`vagrant-nixos-plugin` during `vagrant up` or `vagrant provision` and by
+vagrant for the /etc/nixos/vagrant-hostname.nix and
+/etc/nixos/vagrant-network.nix files.
+
+When declaring the provisioner it is recommended to add the `run: 'always'`
+attribute to make sure that changes to the Vagrantfile are reflected during
+reload.
 
 See the configuration in our
 [NixOS packer template](http://github.com/zimbatm/nixbox) for an example.

data/lib/vagrant-nixos/config.rb

@@ -25,10 +25,6 @@ module VagrantPlugins
       # @return [String, nil]
       attr_accessor :NIX_PATH
 
-      # Configure which files to import in the vagrant.nix file
-      # @return [Array<String>]
-      attr_accessor :imports
-
       def initialize
         @inline      = UNSET_VALUE
         @path        = UNSET_VALUE
@@ -36,11 +32,6 @@ module VagrantPlugins
         @include     = UNSET_VALUE
         @verbose     = UNSET_VALUE
         @NIX_PATH    = UNSET_VALUE
-        @imports     = [
-          "./vagrant-network.nix",
-          "./vagrant-hostname.nix",
-          "./vagrant-provision.nix",
-        ]
       end
 
       def finalize!
@@ -67,10 +58,6 @@ module VagrantPlugins
           errors << "Invalid path #{path}"
         end
 
-        unless imports.is_a?(Array)
-          errors << "Expected imports to be an array of paths"
-        end
-
         { "nixos provisioner" => errors }
       end
     end

data/lib/vagrant-nixos/provisioner.rb

@@ -55,12 +55,24 @@ module VagrantPlugins
 
       # rebuild the base vagrant.nix configuration
       def prepare!
+        cleanup_hostname!
+        cleanup_network!
+
+        imports = ''
+
+        # Find all /etc/nixos/vagrant-*.nix files
+        machine.communicate.tap do |c|
+          c.execute('find /etc/nixos -maxdepth 1 -type f -name "vagrant-*.nix"') do |type, data|
+            imports << data
+          end
+        end
+
         # build
         conf = <<CONF
 { config, pkgs, ... }:
 {
   imports = [
-    #{config.imports.join("\n  ")}
+    #{imports.lines.join("    ").strip}
   ];
 CONF
         # default NIX_PATH
@@ -97,6 +109,22 @@ CONF
         return changed
       end
 
+      # Cleanup the hostname file if it hasn't been configured in the
+      # Vagrantfile.
+      def cleanup_hostname!
+        return unless machine.config.vm.hostname.nil?
+        machine.communicate.sudo("rm -f /etc/nixos/vagrant-hostname.nix")
+      end
+
+      # Cleanup the network file if it hasn't been set in the Vagrantfile
+      def cleanup_network!
+        # Abort if a private network has been defined
+        machine.config.vm.networks.each do |cfg|
+          return if cfg[0] == :private_network
+        end
+        machine.communicate.sudo("rm -f /etc/nixos/vagrant-network.nix")
+      end
+
       def same?(f1, f2)
         machine.communicate.test("cmp --silent #{f1} #{f2}")
       end

data/lib/vagrant-nixos/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Nixos
-    VERSION = '0.1.1'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-nixos-plugin
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Chris Farmiloe
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-18 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler