dynport_tools 0.2.10 → 0.2.11

data/Gemfile

@@ -8,6 +8,8 @@ source "http://rubygems.org"
 gem 'nokogiri'
 gem 'redis'
 gem 'typhoeus'
+gem "term-ansicolor"
+gem 'diff-lcs'
 
 group :development do
   gem "rspec", "~> 2.3.0"

data/Gemfile.lock

@@ -33,6 +33,7 @@ GEM
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
+    term-ansicolor (1.0.5)
     timecop (0.3.5)
     typhoeus (0.2.4)
       mime-types
@@ -46,11 +47,13 @@ DEPENDENCIES
   autotest
   autotest-growl
   bundler (~> 1.0.0)
+  diff-lcs
   jeweler (~> 1.6.4)
   nokogiri
   rcov
   redis
   rspec (~> 2.3.0)
   ruby-debug
+  term-ansicolor
   timecop
   typhoeus

data/VERSION

@@ -1 +1 @@
-0.2.10
+0.2.11

data/dynport_tools.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dynport_tools}
-  s.version = "0.2.10"
+  s.version = "0.2.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
-  s.date = %q{2011-08-24}
+  s.date = %q{2011-08-25}
   s.description = %q{Collection of various tools}
   s.email = %q{tobias.schwab@dynport.de}
   s.executables = ["xmldiff", "redis_dumper"]
@@ -70,6 +70,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
       s.add_runtime_dependency(%q<redis>, [">= 0"])
       s.add_runtime_dependency(%q<typhoeus>, [">= 0"])
+      s.add_runtime_dependency(%q<term-ansicolor>, [">= 0"])
+      s.add_runtime_dependency(%q<diff-lcs>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
@@ -83,6 +85,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<redis>, [">= 0"])
       s.add_dependency(%q<typhoeus>, [">= 0"])
+      s.add_dependency(%q<term-ansicolor>, [">= 0"])
+      s.add_dependency(%q<diff-lcs>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
@@ -97,6 +101,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<redis>, [">= 0"])
     s.add_dependency(%q<typhoeus>, [">= 0"])
+    s.add_dependency(%q<term-ansicolor>, [">= 0"])
+    s.add_dependency(%q<diff-lcs>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])

data/lib/dynport_tools.rb

@@ -5,5 +5,7 @@ require "time"
 require "typhoeus"
 require "nokogiri"
 require "cgi"
+require "term/ansicolor"
+require "diff/lcs"
 
 %w(deep_merger differ jenkins redis_dumper xml_file have_attributes redis_q eta ascii_table).map { |m| require "dynport_tools/#{m}" }

data/lib/dynport_tools/differ.rb

@@ -33,8 +33,41 @@ module DynportTools
         []
       end
     end
+    
+    def diff_strings(a, b)
+      chunks = []
+      last = 0
+      Diff::LCS.diff(a, b).each do |group|
+        old_s = []
+        new_s = []
+        removed_elements(group).each_with_index do |c, i|
+          chunks << a[last..(c.position - 1)] if i == 0
+          old_s << c.element 
+          last = c.position + 1
+        end
+        added_elements(group).each_with_index do |c, i|
+          if i == 0 && removed_elements(group).empty?
+            chunks << a[last..(c.position - 1)]
+            last = c.position
+          end
+          new_s << c.element
+        end
+        if (old_s.join("").length > 0 || new_s.join("").length > 0)
+          chunks << Term::ANSIColor.bold("<#{Term::ANSIColor.red(old_s.join(""))}|#{Term::ANSIColor.green(new_s.join(""))}>")
+        end
+      end
+      chunks.join("")
+    end
   
   private
+    def removed_elements(group)
+      group.select { |c| c.action == "-" }
+    end
+
+    def added_elements(group)
+      group.select { |c| c.action == "+" }
+    end
+    
     def expected_value(value)
       "<#{value.inspect}>"
     end

data/spec/dynport_tools/differ_spec.rb

@@ -1,10 +1,12 @@
 require 'spec_helper'
 
-require "dynport_tools/differ"
-
 describe DynportTools::Differ do
   let(:differ) { DynportTools::Differ.new }
   
+  def uncolor(str)
+    str.gsub(/\e\[(\d+)m/, '')
+  end
+  
   describe "#initialize" do
     it "sets diff_all to true by default" do
       DynportTools::Differ.new.diff_all.should == true
@@ -15,6 +17,26 @@ describe DynportTools::Differ do
     end
   end
   
+  describe "#diff_strings" do
+    it "diffs two strings" do
+      a = %("#!/bin/sh\nssh some.server 'cd /path/to/project && script/runner -e production_slave \"do something\"")
+      b = %("#!/bin/sh\nssh some.server \"cd /path/to/project && ./script/runner -e production 'do something'\")
+      uncolor(differ.diff_strings(a, b)).should == %("#!/bin/sh\nssh some.server <'|">cd /path/to/project && <|./>script/runner -e production<_slave|> <"|'>do something<"|'>")
+    end
+
+    it "diffes simple strings" do
+      a = %(-e production_slave "something)
+      b = %(-e production "something)
+      uncolor(differ.diff_strings(a, b)).should == %(-e production<_slave|> "something)
+    end
+
+    it "diffs a little bit more complicated string" do
+      a = %(-e production_slave "something)
+      b = %(-e production 'something)
+      uncolor(differ.diff_strings(a, b)).should == %(-e production<_slave|> <"|'>something)
+    end
+  end
+  
   describe "diffing two hashes" do
     it "returns true when both hashes are equal" do
       hash = { :a => 1 }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dynport_tools
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 2
-  - 10
-  version: 0.2.10
+  - 11
+  version: 0.2.11
 platform: ruby
 authors: 
 - Tobias Schwab
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-24 00:00:00 +02:00
+date: 2011-08-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,9 +61,37 @@ dependencies:
   type: :runtime
   requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: term-ansicolor
   prerelease: false
   version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  name: diff-lcs
+  prerelease: false
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -75,11 +103,11 @@ dependencies:
         - 0
         version: 2.3.0
   type: :development
-  requirement: *id004
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   name: bundler
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -91,11 +119,11 @@ dependencies:
         - 0
         version: 1.0.0
   type: :development
-  requirement: *id005
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
   name: jeweler
   prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -107,11 +135,11 @@ dependencies:
         - 4
         version: 1.6.4
   type: :development
-  requirement: *id006
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
   name: rcov
   prerelease: false
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -121,11 +149,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  requirement: *id007
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
   name: ZenTest
   prerelease: false
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -137,11 +165,11 @@ dependencies:
         - 0
         version: 4.5.0
   type: :development
-  requirement: *id008
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
   name: autotest
   prerelease: false
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -151,11 +179,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  requirement: *id009
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
   name: autotest-growl
   prerelease: false
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -165,11 +193,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  requirement: *id010
+  requirement: *id012
 - !ruby/object:Gem::Dependency 
   name: ruby-debug
   prerelease: false
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -179,11 +207,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  requirement: *id011
+  requirement: *id013
 - !ruby/object:Gem::Dependency 
   name: timecop
   prerelease: false
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -193,7 +221,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  requirement: *id012
+  requirement: *id014
 description: Collection of various tools
 email: tobias.schwab@dynport.de
 executables: