pvn 0.0.4 → 0.0.5

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

@@ -3,9 +3,23 @@
 
 require 'tc'
 require 'pvn/subcommands/revision/revision_regexp_option'
+require 'pvn/subcommands/revision/tc'
+require 'resources'
 
 module PVN
-  class RevisionRegexpOptionTest < PVN::TestCase
+  class MockRevisionRegexpOption < RevisionRegexpOption
+    include MockBaseRevisionOption
+  end
+
+  class RevisionRegexpOptionTest < BaseRevisionOptionTestCase
+    def create_option
+      PVN::MockRevisionRegexpOption.new
+    end
+
+    def set_value opt, val
+      opt.set_value val
+    end
+
     def assert_tag_match str
       assert_match RevisionRegexpOption::TAG_RE, str
     end
@@ -25,21 +39,9 @@ module PVN
       assert_tag_no_match '123'
       assert_tag_no_match '-x'
     end
-
+    
     def test_out_of_range
-      assert_raises(RuntimeError) do 
-        ropt = PVN::RevisionRegexpOption.new
-        ropt.process [ '-164' ]
-        ropt.post_process nil, [ '/Programs/wiquery/trunk' ]
-      end
-    end
-
-    def assert_post_process exp, val, path = '/Programs/wiquery/trunk'
-      ropt = PVN::RevisionRegexpOption.new
-      ropt.set_value val
-      ropt.post_process nil, [ path ]
-      act = ropt.value
-      assert_equal exp, act, "val: #{val}; path: #{path}"
+      assert_revision_option_raises '-164'
     end
 
     def test_post_process_middling

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pvn
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Jeff Pace
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-04 00:00:00 -04:00
+date: 2012-09-09 00:00:00 -04:00
 default_executable: pvn
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,7 +34,7 @@ dependencies:
         version: 1.1.6
   type: :runtime
   version_requirements: *id001
-description: A set of extensions to the Subversion command line.
+description: A set of extensions to the Subversion command line, inspired by Git and Perforce.
 email: jeugenepace@gmail.com
 executables: 
 - pvn
@@ -74,12 +74,16 @@ files:
 - lib/svnx/log/command.rb
 - lib/svnx/log/entries.rb
 - lib/svnx/log/entry.rb
+- lib/pvn/subcommands/status/options.rb
+- lib/pvn/subcommands/status/command.rb
 - lib/pvn/subcommands/base/options.rb
+- lib/pvn/subcommands/base/color_option.rb
 - lib/pvn/subcommands/base/clargs.rb
 - lib/pvn/subcommands/base/command.rb
 - lib/pvn/subcommands/base/doc.rb
 - lib/pvn/subcommands/pct/options.rb
 - lib/pvn/subcommands/pct/clargs.rb
+- lib/pvn/subcommands/pct/diffcount.rb
 - lib/pvn/subcommands/pct/command.rb
 - lib/pvn/subcommands/log/options.rb
 - lib/pvn/subcommands/log/command.rb
@@ -90,7 +94,11 @@ files:
 - lib/pvn/config.rb
 - lib/pvn/cmddoc.rb
 - lib/pvn/revision.rb
+- lib/pvn/status/formatter/entry_formatter.rb
+- lib/pvn/status/formatter/status_formatter.rb
+- lib/pvn/status/formatter/entries_formatter.rb
 - lib/pvn/base/textlines.rb
+- lib/pvn/base/color_formatter.rb
 - lib/pvn/base/util.rb
 - lib/pvn/diff/diffcmd.rb
 - lib/pvn/diff/diffopts.rb
@@ -99,9 +107,6 @@ files:
 - lib/pvn/io/fselement.rb
 - lib/pvn/wherecmd.rb
 - lib/pvn/app.rb
-- lib/pvn/pct/statcmd.rb
-- lib/pvn/pct/linecount.rb
-- lib/pvn/pct/pctcmd.rb
 - lib/pvn/doc.rb
 - lib/pvn/log/logentry.rb
 - lib/pvn/log/logcmd.rb
@@ -109,7 +114,6 @@ files:
 - lib/pvn/log/logoptions.rb
 - lib/pvn/log/formatter/entry_formatter.rb
 - lib/pvn/log/formatter/summary_formatter.rb
-- lib/pvn/log/formatter/color_formatter.rb
 - lib/pvn/log/formatter/entries_formatter.rb
 - lib/pvn/log/formatter/message_formatter.rb
 - lib/pvn/log/formatter/log_formatter.rb
@@ -136,7 +140,6 @@ files:
 - test/unit/svnx/log/entry_test.rb
 - test/unit/svnx/log/cmargs_test.rb
 - test/unit/pvn/subcommands/log/options_test.rb
-- test/unit/pvn/subcommands/log/command_test.rb
 - test/unit/pvn/subcommands/revision/multiple_revisions_option_test.rb
 - test/unit/pvn/subcommands/revision/revision_regexp_option_test.rb
 - test/unit/pvn/subcommands/revision/revision_option_test.rb
@@ -145,6 +148,7 @@ files:
 - test/unit/pvn/app_test.rb
 - test/unit/pvn/revision/entry_test.rb
 - test/integration/svnx/log/test.rb
+- test/integration/pvn/subcommands/log/command_test.rb
 - README.markdown
 has_rdoc: true
 homepage: http://www.incava.org/projects/pvn
@@ -195,7 +199,6 @@ test_files:
 - test/unit/svnx/log/entry_test.rb
 - test/unit/svnx/log/cmargs_test.rb
 - test/unit/pvn/subcommands/log/options_test.rb
-- test/unit/pvn/subcommands/log/command_test.rb
 - test/unit/pvn/subcommands/revision/multiple_revisions_option_test.rb
 - test/unit/pvn/subcommands/revision/revision_regexp_option_test.rb
 - test/unit/pvn/subcommands/revision/revision_option_test.rb
@@ -204,3 +207,4 @@ test_files:
 - test/unit/pvn/app_test.rb
 - test/unit/pvn/revision/entry_test.rb
 - test/integration/svnx/log/test.rb
+- test/integration/pvn/subcommands/log/command_test.rb

data/lib/pvn/pct/linecount.rb

@@ -1,33 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-module PVN
-  class LineCount
-    attr_accessor :to
-    attr_accessor :from
-    attr_accessor :name
-
-    def initialize args = Hash.new
-      @name = args[:name] || ""
-      @to   = args[:to]   || 0
-      @from = args[:from] || 0
-    end
-
-    def +(other)
-      # the new wc has the name of the lhs of the add:
-      self.class.new :to => @to + other.to, :from => @from + other.from, :name => @name
-    end
-
-    def diff
-      @to - @from
-    end
-
-    def diffpct
-      @from.zero? ? "0" : 100.0 * diff / @from
-    end
-
-    def write
-      printf "%8d %8d %8d %8.1f%% %s\n", @from, @to, diff, diffpct, @name
-    end
-  end
-end

data/lib/pvn/pct/pctcmd.rb

