rdiff3 0.0.2 → 0.0.3

data/lib/rdiff3/version.rb

@@ -1,3 +1,3 @@
 module Rdiff3
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/rdiff3.rb

@@ -1,29 +1,51 @@
 require "rdiff3/version"
+require 'securerandom'
 
 module Rdiff3
-  def self.merge3(my_string,old_string,your_string)
-    now_time = Time.now.to_f.to_s
-    my_file_name = "my"# + now_time
-    old_file_name = "old"# + now_time
-    your_file_name = "your"# + now_time
+  def self.merge3(my_string,my_tag,old_string,old_tag,your_string,your_tag)
+    home_dir = ENV['HOME']
+    default_dir = `pwd`.chomp
+    Dir.chdir(home_dir)
+    now = Time.now
+    now_text = now.strftime("%Y-%m-%d-%H-%M-%S")
+    working_dir = "#{SecureRandom.hex(3)}-#{now_text}"
+    Dir::mkdir(working_dir)
+    my_file_name = working_dir + "/" +my_tag
+    old_file_name = working_dir + "/" +old_tag
+    your_file_name = working_dir + "/" + your_tag
     File.write(my_file_name, my_string +"\n")
     File.write(old_file_name, old_string + "\n")
     File.write(your_file_name, your_string + "\n")
-    text = `diff3 -m #{my_file_name} #{old_file_name} #{your_file_name}`
-    File.delete(my_file_name)
-    File.delete(old_file_name)
-    File.delete(your_file_name)
+    Dir.chdir(working_dir)
+    text = `diff3 -m #{my_tag} #{old_tag} #{your_tag}`
+    File.delete(my_tag)
+    File.delete(old_tag)
+    File.delete(your_tag)
+    Dir.chdir(home_dir)
+    Dir::delete(working_dir)
+    Dir.chdir(default_dir)
     text
   end
-  def self.diff(original_string,new_string)
-    now_time = Time.now.to_f.to_s
-    original_file_name = "original"# + now_time
-    new_file_name = "old"# + now_time
+
+  def self.diff(original_string,original_tag,new_string,new_tag)
+    home_dir = ENV['HOME']
+    default_dir = `pwd`.chomp
+    Dir.chdir(home_dir)
+    now = Time.now
+    now_text = now.strftime("%Y-%m-%d-%H-%M-%S")
+    working_dir = "#{SecureRandom.hex(3)}-#{now_text}"
+    Dir::mkdir(working_dir)
+    original_file_name = working_dir + "/" +original_tag
+    new_file_name = working_dir + "/" +new_tag
     File.write(original_file_name, original_string + "\n")
     File.write(new_file_name, new_string + "\n")
-    text = `diff -c #{original_file_name} #{new_file_name}`
-    File.delete(original_file_name)
-    File.delete(new_file_name)
+    Dir.chdir(working_dir)
+    text = `diff -u #{original_tag} #{new_tag}`
+    File.delete(original_tag)
+    File.delete(new_tag)
+    Dir.chdir(home_dir)
+    Dir::delete(working_dir)
+    Dir.chdir(default_dir)
     text
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdiff3
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-22 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler