dyntool 0.0.7 → 0.0.8

Sign up to get free protection for your applications and to get access to all the features.
Files changed (2) hide show
  1. data/lib/dyntool.rb +10 -5
  2. metadata +2 -2
data/lib/dyntool.rb CHANGED
@@ -62,15 +62,20 @@ class Authentication
62
62
  @svn_chk=`svn stat dyn.yml`
63
63
  if @svn_chk != ""
64
64
  puts "Your dyn.yaml is not identical to the dyn.yml in the svn, or does not exist."
65
- @q1 = ask("Do you want to see the diffrences? (yes|no)?") { |q| q.echo = true }
65
+ @q1 = ask("Do you want to see the diffrences? (yes|no)? ") { |q| q.echo = true }
66
66
  case @q1
67
67
  when "yes" then
68
- `svn diff dyn.yml`
69
- @q2 = ask("Do you want to use the local or svn version? (local|svn)?") { |q| q.echo = true }
68
+ @diff_output = `svn diff dyn.yml`
69
+ puts @diff_output
70
+ @q2 = ask("Do you want to use the local or svn version? (local|svn)? ") { |q| q.echo = true }
70
71
  if @q2 == "local"
71
- `svn ci dyn.yml -m"Updating dyn.yml file to svn`
72
+ @commit_output = `svn ci dyn.yml -m"Updating dyn.yml file to svn`
73
+ puts "Checking in and moving forward"
74
+ puts @commit_output
72
75
  elsif @q2 == "svn"
73
- `svn revert dyn.yml; svn up`
76
+ @revert_output = `svn revert dyn.yml; svn up`
77
+ puts "Reverting to svn version and moving forward"
78
+ puts @revert_output
74
79
  end
75
80
  when "no"
76
81
  puts "Please make sure that you local and svn copies are identical"
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 0
7
7
  - 0
8
- - 7
9
- version: 0.0.7
8
+ - 8
9
+ version: 0.0.8
10
10
  platform: ruby
11
11
  authors:
12
12
  - Ariel Moskovich