conflict 0.1.0 → 0.2.0

data/Rakefile

@@ -34,7 +34,7 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name = 'conflict'
-  s.version = '0.1.0'
+  s.version = '0.2.0'
   s.author = 'Dennis Byrne'
   s.email = 'dbyrne@thoughtworks.com'
   s.platform = Gem::Platform::RUBY

data/lib/conflict/core.rb

@@ -18,6 +18,7 @@
 module Conflict
 
 DIFF_URL = "/diff"
+DIFF_CVS_URL = "/diff.cvs"
 STATUS_URL = "/status.xml"
 PORT = 80 # tcp/ip
 TTL = 43200 # event staleness, 12 hours in secs
@@ -40,7 +41,15 @@ class Server
       RequestValidator::new().validate request
       client = request.query['client'].to_s.strip
       events = RequestParser::new(@cfg[:ttl]).parse request.query['diff'], request.query['info'], client
-      conflicts = @db.find_conflicts(client, events)
+      conflicts = @db.find_conflicts(client, events).sort_by {|c| c.remote_client}
+      res.body = conflicts.to_yaml
+    }
+
+    @s.mount_proc(DIFF_CVS_URL){|request, res|
+      RequestValidator::new().validate_cvs request
+      client = request.query['client'].to_s.strip
+      events = RequestParser::new(@cfg[:ttl]).parse_cvs request.query['diff'], client 
+      conflicts = @db.find_conflicts(client, events).sort_by {|c| c.remote_client}
       res.body = conflicts.to_yaml
     }
     
@@ -72,26 +81,41 @@ end
 class RequestValidator
   
   def validate request
+   
+    validate_common request 
     
-    request_method = request.request_method
+    info = request.query['info']
     
+    raise "info parameter cannot be nil or empty" if info.nil? || info.empty?
+   
+    diff = request.query['diff']
+ 
+    raise "diff count " + diff.list.size.to_s + " != info count " + info.list.size.to_s if diff.list.size != info.list.size
+  end
+
+  def validate_cvs request
+
+    validate_common request
+
+  end
+  
+  private
+  def validate_common request
+   
+    request_method = request.request_method
+
     raise "only POST HTTP requests supported, not " + request_method if ! "POST".eql?(request_method)
-    
+
     client = request.query['client'].to_s.strip
-    
-    raise "client parameter is nil or empty" if nil.eql?(client) || client.empty?    
-    
+
+    raise "client parameter is nil or empty" if client.nil? || client.empty?
+
     diff = request.query['diff']
-      
-    raise "diff parameter is nil" if nil.eql?(diff)
-    
-    info = request.query['info']
-    
-    raise "info parameter cannot be nil or empty" if nil.eql?(info) || info.empty?
+
+    raise "diff parameter is nil" if diff.nil?
     
-    raise "diff count " + diff.list.size.to_s + " != info count " + info.list.size.to_s if diff.list.size != info.list.size
   end
-  
+
 end
 
 class DataBase
@@ -145,8 +169,8 @@ class DataBase
 
   def validate_input client, events
 
-    raise ConflictException::new("client cannot be empty") if nil.eql?(client) || client.empty?
-    raise ConflictException::new("events cannot be nil") if nil.eql?(events)
+    raise ConflictException::new("client cannot be empty") if client.nil? || client.empty?
+    raise ConflictException::new("events cannot be nil") if events.nil?
   
     resources = []
   
@@ -167,4 +191,4 @@ class ConflictException < Exception
   end
 end
 
-end
+end

data/lib/conflict/domain.rb

@@ -22,16 +22,20 @@ class Conflict
   attr_reader :local, :remote
 
   def initialize local, remote
-    raise ConflictException::new("local event cannot be nil") if nil.eql?(local)
-    raise ConflictException::new("remote event cannot be nil") if nil.eql?(remote)
+    raise ConflictException::new("local event cannot be nil") if local.nil?
+    raise ConflictException::new("remote event cannot be nil") if remote.nil?
     raise ConflictException::new("local resource '" + local.resource + "' does not match remote resource '" + remote.resource + "'") if ! local.resource.eql?(remote.resource)
     raise ConflictException::new("local and remote cannot have the same identity") if local == remote
     #what about = names, not = resources?
     raise ConflictException::new("local and remote cannot be eql") if local.eql?(remote)
-    # using clone because jvYaml does not currently support aliasing
+    # using clone because I may have to write a parser in .net
     @local, @remote = local.clone, remote.clone
   end
-  
+
+  def remote_client
+    remote.client
+  end 
+ 
   def eql? other
     @local.eql?(other.local) and @remote.eql?(other.remote)
   end
@@ -48,15 +52,16 @@ class Event
   def initialize client, action, resource, created=Time.now, ttl=TTL
     
     raise ConflictException::new("invalid action '" + action.to_s + "'") if ! ['added', 'changed', 'deleted'].index(action)
-    raise ConflictException::new("client must not be empty value") if nil.eql?(client) or client.empty?
-    raise ConflictException::new("resource must not be empty value") if nil.eql?(resource) or resource.empty?
+    raise ConflictException::new("client must not be empty value") if client.nil? or client.empty?
+    raise ConflictException::new("resource must not be empty value") if resource.nil? or resource.empty?
     raise ConflictException::new("ttl cannot be negative") if ttl < 0
     @client, @action, @resource = client, action, resource
     # kept around for staleness expiration
     @created_time = created
     # rendered in YAML
-    @created = [created.year, created.month, created.day, created.hour, created.min] * "-"
+    @created = created.year.to_s + "/" + created.month.to_s + "/" + created.day.to_s + " " + created.hour.to_s + ":" + created.min.to_s
     @ttl = ttl
+    @reserved = ''
   end
 
   def eql? other
@@ -71,7 +76,7 @@ class Event
     fields = self.instance_variables.clone
     fields.delete "@created_time" # keep data/time out of integration point ( ruby != java != .net )
     fields.delete "@ttl"
-    fields
+    fields.sort
   end
 
   yaml_as "tag:java.yaml.org,2002:object:com.thoughtworks.conflict.Event"

data/lib/conflict/parsers.rb

@@ -34,18 +34,35 @@ class RequestParser
       diff_data = diff.list[i].to_s.strip
       info_data = info.list[i].to_s.strip
         
-      raise "no value for info @ index " + i.to_s if nil.eql?(info_data) or info_data.empty?
+      raise "no value for info @ index " + i.to_s if info_data.nil? or info_data.empty?
       
       lambda {
         infos = InfoParser::new().parse(info_data)
-        events = events | DiffParser::new(infos.merge({:ttl=>@ttl})).parse(diff_data, client)
-      }.call if ! nil.eql?(diff_data) && ! diff_data.empty?
+        events = events | DiffParser::new(infos.merge({:ttl=>@ttl})).parse(diff_data, client, infos[:url], infos[:path])
+      }.call if ! diff_data.nil? && ! diff_data.empty?
       
     end
     
     events
     
   end
+
+  def parse_cvs diffs, client
+
+    events = []
+
+    diffs.each do | diff |
+
+      d = diff.to_s.strip
+      lambda{
+        events = events | DiffParser::new({:ttl=>@ttl}).parse_cvs(d, client)
+      }.call if ! d.nil? && ! d.empty?
+
+    end
+
+    events
+
+  end
   
 end
 
@@ -55,7 +72,7 @@ class InfoParser
   
   def parse info
   
-    raise ConflictException::new("info cannot be nil or empty") if nil.eql?(info) || info.empty?
+    raise ConflictException::new("info cannot be nil or empty") if info.nil? || info.empty?
   
     properties = {}
     
@@ -72,20 +89,24 @@ end
 class DiffParser
   
   @@key = "Index: "
-  
+  @@key_cvs = 'RCS file: '
+ 
   def initialize cfg
-    raise ConflictException::new("cfg cannot be nil") if nil.eql?(cfg)
-    raise ConflictException::new("url value cannot be nil or empty") if nil.eql?(cfg[:url]) or cfg[:url].empty?
-    raise ConflictException::new("path value cannot be nil or empty") if nil.eql?(cfg[:path]) or cfg[:path].empty?
-    raise ConflictException::new("ttl value cannot be nil") if nil.eql?(cfg[:ttl])
+    raise ConflictException::new("cfg cannot be nil") if cfg.nil?
+    raise ConflictException::new("ttl value cannot be nil") if cfg[:ttl].nil?
     raise ConflictException::new("ttl cannot be negative") if cfg[:ttl] < 0
     @cfg = cfg
   end
   
-  def parse diff, client # would be nice to just get a 3rd party for this
+  def parse diff, client, url, path 
+
+    # would be nice to just get a 3rd party for this
   
-    raise ConflictException::new("client cannot by empty") if nil.eql?(client) || client.empty?
-    raise ConflictException::new("diff cannot by empty") if nil.eql?(diff) || diff.empty?
+    raise ConflictException::new("client cannot by empty") if client.nil? || client.empty?
+    raise ConflictException::new("diff cannot by empty") if diff.nil? || diff.empty?
+    raise ConflictException::new("url value cannot be nil or empty") if url.nil? or url.empty?
+    raise ConflictException::new("path value cannot be nil or empty") if path.nil? or path.empty?
+
     events = []
     resource = ""
     lines = diff.split(%r{\n})
