svnx 1.0.1 → 2.0.6

data/lib/svnx/revision/argfactory.rb

@@ -1,9 +1,9 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-module SVNx; module Revision; end; end
+module Svnx; module Revision; end; end
 
-module SVNx::Revision  
+module Svnx::Revision  
   class ArgumentFactory
     include Logue::Loggable
 

data/lib/svnx/revision/argument.rb

@@ -6,11 +6,11 @@ require 'svnx/revision/error'
 require 'logue/loggable'
 require 'svnx/revision/argfactory'
 
-module SVNx; module Revision; end; end
+module Svnx; module Revision; end; end
 
 # We represent what svn calls a revision (-r134:{2010-1-1}) as a Range,
 # consisting of a from and to (optional) Argument.
-module SVNx::Revision
+module Svnx::Revision
   RELATIVE_REVISION_RE = Regexp.new '^([\+\-])(\d+)$'
   
   # Returns the Nth revision from the given logging output.
@@ -42,7 +42,11 @@ module SVNx::Revision
     end
 
     def <=> other
-      @value <=> other.value
+      if other.kind_of? Argument
+        @value <=> other.value
+      else
+        @value <=> other
+      end
     end
   end
 

data/lib/svnx/revision/date.rb

@@ -0,0 +1,27 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'pathname'
+
+module Svnx
+  module Revision
+  end
+end
+
+class Svnx::Revision::DateToDate
+  attr_reader :from
+  attr_reader :to
+  
+  def initialize from, to
+    @from = from
+    @to = to
+  end
+
+  def to_svn_str
+    [ @from, @to ].collect { |dt| "{" + to_svn_date(dt) + "}" }.join(":")
+  end
+  
+  def to_svn_date date
+    date.strftime "%Y-%m-%d"
+  end
+end

data/lib/svnx/revision/error.rb

@@ -1,9 +1,9 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-module SVNx; module Revision; end; end
+module Svnx; module Revision; end; end
 
-module SVNx::Revision
+module Svnx::Revision
   class RevisionError < RuntimeError
   end
 end

data/lib/svnx/revision/range.rb

@@ -5,9 +5,12 @@ require 'svnx/log/entries'
 require 'svnx/revision/argument'
 require 'logue/loggable'
 
-module SVNx; module Revision; end; end
+module Svnx
+  module Revision
+  end
+end
 
-module SVNx::Revision
+module Svnx::Revision
   # this is of the form: -r123:456
   class Range
     include Logue::Loggable

data/lib/svnx/status/command.rb

@@ -2,47 +2,9 @@
 # -*- ruby -*-
 
 require 'svnx/base/command'
-require 'svnx/info/command'
+require 'svnx/status/options'
+require 'svnx/status/entries'
 
-module SVNx
-  class StatusCommandLine < CommandLine
-    def initialize args
-      super "status", args.to_a
-    end
-  end
-
-  class StatusCommandArgs < CommandArgs
-    def to_a
-      [ @path ].compact
-    end
-  end  
-
-  class StatusCommand < Command
-    def command_line
-      StatusCommandLine.new @args
-    end
-  end
-
-  class StatusExec
-    attr_reader :entries
-    
-    def initialize args
-      path = args[:path]
-      rootpath = nil
-      
-      while true
-        begin
-          inf = InfoExec.new(path: path).entry
-          rootpath = inf.wc_root
-          break
-        rescue
-          path = Pathname.new(path).dirname.to_s
-          break if path == '/'
-        end
-      end
-
-      cmd = StatusCommand.new StatusCommandArgs.new(args)
-      @entries = SVNx::Status::Entries.new(xmllines: cmd.execute, rootpath: rootpath)
-    end
-  end
+class Svnx::Status::Command < Svnx::Base::EntriesCommand
+  noncaching
 end

data/lib/svnx/status/entries.rb

@@ -4,19 +4,18 @@
 require 'svnx/status/entry'
 require 'svnx/base/entries'
 
-module SVNx::Status
-  class Entries < SVNx::Entries
-    def initialize args = Hash.new
-      @rootpath = args[:rootpath]
-      super
-    end
+class Svnx::Status::Entries < Svnx::Base::Entries
+  def initialize args = Hash.new
+    @rootpath = args[:rootpath]
+    super
+  end
 
-    def get_elements doc
-      doc.elements['status'].elements['target'].elements
-    end
+  def get_elements doc
+    # status/target
+    doc.elements['status'].elements['target'].elements
+  end
 
-    def create_entry xmlelement
-      Entry.new xmlelement: xmlelement, rootpath: @rootpath
-    end
+  def create_entry xmlelement
+    Svnx::Status::Entry.new xmlelement: xmlelement, rootpath: @rootpath
   end
 end

data/lib/svnx/status/entry.rb

@@ -4,52 +4,54 @@
 require 'svnx/base/entry'
 require 'svnx/base/action'
 
-module SVNx; module Status; end; end
+module Svnx
+  module Status
+  end
+end
+
+class Svnx::Status::Entry < Svnx::Base::Entry
+  include Comparable, Logue::Loggable
+  
+  attr_reader :status
+  attr_reader :path
+  attr_reader :status_revision
+  attr_reader :action
+  attr_reader :commit_revision
+  attr_reader :name
+
+  def initialize xmlelement: nil, rootpath: nil
+    @rootpath = rootpath
+    super xmlelement: xmlelement
+    # @status is an Svnx::Action
+    @action = @status
+  end
+
+  def set_from_element elmt
+    set_attr_var elmt, 'path'
 
-module SVNx::Status
-  class Entry < SVNx::Entry
-    include Comparable, Logue::Loggable
+    wcstatus = elmt.elements['wc-status']
+    @status = Svnx::Action.new(wcstatus.attributes['item'])
+    @status_revision = wcstatus.attributes['revision']
     
-    attr_reader :status
-    attr_reader :path
-    attr_reader :status_revision
-    attr_reader :action
-    attr_reader :commit_revision
-    attr_reader :name
-
-    def initialize args
-      @rootpath = args[:rootpath]
-      super
-      @action = SVNx::Action.new @status
-    end
+    commit = wcstatus.elements['commit']
+    @commit_revision = commit && commit.attributes['revision']
+    @name = @path.dup
 
-    def set_from_element elmt
-      set_attr_var elmt, 'path'
-
-      wcstatus = elmt.elements['wc-status']
-      @status = SVNx::Action.new(wcstatus.attributes['item'])
-      @status_revision = wcstatus.attributes['revision']
-      
-      commit = wcstatus.elements['commit']
-      @commit_revision = commit && commit.attributes['revision']
-      @name = @path.dup
-
-      info "@name: #{@name}"
-      info "@path: #{@path}"
-      info "@rootpath: #{@rootpath}"
-
-      if @rootpath
-        # name is prefixed with directory unless '.' is used as the argument
-        @name.sub! Regexp.new('^' + @rootpath), ''
-      end
-    end
+    info "@name: #{@name}"
+    info "@path: #{@path}"
+    info "@rootpath: #{@rootpath}"
 
-    def to_s
-      "path: #{@path}; status: #{@status}"
+    if @rootpath
+      # name is prefixed with directory unless '.' is used as the argument
+      @name.sub! Regexp.new('^' + @rootpath), ''
     end
+  end
 
-    def <=> other
-      path <=> other.path
-    end
+  def to_s
+    "path: #{@path}; status: #{@status}"
+  end
+
+  def <=> other
+    path <=> other.path
   end
 end

data/lib/svnx/status/options.rb

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

data/lib/svnx/update/command.rb

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

data/lib/svnx/update/options.rb

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

data/lib/svnx/util/dateutil.rb

@@ -0,0 +1,35 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'time'
+
+class DateUtil
+  class << self
+    def relative_full datetime, reltime = Time.now
+      secs = (reltime - datetime).to_i
+      if ago = to_time_units(secs)
+        ago + " ago (" + fmt_mmdd_hhmm(datetime) + ")"
+      else
+        datetime.strftime "%Y/%m/%d %H:%M"
+      end
+    end
+
+    def to_time_units seconds
+      secs = seconds.to_i
+
+      if secs < 120
+        "#{secs} seconds"
+      elsif (min = secs / 60) < 120
+        "#{min} minutes"
+      elsif (hour = min / 60) < 72
+        "#{hour} hours"
+      elsif (day = hour / 24) < 7
+        "#{day} days"
+      end
+    end
+
+    def fmt_mmdd_hhmm date
+      date.strftime "%m/%d %H:%M"
+    end
+  end
+end

data/lib/svnx/util/objutil.rb

@@ -0,0 +1,14 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+module Svnx
+end
+
+module Svnx::ObjectUtil
+  # shortcut for "@var = args[:var]", for multiple variable names, which are symbols.
+  def assign args, *symbols
+    symbols.each do |symbol|
+      instance_variable_set "@" + symbol.to_s, args[symbol]
+    end
+  end
+end

data/lib/{svnx.rb → svnx/version.rb}

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-module SVNx
+module Svnx
   NAME = 'svnx'
-  VERSION = '1.0.1'
+  VERSION = '2.0.6'
 end

data/lib/system/command/arg.rb

@@ -2,11 +2,12 @@
 # -*- ruby -*-
 
 module System
-  class Argument < String
-    # just a string, but quotes itself
+end
+
+class System::Argument < String
+  # just a string, but quotes itself
 
-    def to_s
-      '"' + super + '"'
-    end
+  def to_s
+    '"' + super + '"'
   end
 end

data/lib/system/command/cachefile.rb

@@ -6,45 +6,53 @@ require 'zlib'
 require 'logue/loggable'
 
 module System
-  class CacheFile
+  class GzipPathname < Pathname
     include Logue::Loggable
-
-    attr_reader :output
     
-    def initialize cache_dir, args
-      @args = args
-      @pn = Pathname.new(cache_dir) + (args.join('-').gsub('/', '_slash_') + '.gz')
-      @output = nil
-    end
-
-    def save_file
-      @pn.parent.mkpath unless @pn.parent.exist?
-      @pn.unlink if @pn.exist?
-      Zlib::GzipWriter.open(@pn.to_s) do |gz|
-        gz.puts @output
+    def save_file content
+      parent.mkpath unless parent.exist?
+      unlink if exist?
+      Zlib::GzipWriter.open(to_s) do |gz|
+        gz.puts content
       end
     end
 
     def read_file
-      Zlib::GzipReader.open(@pn.to_s) do |gz|
-        @output = gz.readlines
+      Array.new.tap do |content|
+        Zlib::GzipReader.open(to_s) do |gz|
+          content.concat gz.readlines
+        end
       end
-      @output
     end
+  end
 
+  class CacheFile
+    include Logue::Loggable
+
+    attr_reader :output
+    attr_reader :pathname
+    
+    def initialize cache_dir, args
+      @args = args
+      basename = args.join('-').gsub('/', '_slash_') + '.gz'
+      fullname = Pathname(cache_dir) + basename
+      @pathname = GzipPathname.new fullname
+      @output = nil
+    end
+    
     def readlines
-      if @pn.exist?
-        read_file
+      if @pathname.exist?
+        @output = @pathname.read_file
       else
         cl = CommandLine.new @args
         @output = cl.execute
-        save_file
+        @pathname.save_file @output
         @output
       end
     end
 
     def to_s
-      @pn.to_s
+      @pathname.to_s
     end
   end
 end