svnx 1.0.1 → 2.0.6

data/lib/svnx/base/entry.rb

@@ -4,54 +4,67 @@
 require 'rexml/document'
 require 'logue/loggable'
 
-module SVNx
-  class Entry
-    include Logue::Loggable
-
-    def initialize args
-      if xmllines = args[:xmllines]
-        if xmllines.kind_of? Array
-          xmllines = xmllines.join ''
-        end
-
-        doc = REXML::Document.new xmllines
-
-        set_from_xml doc
-      elsif elmt = args[:xmlelement]
-        set_from_element elmt
-      else
-        raise "must be initialized with xmllines or xmlelement"
+module Svnx
+  module Base
+  end
+end
+
+class Svnx::Base::Entry
+  include Logue::Loggable
+
+  def initialize xmllines: nil, xmlelement: nil
+    if xmllines
+      if xmllines.kind_of? Array
+        xmllines = xmllines.join ''
       end
+      doc = REXML::Document.new xmllines
+      set_from_xml doc
+    elsif xmlelement
+      set_from_element xmlelement
+    else
+      raise "must be initialized with xmllines (received: #{xmllines.inspect}) or xmlelement (received: #{xmlelement.inspect})"
     end
+  end
 
-    def set_from_xml xmldoc
-      raise "must be implemented"
-    end
+  def set_from_xml xmldoc
+    raise "must be implemented"
+  end
 
-    def set_from_element elmt
-      raise "must be implemented"
-    end
+  def set_from_element elmt
+    raise "must be implemented"
+  end
 
-    def get_attribute xmlelement, attrname
-      xmlelement.attributes[attrname]
-    end
+  def set_attr_var xmlelement, varname
+    set_var varname, attribute_value(xmlelement, varname)
+  end
 
-    def get_element_text xmlelement, elmtname
-      elmt = xmlelement.elements[elmtname]
-      # in my test svn repository, revision 1 doesn't have an author element:
-      (elmt && elmt.text) || ""
+  def set_attr_vars xmlelement, *varnames
+    varnames.each do |varname|
+      set_attr_var xmlelement, varname
     end
+  end
 
-    def set_attr_var xmlelement, varname
-      set_var varname, get_attribute(xmlelement, varname)
-    end
+  def set_elmt_var xmlelement, varname
+    set_var varname, element_text(xmlelement, varname)
+  end
 
-    def set_elmt_var xmlelement, varname
-      set_var varname, get_element_text(xmlelement, varname)
+  def set_elmt_vars xmlelement, *varnames
+    varnames.each do |varname|
+      set_elmt_var xmlelement, varname
     end
+  end
 
-    def set_var varname, value
-      instance_variable_set '@' + varname, value
-    end
+  def set_var varname, value
+    instance_variable_set '@' + varname.to_s, value
+  end
+
+  def attribute_value xmlelement, attrname
+    xmlelement.attributes[attrname.to_s]
   end
+
+  def element_text xmlelement, elmtname
+    elmt = xmlelement.elements[elmtname.to_s]
+    # some elements don't have text:
+    (elmt && elmt.text) || ""
+  end  
 end

data/lib/svnx/base/env.rb

@@ -0,0 +1,26 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'singleton'
+
+module Svnx
+end
+
+class Svnx::Env
+  include Singleton
+
+  # the directory into which to put cached files
+  attr_accessor :cache_dir_name
+
+  # the environment variable, naming the cache directory
+  attr_accessor :cache_dir_env_varname
+  
+  def initialize
+    @cache_dir_name = "/tmp/svnx"
+    @cache_dir_env_varname = "SVNX_TMP_DIR"
+  end
+
+  def cache_dir
+    ENV[@cache_dir_env_varname] || @cache_dir_name
+  end
+end

data/lib/svnx/base/options.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'svnx/util/objutil'
+
+module Svnx
+  module Base
+  end
+end
+
+class Svnx::Base::Options
+  include Svnx::ObjectUtil
+  
+  def to_args
+    Array.new.tap do |args|
+      options_to_args.each do |opt|
+        optname = opt[0]
+        values = opt[1]
+        if send optname
+          args.concat [ values ].flatten
+        end
+      end
+    end
+  end
+end

data/lib/svnx/cat/command.rb

@@ -1,70 +1,9 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
+require 'svnx/cat/options'
 require 'svnx/base/command'
-require 'system/command/caching'
 
-module SVNx
-  module CatCmdLine
-    # this can be either an Array (for which to_a returns itself), or a
-    # CommandArgs, which also has to_a.
-    def initialize args = Array.new
-      super "cat", args.to_a
-    end
-
-    def uses_xml?
-      false
-    end
-  end
-  
-  class CatCommandLine < CommandLine
-    include CatCmdLine
-  end
-
-  class CatCommandLineCaching < CachingCommandLine
-    include CatCmdLine
-  end
-
-  class CatCommandArgs < CommandArgs
-    attr_reader :revision
-    attr_reader :use_cache
-
-    def initialize args = Hash.new
-      @use_cache = args[:use_cache].nil? || args[:use_cache]
-      @revision = args[:revision]
-      super
-    end
-
-    def to_a
-      ary = Array.new
-      if @revision
-        ary << "-r#{@revision}"
-      end
-      
-      if @path
-        ary << @path
-      end
-    end
-  end  
-
-  class CatCommand < Command
-    def initialize args
-      @use_cache = args.use_cache
-      super
-    end
-
-    def command_line
-      cls = @use_cache ? CatCommandLineCaching : CatCommandLine
-      cls.new @args
-    end
-  end
-
-  class CatExec
-    attr_reader :output
-    
-    def initialize args
-      cmd = CatCommand.new CatCommandArgs.new(args)
-      @output = cmd.execute
-    end
-  end
+class Svnx::Cat::Command < Svnx::Base::Command
+  caching
 end

data/lib/svnx/cat/options.rb

@@ -0,0 +1,28 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'svnx/util/objutil'
+require 'svnx/base/options'
+
+module Svnx
+  module Cat
+  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
+
+  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/commit/command.rb

@@ -0,0 +1,9 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'svnx/commit/options'
+require 'svnx/base/command'
+
+class Svnx::Commit::Command < Svnx::Base::Command
+  noncaching
+end

data/lib/svnx/commit/options.rb

@@ -0,0 +1,29 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'svnx/base/options'
+
+module Svnx
+  module Commit
+  end
+end
+
+class Svnx::Commit::Options < Svnx::Base::Options
+  include Svnx::ObjectUtil
+
+  attr_reader :file
+  attr_reader :paths
+  attr_reader :url
+  
+  def initialize args = Hash.new
+    assign args, :file, :paths, :url
+  end
+
+  def options_to_args
+    Array.new.tap do |optargs|
+      optargs << [ :file,   [ "-F", file ] ]
+      optargs << [ :url,    url ]
+      optargs << [ :paths,  paths ]
+    end
+  end  
+end

data/lib/svnx/diff/command.rb

@@ -0,0 +1,17 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+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
+    end
+  end
+end

data/lib/svnx/diff/elements.rb

@@ -0,0 +1,84 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'logue/loggable'
+
+module Svnx
+  module Diff
+  end
+end
+
+class Svnx::Diff::File
+  attr_reader :filename
+  attr_reader :revision
+
+  def initialize args
+    @filename = args[:filename]
+    @revision = args[:revision]
+  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]
+  end
+end
+
+class Svnx::Diff::HunkRange
+  attr_reader :line
+  attr_reader :length
+
+  def initialize line, length
+    @line = line
+    @length = length
+  end
+end
+
+class Svnx::Diff::HunkRanges
+  attr_reader :from
+  attr_reader :to
+
+  def initialize from, to
+    @from = from
+    @to = to
+  end
+end
+
+# unused; I prefer a two-element array: [ :added, "sometext" ]
+
+class Svnx::Diff::Line
+  attr_reader :type
+  attr_reader :text
+
+  def initialize type, text
+    @type = type
+    @text = text
+  end
+end
+
+class Svnx::Diff::Hunk
+  attr_reader :ranges
+  attr_reader :lines
+
+  def initialize ranges, lines
+    @ranges = ranges
+    @lines = lines
+  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
+  end
+end

data/lib/svnx/diff/options.rb

@@ -0,0 +1,35 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'svnx/base/options'
+
+module Svnx
+  module Diff
+  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
+
+  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 ]
+    end
+  end
+end