build-text 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e56e9d24d3f0ec039b6380bb7e921f9ef7713c5
-  data.tar.gz: fd4360cd52c71b0474f94fb4e4c6d1d6517a637c
+  metadata.gz: 6a07b6c0d25cb2997fd69da6e9efbff841605427
+  data.tar.gz: 5ca566c8d0de6367608545fcf572d223380a32d4
 SHA512:
-  metadata.gz: 887249e37b4e6df5368acbd13c3733997e9095ae3ddb6f8fa58b8604881c2229bce72cae0cd2740f7dcc03d8ef70da42a805fd7f9b3bc6a04687a4c9098f1e59
-  data.tar.gz: ee42f4d82827b140c98e4a47c2efbd123881c195b0bbb0d1fa84536daa95c681bcb8016c6a9babf0db066397d949971e70fed170439f6fb3d1c6ca34ccce9df0
+  metadata.gz: bddb50ac6a6ba513c1ba00ad8f26546cb07affd152f9c9efbd89bfeed7df16eed85fdd486caed2f66e246f594da68f82fb234d4e47a151658a50b2b8248c76d6
+  data.tar.gz: 2e834e7af0c6cc94a1ff325fd0c0a1c093378d9848d4005ae0637081b19d97e32751feaa9ab2d2206e28edd652e07dbaf24549fe10c916ec9f429b9e1679cd6a

data/lib/build/text/merge.rb

@@ -32,16 +32,26 @@ module Build
 				while o < old_text.size and n < new_text.size and l < lcs.size
 					if !similar(old_text[o], lcs[l])
 						changes << Difference.new(:old, old_text[o])
-						o+=1
+						o += 1
 					elsif !similar(new_text[n], lcs[l])
 						changes << Difference.new(:new, new_text[n])
-						n+=1
+						n += 1
 					else
 						changes << Difference.new(:both, lcs[l])
-						o+=1; n+=1; l+=1
+						o += 1; n += 1; l += 1
 					end
 				end
-
+				
+				while o < old_text.size
+					changes << Difference.new(:old, old_text[o])
+					o += 1
+				end
+				
+				while n < new_text.size
+					changes << Difference.new(:old, new_text[n])
+					n += 1
+				end
+				
 				changes.map do |change|
 					change.value
 				end

data/lib/build/text/version.rb

@@ -20,6 +20,6 @@
 
 module Build
 	module Text
-		VERSION = "1.0.0"
+		VERSION = "1.0.1"
 	end
 end

data/spec/build/text/merge_spec.rb

@@ -43,4 +43,11 @@ EOF
 		
 		expect(merged).to be == MERGED.lines 
 	end
+	
+	it "can merge last lines" do
+		a = ["# Run tests:\n", "script:\n", "  - teapot -c test fetch\n"] 
+		b = ["  - teapot -c test fetch\n", "  - teapot -c test build Test/UnitTest2\n"]
+		
+		expect(Build::Text::Merge.combine(a, b)).to be == ["# Run tests:\n", "script:\n", "  - teapot -c test fetch\n", "  - teapot -c test build Test/UnitTest2\n"]
+	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build-text
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-06 00:00:00.000000000 Z
+date: 2017-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler