rdiff3 0.0.3 → 0.0.4
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/rdiff3.rb +8 -8
- data/lib/rdiff3/version.rb +1 -1
- metadata +1 -1
data/lib/rdiff3.rb
CHANGED
@@ -3,9 +3,9 @@ require 'securerandom'
|
|
3
3
|
|
4
4
|
module Rdiff3
|
5
5
|
def self.merge3(my_string,my_tag,old_string,old_tag,your_string,your_tag)
|
6
|
-
home_dir = ENV['HOME']
|
6
|
+
# home_dir = ENV['HOME']
|
7
7
|
default_dir = `pwd`.chomp
|
8
|
-
Dir.chdir(home_dir)
|
8
|
+
# Dir.chdir(home_dir)
|
9
9
|
now = Time.now
|
10
10
|
now_text = now.strftime("%Y-%m-%d-%H-%M-%S")
|
11
11
|
working_dir = "#{SecureRandom.hex(3)}-#{now_text}"
|
@@ -21,16 +21,16 @@ module Rdiff3
|
|
21
21
|
File.delete(my_tag)
|
22
22
|
File.delete(old_tag)
|
23
23
|
File.delete(your_tag)
|
24
|
-
Dir.chdir(home_dir)
|
25
|
-
Dir::delete(working_dir)
|
24
|
+
# Dir.chdir(home_dir)
|
26
25
|
Dir.chdir(default_dir)
|
26
|
+
Dir::delete(working_dir)
|
27
27
|
text
|
28
28
|
end
|
29
29
|
|
30
30
|
def self.diff(original_string,original_tag,new_string,new_tag)
|
31
|
-
home_dir = ENV['HOME']
|
31
|
+
# home_dir = ENV['HOME']
|
32
32
|
default_dir = `pwd`.chomp
|
33
|
-
Dir.chdir(home_dir)
|
33
|
+
# Dir.chdir(home_dir)
|
34
34
|
now = Time.now
|
35
35
|
now_text = now.strftime("%Y-%m-%d-%H-%M-%S")
|
36
36
|
working_dir = "#{SecureRandom.hex(3)}-#{now_text}"
|
@@ -43,9 +43,9 @@ module Rdiff3
|
|
43
43
|
text = `diff -u #{original_tag} #{new_tag}`
|
44
44
|
File.delete(original_tag)
|
45
45
|
File.delete(new_tag)
|
46
|
-
Dir.chdir(home_dir)
|
47
|
-
Dir::delete(working_dir)
|
46
|
+
# Dir.chdir(home_dir)
|
48
47
|
Dir.chdir(default_dir)
|
48
|
+
Dir::delete(working_dir)
|
49
49
|
text
|
50
50
|
end
|
51
51
|
end
|
data/lib/rdiff3/version.rb
CHANGED