dyntool 0.0.5 → 0.0.6

data/lib/dyntool.rb

@@ -61,11 +61,22 @@ class Authentication
 	def SvnChk()
 		@svn_chk=`svn stat dyn.yml`
 		if @svn_chk != ""
-			STDOUT.puts <<-EOF
-			Your dyn.yaml is not identical to the svn copy, or not exist.
-			Run "svn up" before using this tool
-			EOF
-			exit 2
+			puts "Your dyn.yaml is not identical to the dyn.yml in the svn, or does not exist."
+			@q1 = ask("Do you want to see the diffrences? (yes|no)?") { |q| q.echo = true }
+			case @q1 
+				when "yes" then
+					`svn diff dyn.yml`
+					@q2 = ask ("Do you want to use the local or svn version? (local|svn)?") { |q| q.echo = true }
+					if @q2 == "local"
+						`svn ci dyn.yml -m"Updating dyn.yml file to svn`
+					elsif @q2 == "svn"
+						`svn revert dyn.yml; svn up`
+					end
+				when "no"
+					puts "Please make sure that you local and svn copies are identical"
+					exit 2
+
+			end
 		end
 	end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Ariel Moskovich