nise-bosh-vagrant 0.4.1 → 0.4.2

data/lib/nise-bosh-vagrant/cli.rb

@@ -54,10 +54,16 @@ EOS
 
 			# If instructed, install the release
 			if opts[:install]
-				runner.hook_preinstall_release
+				if opts[:preinstall]
+					puts "---> Running preinstall script"
+					runner.run_preinstall_release
+				end
 				puts "---> Installing release"
 				runner.install_release
-				runner.hook_postinstall_release
+				if opts[:postinstall]
+					puts "---> Running postinstall script"
+					runner.run_postinstall_release
+				end
 			end
 
 			# If instructed, start the release

data/lib/nise-bosh-vagrant/runner.rb

@@ -10,7 +10,7 @@ module NiseBOSHVagrant
 					:copy_name, :memory
 
 		def initialize(opts)
-			opts[:nise].nil? ? @nise_path = nil : @nise_path = opts[:nise]
+			opts[:nise].nil? ? @nise_path = nil : @nise_path = File.expand_path(opts[:nise])
 			@release_path = opts[:release]
 			@vagrantfile_path = File.join(@release_path, "Vagrantfile")
 			@scripts_path = File.join(File.dirname(File.expand_path(__FILE__)), "../../scripts")
@@ -43,13 +43,17 @@ module NiseBOSHVagrant
 		end
 
 		def copy_hook_scripts(output_dir=@release_path, preinstall_file=@preinstall_file, postinstall_file=@postinstall_file)
+			@preinstall_copy_path = File.join(output_dir, @copy_name[:preinstall])
 			if preinstall_file
-				@preinstall_copy_path = File.join(output_dir, @copy_name[:preinstall])
 				FileUtils.cp(preinstall_file, @preinstall_copy_path)
+			else
+				FileUtils.rm(@preinstall_copy_path)
 			end
+			@postinstall_copy_path = File.join(output_dir, @copy_name[:postinstall])
 			if postinstall_file
-				@postinstall_copy_path = File.join(output_dir, @copy_name[:postinstall])
 				FileUtils.cp(postinstall_file, @postinstall_copy_path)
+			else
+				FileUtils.rm(@postinstall_copy_path)
 			end
 		end
 
@@ -112,12 +116,12 @@ module NiseBOSHVagrant
 			self.exec(install_cmd)
 		end
 
-		def hook_preinstall_release(release_path=@release_path)
+		def run_preinstall_release(release_path=@release_path)
 			hook_cmd = "cd #{release_path} ; vagrant ssh -c \"/home/vagrant/preinstall_release\""
 			self.exec(hook_cmd)
 		end
 
-		def hook_postinstall_release(release_path=@release_path)
+		def run_postinstall_release(release_path=@release_path)
 			hook_cmd = "cd #{release_path} ; vagrant ssh -c \"/home/vagrant/postinstall_release\""
 			self.exec(hook_cmd)
 		end

data/lib/nise-bosh-vagrant/version.rb

@@ -1,3 +1,3 @@
 module NiseBOSHVagrant
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/scripts/prepare.sh

@@ -44,7 +44,6 @@ chmod +x /home/vagrant/start.sh
 
 # Copy hook scripts
 for hook in preinstall postinstall; do
-echo ${hook}
 	if [ -f /home/vagrant/release/.nise-bosh-${hook} ]; then
 		cp /home/vagrant/release/.nise-bosh-${hook} /home/vagrant/${hook}_release
 		chmod +x /home/vagrant/${hook}_release

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nise-bosh-vagrant
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -65,7 +65,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3127345706086904064
+      hash: -696603529254147692
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: