vagrant-nixos 0.0.2 → 0.0.3

data/README.md

@@ -32,7 +32,7 @@ Vagrant.configure("2") do |config|
 		environment: {
 			systemPackages: [ :htop ]
 		}
-	}, :NIX_PATH => "/custom/path/to/nixpkgs"
+	}
 
 end
 ```
@@ -40,14 +40,33 @@ end
 In the above `Vagrantfile` example we provision the box using the `:expression` method, which will perform a simple ruby -> nix conversion. `:expression` provisioning creates a nix module that executes with `pkgs` in scope. It is roughly equivilent to the below version that uses the `:inline` method.
 
 ```ruby
-	config.vm.provision :nixos, :inline => %{
-		{config, pkgs, ...}: with pkgs; {
-			environment.systemPackages = [ htop ];
-		}
-	}, :NIX_PATH => "/custom/path/to/nixpkgs"
+config.vm.provision :nixos, :inline => %{
+	{config, pkgs, ...}: with pkgs; {
+		environment.systemPackages = [ htop ];
+	}
+}, :NIX_PATH => "/custom/path/to/nixpkgs"
 ```
 
-Both examples show the optional configuring of a custom `NIX_PATH` path.
+The above example also shows the optional setting of a custom `NIX_PATH` path.
+
+If you need to use functions or access values using dot syntax you can use the `Nix` module:
+
+```ruby
+config.vm.provision :nixos, :expression => {
+	services: {
+		postgresql: {
+			enable: true,
+			package: Nix.pkgs.postgresql93,
+			enableTCPIP: true,
+			authentication: Nix.lib.mkForce(%{
+				local all all              trust
+				host  all all 127.0.0.1/32 trust
+			}),
+			initialScript: "/etc/nixos/postgres.sql"
+		}
+	}
+}	
+```
 
 
 ## How it works

data/lib/vagrant-nixos.rb

@@ -1,6 +1,7 @@
 require "vagrant-nixos/version"
 require "vagrant-nixos/plugin"
 require "vagrant-nixos/util"
+require "vagrant-nixos/nix"
 
 module VagrantPlugins
 	module Nixos

data/lib/vagrant-nixos/nix.rb

@@ -0,0 +1,78 @@
+#################################################
+# Naughty extending of builtins.
+# Add to_nix functions to convert ruby2nix (ish).
+#################################################
+
+module Nix
+	INDENT_STRING="  "
+
+	def self.method_missing(m, *args, &block)
+		NixBuilder.new(nil, m.to_sym, *args)
+	end
+
+	class NixBuilder
+
+		attr_accessor :exprs
+		attr_accessor :parent
+
+		def initialize(parent, expr, *args)
+			@parent = parent
+			@exprs  = args.inject([expr]){|exs, e| exs << e}
+		end
+
+		def method_missing(m, *args, &block)
+			NixBuilder.new(self, m.to_sym, *args)
+		end
+
+		def to_nix(indent = 0)
+			s = ""
+			if @parent
+				s = @parent.to_nix << "."
+			end
+			s << @exprs.map{|e| e.to_nix}.join(" ")
+		end
+	end
+end
+
+class Symbol
+	def to_nix(indent = 0)
+		to_s
+	end
+end
+
+class NilClass
+	def to_nix(indent = 0)
+		"null"
+	end
+end
+
+class Hash
+	def to_nix(indent = 0)
+		"{\n" +
+		sort {|a, b| a[0].to_s <=> b[0].to_s}.map do |key, value|
+			raise "Key must be a Symbol, not #{key.class}" unless key.is_a?(Symbol)
+			Nix::INDENT_STRING * (indent + 1)+ key.to_nix +
+			" = " + value.to_nix(indent + 1) + ";"
+		end.join("\n") + "\n" +
+		Nix::INDENT_STRING * indent + "}"
+	end
+end
+
+class Array
+	def to_nix(indent = 0)
+		"[ " + map(&:to_nix).join(" ") + " ]"
+	end
+end
+
+class String
+	def to_nix(indent = 0)
+	    # TODO: escape ${var} in string
+	    "''#{self}''"
+	end
+end
+
+class Fixnum
+	def to_nix(indent = 0)
+	    to_s
+	end
+end

data/lib/vagrant-nixos/util.rb

@@ -103,54 +103,3 @@ module VagrantPlugins
 	end
 end
 
-#################################################
-# Naughty extending of builtins.
-# Add to_nix functions to convert ruby2nix (ish).
-#################################################
-
-module Nix
-	INDENT_STRING="  "
-end
-
-class Symbol
-	def to_nix(indent = 0)
-		to_s
-	end
-end
-
-class NilClass
-	def to_nix(indent = 0)
-		"null"
-	end
-end
-
-class Hash
-	def to_nix(indent = 0)
-		"{\n" +
-		sort {|a, b| a[0].to_s <=> b[0].to_s}.map do |key, value|
-			raise "Key must be a Symbol, not #{key.class}" unless key.is_a?(Symbol)
-			Nix::INDENT_STRING * (indent + 1)+ key.to_nix +
-			" = " + value.to_nix(indent + 1) + ";"
-		end.join("\n") + "\n" +
-		Nix::INDENT_STRING * indent + "}"
-	end
-end
-
-class Array
-	def to_nix(indent = 0)
-		"[ " + map(&:to_nix).join(" ") + " ]"
-	end
-end
-
-class String
-	def to_nix(indent = 0)
-	    # TODO: escape ${var} in string
-	    "''#{self}''"
-	end
-end
-
-class Fixnum
-	def to_nix(indent = 0)
-	    to_s
-	end
-end

data/lib/vagrant-nixos/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
 	module Nixos
-		VERSION = "0.0.2"
+		VERSION = "0.0.3"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-nixos
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-02 00:00:00.000000000 Z
+date: 2014-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,6 +61,7 @@ files:
 - lib/vagrant-nixos/cap/configure_networks.rb
 - lib/vagrant-nixos/config.rb
 - lib/vagrant-nixos/guest.rb
+- lib/vagrant-nixos/nix.rb
 - lib/vagrant-nixos/plugin.rb
 - lib/vagrant-nixos/provisioner.rb
 - lib/vagrant-nixos/util.rb
@@ -81,7 +82,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2672908896929741571
+      hash: -423762119542471155
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -90,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2672908896929741571
+      hash: -423762119542471155
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23