kronk 1.6.0 → 1.6.1

data/History.rdoc

@@ -1,3 +1,9 @@
+=== 1.6.1 / 2011-09-12
+
+* Enhancements:
+
+  * Support for diff paths on both sides when they are different.
+
 === 1.6.0 / 2011-09-11
 
 * Major Enhancements:

data/lib/kronk.rb

@@ -14,7 +14,7 @@ require 'yaml'
 class Kronk
 
   # This gem's version.
-  VERSION = '1.6.0'
+  VERSION = '1.6.1'
 
   require 'kronk/constants'
   require 'kronk/player'

data/lib/kronk/diff.rb

@@ -93,6 +93,13 @@ class Kronk
         diff_ary << [left, right] unless left.empty? && right.empty?
 
         # add common
+        arr1[c[1], c[0]].each_with_index do |str1, i|
+          str2 = arr2[c[2]+i]
+          next unless str1.respond_to?(:meta) && str2.respond_to?(:meta) &&
+                      str1.meta.first != str2.meta.first
+
+          str1.meta[0] = [str1.meta[0], str2.meta[0]]
+        end
         diff_ary.concat arr1[c[1], c[0]]
 
         last_i1 = c[1] + c[0]

data/lib/kronk/diff/output.rb

@@ -81,6 +81,12 @@ class Kronk::Diff
           str    = str[0][0]   if Array === str
           info   = str.meta[0] if str.respond_to?(:meta)
 
+          if Array === info && !info.empty?
+            cleft  << " " << info[0]
+            cright << " " << info[1]
+            info = nil
+          end
+
           @output[start,0] = @format.context cleft, cright, info
           false
 

metadata

@@ -1,96 +1,98 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: kronk
-version: !ruby/object:Gem::Version
-  version: 1.6.0
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 1.6.1
 platform: ruby
-authors:
+authors: 
 - Jeremie Castagna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-11 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-09-12 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: &2154385240 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.5'
+      - !ruby/object:Gem::Version 
+        version: "1.5"
   type: :runtime
-  prerelease: false
-  version_requirements: *2154385240
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: cookiejar
-  requirement: &2154384820 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.3.0
   type: :runtime
-  prerelease: false
-  version_requirements: *2154384820
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: plist
-  requirement: &2154384400 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 3.1.0
   type: :development
-  prerelease: false
-  version_requirements: *2154384400
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: nokogiri
-  requirement: &2154413140 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.4'
+      - !ruby/object:Gem::Version 
+        version: "1.4"
   type: :development
-  prerelease: false
-  version_requirements: *2154413140
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: &2154412720 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.9.12
   type: :development
-  prerelease: false
-  version_requirements: *2154412720
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: hoe
-  requirement: &2154412300 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.11'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.9.1
   type: :development
-  prerelease: false
-  version_requirements: *2154412300
-description: ! 'Kronk runs diffs against data from live and cached http responses.
-
-  Kronk was made possible by the sponsoring of AT&T Interactive.'
-email:
+  version_requirements: *id006
+description: |-
+  Kronk runs diffs against data from live and cached http responses.
+  Kronk was made possible by the sponsoring of AT&T Interactive.
+email: 
 - yaksnrainbows@gmail.com
-executables:
+executables: 
 - kronk
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - Manifest.txt
 - History.rdoc
 - README.rdoc
 - TODO.rdoc
-files:
+files: 
 - .autotest
 - History.rdoc
 - Manifest.txt
@@ -155,34 +157,36 @@ files:
 - .gemtest
 homepage: https://github.com/yaksnrainbows/kronk
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
 - README.rdoc
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 2162238022894922072
+      segments: 
       - 0
-      hash: 768057654813654441
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: kronk
-rubygems_version: 1.8.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Kronk runs diffs against data from live and cached http responses
-test_files:
+test_files: 
 - test/test_assertions.rb
 - test/test_cmd.rb
 - test/test_core_ext.rb