pvn 0.0.8 → 0.0.9

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

@@ -2,13 +2,13 @@
 # -*- ruby -*-
 
 require 'pvn/diff/repository_differ'
-require 'integration/pvn/diff/differ_tc'
+require 'integration/pvn/diff/tc'
 
 module PVN::Diff
-  class RepositoryDifferTestCase < DifferTestCase
+  class RepositoryDifferTestCase < TestCase
 
-    def create_differ opts
-      RepositoryDiffer.new opts
+    def assert_diff_command args, explines
+      super RepositoryDiffer, args, explines
     end
     
     def test_adds
@@ -114,14 +114,5 @@ module PVN::Diff
 
       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

@@ -7,11 +7,11 @@ require 'pp'
 
 module PVN::Diff
   class StatusPathsTestCase < PVN::IntegrationTestCase
-    def assert_status_path exp_name, exp_nrevisions, exp_url, statuspaths, idx
+    def assert_status_path exp_name, exp_nchanges, 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
+      assert_equal exp_name,     statuspath.name,         msg
+      assert_equal exp_nchanges, statuspath.changes.size, msg
     end
       
     def test_to_working_copy
@@ -22,10 +22,10 @@ module PVN::Diff
       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
+      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/pct/local_differ_test.rb

@@ -0,0 +1,21 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'rubygems'
+require 'riel'
+require 'integration/pvn/pct/tc'
+require 'pvn/pct/local_differ'
+require 'pvn/pct/options'
+
+module PVN::Pct
+  class LocalDifferTest < TestCase
+    def test_working_copy
+      explines = Array.new
+
+      explines << "       3        4        1     33.3% FirstFile.txt"
+      explines << "       3        4        1     33.3% total"
+
+      assert_diff_command LocalDiffer, %w{ }, explines
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'rubygems'
+require 'riel'
+require 'integration/pvn/pct/tc'
+require 'pvn/pct/repository_differ'
+
+module PVN::Pct
+  class RepositoryDifferTest < TestCase
+    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_diff_command RepositoryDiffer, %w{ -r20 }, explines
+    end
+
+    def test_revision_to_revision
+      explines = Array.new
+
+      explines << "       3        7        4    133.3% SecondFile.txt"
+      explines << "       7        8        1     14.3% src/ruby/charlie.rb"
+      explines << "      10       15        5     50.0% total"
+      
+      assert_diff_command RepositoryDiffer, %w{ -r19:22 }, explines
+    end
+
+    def test_revision_to_relative_revision
+      explines = Array.new
+
+      explines << "       3        7        4    133.3% SecondFile.txt"
+      explines << "       7        8        1     14.3% src/ruby/charlie.rb"
+      explines << "      10       15        5     50.0% total"
+      
+      assert_diff_command RepositoryDiffer, %w{ -r19 -1 }, explines
+    end
+  end
+end

data/test/unit/pvn/diff/change_test.rb

@@ -0,0 +1,43 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'tc'
+require 'pvn/diff/change'
+
+module PVN::Diff
+  class ChangeTestCase < PVN::TestCase
+    def create_change revision, action
+      Change.new revision, action
+    end
+
+    def assert_change_revision exprevision, revision
+      prev = create_change revision, "added"
+      assert_equal exprevision, prev.revision
+    end
+
+    def assert_change_action expaction, action
+      prev = create_change "0", action
+      assert_equal expaction, prev.action
+    end
+
+    def test_init_revision_string
+      assert_change_revision "0", "0"
+    end
+
+    def test_init_revision_integer
+      assert_change_revision "0", 0
+    end
+
+    def test_init_action_long_string
+      assert_change_action SVNx::Action.new(:added), "added"
+    end
+
+    def test_init_action_short_string
+      assert_change_action SVNx::Action.new(:deleted), "D"
+    end
+
+    def test_init_action_symbol
+      assert_change_action SVNx::Action.new(:modified), :modified
+    end
+  end
+end

data/test/unit/pvn/diff/path_test.rb

@@ -28,11 +28,11 @@ module PVN::Diff
       assert_path_url "file:///var/svn/repo", "file:///var/svn/repo"
     end
 
-    def test_add_revision
+    def test_add_change
       path = create_path "File.txt", "0", :added, "file:///var/svn/repo"
-      assert_equal 1, path.path_revisions.size
-      path.add_revision "1", :modified
-      assert_equal 2, path.path_revisions.size
+      assert_equal 1, path.changes.size
+      path.add_change "1", :modified
+      assert_equal 2, path.changes.size
     end
   end
 end

