pvn 0.0.7 → 0.0.8

data/lib/svnx/action.rb

@@ -0,0 +1,52 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'rubygems'
+require 'riel'
+
+module SVNx
+  # $$$ this cries for a little metaprogramming ... tomorrow
+
+  class Action
+    include Loggable, Comparable    
+    
+    attr_reader :type
+
+    def initialize str
+      @type = case str
+              when 'added', 'A', :added
+                :added
+              when 'deleted', 'D', :deleted
+                :deleted
+              when 'modified', 'M', :modified
+                :modified
+              when 'unversioned', '?', :unversioned
+                :unversioned
+              end
+    end
+
+    def added?
+      @type == :added
+    end
+
+    def deleted?
+      @type == :deleted
+    end
+    
+    def modified?
+      @type == :modified
+    end
+    
+    def unversioned?
+      @type == :unversioned
+    end
+
+    def <=> other
+      @type.to_s <=> other.type.to_s
+    end
+
+    def to_s
+      @type.to_s
+    end
+  end
+end

data/lib/svnx/entries.rb

@@ -38,8 +38,16 @@ module SVNx
     def create_entry xmlelement
     end
 
+    # this doesn't handle negative indices
     def [] idx
-      @entries[idx] ||= create_entry(@elements[idx + 1])
+      if entry = @entries[idx]
+        return entry
+      end
+      if idx < 0 && idx >= size
+        raise "error: index #{idx} is not in range(0 .. #{size})"
+      end
+
+      @entries[idx] = create_entry(@elements[idx + 1])
     end
 
     def each(&blk)

data/lib/svnx/log/command.rb

@@ -5,11 +5,12 @@ require 'rubygems'
 require 'riel'
 require 'system/command/line'
 require 'system/command/caching'
-require 'pvn/svn/environment'
 require 'svnx/command'
 
 module SVNx
-  CACHE_DIR = "/tmp/cache_dir_for_log_command"
+  DEFAULT_CACHE_DIR = '/tmp/svnx'
+
+  TMP_DIR_ENV_VARNAME = 'SVNX_TMP_DIR'
 
   class LogCommandLine < CommandLine
     def initialize args = Array.new
@@ -25,7 +26,7 @@ module SVNx
     end
 
     def cache_dir
-      PVN::Environment.instance.cache_dir
+      ENV[TMP_DIR_ENV_VARNAME] || DEFAULT_CACHE_DIR
     end
   end
 

data/lib/svnx/status/entry.rb

@@ -2,6 +2,7 @@
 # -*- ruby -*-
 
 require 'svnx/entry'
+require 'svnx/action'
 
 module SVNx; module Status; end; end
 
@@ -10,27 +11,43 @@ module SVNx::Status
 
     attr_reader :status
     attr_reader :path
+    attr_reader :status_revision
+    attr_reader :action
+
+    def initialize args = Hash.new
+      super
+      @action = SVNx::Action.new @status
+    end
 
     def set_from_xml xmldoc
       stelmt = xmldoc.elements['status']
       tgt    = stelmt.elements['target']
-
-      set_attr_var tgt, 'path'      
-      @status = if entry = tgt.elements['entry']
-                  wcstatus = entry.elements['wc-status']
-                  wcstatus.attributes['item']
-                else
-                  "unchanged"
-                end
+      
+      set_attr_var tgt, 'path'
+      
+      if entry = tgt.elements['entry']
+        set_from_element entry
+      else
+        @status = "unchanged"
+      end
     end
 
     def set_from_element elmt
       set_attr_var elmt, 'path'
-      @status = if wcstatus = elmt.elements['wc-status']
-                  wcstatus.attributes['item']
-                else
-                  "unchanged"
-                end
+
+      wcstatus = elmt.elements['wc-status']
+      @status = wcstatus.attributes['item']
+      @status_revision = wcstatus.attributes['revision']
+      
+      if commit = wcstatus.elements['commit']
+        @commit_revision = commit.attributes['revision']
+      else
+        @commit_revision = nil
+      end
+    end
+
+    def to_s
+      "path: #{@path}; status: #{@status}"
     end
   end
 end

data/lib/synoption/base_option.rb

@@ -5,6 +5,7 @@ require 'rubygems'
 require 'riel'
 require 'synoption/doc'
 require 'synoption/match'
+require 'synoption/matchers'
 
 module PVN
   class BaseOption
@@ -28,16 +29,10 @@ module PVN
 
       @value = @default = default
 
-      @matchers = Hash.new
-      @matchers[:exact] = OptionExactMatch.new @tag, @name
+      @matchers = Matchers.new @tag, @name, options[:negate], options[:regexp]
 
-      if @negate = options[:negate]
-        @matchers[:negative] = OptionNegativeMatch.new @negate
-      end
-      
-      if @regexp = options[:regexp]
-        @matchers[:regexp] = OptionRegexpMatch.new @regexp
-      end
+      @negate = options[:negate]
+      @regexp = options[:regexp]
       
       if options.include? :as_cmdline_option
         if options[:as_cmdline_option].nil?
@@ -71,27 +66,15 @@ module PVN
     end
 
     def exact_match? arg
-      @matchers[:exact].match? arg
+      @matchers.exact.match? arg
     end
 
     def negative_match? arg
-      @matchers[:negative] and @matchers[:negative].match? arg
+      @matchers.negative and @matchers.negative.match? arg
     end
 
     def regexp_match? arg
-      @matchers[:regexp] and @matchers[:regexp].match? arg
-    end
-
-    def match arg
-      return nil unless arg
-      
-      @matchers.each do |type, matcher|
-        if matcher.match? arg
-          return [ type, matcher ]
-        end
-      end
-
-      nil
+      @matchers.regexp and @matchers.regexp.match? arg
     end
 
     def unset
@@ -117,16 +100,16 @@ module PVN
     end
 
     def process args
-      if @matchers[:exact].match? args[0]
+      if @matchers.exact.match? args[0]
         args.shift
         val = takes_value? ? next_argument(args) : true
         set_value val
         true
-      elsif @matchers[:negative] && @matchers[:negative].match?(args[0])
+      elsif @matchers.negative && @matchers.negative.match?(args[0])
         arg = args.shift
         set_value false
         true
-      elsif @matchers[:regexp] && (md = @matchers[:regexp].match?(args[0]))
+      elsif @matchers.regexp && (md = @matchers.regexp.match?(args[0]))
         arg = args.shift
         set_value md[0]
         true

data/lib/synoption/matchers.rb

@@ -0,0 +1,22 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'rubygems'
+require 'riel'
+require 'synoption/match'
+
+module PVN
+  class Matchers
+    include Loggable
+
+    attr_reader :exact
+    attr_reader :negative
+    attr_reader :regexp
+
+    def initialize tag, name, negate, regexp
+      @exact = OptionExactMatch.new tag, name
+      @negative = negate && OptionNegativeMatch.new(negate)
+      @regexp = regexp && OptionRegexpMatch.new(regexp)
+    end
+  end
+end

data/lib/system/command/cachefile.rb

@@ -2,33 +2,47 @@
 # -*- ruby -*-
 
 require 'system/command/line'
+require 'zlib'
 
 module System
   class CacheFile
     include Loggable
+
+    attr_reader :output
     
     def initialize cache_dir, args
-      # pwd = Pathname.pwd.split_path.join('')
-      # info "pwd: #{pwd}"
+      info "cache_dir: #{cache_dir}"
       @args = args
-      @pn = Pathname.new(cache_dir) + args.join('-').gsub('/', '\/')
-      info "pn: #{@pn}".yellow
+      @pn = Pathname.new(cache_dir) + (args.join('-').gsub('/', '_slash_') + '.gz')
+      info "pn: #{@pn}"
+      @output = nil
+    end
+
+    def save_file
+      @pn.parent.mkpath unless @pn.parent.exist?
+      @pn.unlink if @pn.exist?
+      info "saving output to cache file: #{@pn}"
+      Zlib::GzipWriter.open(@pn.to_s) do |gz|
+        gz.puts @output
+      end
+    end
+
+    def read_file
+      info "reading from cache file: #{@pn}"
+      Zlib::GzipReader.open(@pn.to_s) do |gz|
+        @output = gz.readlines
+      end
+      @output
     end
 
     def readlines
       if @pn.exist?
-        info "reading from cache file: #{@pn}".cyan
-        @pn.readlines
+        read_file
       else
         cl = CommandLine.new @args
-        output = cl.execute
-
-        @pn.parent.mkpath
-        info "saving output to cache file: #{@pn}"
-        File.put_via_temp_file @pn.to_s do
-          output
-        end
-        output
+        @output = cl.execute
+        save_file
+        @output
       end
     end
 

data/lib/system/command.rb

@@ -3,7 +3,7 @@
 
 require 'system/cmdexec'
 require 'synoption/optionable'
-require 'pvn/subcommands/revision/revision_option'
+require 'pvn/revision/revision_option'
 
 module PVN
   class Command

data/test/integration/pvn/diff/command_test.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'tc'
+require 'pvn/diff/command'
+require 'resources'
+require 'stringio'
+
+Log.level = Log::DEBUG
+
+module PVN::Diff
+  class CommandTest < PVN::TestCase
+
+    # the tests previously herewith have been moved to local and repository
+    # differ tests.
+
+    def test_nothing
+    end
+  end
+end

data/test/integration/pvn/diff/local_differ_test.rb

@@ -0,0 +1,72 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'pvn/diff/local_differ'
+require 'integration/pvn/diff/differ_tc'
+
+Log.level = Log::DEBUG
+
+module PVN::Diff
+  class LocalDifferTestCase < DifferTestCase
+
+    def create_differ opts
+      LocalDiffer.new opts
+    end
+
+    def get_explines comparing_whitespace
+      explines = Array.new
+
+      explines << "Index: FirstFile.txt"
+      explines << "==================================================================="
+      explines << "--- FirstFile.txt	(revision 22)"
+      explines << "+++ FirstFile.txt	(working copy)"
+      explines << "@@ -1,3 +1,4 @@"
+      explines << " this is the second line of the first file."
+
+      if comparing_whitespace
+        explines << "-third line here."
+        explines << "+    third line here."
+      else
+        explines << " third line here."
+      end
+
+      explines << " fourth line this is."
+      explines << "+this is the fifth line."
+      explines << "Index: SeventhFile.txt"
+      explines << "==================================================================="
+      explines << "--- SeventhFile.txt	(revision 0)"
+      explines << "+++ SeventhFile.txt	(revision 0)"
+      explines << "@@ -0,0 +1 @@"
+      explines << "+this is the 7th file."
+      explines << "Index: dirzero/SixthFile.txt"
+      explines << "==================================================================="
+      explines << "--- dirzero/SixthFile.txt	(revision 22)"
+      explines << "+++ dirzero/SixthFile.txt	(working copy)"
+      explines << "@@ -1,2 +0,0 @@"
+      explines << "-line one."
+      explines << "-line two."
+      explines << "Index: src/ruby/dog.rb"
+      explines << "==================================================================="
+      explines << "--- src/ruby/dog.rb	(revision 0)"
+      explines << "+++ src/ruby/dog.rb	(revision 0)"
+      explines << "@@ -0,0 +1,7 @@"
+      explines << "+#!/usr/bin/ruby -w"
+      explines << "+# -*- ruby -*-"
+      explines << "+"
+      explines << "+require 'rubygems'"
+      explines << "+require 'riel'"
+      explines << "+"
+      explines << "+puts \"hello, world\""
+
+      explines
+    end
+    
+    def test_default
+      assert_diff_command %w{ }, get_explines(true)
+    end
+    
+    def test_no_whitespace
+      assert_diff_command %w{ -w }, get_explines(false)
+    end
+  end
+end

data/test/integration/pvn/diff/log_paths_test.rb