@@ -101,7 +122,7 @@ class DiffParser
       else
         if line.to_s.index("@@ ") == 0
           action = infer_action line
-          resource_full = infer_resource(@cfg[:url].to_s, @cfg[:path], resource)
+          resource_full = infer_resource(url.to_s, path, resource)
           events << Event::new(client, action, resource_full, now, @cfg[:ttl])
           bit = ! bit
         end
@@ -111,6 +132,29 @@ class DiffParser
     events
   end
   
+  def parse_cvs diff, client
+    
+    raise ConflictException::new("client cannot by empty") if client.nil? || client.empty?
+    raise ConflictException::new("diff cannot by empty") if diff.nil? || diff.empty?    
+
+    events = []
+
+    lines = diff.split(%r{\n})
+    now = Time.now
+
+    lines.each do |line|
+
+      if line.to_s.index(@@key_cvs) == 0
+        resource = line.to_s.sub(@@key_cvs, '')
+        events << Event::new(client, 'changed', resource.slice!(0..(resource.index(",") - 1)), now, @cfg[:ttl])
+      end
+
+    end
+
+    events 
+
+  end
+
   private
   def infer_action numbers # we are assuming a lot about unified diff here
     tokens = numbers.split(' ')
@@ -127,4 +171,4 @@ class DiffParser
 
 end
   
-end
+end

data/test/common.rb

