svnx 2.0.6 → 2.1.0

data/lib/svnx/cat/options.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'svnx/util/objutil'
 require 'svnx/base/options'
 
 module Svnx
@@ -9,20 +8,18 @@ module Svnx
   end
 end
 
-class Svnx::Cat::Options < Svnx::Base::Options
-  attr_reader :revision
-  attr_reader :url
-  attr_reader :path
-  
-  def initialize args
-    assign args, :revision, :url, :path
-  end
+module Svnx::Cat
+  class Options < Svnx::Base::Options
+    FIELDS = [ :revision, :path, :url ]
+    
+    has_fields FIELDS
 
-  def options_to_args
-    Array.new.tap do |optargs|
-      optargs << [ :revision, [ "-r", revision ] ]
-      optargs << [ :url,      url ]
-      optargs << [ :path,     path ]
+    def options_to_args
+      Array.new.tap do |a|
+        a << [ :revision, [ "-r", revision ] ]
+        a << [ :url,      url ]
+        a << [ :path,     path ]
+      end
     end
   end
 end

data/lib/svnx/commit/command.rb

@@ -4,6 +4,8 @@
 require 'svnx/commit/options'
 require 'svnx/base/command'
 
-class Svnx::Commit::Command < Svnx::Base::Command
-  noncaching
+module Svnx::Commit
+  class Command < Svnx::Base::Command
+    noncaching
+  end
 end

data/lib/svnx/commit/options.rb

@@ -8,22 +8,17 @@ module Svnx
   end
 end
 
-class Svnx::Commit::Options < Svnx::Base::Options
-  include Svnx::ObjectUtil
+module Svnx::Commit
+  class Options < Svnx::Base::Options
+    FIELDS = [ :file, :paths ]
 
-  attr_reader :file
-  attr_reader :paths
-  attr_reader :url
-  
-  def initialize args = Hash.new
-    assign args, :file, :paths, :url
-  end
+    has_fields FIELDS
 
-  def options_to_args
-    Array.new.tap do |optargs|
-      optargs << [ :file,   [ "-F", file ] ]
-      optargs << [ :url,    url ]
-      optargs << [ :paths,  paths ]
-    end
-  end  
+    def options_to_args
+      Array.new.tap do |a|
+        a << [ :file,   [ "-F", file ] ]
+        a << [ :paths,  paths ]
+      end
+    end  
+  end
 end

data/lib/svnx/diff/command.rb

@@ -5,13 +5,15 @@ require 'svnx/diff/options'
 require 'svnx/base/command'
 require 'svnx/diff/parser'
 
-class Svnx::Diff::Command < Svnx::Base::Command
-  attr_reader :entries
-  
-  def initialize cmdopts, cls: Svnx::Base::CommandLine, exec: nil
-    super cmdopts, cls: cls, exec: exec, xml: false, caching: true
-    if @output
-      @entries = Svnx::Diff::Parser.new.parse_all_output @output.dup
+module Svnx::Diff
+  class Command < Svnx::Base::Command
+    attr_reader :entries
+    
+    def initialize cmdopts, cls: Svnx::Base::CommandLine
+      super cmdopts, cls: cls, xml: false, caching: true
+      if @output
+        @entries = Svnx::Diff::Parser.new.parse_all_output @output.dup
+      end
     end
   end
 end

data/lib/svnx/diff/elements.rb

@@ -8,77 +8,79 @@ module Svnx
   end
 end
 
-class Svnx::Diff::File
-  attr_reader :filename
-  attr_reader :revision
+module Svnx::Diff
+  class File
+    attr_reader :filename
+    attr_reader :revision
 
-  def initialize args
-    @filename = args[:filename]
-    @revision = args[:revision]
+    def initialize args
+      @filename = args[:filename]
+      @revision = args[:revision]
+    end
   end
-end
 
-class Svnx::Diff::Header
-  attr_reader :filename
-  attr_reader :from
-  attr_reader :to
-  
-  def initialize args
-    @filename = args[:filename]
-    @from = args[:from]
-    @to = args[:to]
+  class Header
+    attr_reader :filename
+    attr_reader :from
+    attr_reader :to
+    
+    def initialize args
+      @filename = args[:filename]
+      @from = args[:from]
+      @to = args[:to]
+    end
   end
-end
 
-class Svnx::Diff::HunkRange
-  attr_reader :line
-  attr_reader :length
+  class HunkRange
+    attr_reader :line
+    attr_reader :length
 
-  def initialize line, length
-    @line = line
-    @length = length
+    def initialize line, length
+      @line = line
+      @length = length
+    end
   end
-end
 