@@ -0,0 +1,28 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'integration/pvn/diff/differ_tc'
+require 'pvn/diff/log_paths'
+require 'pvn/revision/range'
+
+module PVN::Diff
+  class LogPathsTestCase < PVN::IntegrationTestCase
+    def assert_log_path exp_name, exp_nrevisions, expurl, logpaths, idx
+      logpath = logpaths[idx]
+      msg = "element[#{idx}]"
+      assert_equal exp_name, logpath.name, msg
+      assert_equal exp_nrevisions, logpath.path_revisions.size, msg
+    end
+      
+    def test_revision_to_revision
+      revision = PVN::Revision::Range.new '15', '16'
+      paths = %w{ . }
+      logpaths = LogPaths.new revision, paths
+      assert_equal 3, logpaths.size
+      
+      assert_log_path "/SecondFile.txt",      1, nil, logpaths, 0
+      assert_log_path "/src/java/Bravo.java", 1, nil, logpaths, 1
+      assert_log_path "/src/java/Alpha.java", 1, nil, logpaths, 2
+    end
+  end
+end

data/test/integration/pvn/diff/repository_differ_test.rb

@@ -0,0 +1,127 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'pvn/diff/repository_differ'
+require 'integration/pvn/diff/differ_tc'
+
+module PVN::Diff
+  class RepositoryDifferTestCase < DifferTestCase
+
+    def create_differ opts
+      RepositoryDiffer.new opts
+    end
+    
+    def test_adds
+      explines = Array.new
+
+      explines << "Index: src/java/Alpha.java"
+      explines << "==================================================================="
+      explines << "--- src/java/Alpha.java	(revision 0)"
+      explines << "+++ src/java/Alpha.java	(revision 16)"
+      explines << "@@ -0,0 +1,6 @@"
+      explines << "+package org.incava.pvntest;"
+      explines << "+"
+      explines << "+public class Alpha {"
+      explines << "+    public Alpha() {"
+      explines << "+    }"
+      explines << "+}"
+      explines << "Index: src/java/Bravo.java"
+      explines << "==================================================================="
+      explines << "--- src/java/Bravo.java	(revision 0)"
+      explines << "+++ src/java/Bravo.java	(revision 16)"
+      explines << "@@ -0,0 +1,10 @@"
+      explines << "+/**"
+      explines << "+ * This describes this interface."
+      explines << "+ */"
+      explines << "+interface Bravo "
+      explines << "+{"
+      explines << "+	/**"
+      explines << "+	 * This describes this method."
+      explines << "+	 */"
+      explines << "+	public int size();"
+      explines << "+}"
+
+      assert_diff_command %w{ -r15:16 }, explines
+    end
+
+    def test_one_add_one_delete
+      explines = Array.new
+
+      explines << "Index: FifthFile.txt"
+      explines << "==================================================================="
+      explines << "--- FifthFile.txt	(revision 0)"
+      explines << "+++ FifthFile.txt	(revision 7)"
+      explines << "@@ -0,0 +1 @@"
+      explines << "+uno"
+      explines << "Index: SecondFile.txt"
+      explines << "==================================================================="
+      explines << "--- SecondFile.txt	(revision 6)"
+      explines << "+++ SecondFile.txt	(revision 7)"
+      explines << "@@ -1,4 +0,0 @@"
+      explines << "-line one of file two."
+      explines << "-# file two, line two"
+      explines << "-# line three"
+      explines << "-line four"
+
+      assert_diff_command %w{ -r6:7 }, explines
+    end
+
+    def test_only_changes
+      explines = Array.new
+
+      explines << "Index: FirstFile.txt"
+      explines << "==================================================================="
+      explines << "--- FirstFile.txt	(revision 2)"
+      explines << "+++ FirstFile.txt	(revision 3)"
+      explines << "@@ -1,2 +1,3 @@"
+      explines << " This is the first line of the first file in the testbed."
+      explines << " This is the second line of the first file."
+      explines << "+Third line here."
+      explines << "Index: SecondFile.txt"
+      explines << "==================================================================="
+      explines << "--- SecondFile.txt	(revision 2)"
+      explines << "+++ SecondFile.txt	(revision 3)"
+      explines << "@@ -1,2 +1,3 @@"
+      explines << " line one of file two."
+      explines << "+file two, line two"
+      explines << " "
+      
+      assert_diff_command %w{ -r2:3 }, explines
+    end
+
+    def test_multiple_changes
+      explines = Array.new
+
+      explines << "Index: FirstFile.txt"
+      explines << "==================================================================="
+      explines << "--- FirstFile.txt	(revision 1)"
+      explines << "+++ FirstFile.txt	(revision 4)"
+      explines << "@@ -1 +1,3 @@"
+      explines << " This is the first line of the first file in the testbed."
+      explines << "+This is the second line of the first file."
+      explines << "+Third line here."
+      explines << "Index: SecondFile.txt"
+      explines << "==================================================================="
+      explines << "--- SecondFile.txt	(revision 0)"
+      explines << "+++ SecondFile.txt	(revision 4)"
+      explines << "@@ -0,0 +1,3 @@"
+      explines << "+line one of file two."
+      explines << "+# file two, line two"
+      explines << "+line three"
+      explines << "Index: ThirdFile.tar.gz"
+      explines << "==================================================================="
+      explines << "Binary files ThirdFile.tar.gz	(revision 0) and ThirdFile.tar.gz	(revision 4) differ"
+
+      assert_diff_command %w{ -r1:4 }, explines
+    end
+
+    # still broken
+    def xxxtest_revision_against_working_copy
+      explines = Array.new
+      
+      # -r20 means -r20:working_copy
+
+      assert_diff_command %w{ -r20 src/ruby/charlie.rb }, explines
+    end
+  end
+end

data/test/integration/pvn/diff/status_paths_test.rb

@@ -0,0 +1,31 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'pvn/diff/status_paths'
+require 'pvn/revision/range'
+require 'pp'
+
+module PVN::Diff
+  class StatusPathsTestCase < PVN::IntegrationTestCase
+    def assert_status_path exp_name, exp_nrevisions, exp_url, statuspaths, idx
+      statuspath = statuspaths[idx]
+      msg = "element[#{idx}]"
+      assert_equal exp_name, statuspath.name, msg
+      assert_equal exp_nrevisions, statuspath.path_revisions.size, msg
+    end
+      
+    def test_to_working_copy
+      # revision doesn't matter:
+      revision = PVN::Revision::Range.new '20'
+      paths = %w{ . }
+      statuspaths = StatusPaths.new revision, paths
+      pp statuspaths
+      assert_equal 4, statuspaths.size
+      
+      assert_status_path "/FirstFile.txt",         1, nil, statuspaths, 0
+      assert_status_path "/src/ruby/dog.rb",       1, nil, statuspaths, 1
+      assert_status_path "/SeventhFile.txt",       1, nil, statuspaths, 2
+      assert_status_path "/dirzero/SixthFile.txt", 1, nil, statuspaths, 3
+    end
+  end
+end

data/test/integration/pvn/log/command_test.rb

@@ -0,0 +1,29 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'integration/tc'
+require 'pvn/log/command'
+
+module PVN; module App; module Log; end; end; end
+
+module PVN::App::Log
+  class CommandTest < PVN::IntegrationTestCase
+    
+    def test_path
+      PVN::Log::Command.new [ PT_DIRNAME ]
+    end
+    
+    def test_invalid_path
+      assert_raises(RuntimeError) do
+        PVN::Log::Command.new %w{ /this/doesnt/exist }
+      end
+    end
+
+    def test_user
+      # filter_for_user
+      # fetch_log_in_pieces (-n LIMIT, LIMIT * 2, LIMIT * 4, LIMIT * 8 ... )
+      # PVN::Log::Command.new [ PT_DIRNAME ]
+    end
+
+  end
+end

data/test/integration/pvn/pct/command_test.rb

@@ -0,0 +1,30 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'integration/tc'
+require 'pvn/pct/command'
+
+Log.level = Log::DEBUG
+
+module PVN::Pct
+  class CommandTest < PVN::IntegrationTestCase
+
+    def test_working_copy
+      explines = Array.new
+
+      explines << "       3        4        1     33.3% FirstFile.txt"
+      explines << "       3        4        1     33.3% total"
+      
+      assert_command_output PVN::Pct::Command, %w{ }, explines
+    end
+
+    def test_revision_to_working_copy
+      explines = Array.new
+      
+      explines << "       3        5        2     66.7% SecondFile.txt"
+      explines << "       3        5        2     66.7% total"
+      
+      assert_command_output PVN::Pct::Command, %w{ -r20 }, explines
+    end
+  end
+end