rdiff3 0.0.1 → 0.0.2

data/lib/rdiff3/version.rb

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

data/lib/rdiff3.rb

@@ -1,7 +1,29 @@
 require "rdiff3/version"
 
 module Rdiff3
-  def self.ipsum
-    "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+  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
+    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)
+    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
+    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)
+    text
   end
 end

metadata

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