data/test/unit/svnx/action_test.rb

@@ -8,60 +8,31 @@ module SVNx
   class ActionTestCase < PVN::TestCase
     include Loggable
 
-    def assert_action_added exp, str
-      action = Action.new str
-      assert_equal exp, action.added?
-    end
-
-    def assert_action_deleted exp, str
-      action = Action.new str
-      assert_equal exp, action.deleted?
-    end
-
-    def assert_action_modified exp, str
-      action = Action.new str
-      assert_equal exp, action.modified?
-    end
-
-    def assert_action_unversioned exp, str
-      action = Action.new str
-      assert_equal exp, action.unversioned?
-    end
+    def assert_action_equals expadd, expdel, expmod, expunver, *vals
+      vals.each do |val|
+        action = Action.new val
+        msg = "value: #{val}"
+        assert_equal expadd, action.added?, msg
+        assert_equal expdel, action.deleted?, msg
+        assert_equal expmod, action.modified?, msg
+        assert_equal expunver, action.unversioned?, msg
+      end
+    end    
     
     def test_added
-      [ 'added', 'A' ].each do |str|
-        assert_action_added       true,  str
-        assert_action_deleted     false, str
-        assert_action_modified    false, str
-        assert_action_unversioned false, str
-      end
+      assert_action_equals true, false, false, false, 'added', 'A'
     end
     
     def test_deleted
-      [ 'deleted', 'D' ].each do |str|
-        assert_action_added       false, str
-        assert_action_deleted     true,  str
-        assert_action_modified    false, str
-        assert_action_unversioned false, str
-      end
+      assert_action_equals false, true, false, false, 'deleted', 'D'
     end
     
     def test_modified
-      [ 'modified', 'M' ].each do |str|
-        assert_action_added       false, str
-        assert_action_deleted     false,  str
-        assert_action_modified    true,  str
-        assert_action_unversioned false, str
-      end
+      assert_action_equals false, false, true, false, 'modified', 'M'
     end    
     
     def test_unversioned
-      [ 'unversioned', '?' ].each do |str|
-        assert_action_added       false, str
-        assert_action_deleted     false, str
-        assert_action_modified    false, str
-        assert_action_unversioned true, str
-      end
+      assert_action_equals false, false, false, true, 'unversioned', '?'
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pvn
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Jeff Pace
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-30 00:00:00 -04:00
+date: 2012-10-19 00:00:00 -04:00
 default_executable: pvn
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,10 +66,6 @@ files:
 - lib/system/command/cachefile.rb
 - lib/system/command/line.rb
 - lib/system/command/caching.rb
-- lib/system/cmdline.rb
-- lib/system/command.rb
-- lib/system/cachecmd.rb
-- lib/system/cmdexec.rb
 - lib/svnx/cat/command.rb
 - lib/svnx/status/command.rb
 - lib/svnx/status/entries.rb
@@ -93,6 +89,9 @@ files:
 - lib/pvn/util/array.rb
 - lib/pvn/util/textlines.rb
 - lib/pvn/util/color_formatter.rb
+- lib/pvn/util/diffcount.rb
+- lib/pvn/seek/options.rb
+- lib/pvn/seek/command.rb
 - lib/pvn/config.rb
 - lib/pvn/cmddoc.rb
 - lib/pvn/status/options.rb
@@ -105,10 +104,13 @@ files:
 - lib/pvn/diff/paths.rb
 - lib/pvn/diff/path.rb
 - lib/pvn/diff/options.rb
+- lib/pvn/diff/changed_paths.rb
+- lib/pvn/diff/local_path.rb
 - lib/pvn/diff/repository_differ.rb
-- lib/pvn/diff/revision.rb
+- lib/pvn/diff/log_path.rb
 - lib/pvn/diff/command.rb
-- lib/pvn/diff/path_revision.rb
+- lib/pvn/diff/change.rb
+- lib/pvn/diff/name.rb
 - lib/pvn/diff/differ.rb
 - lib/pvn/diff/status_paths.rb
 - lib/pvn/io/element.rb
@@ -117,7 +119,6 @@ files:
 - lib/pvn/pct/local_differ.rb
 - lib/pvn/pct/options.rb
 - lib/pvn/pct/repository_differ.rb
