svnx 1.0.1 → 2.0.6

data/lib/svnx/diff/parser.rb

@@ -0,0 +1,105 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'logue/loggable'
+require 'svnx/diff/elements'
+
+class Svnx::Diff::Parser
+  include Logue::Loggable
+
+  def parse_header_file lines
+    re = Regexp.new '^[\-\+]{3} (.*)\t\((?:nonexistent|revision (\d+))\)'
+    if md = re.match(lines.first)
+      lines.shift
+      Svnx::Diff::File.new filename: md[1], revision: md[2] && md[2].to_i
+    end
+  end
+  
+  def parse_header_section lines
+    re = Regexp.new '^Index: (.*)'
+    if md = re.match(lines.first)
+      filename = md[1]      
+      lines.shift
+      
+      # discard the ==== line:
+      lines.shift
+
+      from = parse_header_file lines
+      to = parse_header_file lines
+      
+      Svnx::Diff::Header.new filename: filename, from: from, to: to
+    end
+  end
+
+  def parse_ranges lines
+    range_re = Regexp.new '@@ \-(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@'
+    if md = range_re.match(lines.first)
+      lines.shift
+      
+      from, to = [ 1, 3 ].collect do |idx|
+        Svnx::Diff::HunkRange.new md[idx].to_i, (md[idx + 1] || 1).to_i
+      end
+      
+      Svnx::Diff::HunkRanges.new from, to
+    end
+  end
+
+  def parse_hunk lines
+    if ranges = parse_ranges(lines)
+      Svnx::Diff::Hunk.new(ranges, Array.new).tap do |hunk|
+        char_to_type = { ' ' => :context, '+' => :added,  '-' => :deleted }
+        
+        while !lines.empty?
+          if lines.first == "\"
+            hunk.lines << [ :context, :no_newline ]
+            lines.shift
+          elsif type = char_to_type[lines.first[0]]
+            hunk.lines << [ type, lines.shift[1 .. -1] ]
+          else
+            break
+          end
+        end
+      end
+    end
+  end
+
+  def parse_hunks lines
+    Array.new.tap do |hunks|
+      while !lines.empty?
+        if hunk = parse_hunk(lines)
+          hunks << hunk
+        else
+          break
+        end
+      end
+    end
+  end
+
+  def parse_file_diff lines
+    if header = parse_header_section(lines)
+      SvnFileDiff.new(header).tap do |diff|
+        if header.from && header.to
+          while !lines.empty?
+            if hunk = parse_hunk(lines)
+              diff.hunks << hunk
+            else
+              break
+            end
+          end
+        end
+      end
+    end
+  end
+
+  def parse_all_output lines
+    Array.new.tap do |diffs|
+      until lines.empty?
+        if filediff = parse_file_diff(lines)
+          diffs << filediff
+        else
+          break
+        end
+      end
+    end
+  end
+end

data/lib/svnx/info/command.rb

@@ -1,53 +1,10 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'svnx/base/command'
+require 'svnx/info/options'
 require 'svnx/info/entries'
+require 'svnx/base/command'
 
-module SVNx
-  class InfoCommandLine < CommandLine
-    def initialize args = Array.new
-      super "info", args.to_a
-    end
-  end
-
-  class InfoCommandArgs < CommandArgs
-    attr_reader :revision
-
-    def initialize args = Hash.new
-      @revision = args[:revision]
-      super
-    end
-
-    def to_a
-      ary = Array.new
-
-      if @revision
-        [ @revision ].flatten.each do |rev|
-          ary << "-r#{rev}"
-        end
-      end
-
-      if @path
-        ary << @path
-      end
-      ary
-    end
-  end  
-
-  class InfoCommand < Command
-    def command_line
-      InfoCommandLine.new @args
-    end
-  end
-
-  class InfoExec
-    attr_reader :entry
-    
-    def initialize args
-      cmd = InfoCommand.new InfoCommandArgs.new(args)
-      # info has only one entry
-      @entry = SVNx::Info::Entries.new(:xmllines => cmd.execute)[0]
-    end
-  end
+class Svnx::Info::Command < Svnx::Base::EntriesCommand
+  noncaching
 end

data/lib/svnx/info/entries.rb

@@ -4,14 +4,12 @@
 require 'svnx/info/entry'
 require 'svnx/base/entries'
 
-module SVNx::Info
-  class Entries < SVNx::Entries
-    def get_elements doc
-      doc.elements['info'].elements
-    end
+class Svnx::Info::Entries < Svnx::Base::Entries
+  def get_elements doc
+    doc.elements['info'].elements
+  end
 
-    def create_entry xmlelement
-      Entry.new :xmlelement => xmlelement
-    end
+  def create_entry xmlelement
+    Svnx::Info::Entry.new :xmlelement => xmlelement
   end
 end

data/lib/svnx/info/entry.rb

@@ -3,32 +3,30 @@
 
 require 'svnx/base/entry'
 
-module SVNx; module Info; end; end
+module Svnx
+  module Info
+  end
+end
 
-module SVNx::Info
-  class Entry < SVNx::Entry
-    attr_reader :url
-    attr_reader :root
-    attr_reader :kind
-    attr_reader :path
-    attr_reader :revision
-    attr_reader :wc_root
+class Svnx::Info::Entry < Svnx::Base::Entry
+  attr_reader :url
+  attr_reader :root
+  attr_reader :kind
+  attr_reader :path
+  attr_reader :revision
+  attr_reader :wc_root
 
-    def set_from_element elmt
-      set_attr_var elmt, 'kind'
-      set_attr_var elmt, 'path'
-      set_attr_var elmt, 'revision'
-      
-      set_elmt_var elmt, 'url'
-      
-      repo = elmt.elements['repository']
-      set_elmt_var repo, 'root'
+  def set_from_element elmt
+    set_attr_vars elmt, 'kind', 'path', 'revision'
+    set_elmt_var  elmt, 'url'
+    
+    repo = elmt.elements['repository']
+    set_elmt_var repo, 'root'
 
-      @wc_root = nil
-      if wcinfo = elmt.elements['wc-info']
-        if wcroot = wcinfo.elements['wcroot-abspath']
-          @wc_root = wcroot.text
-        end
+    @wc_root = nil
+    if wcinfo = elmt.elements['wc-info']
+      if wcroot = wcinfo.elements['wcroot-abspath']
+        @wc_root = wcroot.text
       end
     end
   end

data/lib/svnx/info/options.rb

@@ -0,0 +1,28 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'svnx/util/objutil'
+require 'svnx/base/options'
+
+module Svnx
+  module Info
+  end
+end
+
+class Svnx::Info::Options < Svnx::Base::Options
+  attr_reader :revision
+  attr_reader :url
+  attr_reader :path
+  
+  def initialize args
+    assign args, :revision, :url, :path
+  end
+
+  def options_to_args
+    Array.new.tap do |optargs|
+      optargs << [ :revision, [ "-r", revision ] ]
+      optargs << [ :url,      url ]
+      optargs << [ :path,     path ]
+    end
+  end
+end

data/lib/svnx/io/directory.rb

@@ -1,10 +1,14 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-module SVNx::IO
-  # An element unites an svn element and a file/directory (at least one of
-  # which should exist).
-
-  class Directory < Element
+module Svnx
+  module IO
   end
 end
+
+
+# An element unites an svn element and a file/directory (at least one of
+# which should exist).
+
+class Svnx::IO::Directory < Element
+end

data/lib/svnx/io/element.rb

@@ -1,127 +1,125 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'rubygems'
 require 'logue/loggable'
-require 'svnx/log/entries'
-require 'svnx/status/entries'
+require 'svnx/log/command'
 require 'svnx/status/command'
-require 'svnx/info/entries'
 require 'svnx/info/command'
 require 'svnx/cat/command'
 require 'pathname'
 
-module SVNx; module IO; end; end
+module Svnx
+  module IO
+  end
+end
 
-module SVNx::IO
-  # An element unites an svn element and a file/directory (at least one of
-  # which should exist).
+# An element unites an svn element and a file/directory (at least one of
+# which should exist).
 
-  class Element
-    include Logue::Loggable, Comparable
+class Svnx::IO::Element
+  include Logue::Loggable, Comparable
 
-    attr_reader :svn
-    attr_reader :path
-    attr_reader :local
+  attr_reader :svn
+  attr_reader :path
+  attr_reader :local
+  
+  def initialize args = Hash.new
+    info "args: #{args.inspect}".color("438802")
     
-    def initialize args = Hash.new
-      info "args: #{args.inspect}".color("438802")
-      
-      # svnurl = args[:svnurl]
-      # fname  = args[:filename] || args[:file] # legacy
-      # $$$ todo: map svnurl to SVNElement, and fname to FSElement
-
-      @svn   = args[:svn] # || (args[:file] && SVNElement.new(:filename => args[:file]))
-      @local = args[:local] && Pathname.new(args[:local]) # && PVN::FSElement.new(args[:local] || args[:file])
-      @path  = args[:path]
-      
-      info "local: #{@local.inspect}"
-    end
+    # svnurl = args[:svnurl]
+    # fname  = args[:filename] || args[:file] # legacy
+    # $$$ todo: map svnurl to SVNElement, and fname to FSElement
 
-    def exist?
-      @local && @local.exist?
-    end
+    @svn   = args[:svn] # || (args[:file] && SVNElement.new(:filename => args[:file]))
+    @local = args[:local] && Pathname.new(args[:local]) # && PVN::FSElement.new(args[:local] || args[:file])
+    @path  = args[:path]
+    
+    info "local: #{@local.inspect}"
+  end
 
-    def directory?
-      @local && @local.directory?
-    end
+  def exist?
+    @local && @local.exist?
+  end
 
-    def file?
-      @local && @local.file?
-    end
+  def directory?
+    @local && @local.directory?
+  end
 
-    def get_info revision = nil
-      return nil unless in_svn?
-      
-      usepath = @local ? @local.to_path : @path
-      inf = SVNx::InfoExec.new path: usepath, revision: revision
-      inf.entry
-    end
+  def file?
+    @local && @local.file?
+  end
+
+  def get_info revision = nil
+    return nil unless in_svn?
+    
+    usepath = @local ? @local.to_path : @path
+    inf = Svnx::Info::Command.new url: usepath, revision: revision
+    inf.entry
+  end
 
-    def in_svn?
-      # svn status can only be a local path:
-      if @local
-        st = SVNx::StatusExec.new path: @local.to_path
-        st.entries.size == 0 || st.entries[0].status.to_s != 'unversioned'
-      else
-        raise "cannot determine svn status without a local path; only target '#{@path}' defined"
-      end
+  def in_svn?
+    # svn status can only be a local path:
+    if @local
+      st = Svnx::StatusExec.new path: @local.to_path
+      st.entries.size == 0 || st.entries[0].status.to_s != 'unversioned'
+    else
+      raise "cannot determine svn status without a local path; only target '#{@path}' defined"
     end
+  end
 
-    def find_entries args = Hash.new
-      revision = args[:revision]
-      status = args[:status]
-      
-      if revision.nil?
-        find_by_status status
-      else
-        find_in_log revision, status
-      end
+  def find_entries args = Hash.new
+    revision = args[:revision]
+    status = args[:status]
+    
+    if revision.nil?
+      find_by_status status
+    else
+      find_in_log revision, status
     end
+  end
 
-    def find_in_log revision, action
-      svninfo = get_info
+  def find_in_log revision, action
+    svninfo = get_info
 
-      filter = svninfo.url.dup
-      filter.slice! svninfo.root
+    filter = svninfo.url.dup
+    filter.slice! svninfo.root
 
-      # we can't cache this, because we don't know if there has been an svn
-      # update since the previous run:
-      logexec = SVNx::LogExec.new path: @local, revision: revision, verbose: true, use_cache: false
-      entries = logexec.entries
-      
-      act = action.kind_of?(SVNx::Action) ? action : SVNx::Action.new(action)
-      entries.match act, filter
-    end
+    # we can't cache this, because we don't know if there has been an svn
+    # update since the previous run:
+    logexec = Svnx::LogExec.new path: @local, revision: revision, verbose: true, use_cache: false
+    entries = logexec.entries
+    
+    act = action.kind_of?(Svnx::Action) ? action : Svnx::Action.new(action)
+    entries.match act, filter
+  end
 
-    def find_by_status status
-      statexec = SVNx::StatusExec.new path: @local, use_cache: false
-      entries = statexec.entries
+  def find_by_status status
+    statexec = Svnx::StatusExec.new path: @local, use_cache: false
+    entries = statexec.entries
 
-      entries.select do |entry|
-        status.nil? || entry.status.to_s == status.to_s
-      end.sort
-    end
+    entries.select do |entry|
+      status.nil? || entry.status.to_s == status.to_s
+    end.sort
+  end
 
-    def log_entries args = Hash.new
-      rev = args[:revision]
-      # use_cache should be conditional on revision:
-      logexec = SVNx::LogExec.new :path => @local, :revision => rev && rev.to_s, :verbose => true, :use_cache => false
-      logexec.entries
-    end
+  def log_entries args = Hash.new
+    rev = args[:revision]
+    # use_cache should be conditional on revision:
+    logexec = Svnx::LogExec.new :path => @local, :revision => rev && rev.to_s, :verbose => true, :use_cache => false
+    logexec.entries
+  end
 
-    def cat args = Hash.new
-      rev = args[:revision]
-      catexec = SVNx::CatExec.new :path => @local, :revision => rev && rev.to_s, :use_cache => false
-      catexec.output
-    end
+  def cat args = Hash.new
+    rev = args[:revision]
+    catexec = Svnx::CatExec.new :path => @local, :revision => rev && rev.to_s, :use_cache => false
+    catexec.output
+  end
 
-    def to_s
-      "svn => " + @svn.to_s + "; local => " + @local.to_s
-    end
+  def to_s
+    "svn => " + @svn.to_s + "; local => " + @local.to_s
+  end
 
-    def <=> other
-      @local <=> other.local
-    end
+  def <=> other
+    @local <=> other.local
   end
 end