pvn 0.0.4 → 0.0.5

data/lib/pvn/subcommands/pct/command.rb

@@ -7,31 +7,10 @@ require 'pvn/subcommands/base/command'
 require 'svnx/info/command'
 require 'svnx/status/command'
 require 'svnx/cat/command'
+require 'pvn/subcommands/pct/diffcount'
 require 'set'
 
 module PVN::Subcommands::Pct
-  class DiffCount
-    attr_reader :from
-    attr_reader :to
-
-    def initialize from = 0, to = 0
-      @from = from
-      @to = to
-    end
-
-    def print name
-      diff = to - from
-      diffpct = diff == 0 ? 0 : 100.0 * diff / from
-      
-      printf "%8d %8d %8d %8.1f%% %s\n", from, to, diff, diffpct, name
-    end
-
-    def << diff
-      @from += diff.from
-      @to += diff.to
-    end
-  end
-
   class Command < PVN::Subcommands::Base::Command
 
     DEFAULT_LIMIT = 15
@@ -59,27 +38,57 @@ module PVN::Subcommands::Pct
     example "pvn pct -r117",        "Prints the changes between revision 117 and the previous revision. (not yet supported)"
     example "pvn pct -7",           "Prints the changes between relative revision -7 and the previous revision. (not yet supported)"
     example "pvn pct -r31 -4",      "Prints the changes between revision 31 and relative revision -4. (not yet supported)"
-    
-    def initialize args
-      options = PVN::Subcommands::Pct::OptionSet.new 
-      options.process args
 
-      return show_help if options.help 
+    class << self
+      # base command aliases new to init, so we're aliasing init to init2
+      alias_method :init2, :init
+
+      def init options
+        if options.revision && !options.revision.empty?
+          CommandRepository.init2 options
+        else
+          CommandLocal.init2 options
+        end
+      end
+    end
 
-      info "options: #{options}"
+    def initialize options = nil
+    end
+  end
 
-      path    = options.paths[0] || "."
-      cmdargs = Hash.new
+  class CommandLocal < Command
+    def initialize options
+      # do we support multiple paths?
+      path = options.paths[0] || '.'
 
-      cmdargs[:path] = path
+      elmt = PVN::IO::Element.new :local => path || '.'
+      modified = elmt.find_modified_files
+      info "modified: #{modified}".blue
 
-      if options.revision && !options.revision.empty?
-        compare_by_revisions options
-      else
-        compare_local_to_base options
+      total = PVN::DiffCount.new
+
+      modified = modified.sort_by { |n| n.path }
+
+      modified.each do |entry|
+        catcmd = SVNx::CatCommand.new entry.path
+        info "catcmd: #{catcmd}"
+          
+        svn_count = catcmd.execute.size
+        info "svn_count: #{svn_count}"
+        
+        local_count = Pathname.new(entry.path).readlines.size
+        info "local_count: #{local_count}"
+
+        dc = PVN::DiffCount.new svn_count, local_count
+        total << dc
+        dc.print entry.path
       end
+
+      total.print 'total'
     end
+  end
 
+  class CommandRepository < Command
     ### $$$ this belongs in Revision
     def get_from_to_revisions rev
       if rev.kind_of? Array
@@ -97,89 +106,60 @@ module PVN::Subcommands::Pct
       end
     end
 
-    def compare_by_revisions options
+    def get_line_count path, revision
+      cmdargs = SVNx::CatCommandArgs.new :path => path, :revision => revision
+      catcmd = SVNx::CatCommand.new cmdargs
+      catcmd.execute.size
+    end
+    
+    def initialize options
       # what was modified between the revisions?
 
       path = options.paths[0] || "."
+      info "path: #{path}"
 
       elmt = PVN::IO::Element.new :local => path || '.'
       modified = elmt.find_modified_entries options.revision
 
-      modnames = modified.collect { |m| m.name }
-
-      info "modnames: #{modnames.inspect}".yellow
-
-      rev = options.revision
-
-      info "rev: #{rev}; #{rev.class}".blue.on_yellow
-      info "rev: #{rev.inspect}; #{rev.class}".blue.on_yellow
+      modnames = modified.collect { |m| m.name }.sort.uniq
 
       fromrev, torev = get_from_to_revisions options.revision
 
-      info "fromrev: #{fromrev}; torev: #{torev}".black.on_green
-      info "fromrev: #{fromrev.class}; torev: #{torev.class}".black.on_green
-
-      total = DiffCount.new
+      total = PVN::DiffCount.new
 
       reporoot = elmt.repo_root
 
-      modnames.each do |mod|
-        info "mod: #{mod}"
+      direlmt = PVN::IO::Element.new :local => '.'
+      svninfo = direlmt.get_info
 
+      filter = svninfo.url.dup
+      filter.slice! svninfo.root
+      info "filter: #{filter}"
+      filterre = Regexp.new '^' + filter + '/'
+      
+      modnames.each do |mod|
         fullpath = reporoot + mod
-        
-        from_count = get_line_count fullpath, fromrev
-        info "from_count: #{from_count}".red
+        elmt = PVN::IO::Element.new :path => fullpath
+
+        next unless elmt.has_revision? fromrev
+        next unless elmt.has_revision? torev
+        next if elmt.get_info.kind == 'dir'
 
+        from_count = get_line_count fullpath, fromrev
         to_count = get_line_count fullpath, torev
-        info "to_count: #{to_count}".red
 
-        dc = DiffCount.new from_count, to_count
+        dc = PVN::DiffCount.new from_count, to_count
         total << dc
+        mod.slice! filterre
         dc.print mod
       end
 
       total.print 'total'
     end
 
-    def get_line_count path, revision
-      cmdargs = SVNx::CatCommandArgs.new :path => path, :revision => revision
-      catcmd = SVNx::CatCommand.new cmdargs
-      info "catcmd: #{catcmd}"
-      
-      count = catcmd.execute.size
-      info "count: #{count}"
-
-      count
-    end
-
-    def compare_local_to_base options
-      # do we support multiple paths?
-      path = options.paths[0] || '.'
-
-      elmt = PVN::IO::Element.new :local => path || '.'
-      modified = elmt.find_modified_files
-
-      total = DiffCount.new    
 
-      modified.each do |entry|
-        catcmd = SVNx::CatCommand.new entry.path
-        info "catcmd: #{catcmd}"
-          
-        svn_count = catcmd.execute.size
-        info "svn_count: #{svn_count}"
-        
-        local_count = Pathname.new(entry.path).readlines.size
-        info "local_count: #{local_count}"
-
-        dc = DiffCount.new svn_count, local_count
-        total << dc
-        dc.print entry.path
-      end
-
-      total.print 'total'
-    end
   end
+
 end
 
 __END__

data/lib/pvn/subcommands/pct/diffcount.rb

@@ -0,0 +1,26 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+module PVN
+  class DiffCount
+    attr_reader :from
+    attr_reader :to
+
+    def initialize from = 0, to = 0
+      @from = from
+      @to = to
+    end
+
+    def print name
+      diff = to - from
+      diffpct = diff == 0 ? 0 : 100.0 * diff / from
+      
+      printf "%8d %8d %8d %8.1f%% %s\n", from, to, diff, diffpct, name
+    end
+
+    def << diff
+      @from += diff.from
+      @to += diff.to
+    end
+  end
+end

data/lib/pvn/subcommands/revision/revision_option.rb

@@ -62,17 +62,19 @@ module PVN
 
     def relative_to_absolute rel, path
       limit = rel[0, 1] == '-' ? rel.to_i.abs : nil
-      
-      cmdargs = SVNx::LogCommandArgs.new :limit => limit, :path => path, :use_cache => false
-      
-      cmd = SVNx::LogCommand.new cmdargs
-      xmllines = cmd.execute
+      xmllines = run_log_command limit, path
 
       reventry = PVN::Revision::Entry.new :value => rel, :xmllines => xmllines
       revval   = reventry.value.to_s
       revval
     end
 
+    def run_log_command limit, path
+      cmdargs = SVNx::LogCommandArgs.new :limit => limit, :path => path, :use_cache => false
+      cmd = SVNx::LogCommand.new cmdargs
+      cmd.execute
+    end
+
     def entry
     end
   end