-- lib/pvn/pct/diffcount.rb
 - lib/pvn/pct/command.rb
 - lib/pvn/pct/differ.rb
 - lib/pvn/doc.rb
@@ -152,9 +153,8 @@ files:
 - test/unit/svnx/log/entries_test.rb
 - test/unit/svnx/log/entry_test.rb
 - test/unit/svnx/log/cmargs_test.rb
-- test/unit/pvn/diff/revision_test.rb
 - test/unit/pvn/diff/path_test.rb
-- test/unit/pvn/diff/path_revision_test.rb
+- test/unit/pvn/diff/change_test.rb
 - test/unit/pvn/io/element/log/log_test.rb
 - test/unit/pvn/log/options_test.rb
 - test/unit/pvn/log/formatter/entry_formatter_test.rb
@@ -166,11 +166,13 @@ files:
 - test/unit/pvn/revision/revision_option_test.rb
 - test/integration/pvn/status/command_test.rb
 - test/integration/pvn/diff/repository_differ_test.rb
+- test/integration/pvn/diff/changed_paths_test.rb
 - test/integration/pvn/diff/local_differ_test.rb
 - test/integration/pvn/diff/log_paths_test.rb
 - test/integration/pvn/diff/status_paths_test.rb
 - test/integration/pvn/diff/command_test.rb
-- test/integration/pvn/pct/command_test.rb
+- test/integration/pvn/pct/repository_differ_test.rb
+- test/integration/pvn/pct/local_differ_test.rb
 - test/integration/pvn/log/command_test.rb
 - README.markdown
 has_rdoc: true
@@ -223,9 +225,8 @@ test_files:
 - test/unit/svnx/log/entries_test.rb
 - test/unit/svnx/log/entry_test.rb
 - test/unit/svnx/log/cmargs_test.rb
-- test/unit/pvn/diff/revision_test.rb
 - test/unit/pvn/diff/path_test.rb
-- test/unit/pvn/diff/path_revision_test.rb
+- test/unit/pvn/diff/change_test.rb
 - test/unit/pvn/io/element/log/log_test.rb
 - test/unit/pvn/log/options_test.rb
 - test/unit/pvn/log/formatter/entry_formatter_test.rb
@@ -237,9 +238,11 @@ test_files:
 - test/unit/pvn/revision/revision_option_test.rb
 - test/integration/pvn/status/command_test.rb
 - test/integration/pvn/diff/repository_differ_test.rb
+- test/integration/pvn/diff/changed_paths_test.rb
 - test/integration/pvn/diff/local_differ_test.rb
 - test/integration/pvn/diff/log_paths_test.rb
 - test/integration/pvn/diff/status_paths_test.rb
 - test/integration/pvn/diff/command_test.rb
-- test/integration/pvn/pct/command_test.rb
+- test/integration/pvn/pct/repository_differ_test.rb
+- test/integration/pvn/pct/local_differ_test.rb
 - test/integration/pvn/log/command_test.rb

data/lib/pvn/diff/revision.rb

@@ -1,36 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'pvn/revision/range'
-
-module PVN::Diff
-  class RevisionRange < PVN::Revision::Range
-    include Loggable, Comparable
-
-    def initialize change, rev
-      if change
-        super change.to_i - 1, change.to_i
-      elsif rev.kind_of? Array
-        if rev.size == 2
-          # this is some contorting, since -rx:y does not mean comparing the files
-          # in changelist x; it means all the entries from x+1 through y, inclusive.
-
-          super rev[0].to_i, rev[1].to_i
-        else
-          from, to = rev[0].split(':')
-          info "from: #{from}"
-          info "to  : #{to}".cyan
-          super from, to
-        end
-      else
-        raise "revision argument not handled: #{rev}"
-      end
-    end
-
-    def <=> other
-      info "other: #{other}".yellow
-      info "self: #{self}".yellow
-      nil
-    end
-  end
-end

data/lib/system/cachecmd.rb

@@ -1,65 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'system/command'
-
-module PVN
-  class CachableCommand < Command
-    TMP_DIR = ENV['PVN_TMP_DIR'] || '/tmp/pvncache'
-    CACHE_DIR = Pathname.new TMP_DIR
-
-    attr_accessor :lines
-
-    def initialize args = Hash.new
-      debug "args: #{args.inspect}"
-
-      @use_cache = args[:use_cache].nil? ? true : args[:use_cache]
-      info "@use_cache: #{@use_cache}".blue
-
-      super
-    end
-
-    def sysexec cmd
-      info "cmd: #{cmd}".on_red
-      if use_cache?
-        info "cmd: #{cmd}".on_green
-        run_cached_command cmd
-      else
-        @output = ::IO::popen(cmd).readlines
-      end
-    end
-
-    def run args
-      if use_cache?
-        run_cached_command args
-      else
-        super
-      end      
-    end
-
-    def use_cache?
-      @use_cache
-    end
-
-    def get_cache_file cmd
-      pwd = Pathname.pwd.to_s.sub(%r{^/}, '')
-      CACHE_DIR + pwd + cmd.gsub(' ', '')
-    end
-
-    def run_cached_command cmd
-      stack "cmd: #{cmd}".cyan
-      cfile = get_cache_file cmd
-      if cfile.exist?
-        debug "reading from cache file: #{cfile}".cyan
-        @output = cfile.readlines
-      else
-        @output = ::IO::popen(cmd).readlines
-        cfile.parent.mkpath
-        stack "saving output to cache file: #{cfile}".cyan
-        File.put_via_temp_file cfile do
-          output
-        end
-      end
-    end
-  end
-end

data/lib/system/cmdexec.rb

@@ -1,13 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-module PVN
-  class CommandExecutor
-    def initialize
-    end
-
-    def run cmd
-      IO.popen(cmd).readlines
-    end
-  end
-end

data/lib/system/cmdline.rb

@@ -1,70 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-module PVN
-  class CommandLine
-    include Loggable
-
-    attr_reader :output
-    attr_accessor :use_cache
-
-    def initialize use_cache, args = Array.new
-      @args = args.dup
-      @use_cache = use_cache
-    end
-
-    def use_cache?
-      @use_cache
-    end
-
-    def cache_dir
-      nil
-    end
-
-    def << arg
-      @args << arg
-    end
-
-    def execute
-      if use_cache?
-        run_cached_command
-      else
-        @output = ::IO.popen(to_command).readlines
-      end
-    end
-
-    def to_command
-      @args.join ' '
-    end
-
-    def run args
-      if use_cache?
-        run_cached_command
-      else
-        super
-      end      
-    end
-
-    def get_cache_file
-      pwd = Pathname.pwd.split_path.join('')
-      info "pwd: #{pwd}"
-      Pathname.new(cache_dir) + pwd + @args.join('-')
-    end
-
-    def run_cached_command
-      stack "@args: #{@args}".cyan
-      cachefile = get_cache_file
-      if cachefile.exist?
-        debug "reading from cache file: #{cachefile}".cyan
-        @output = cachefile.readlines
-      else
-        @output = IO.popen(to_command).readlines
-        cachefile.parent.mkpath
-        debug "saving output to cache file: #{cachefile}".on_cyan
-        File.put_via_temp_file cachefile do
-          @output
-        end
-      end
-    end
-  end
-end

data/lib/system/command.rb

@@ -1,72 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'system/cmdexec'
-require 'synoption/optionable'
-require 'pvn/revision/revision_option'
-
-module PVN
-  class Command
-    include Optionable
-    include Loggable
-
-    def self.has_revision_option revopts = Hash.new
-      options << RevisionRegexpOption.new(revopts)
-    end
-
-    attr_reader :output
-
-    def initialize args = Hash.new
-      debug "args: #{args}"
-      @execute  = args[:execute].nil? || args[:execute]
-      @executor = args[:executor] || CommandExecutor.new
-      
-      if options
-        options.process self, args, args[:command_args] || Array.new
-      end
-      
-      execute
-    end
-
-    def get_command_line args
-      fullcmdargs = options.to_command_line + options.arguments
-      info "fullcmdargs: #{fullcmdargs}"
-
-      fullcmdargs
-    end
-
-    def execute
-      # see SVNCommand#execute
-      raise "abstract method invoked"
-    end
-
-    def command
-      raise "abstract method invoked"
-    end
-
-    def run args
-      info "self.class: #{self.class}"
-      info "@command  : #{command}"
-      info "@execute  : #{@execute}"
-
-      if @execute
-        info "@executor : #{@executor}"
-        @output = @executor.run command
-      else
-        debug "not executing: #{command}"
-      end
-    end
-
-    def option optname
-      self.class.find_option optname
-    end
-
-    def has_entries?
-      false
-    end
-
-    def options
-      # self.class.options
-    end
-  end
-end

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

@@ -1,30 +0,0 @@
-#!/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