@@ -1,204 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'system/command'
-require 'pvn/pct/linecount'
-require 'pvn/io/fselement'
-require 'pvn/svn/svnelement'
-require 'pvn/svn/svnroot'
-require 'pvn/io/element'
-
-module PVN
-  class PctOptionSet < OptionSet
-    attr_accessor :revision
-    
-    def initialize
-      super
-      @revision = add RevisionRegexpOption.new
-    end
-  end
-
-  class PctCommand < Command
-    DEFAULT_LIMIT = 5
-    COMMAND = "pct"
-
-    self.doc do |doc|
-      doc.subcommands = [ COMMAND ]
-      doc.description = "Print the comparison of size of locally-changed files."
-      doc.usage       = "[OPTIONS] FILE..."
-      doc.summary     = [ "Prints the changes in the size (length) of files that have ",
-                          "been changed locally, to show the extent to which they have",
-                          "increased or decreased. The columns are:",
-                          " - length in svn repository",
-                          " - length in local version",
-                          " - difference",
-                          " - percentage change",
-                          " - file name",
-                          "When more than one file is specified, the total is displayed",
-                          "as the last line." ]
-      doc.examples   << [ "pvn pct main.c", "Prints the number of lines and percentage by which main.c has changed." ]
-    end
-
-    def initialize args
-      # not calling super, since all of our stuff goes on in this ctor.
-
-      info "args: #{args}"
-
-      @options = PctOptionSet.new
-
-      @options.process self, args, args[:command_args]
-      info "args: #{args}"
-
-      files = get_files @options.arguments
-      info "files: #{files.inspect}"
-
-      rev = @options.revision.value
-      info "rev: #{rev}"
-      
-      @output = Array.new
-
-      totallc = LineCount.new :name => "total"
-
-      files.sort.each do |file|
-        info "file: #{file}"
-
-        fromlc, tolc = if rev
-                         [ file.svn.line_count(rev - 1), file.svn.line_count(rev) ]
-                       else
-                         [ file.svn.line_count(rev), file.local.line_count ]
-                       end
-
-        info "fromlc: #{fromlc}"
-        info "tolc: #{tolc}"
-        
-        filelc = LineCount.new :from => fromlc, :to => tolc, :name => file.local.name
-        filelc.write
-
-        totallc += filelc
-        info "totallc: #{totallc.inspect}"
-      end
-
-      if files.size > 1
-        totallc.write
-      end
-    end
-
-    def to_command subcmd, *args
-      cmd = "svn #{subcmd}"
-      info "cmd: #{cmd}"
-      info "args: #{args}"
-      args = args.flatten
-
-      revcl = @options.revision.to_command_line
-      if revcl
-        cmd << " " << revcl.join(" ")
-      end
-      cmd << " " << Util::quote_list(args)
-      info "cmd: #{cmd}".on_blue
-      cmd
-    end
-
-    def get_changed_files filespec
-      rev = @options.revision.value
-      info "rev: #{rev}"
-      
-      if rev
-        get_changed_files_revision filespec
-      else
-        get_changed_files_wc filespec
-      end
-    end
-
-    def svn_fullname_to_local_file svnname
-      svnelement = SVNElement.new :name => '.'
-      info "svnelement.info: #{svnelement.info}"
-
-      fullurl = svnelement.info[:repository_root] + svnname
-      info "fullurl        : #{fullurl}".yellow
-
-      svnroot = SVNRootElement.new
-      info "svnroot        : #{svnroot}".yellow
-
-      info "svnroot.info   : #{svnroot.info}".yellow
-
-      here = SVNElement.new :name => '.'
-
-      hereinfo    = here.info
-      info "hereinfo[:url] : #{hereinfo[:url]}".yellow
-      reporoot    = hereinfo[:repository_root]
-
-      info "reporoot       : #{reporoot}".yellow
-
-      info "svnroot[:url]  : #{svnroot.info[:url]}".yellow
-
-      rootpath = svnroot.name
-      rooturl  = svnroot.info[:url]
-
-      info "rootpath       : #{rootpath}".yellow
-      info "rooturl        : #{rooturl}".yellow
-
-      if fullurl.index(rooturl) == 0
-        localname = fullurl[rooturl.length .. -1]
-        info "localname      : #{localname}".yellow
-        localname
-      else
-        info "fullurl        : #{fullurl}".on_red
-        nil
-      end
-
-    end
-
-    def get_changed_files_revision filespec
-      lc = LogCommand.new :revision => @options.revision.value, :verbose => true
-      info "lc: #{lc}"
-      entry = lc.entries[0]
-      return Array.new if entry.nil?
-
-      # entry.write true
-
-      files = entry.files.collect do |svnfile|
-        localfile = svn_fullname_to_local_file svnfile
-        Element.new :file => localfile
-      end
-      info "files: #{files}".yellow
-      files
-    end
-
-    def get_changed_files_wc filespec
-      files = Array.new
-      cmd = to_command "st", filespec
-      IO.popen cmd do |io|
-        io.each do |line|
-          info "line: #{line}".yellow
-          next if line.index %r{^\?}
-          pn = Element.new :file => line.chomp[8 .. -1]
-          files << pn if pn.local.file?
-        end
-      end
-      info "files: #{files}".red
-      files
-    end
-    
-    def get_files fileargs
-      info "fileargs: #{fileargs}".yellow
-
-      files = Array.new
-      if fileargs.empty?
-        files = get_changed_files fileargs
-      else
-        fileargs.collect do |fn|
-          elmt = Element.new :file => fn
-          if elmt.local.directory?
-            files.concat get_changed_files(fn)
-          else
-            files << elmt
-          end
-        end
-      end
-
-      info "files: #{files}".yellow
-
-      files
-    end
-  end
-end

data/lib/pvn/pct/statcmd.rb

@@ -1,13 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-module PVN
-  class StatOptionSet < OptionSet
-    attr_accessor :revision
-    
-    def initialize
-      super
-      @revision = add RevisionRegexpOption.new
-    end
-  end
-end