rdiff3 0.0.2 → 0.0.3
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/rdiff3/version.rb +1 -1
- data/lib/rdiff3.rb +38 -16
- metadata +2 -2
data/lib/rdiff3/version.rb
CHANGED
data/lib/rdiff3.rb
CHANGED
@@ -1,29 +1,51 @@
|
|
1
1
|
require "rdiff3/version"
|
2
|
+
require 'securerandom'
|
2
3
|
|
3
4
|
module Rdiff3
|
4
|
-
def self.merge3(my_string,old_string,your_string)
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
5
|
+
def self.merge3(my_string,my_tag,old_string,old_tag,your_string,your_tag)
|
6
|
+
home_dir = ENV['HOME']
|
7
|
+
default_dir = `pwd`.chomp
|
8
|
+
Dir.chdir(home_dir)
|
9
|
+
now = Time.now
|
10
|
+
now_text = now.strftime("%Y-%m-%d-%H-%M-%S")
|
11
|
+
working_dir = "#{SecureRandom.hex(3)}-#{now_text}"
|
12
|
+
Dir::mkdir(working_dir)
|
13
|
+
my_file_name = working_dir + "/" +my_tag
|
14
|
+
old_file_name = working_dir + "/" +old_tag
|
15
|
+
your_file_name = working_dir + "/" + your_tag
|
9
16
|
File.write(my_file_name, my_string +"\n")
|
10
17
|
File.write(old_file_name, old_string + "\n")
|
11
18
|
File.write(your_file_name, your_string + "\n")
|
12
|
-
|
13
|
-
|
14
|
-
File.delete(
|
15
|
-
File.delete(
|
19
|
+
Dir.chdir(working_dir)
|
20
|
+
text = `diff3 -m #{my_tag} #{old_tag} #{your_tag}`
|
21
|
+
File.delete(my_tag)
|
22
|
+
File.delete(old_tag)
|
23
|
+
File.delete(your_tag)
|
24
|
+
Dir.chdir(home_dir)
|
25
|
+
Dir::delete(working_dir)
|
26
|
+
Dir.chdir(default_dir)
|
16
27
|
text
|
17
28
|
end
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
29
|
+
|
30
|
+
def self.diff(original_string,original_tag,new_string,new_tag)
|
31
|
+
home_dir = ENV['HOME']
|
32
|
+
default_dir = `pwd`.chomp
|
33
|
+
Dir.chdir(home_dir)
|
34
|
+
now = Time.now
|
35
|
+
now_text = now.strftime("%Y-%m-%d-%H-%M-%S")
|
36
|
+
working_dir = "#{SecureRandom.hex(3)}-#{now_text}"
|
37
|
+
Dir::mkdir(working_dir)
|
38
|
+
original_file_name = working_dir + "/" +original_tag
|
39
|
+
new_file_name = working_dir + "/" +new_tag
|
22
40
|
File.write(original_file_name, original_string + "\n")
|
23
41
|
File.write(new_file_name, new_string + "\n")
|
24
|
-
|
25
|
-
|
26
|
-
File.delete(
|
42
|
+
Dir.chdir(working_dir)
|
43
|
+
text = `diff -u #{original_tag} #{new_tag}`
|
44
|
+
File.delete(original_tag)
|
45
|
+
File.delete(new_tag)
|
46
|
+
Dir.chdir(home_dir)
|
47
|
+
Dir::delete(working_dir)
|
48
|
+
Dir.chdir(default_dir)
|
27
49
|
text
|
28
50
|
end
|
29
51
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rdiff3
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.3
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2013-06-
|
12
|
+
date: 2013-06-25 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: bundler
|