vagrant-scriptrock 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3882e4771b3636fdab43dc218cc39d194d67c374
-  data.tar.gz: 64e808df145fff2ab3c9a43a271a598f92aeee7b
+  metadata.gz: 4f4c9bf8163d876c54c15965a74b2d55b2befaee
+  data.tar.gz: a92d790d341853ddffaf39f16937b1aa2b107802
 SHA512:
-  metadata.gz: b8ffa61cf30d1a2a6ba15d2c78fa2887385bd1221e48ee099d440cfec197587675c5960b7effa335eb8bd7f577e639901172413c9c317d8af1ae7b21b2a8cba6
-  data.tar.gz: 687aa62182cc0bd49f222ae42120e42be29605682ab62825517dd29dcce28004ff7a6ca9a37605556d9287918cdd58d615189305211af30236b3b9d0735ff469
+  metadata.gz: 9c427a2249a88cf2110fc97cceafbc0d3a41d9f55486e434ab078b8276f56b20f8123f7809667fd3ad837f2bb25e78c549a4fab2000f07f48a59be5677e5fdf8
+  data.tar.gz: 8a60e9ec03e84255a26e4408b88c6d6cab5a515a508a994c881464a9f49e2903bae90924de8c97331c186ee0ac4b7a5024bf72de9435a450c0feb71de1eb7002

data/lib/vagrant-scriptrock/config.rb

@@ -11,6 +11,7 @@ module VagrantPlugins
 			attr_accessor :secret_key
 			attr_accessor :connect_url
 			attr_accessor :ssh_pubkey
+			attr_accessor :name_prefix
 
 			def initialize
 				@debug = false
@@ -21,6 +22,7 @@ module VagrantPlugins
 				@secret_key = UNSET_VALUE
 				@connect_url = UNSET_VALUE
 				@ssh_pubkey = UNSET_VALUE
+				@name_prefix = UNSET_VALUE
 			end
 
 			def load_vars_from_yml
@@ -77,6 +79,9 @@ module VagrantPlugins
 				if unset(@first_hop)
 					@first_hop = ""
 				end
+				if unset(@name_prefix)
+					@name_prefix = "vagrant"
+				end
 			end
 
 			def unset(v)

data/lib/vagrant-scriptrock/provisioner.rb

@@ -21,7 +21,7 @@ module VagrantPlugins
 			end
 
 			def guardrail_name
-				return "vagrant #{@machine.name} #{@machine.id}"
+				return "#{@root_config.scriptrock.name_prefix} #{@machine.name}"
 			end
 
 			def guardrail_auth_headers
@@ -37,7 +37,7 @@ module VagrantPlugins
 					response = HTTParty.get(url, :headers => guardrail_auth_headers)
 					responseJson = JSON.parse(response.body)
 					if response.code == 200
-						puts "ScriptRock: node already exists, id #{responseJson["id"]} name #{guardrail_name}"
+						puts "ScriptRock: node already exists, id #{responseJson["id"]} name '#{guardrail_name}'"
 						return responseJson
 					end
 				end
@@ -54,7 +54,7 @@ module VagrantPlugins
 					})
 				responseJson = JSON.parse(response.body)
 				if response.code == 201
-					puts "ScriptRock: created new node, id #{responseJson["id"]} name #{guardrail_name}"
+					puts "ScriptRock: created new node, id #{responseJson["id"]} name '#{guardrail_name}'"
 					return responseJson
 				else
 					throw "ScriptRock Guardrail create node error code #{response.code} body: #{response.body}"
@@ -80,7 +80,9 @@ module VagrantPlugins
 			def guardrail_delete
 				begin
 					node = guardrail_lookup_and_show
-					if node != nil
+					if node == nil
+						puts "ScriptRock: node with name '#{guardrail_name}' not found"
+					else
 						url = "#{@root_config.scriptrock.connect_url}/api/v1/nodes/#{node["id"]}.json"
 						response = HTTParty.delete(url, :headers => guardrail_auth_headers)
 						if response.code == 204

data/lib/vagrant-scriptrock/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-scriptrock
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Mark Sheahan