vagrant-nixos 0.0.4 → 0.0.5

data/lib/vagrant-nixos/nix.rb

@@ -26,10 +26,13 @@ module Nix
 
 		def to_nix(indent = 0)
 			s = ""
+			s << "(" if @exprs[0] == :import
 			if @parent
 				s = @parent.to_nix << "."
 			end
 			s << @exprs.map{|e| e.to_nix}.join(" ")
+			s << ")" if @exprs[0] == :import
+			s
 		end
 	end
 end
@@ -66,8 +69,9 @@ end
 
 class String
 	def to_nix(indent = 0)
-	    # TODO: escape ${var} in string
-	    "''#{self}''"
+		return self if self.slice(0,2) == "./"
+		return %{''#{self}''} if self =~ /\n/
+		%{"#{self}"}
 	end
 end
 

data/lib/vagrant-nixos/util.rb

@@ -66,6 +66,11 @@ module VagrantPlugins
 
 		# just do nixos-rebuild
 		def self.rebuild!(machine, nix_env=nil)
+			# Add a tmp vagreant.nix file if it is missing
+			if !machine.communicate.test("grep 'provision' </etc/nixos/vagrant.nix")
+				_write_config(machine, "vagrant.nix", %{{ config, pkgs, ... }: { imports = [ ./vagrant-provision.nix ];}})
+			end
+			# rebuild
 			rebuild_cmd = "nixos-rebuild switch"
 			rebuild_cmd = "NIX_PATH=#{nix_env}:$NIX_PATH #{rebuild_cmd}" if nix_env
 			machine.communicate.tap do |comm|
@@ -74,7 +79,7 @@ module VagrantPlugins
 		end
 
 		def self.same?(machine, f1, f2)
-			machine.communicate.test("cmp --silent '#{f1}' '#{f2}'")
+			machine.communicate.test("cmp --silent #{f1} #{f2}")
 		end
 
 		protected
@@ -92,10 +97,12 @@ module VagrantPlugins
 				source = "/tmp/#{filename}"
 				target = "/etc/nixos/#{filename}"
 	            comm.upload(temp.path, source)
+	            puts conf
 	            if same?(machine, source, target)
+	            	puts "SAME"
 	            	changed = false
 	            else
-	            	comm.sudo("mv '#{source}' '#{target}'")
+	            	comm.sudo("mv #{source} #{target}")
 	            end
 	        end
 	        return changed

data/lib/vagrant-nixos/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
 	module Nixos
-		VERSION = "0.0.4"
+		VERSION = "0.0.5"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-nixos
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -82,7 +82,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3098690903915324060
+      hash: 3612314916842241992
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3098690903915324060
+      hash: 3612314916842241992
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23