@@ -1,132 +1,132 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-require 'test/unit'
-require 'net/http'
-module Conflict
-
-class DataBase
-  def presence_of item
-    @db.index(item)
-  end
-  def insert item
-    @db << item
-  end
-end
-
-class Client
-  
-  def initialize cfg={}
-    @cfg = {}
-    @cfg[:command] = cfg[:command] ||= "svn diff"
-    @cfg[:id] = cfg[:id] ||= "Conflict Ruby client"
-    @cfg[:ip] = cfg[:ip] ||= "127.0.0.1"
-    @cfg[:port] = cfg[:port] ||= PORT
-    @cfg[:poll] = cfg[:poll] ||= 3
-  end
-  
-  def resend
-    raise ConflictException::new('do not call resend before calling send') if ! defined?(@last_diff) or ! defined?(@last_info)
-    diff @last_diff, @last_info
-  end
-  
-  def diff diff, info
-  
-    raise ConflictException::new('info cannot be nil or empty') if nil.eql?(info) || info.empty?
-    
-    response = multi_diff [diff], [info]  # a multi diff of one
-    @last_diff, @last_info = diff, info
-    response
-  end
-  
-  def multi_diff diff, info
-    body = {"client" => @cfg[:id]}
-    diff.each do | d | body = body.merge("diff"=>d, "path"=>".") end
-    info.each do | i | body = body.merge("info"=>i) end
-    YAML.load send(DIFF_URL, body)
-  end
-  
-  def revert info
-    diff("", info)
-  end
-  
-  #make this static?
-  def count
-    body = send(STATUS_URL, {})
-    document = REXML::Document.new(body)
-    document.root.elements['events'].size
-  end
-  
-  def poll
-    
-    while true
-      diff = `#{@cfg[:command]}`
-      info = `svn info`
-      puts multi_diff([diff], [info]).to_yaml
-      sleep @cfg[:poll]
-    end
-    
-  end
-
-  def to_s
-    self.class.to_s + " " + @cfg.to_s
-  end
-
-  private
-  def send url, body
-    req = Net::HTTP::Post.new(url)
-    req.set_form_data(body)
-    http = Net::HTTP.new(@cfg[:ip],@cfg[:port])
-    res = http.request(req)
-    res.body
-  end
-  
-end  
-  
-end
-
-module ConflictConstants
-
-  CLIENT_ONE = "unit test"
-  CLIENT_TWO = "unit test 2"
-  CLIENT_THREE = "unit test 3"
-  NO_CONFLICT = [].to_yaml
-  CONTROLLER = "com.thoughtworks.Controller.java"
-  VIEW = "com.thoughtworks.View.java"
-  MODEL = "com.thoughtworks.Model.java"  
-  DATA_DIR = './test/data/'
-  STOMP_DIR = DATA_DIR + 'stomp/'  
-  STOMP_1_INFO_PATH = STOMP_DIR + 'stomp.1.info.txt'
-  STOMP_2_INFO_PATH = STOMP_DIR + 'stomp.2.info.txt'
-  STOMP_1_DIFF_PATH = STOMP_DIR + 'stomp.1.diff.txt'
-  STOMP_2_DIFF_PATH = STOMP_DIR + 'stomp.2.diff.txt'  
-  STOMP_1_URL = 'http://svn.codehaus.org/stomp/ruby/trunk'
-  STOMP_2_URL = 'http://svn.codehaus.org/stomp/ruby/trunk/lib'  
-  STOMP_RESOURCE = STOMP_2_URL + "/stomp.rb"
-  CONFLICT_URL = 'https://conflict.svn.sourceforge.net/svnroot/conflict/src/ruby'
-  
-end
-  
-class File
-  def to_s
-    string = ""
-    self.each do | line | string += line.to_s end
-    self.close
-    string
-  end
-end  
-
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'test/unit'
+require 'net/http'
+module Conflict
+
+class DataBase
+  def presence_of item
+    @db.index(item)
+  end
+  def insert item
+    @db << item
+  end
+end
+
+class Client
+  
+  def initialize cfg={}
+    @cfg = {}
+    @cfg[:command] = cfg[:command] ||= "svn diff"
+    @cfg[:id] = cfg[:id] ||= "Conflict Ruby client"
+    @cfg[:ip] = cfg[:ip] ||= "127.0.0.1"
+    @cfg[:port] = cfg[:port] ||= PORT
+    @cfg[:poll] = cfg[:poll] ||= 3
+  end
+  
+  def resend
+    raise ConflictException::new('do not call resend before calling send') if ! defined?(@last_diff) or ! defined?(@last_info)
+    diff @last_diff, @last_info
+  end
+  
+  def diff diff, info
+  
+    raise ConflictException::new('info cannot be nil or empty') if nil.eql?(info) || info.empty?
+    
+    response = multi_diff [diff], [info]  # a multi diff of one
+    @last_diff, @last_info = diff, info
+    response
+  end
+  
+  def multi_diff diff, info
+    body = {"client" => @cfg[:id]}
+    diff.each do | d | body = body.merge("diff"=>d, "path"=>".") end
+    info.each do | i | body = body.merge("info"=>i) end
+    YAML.load send(DIFF_URL, body)
+  end
+  
+  def revert info
+    diff("", info)
+  end
+  
+  #make this static?
+  def count
+    body = send(STATUS_URL, {})
+    document = REXML::Document.new(body)
+    document.root.elements['events'].size
+  end
+  
+  def poll
+    
+    while true
+      diff = `#{@cfg[:command]}`
+      info = `svn info`
+      puts multi_diff([diff], [info]).to_yaml
+      sleep @cfg[:poll]
+    end
+    
+  end
+
+  def to_s
+    self.class.to_s + " " + @cfg.to_s
+  end
+
+  private
+  def send url, body
+    req = Net::HTTP::Post.new(url)
+    req.set_form_data(body)
+    http = Net::HTTP.new(@cfg[:ip],@cfg[:port])
+    res = http.request(req)
+    res.body
+  end
+  
+end  
+  
+end
+
+module ConflictConstants
+
+  CLIENT_ONE = "unit test"
+  CLIENT_TWO = "unit test 2"
+  CLIENT_THREE = "unit test 3"
+  NO_CONFLICT = [].to_yaml
+  CONTROLLER = "com.thoughtworks.Controller.java"
+  VIEW = "com.thoughtworks.View.java"
+  MODEL = "com.thoughtworks.Model.java"  
+  DATA_DIR = './test/data/'
+  STOMP_DIR = DATA_DIR + 'stomp/'  
+  STOMP_1_INFO_PATH = STOMP_DIR + 'stomp.1.info.txt'
+  STOMP_2_INFO_PATH = STOMP_DIR + 'stomp.2.info.txt'
+  STOMP_1_DIFF_PATH = STOMP_DIR + 'stomp.1.diff.txt'
+  STOMP_2_DIFF_PATH = STOMP_DIR + 'stomp.2.diff.txt'  
+  STOMP_1_URL = 'http://svn.codehaus.org/stomp/ruby/trunk'
+  STOMP_2_URL = 'http://svn.codehaus.org/stomp/ruby/trunk/lib'  
+  STOMP_RESOURCE = STOMP_2_URL + "/stomp.rb"
+  CONFLICT_URL = 'https://conflict.svn.sourceforge.net/svnroot/conflict/src/ruby'
+  
+end
+  
+class File
+  def to_s
+    string = ""
+    self.each do | line | string += line.to_s end
+    self.close
+    string
+  end
+end  
+