fossilize 1.0.0 → 1.1.0

data/.rspec

@@ -0,0 +1,2 @@
+--color
+-f d

data/bin/fossilize

@@ -2,8 +2,28 @@
 
 require "fossilize"
 
-delta = Fossilize.create(ARGV[0], ARGV[1])
-output = Fossilize.apply(ARGV[0], delta)
+usage = "usage: fossilize <create|apply> old_version <new_version|delta_string>"
 
-File.write("fossilized_#{ARGV[0]}", output)
+if ARGV.size < 2
+  puts usage
+  exit -1
+end
 
+old_version = ARGV[1]
+new_or_delta = ARGV[2]
+
+if ARGV[0] == "create"
+  delta = Fossilize.create(old_version, new_or_delta)
+  File.write("#{old_version}.delta", delta)
+  puts "Wrote delta string to: #{old_version}.fdelta\n\n"
+  puts delta
+  exit 0
+elsif ARGV[0] == "apply"
+  result = Fossilize.apply(old_version, new_or_delta)
+  File.write("#{old_version}.fossilized", result)
+  puts "Wrote new version to: #{old_version}.fossilized"
+  exit 0
+else
+  puts usage
+  exit -1
+end

data/lib/fossilize.rb

@@ -54,20 +54,14 @@ module Fossilize
     source_string = check_input(source)
     target_string = check_input(target)
 
-    # Create native memory buffers for the input Strings.
-    source_ptr = FFI::MemoryPointer.new(:char, source_string.size)
-    source_ptr.put_bytes(0, source_string)
-    target_ptr = FFI::MemoryPointer.new(:char, target_string.size)
-    target_ptr.put_bytes(0, target_string)
-
     # Create a bare string to hold to returning delta from the C function that's the
     # size of the target + 60 (according to the Fossil source docs).
-    delta = (' ' * (target_string.size + 60))
+    delta = ("\0" * (target_string.size + 60))
 
     # create the delta, retaining the size of the delta output and return the delta,
     # stripping out any excess left over (needs refinement...).
-    delta_size = delta_create(source_ptr, source_ptr.size, target_ptr, target_ptr.size, delta)
-    return delta.strip!
+    delta_size = delta_create(source_string, source_string.size, target_string, target_string.size, delta)
+    return delta.rstrip!
   end
 
   # Access
@@ -96,7 +90,6 @@ module Fossilize
 
     # Get the eventual size of the deltaed file and create a string to hold it
     expected_output_size = delta_output_size(delta_string, delta_string.size)
-    puts "expected = #{expected_output_size}"
 
     # The algorithm will return -1 as the output size if there was an error
     if expected_output_size == -1
@@ -116,7 +109,7 @@ module Fossilize
       return nil
     end
 
-    return output.strip!
+    return output
   end
 
   private

data/lib/fossilize/version.rb

@@ -1,3 +1,3 @@
 module Fossilize
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fossilize
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-15 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -86,6 +86,7 @@ extensions:
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - LICENSE
 - README.md