data/lib/pvn/subcommands/status/command.rb

@@ -0,0 +1,42 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'pvn/io/element'
+require 'pvn/subcommands/base/command'
+require 'pvn/subcommands/status/options'
+require 'pvn/status/formatter/entries_formatter'
+
+module PVN::Subcommands::Status
+  class Command < PVN::Subcommands::Base::Command
+
+    DEFAULT_LIMIT = 15
+
+    subcommands [ "status" ]
+    description "Prints the status for locally changed files."
+    usage       "[OPTIONS] FILE..."
+    summary     [ "Prints the status for the given files, with colorized",
+                  "output, and names sorted."
+                ]
+
+    optscls
+
+    example "pvn status foo.rb",      "Prints the status of foo.rb."
+    example "pvn status",             "Prints the status for locally changed files."
+    example "pvn status --no-color",  "Prints the status, uncolorized, for locally changed files."
+    
+    def initialize options = nil
+      return unless options
+
+      # do we support multiple paths?
+      path = options.paths[0] || '.'
+
+      elmt = PVN::IO::Element.new :local => path || '.'
+      entries = elmt.find_files_by_status
+
+      entries = entries.sort_by { |n| n.path }
+
+      fmtr = PVN::Status::EntriesFormatter.new options.color, entries
+      puts fmtr.format
+    end
+  end
+end

data/lib/pvn/subcommands/status/options.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'pvn/subcommands/base/options'
+require 'pvn/subcommands/base/color_option'
+
+module PVN::Subcommands::Status
+  class OptionSet < PVN::Subcommands::Base::OptionSet
+    has_option :color,    PVN::Subcommands::Base::ColorOption
+    has_option :help,     PVN::Subcommands::Base::HelpOption
+    
+    def paths
+      unprocessed
+    end
+  end
+end

data/lib/svnx/info/command.rb

@@ -11,8 +11,22 @@ module SVNx
   end
 
   class InfoCommandArgs < CommandArgs
+    attr_reader :revision
+
+    def initialize args = Hash.new
+      @revision = args[:revision]
+      super
+    end
+
     def to_a
       ary = Array.new
+
+      if @revision
+        @revision.each do |rev|
+          ary << "-r#{rev}"
+        end
+      end
+
       if @path
         ary << @path
       end

data/lib/svnx/log/entry.rb

@@ -31,6 +31,10 @@ module SVNx::Log
     def message
       @msg
     end
+
+    def to_s
+      [ @revision, @author, @date, @msg, @paths ].collect { |x| x.to_s }.join " "
+    end
   end
 
   class LogEntryPath

data/lib/synoption/fixnum_option.rb

@@ -7,7 +7,7 @@ module PVN
   # An option that has a fixnum (integer) as its value.
   class FixnumOption < Option
     def set_value val
-      super val.to_i
+      super(val && val.to_i)
     end
   end
 end

data/test/unit/pvn/io/element/log/log_test.rb

@@ -4,6 +4,7 @@
 require 'pvn/log/tc'
 require 'svnx/log/entries'
 require 'pvn/io/element'
+require 'resources'
 
 module PVN::IO::IOElement
   class LogTestCase ###$$$ < PVN::Log::TestCase
@@ -25,11 +26,11 @@ module PVN::IO::IOElement
     end
     
     def test_options_none
-      assert_log_command 163, '/Programs/wiquery/trunk'
+      assert_log_command 163, Resources::WIQTR_PATH
     end
     
     def test_option_limit
-      assert_log_command 15, '/Programs/wiquery/trunk', :limit => 15
+      assert_log_command 15, Resources::WIQTR_PATH, :limit => 15
     end
   end
 end

data/test/unit/pvn/log/formatter/entry_formatter_test.rb

@@ -12,7 +12,7 @@ module PVN; module Log; end; end
 
 module PVN::Log
   class EntryFormatTestCase < PVN::TestCase
-    TEST_LINES = Resources.instance.test_lines '/Programs/wiquery/trunk', "svn", "log", "-l", "15", "-v", "--xml"
+    TEST_LINES = Resources::WIQTR_LOG_L_15_V.readlines
     ENTRIES = SVNx::Log::Entries.new :xmllines => TEST_LINES
 
     def show_all entries, from_head, from_tail

data/test/unit/pvn/revision/entry_test.rb

@@ -10,7 +10,7 @@ require 'resources'
 module PVN::Revision
   class TestCase < PVN::TestCase
     def setup
-      @xmllines = Resources.instance.test_lines '/Programs/wiquery/trunk', "svn", "log", "--xml", "pom.xml"
+      @xmllines = Resources::WIQTR_LOG_POM_XML.readlines
     end
 
     def assert_revision_entry exp_value, value
@@ -18,6 +18,12 @@ module PVN::Revision
       assert_equal exp_value, rev.value
     end
 
+    def assert_revision_entry_raises value
+      assert_raises(PVN::Revision::RevisionError) do 
+        assert_revision_entry nil, value
+      end
+    end
+
     def test_absolute_midrange
       assert_revision_entry 733, 733
     end
@@ -62,9 +68,7 @@ module PVN::Revision
     end
 
     def test_negative_too_far_back
-      assert_raises(RuntimeError) do 
-        assert_revision_entry nil, -35
-      end
+      assert_revision_entry_raises -35
     end
 
     def test_negative_most_recent_as_string
@@ -80,9 +84,7 @@ module PVN::Revision
     end
 
     def test_negative_too_far_back_as_string
-      assert_raises(RuntimeError) do 
-        assert_revision_entry nil, '-35'
-      end
+      assert_revision_entry_raises '-35'
     end
 
     def test_positive_most_recent
@@ -98,9 +100,7 @@ module PVN::Revision
     end
 
     def test_positive_too_far_forward
-      assert_raises(RuntimeError) do 
-        assert_revision_entry nil, '+35'
-      end
+      assert_revision_entry_raises '+35'
     end
 
     def xxxtest_range_svn_word_to_number

data/test/unit/pvn/subcommands/log/options_test.rb

@@ -3,6 +3,7 @@
 
 require 'tc'
 require 'pvn/subcommands/log/options'
+require 'resources'
 
 module PVN; module App; module Log; end; end; end
 
@@ -19,6 +20,14 @@ module PVN::App::Log
       assert_equal exppaths, options.paths
     end
 
+    def run_revision_test arg, *rev
+      expdata = Hash.new
+      expdata[:limit] = nil
+      expdata[:revision] = rev
+      expdata[:path] = Resources::WIQTR_PATH
+      assert_options expdata, [ arg, Resources::WIQTR_PATH ].flatten
+    end
+
     def test_default
       expdata = Hash.new
       expdata[:limit] = 5
@@ -43,43 +52,15 @@ module PVN::App::Log
     end          
 
     def test_revision_single
-      expdata = Hash.new
-      expdata[:limit] = nil
-      expdata[:revision] = [ '500' ]
-      expdata[:path] = '/Programs/wiquery/trunk'
-      assert_options expdata, %w{ -r500 /Programs/wiquery/trunk }
+      run_revision_test '-r500', '500' 
     end
 
     def test_revision_multi
-      expdata = Hash.new
-      expdata[:limit] = nil
-      expdata[:revision] = [ '500:600' ]
-      expdata[:path] = '/Programs/wiquery/trunk'
-      assert_options expdata, %w{ -r500:600 /Programs/wiquery/trunk }
-    end
-
-    def test_revision_relative
-      expdata = Hash.new
-      expdata[:limit] = nil
-      expdata[:revision] = [ '1944' ]
-      expdata[:path] = '/Programs/wiquery/trunk'
-      assert_options expdata, %w{ -5 /Programs/wiquery/trunk }
+      run_revision_test '-r500:600', '500:600'
     end
 
     def test_revisions_single
-      expdata = Hash.new
-      expdata[:limit] = nil
-      expdata[:revision] = [ '1', '3' ]
-      expdata[:path] = '/Programs/wiquery/trunk'
-      assert_options expdata, %w{ -r1 -r3 /Programs/wiquery/trunk }
-    end
-
-    def test_revisions_relative
-      expdata = Hash.new
-      expdata[:limit] = nil
-      expdata[:revision] = [ '1944', '1848' ]
-      expdata[:path] = '/Programs/wiquery/trunk'
-      assert_options expdata, %w{ -5 -10 /Programs/wiquery/trunk }
+      run_revision_test %w{ -r1 -r3 }, '1', '3'
     end
   end
 end

data/test/unit/pvn/subcommands/revision/multiple_revisions_option_test.rb

@@ -3,25 +3,26 @@
 
 require 'tc'
 require 'pvn/subcommands/revision/multiple_revisions_option'
+require 'pvn/subcommands/revision/tc'
 
 module PVN
-  class MultipleRevisionsRegexpOptionTestCase < PVN::TestCase
-    def test_out_of_range
-      assert_raises(RuntimeError) do 
-        ropt = PVN::MultipleRevisionsRegexpOption.new
-        ropt.process [ '-164' ]
-        ropt.post_process nil, [ '/Programs/wiquery/trunk' ]
-      end
+  class MockMultipleRevisionsRegexpOption < MultipleRevisionsRegexpOption
+    include MockBaseRevisionOption
+  end
+
+  class MultipleRevisionsRegexpOptionTestCase < BaseRevisionOptionTestCase
+    def create_option
+      PVN::MockMultipleRevisionsRegexpOption.new
     end
 
-    def assert_post_process exp, vals, path = '/Programs/wiquery/trunk'
-      ropt = PVN::MultipleRevisionsRegexpOption.new
+    def set_value opt, vals
       vals.each do |val|
-        ropt.set_value val
+        opt.set_value val
       end
-      ropt.post_process nil, [ path ]
-      act = ropt.value
-      assert_equal exp, act, "vals: #{vals}; path: #{path}"
+    end
+
+    def test_out_of_range
+      assert_revision_option_raises '-164'
     end
 
     def test_post_process_single_middling
@@ -52,14 +53,6 @@ module PVN
       assert_post_process [ '1944', '7' ], [ '-5', '-r7' ]
     end
 
-    def assert_process exp, args, path = '/Programs/wiquery/trunk'
-      ropt = PVN::MultipleRevisionsRegexpOption.new
-      ropt.process args
-      ropt.post_process nil, [ path ]
-      act = ropt.value
-      assert_equal exp, act, "args: #{args}; path: #{path}"
-    end
-
     def test_process_tag_value
       assert_process %w{ 317 }, %w{ -r 317 }
     end

data/test/unit/pvn/subcommands/revision/revision_option_test.rb

@@ -3,12 +3,27 @@
 
 require 'tc'
 require 'pvn/subcommands/revision/revision_option'
+require 'pvn/subcommands/revision/tc'
+require 'resources'
 
 module PVN
-  class RevisionOptionTestCase < PVN::TestCase
-    def assert_relative_to_absolute exp, val, path = '/Programs/wiquery/trunk'
-      ropt = PVN::RevisionOption.new
-      act = ropt.relative_to_absolute val, path
+  class MockRevisionOption < RevisionOption
+    include MockBaseRevisionOption
+  end
+
+  class RevisionOptionTestCase < BaseRevisionOptionTestCase
+    def create_option
+      PVN::MockRevisionOption.new
+    end
+
+    def set_value opt, val
+      opt.set_value val
+    end
+
+    def assert_relative_to_absolute exp, val
+      ropt = MockRevisionOption.new
+      act = ropt.relative_to_absolute val, Resources::WIQTR_PATH
+      info "act: #{act}".cyan
       assert_equal exp, act, "val: #{val}; path: #{val}"
     end
 
@@ -25,19 +40,11 @@ module PVN
     end
 
     def test_out_of_range
-      assert_raises(RuntimeError) do 
+      assert_raises(PVN::Revision::RevisionError) do 
         assert_relative_to_absolute '1944', '-164'
       end
     end
 
-    def assert_post_process exp, val, path = '/Programs/wiquery/trunk'
-      ropt = PVN::RevisionOption.new
-      ropt.set_value val
-      ropt.post_process nil, [ path ]
-      act = ropt.value
-      assert_equal exp, act, "val: #{val}; path: #{path}"
-    end
-
     def test_post_process_absolute_middling
       assert_post_process '1887', '1887'
     end