-class Svnx::Diff::HunkRanges
-  attr_reader :from
-  attr_reader :to
+  class HunkRanges
+    attr_reader :from
+    attr_reader :to
 
-  def initialize from, to
-    @from = from
-    @to = to
+    def initialize from, to
+      @from = from
+      @to = to
+    end
   end
-end
 
-# unused; I prefer a two-element array: [ :added, "sometext" ]
+  # unused; I prefer a two-element array: [ :added, "sometext" ]
 
-class Svnx::Diff::Line
-  attr_reader :type
-  attr_reader :text
+  class Line
+    attr_reader :type
+    attr_reader :text
 
-  def initialize type, text
-    @type = type
-    @text = text
+    def initialize type, text
+      @type = type
+      @text = text
+    end
   end
-end
 
-class Svnx::Diff::Hunk
-  attr_reader :ranges
-  attr_reader :lines
+  class Hunk
+    attr_reader :ranges
+    attr_reader :lines
 
-  def initialize ranges, lines
-    @ranges = ranges
-    @lines = lines
+    def initialize ranges, lines
+      @ranges = ranges
+      @lines = lines
+    end
   end
-end
 
-# all diffs for one file
-class SvnFileDiff
-  attr_reader :header
-  attr_reader :hunks
-  
-  def initialize header, hunks = Array.new
-    @header = header
-    @hunks = hunks
+  # all diffs for one file
+  class SvnFileDiff
+    attr_reader :header
+    attr_reader :hunks
+    
+    def initialize header, hunks = Array.new
+      @header = header
+      @hunks = hunks
+    end
   end
 end

data/lib/svnx/diff/options.rb

@@ -8,28 +8,21 @@ module Svnx
   end
 end
 
-class Svnx::Diff::Options < Svnx::Base::Options
-  attr_reader :commit
-  attr_reader :ignoreproperties
-  attr_reader :ignorewhitespace
-  attr_reader :paths
-  attr_reader :url
-  
-  def initialize args = Hash.new
-    @commit = args[:commit]
-    @ignoreproperties = args[:ignoreproperties]
-    @ignorewhitespace = args[:ignorewhitespace]
-    @paths = args[:paths]
-    @url = args[:url]
-  end
+module Svnx::Diff
+  class Options < Svnx::Base::Options
+    FIELDS = [ :commit, :ignoreproperties, :ignorewhitespace, :paths, :url, :depth ]
+    
+    has_fields FIELDS
 
-  def options_to_args
-    Array.new.tap do |optargs|
-      optargs << [ :commit, [ "-c", commit ] ]
-      optargs << [ :ignoreproperties, "--ignore-properties" ] 
-      optargs << [ :ignorewhitespace, [ "-x", "-bw" ] ]
-      optargs << [ :url, url ]
-      optargs << [ :paths, paths ]
+    def options_to_args
+      Array.new.tap do |a|
+        a << [ :commit,           [ "-c",      commit ] ]
+        a << [ :ignoreproperties, "--ignore-properties" ] 
+        a << [ :depth,            [ "--depth", depth ] ] 
+        a << [ :ignorewhitespace, [ "-x",      "-bw" ] ]
+        a << [ :url,              url ]
+        a << [ :paths,            paths ]
+      end
     end
   end
 end

data/lib/svnx/diff/parser.rb

@@ -4,100 +4,102 @@
 require 'logue/loggable'
 require 'svnx/diff/elements'
 
-class Svnx::Diff::Parser
-  include Logue::Loggable
+module Svnx::Diff
+  class 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
+    def parse_header_file lines
+      re = Regexp.new '^[\-\+]{3} (.*)\t\((?:nonexistent|working copy|revision (\d+))\)'
+      if md = re.match(lines.first)
+        lines.shift
+        File.new filename: md[1], revision: md[2] && md[2].to_i
+      end
     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
+    
+    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
+        from = parse_header_file lines
+        to = parse_header_file lines
+        
+        Header.new filename: filename, from: from, to: to
+      end
     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
+    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|
+          HunkRange.new md[idx].to_i, (md[idx + 1] || 1).to_i
+        end
+        
+        HunkRanges.new from, to
       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
+    def parse_hunk lines
+      if ranges = parse_ranges(lines)
+        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
-  end
 
-  def parse_hunks lines
-    Array.new.tap do |hunks|
-      while !lines.empty?
-        if hunk = parse_hunk(lines)
-          hunks << hunk
-        else
-          break
+    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
-  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
+    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
-  end
 
-  def parse_all_output lines
-    Array.new.tap do |diffs|
-      until lines.empty?
-        if filediff = parse_file_diff(lines)
-          diffs << filediff
-        else
-          break
+    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