pvn 0.0.5 → 0.0.6

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

@@ -0,0 +1,103 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'pvn/io/element'
+require 'svnx/cat/command'
+require 'pvn/subcommands/pct/diffcount'
+require 'pvn/subcommands/pct/differ'
+
+module PVN::Subcommands::Pct
+  class LocalDiffer < Differ
+    def get_diff_counts path, options
+      elmt = PVN::IO::Element.new :local => path
+      modified = elmt.find_modified_files
+
+      total = PVN::DiffCount.new
+
+      modified = modified.sort_by { |n| n.path }
+
+      diff_counts = Array.new
+
+      modified.each do |entry|
+        info "entry.path: #{entry.path}"
+        catcmd      = SVNx::CatCommand.new entry.path
+        svn_count   = catcmd.execute.size
+        local_count = Pathname.new(entry.path).readlines.size
+        
+        dc = PVN::DiffCount.new svn_count, local_count, entry.path
+        diff_counts << dc
+      end
+
+      diff_counts
+    end
+  end
+
+  class RepositoryDiffer < Differ
+    ### $$$ this belongs in Revision
+    def get_from_to_revisions rev
+      if rev.kind_of? Array
+        if rev.size == 1
+          if md = Regexp.new('(.+):(.+)').match(rev[0])
+            return [ md[1], md[2] ]
+          else
+            return [ (rev[0].to_i - 1).to_s, rev[0] ]
+          end
+        else
+          return [ rev[0], rev[1] ]
+        end
+      else
+        info "rev: #{rev}".bold.white.on_red
+      end
+    end
+
+    def get_line_count path, revision
+      info "path: #{path}".yellow
+      cmdargs = SVNx::CatCommandArgs.new :path => path, :revision => revision
+      catcmd = SVNx::CatCommand.new cmdargs
+      catcmd.execute.size
+    end
+    
+    def get_diff_counts path, options
+      diff_counts = Array.new
+
+      revision = options.revision
+      
+      elmt = PVN::IO::Element.new :local => path
+      modified = elmt.find_modified_entries revision
+
+      modnames = modified.collect { |m| m.name }.sort.uniq
+
+      fromrev, torev = get_from_to_revisions revision
+
+      reporoot = elmt.repo_root
+
+      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
+        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
+
+        name = mod.dup
+        name.slice! filterre
+
+        dc = PVN::DiffCount.new from_count, to_count, name
+        diff_counts << dc
+      end
+
+      diff_counts
+    end
+  end
+end

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

@@ -8,9 +8,5 @@ module PVN::Subcommands::Pct
   class OptionSet < PVN::Subcommands::Base::OptionSet
     has_option :revision, PVN::MultipleRevisionsRegexpOption
     has_option :help,     PVN::Subcommands::Base::HelpOption
-    
-    def paths
-      unprocessed
-    end
   end
 end

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

@@ -0,0 +1,78 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'pvn/io/element'
+require 'svnx/cat/command'
+require 'pvn/subcommands/pct/diffcount'
+require 'pvn/subcommands/pct/differ'
+
+module PVN::Subcommands::Pct
+  class RepositoryDiffer < Differ
+    ### $$$ this belongs in Revision
+    def get_from_to_revisions rev
+      if rev.kind_of? Array
+        if rev.size == 1
+          if md = Regexp.new('(.+):(.+)').match(rev[0])
+            return [ md[1], md[2] ]
+          else
+            return [ (rev[0].to_i - 1).to_s, rev[0] ]
+          end
+        else
+          return [ rev[0], rev[1] ]
+        end
+      else
+        info "rev: #{rev}".bold.white.on_red
+      end
+    end
+
+    def get_line_count path, revision
+      info "path: #{path}".yellow
+      cmdargs = SVNx::CatCommandArgs.new :path => path, :revision => revision
+      catcmd = SVNx::CatCommand.new cmdargs
+      catcmd.execute.size
+    end
+    
+    def get_diff_counts path, options
+      diff_counts = Array.new
+
+      revision = options.revision
+      
+      elmt = PVN::IO::Element.new :local => path
+      modified = elmt.find_modified_entries revision
+
+      modnames = modified.collect { |m| m.name }.sort.uniq
+
+      fromrev, torev = get_from_to_revisions revision
+
+      reporoot = elmt.repo_root
+
+      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
+        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
+
+        name = mod.dup
+        name.slice! filterre
+
+        dc = PVN::DiffCount.new from_count, to_count, name
+        diff_counts << dc
+      end
+
+      diff_counts
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'riel'
+require 'rubygems'
+require 'synoption/option'
+require 'svnx/log/command'
+require 'pvn/revision/entry'
+
+module PVN
+  class BaseRevisionOption < Option
+    REVISION_DESCRIPTION = [ "revision to apply.",
+                             "ARG can be relative, of the form:",
+                             "    +N : N revisions from the BASE",
+                             "    -N : N revisions from the HEAD,",
+                             "         when -1 is the previous revision" ,
+                           ]
+    
+    def head?
+      value.nil? || value == 'HEAD'
+    end
+
+    def resolve_value optset, unprocessed
+      val = value
+      if PVN::Revision::RELATIVE_REVISION_RE.match val
+        @value = relative_to_absolute val, unprocessed[0]
+      end
+    end
+
+    def relative_to_absolute rel, path
+      limit = rel[0, 1] == '-' ? rel.to_i.abs : nil
+      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
+end

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

@@ -1,14 +1,10 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'riel'
-require 'rubygems'
-require 'synoption/option'
-require 'svnx/log/command'
-require 'pvn/revision/entry'
+require 'pvn/subcommands/revision/base_option'
 
 module PVN
-  class RevisionOption < Option
+  class RevisionOption < BaseRevisionOption
     attr_accessor :fromdate
     attr_accessor :todate
 
@@ -18,8 +14,6 @@ module PVN
                              "    -N : N revisions from the HEAD,",
                              "         when -1 is the previous revision" ,
                            ]
-
-    POS_NEG_NUMERIC_RE = Regexp.new('^[\-\+]\d+$')
     
     def initialize revargs = Hash.new
       @fromdate = nil
@@ -48,34 +42,5 @@ module PVN
         super
       end
     end
-
-    def head?
-      value.nil? || value == 'HEAD'
-    end
-
-    def resolve_value optset, unprocessed
-      val = value
-      if POS_NEG_NUMERIC_RE.match val
-        @value = relative_to_absolute val, unprocessed[0]
-      end
-    end
-
-    def relative_to_absolute rel, path
-      limit = rel[0, 1] == '-' ? rel.to_i.abs : nil
-      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
 end

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

@@ -24,18 +24,23 @@ module PVN::Subcommands::Status
     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
+    def init options
+      paths = options.paths
 
-      # do we support multiple paths?
-      path = options.paths[0] || '.'
+      paths = %w{ . } if paths.empty?
 
-      elmt = PVN::IO::Element.new :local => path || '.'
-      entries = elmt.find_files_by_status
+      allentries = Array.new
 
-      entries = entries.sort_by { |n| n.path }
+      # we sort only the sub-entries, so the order in which paths were specified is preserved
 
-      fmtr = PVN::Status::EntriesFormatter.new options.color, entries
+      paths.each do |path|
+        elmt = PVN::IO::Element.new :local => path
+        entries = elmt.find_files_by_status
+
+        allentries.concat entries.sort_by { |n| n.path }
+      end
+
+      fmtr = PVN::Status::EntriesFormatter.new options.color, allentries
       puts fmtr.format
     end
   end

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

@@ -8,9 +8,5 @@ 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/cat/command.rb

@@ -5,6 +5,8 @@ require 'svnx/command'
 
 module SVNx
   class CatCommandLine < CommandLine
+    # this can be either an Array (for which to_a returns itself), or
+    # a CommandArgs, which also has to_a.
     def initialize args = Array.new
       super "cat", args.to_a
     end

data/lib/svnx/info/entry.rb

@@ -11,12 +11,14 @@ module SVNx::Info
     attr_reader :root
     attr_reader :kind
     attr_reader :path
+    attr_reader :revision
 
     def set_from_xml xmldoc
       entry = xmldoc.elements['info/entry']
 
       set_attr_var entry, 'kind'
       set_attr_var entry, 'path'
+      set_attr_var entry, 'revision'
       set_elmt_var entry, 'url'
 
       repo = entry.elements['repository']
@@ -26,6 +28,7 @@ module SVNx::Info
     def set_from_element elmt
       set_attr_var elmt, 'kind'
       set_attr_var elmt, 'path'
+      set_attr_var elmt, 'revision'
       set_elmt_var elmt, 'url'
       
       repo = elmt.elements['repository']

data/lib/synoption/exception.rb

@@ -0,0 +1,12 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'rubygems'
+require 'riel'
+
+module PVN
+  class OptionException < RuntimeError
+    include Loggable
+
+  end
+end

data/lib/synoption/set.rb

@@ -4,6 +4,7 @@
 require 'rubygems'
 require 'riel'
 require 'synoption/option'
+require 'synoption/exception'
 
 module PVN
   class OptionSet
@@ -80,9 +81,18 @@ module PVN
       options_processed = Array.new
 
       @unprocessed = args
+
+      aborted = false
       
       while !@unprocessed.empty?
+        if @unprocessed[0] == '--'
+          @unprocessed.delete_at 0
+          aborted = true
+          break
+        end
+
         processed = false
+
         options.each do |opt|
           if opt.process @unprocessed
             processed = true
@@ -93,6 +103,22 @@ module PVN
         break unless processed
       end
 
+      unless aborted
+        check_for_valid_options 
+      end
+
+      post_process_all options_processed
+    end
+
+    def check_for_valid_options 
+      @unprocessed.each do |opt|
+        if opt.start_with? '-'
+          raise OptionException.new "error: option: #{opt} invalid for #{name}"
+        end
+      end
+    end
+
+    def post_process_all options_processed
       options_processed.each do |opt|
         opt.post_process self, @unprocessed
       end

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

@@ -0,0 +1,153 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'tc'
+require 'pvn/subcommands/diff/command'
+require 'resources'
+require 'stringio'
+
+module PVN::Subcommands::Diff
+  class CommandTest < PVN::TestCase
+
+    def assert_arrays_equal expected, actual
+      (0 ... [ expected.size, actual.size ].max).each do |idx|
+        assert_equal expected[idx], actual[idx]
+      end
+    end
+
+    def assert_diff_command args, explines
+      orig_dir = Dir.pwd
+      
+      Dir.chdir '/Programs/wiquery/trunk'
+
+      strio = StringIO.new
+
+      $io = strio
+
+      dc = Command.new args
+      info "dc: #{dc}".yellow
+      
+      strio.close
+      # puts strio.string
+
+      actlines = strio.string.split("\n")
+
+      assert_arrays_equal explines, actlines
+
+      $io = $stdout
+      Dir.chdir orig_dir
+    end
+    
+    def test_local_to_head
+      explines = Array.new
+
+      explines << "Index: AddedFile.txt"
+      explines << "==================================================================="
+      explines << "--- AddedFile.txt	(revision 0)"
+      explines << "+++ AddedFile.txt	(revision 0)"
+      explines << "@@ -0,0 +1,17 @@"
+      explines << "+THE KNIGHT'S TALE"
+      explines << "+WHILOM, as olde stories tellen us,"
+      explines << "+There was a duke that highte Theseus. was called"
+      explines << "+Of Athens he was lord and governor,"
+      explines << "+And in his time such a conqueror"
+      explines << "+That greater was there none under the sun."
+      explines << "+Full many a riche country had he won."
+      explines << "+What with his wisdom and his chivalry,"
+      explines << "+He conquer'd all the regne of Feminie,"
+      explines << "+That whilom was y-cleped Scythia;"
+      explines << "+And weddede the Queen Hippolyta"
+      explines << "+And brought her home with him to his country"
+      explines << "+With muchel glory and great solemnity,"
+      explines << "+And eke her younge sister Emily,"
+      explines << "+And thus with vict'ry and with melody"
+      explines << "+Let I this worthy Duke to Athens ride,"
+      explines << "+And all his host, in armes him beside."
+      explines << "Index: LICENSE"
+      explines << "==================================================================="
+      explines << "--- LICENSE	(revision 1950)"
+      explines << "+++ LICENSE	(working copy)"
+      explines << "@@ -1,19 +0,0 @@"
+      explines << "-Copyright (c) 2009 WiQuery team"
+      explines << "-"
+      explines << "-Permission is hereby granted, free of charge, to any person obtaining a copy"
+      explines << "-of this software and associated documentation files (the \"Software\"), to deal"
+      explines << "-in the Software without restriction, including without limitation the rights"
+      explines << "-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell"
+      explines << "-copies of the Software, and to permit persons to whom the Software is"
+      explines << "-furnished to do so, subject to the following conditions:"
+      explines << "-"
+      explines << "-The above copyright notice and this permission notice shall be included in"
+      explines << "-all copies or substantial portions of the Software."
+      explines << "-"
+      explines << "-THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR"
+      explines << "-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,"
+      explines << "-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE"
+      explines << "-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER"
+      explines << "-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,"
+      explines << "-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN"
+      explines << "-THE SOFTWARE."
+      # because we're reading the lines, then puts-ing them, each line gets a "\n"
+      # explines << ""
+      explines << "Index: pom.xml"
+      explines << "==================================================================="
+      explines << "--- pom.xml	(revision 1950)"
+      explines << "+++ pom.xml	(working copy)"
+      explines << "@@ -7,7 +7,7 @@"
+      explines << " 	<packaging>pom</packaging>"
+      explines << " 	<version>1.5-SNAPSHOT</version>"
+      explines << " 	<name>WiQuery Parent</name>"
+      explines << "-"
+      explines << "+        <!-- inserted comment -->"
+      explines << " 	<scm>"
+      explines << " 		<developerConnection>scm:svn:https://wiquery.googlecode.com/svn/branches/wicket-1.5</developerConnection>"
+      explines << " 	</scm>"
+      explines << "Index: wiquery-core/src/main/java/org/odlabs/wiquery/core/effects/EffectBehavior.java"
+      explines << "==================================================================="
+      explines << "--- wiquery-core/src/main/java/org/odlabs/wiquery/core/effects/EffectBehavior.java	(revision 1950)"
+      explines << "+++ wiquery-core/src/main/java/org/odlabs/wiquery/core/effects/EffectBehavior.java	(working copy)"
+      explines << "@@ -38,7 +38,6 @@"
+      explines << "  */"
+      explines << " public class EffectBehavior extends WiQueryAbstractBehavior"
+      explines << " {"
+      explines << "-"
+      explines << " 	private static final long serialVersionUID = 3597955113451275208L;"
+      explines << " "
+      explines << " 	/**"
+      explines << "@@ -49,17 +48,19 @@"
+      explines << " 	/**"
+      explines << " 	 * Builds a new instance of {@link EffectBehavior}."
+      explines << " 	 */"
+      explines << "-	public EffectBehavior(Effect effect)"
+      explines << "-	{"
+      explines << "-		super();"
+      explines << "+	public EffectBehavior(Effect effect) {"
+      explines << " 		this.effect = effect;"
+      explines << " 	}"
+      explines << " "
+      explines << "+    public void newMethod() {"
+      explines << "+        // a new method"
+      explines << "+    }"
+      explines << "+"
+      explines << " 	@Override"
+      explines << " 	public JsStatement statement()"
+      explines << " 	{"
+      explines << "-		JsQuery query = new JsQuery(getComponent());"
+      explines << "-		query.$().chain(this.effect);"
+      explines << "-		return query.getStatement();"
+      explines << "+		JsQuery queryx = new JsQuery(getComponent());"
+      explines << "+		queryx.$().chain(this.effect);"
+      explines << "+		return queryx.getStatement();"
+      explines << " 	}"
+      explines << " }"
+
+      assert_diff_command %w{ }, explines
+    end
+
+    def test_remote
+      explines = Array.new
+
+      assert_diff_command %w{ -r923:926 }, explines
+    end
+  end
+end

data/test/integration/svnx/log/test.rb

@@ -29,7 +29,7 @@ module SVNx::Log
       
       lc.execute
       output = lc.output
-      info "output: #{output}"
+      # info "output: #{output}"
       
       expdata = '1947', 'reiern70', '2011-11-14T12:24:45.757124Z', 'added a convenience method to set the range'
       expdata << { :kind => 'file', :action => 'M', :name => '/trunk/wiquery-jquery-ui/src/test/java/org/odlabs/wiquery/ui/slider/SliderTestCase.java' }

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

@@ -106,18 +106,5 @@ module PVN::Revision
     def xxxtest_range_svn_word_to_number
       assert_revision_entry 'BASE:1', 'BASE:1'
     end
-
-    # def test_end
-    #   class File
-    #     def initialize args
-    #       rev = args[:revision]
-    #       reventry = Revision.new name, rev
-    #       @revision = reventry.number
-    #     end
-    #   end
-
-    #   dir = PVN::IO::File :name => "pom.xml", :revision => "-3"
-    #   assert_equal 190, dir.revision
-    # end
   end
 end

data/test/unit/svnx/info/entries_test.rb

@@ -8,15 +8,15 @@ module SVNx::Info
   class EntriesTestCase < SVNx::Info::TestCase
     
     def test_create_from_xml
-      entries = Entries.new :xmllines => get_test_lines_two_entries
+      entries = Entries.new :xmllines => Resources::WIQTR_INFO_POM_XML_ADDED_FILE_TXT.readlines
       info "entries: #{entries}"
 
       assert_equal 2, entries.size
 
       exproot = 'file:///home/jpace/Programs/Subversion/Repositories/wiquery'
 
-      assert_entry_equals entries[0], :path => 'pom.xml',   :kind => 'file', :url => exproot + '/trunk/pom.xml',   :root => exproot
-      assert_entry_equals entries[1], :path => 'Orig.java', :kind => 'file', :url => exproot + '/trunk/Orig.java', :root => exproot
+      assert_entry_equals entries[0], :path => 'pom.xml',   :kind => 'file', :url => exproot + '/trunk/pom.xml',   :root => exproot, :revision => '1950'
+      assert_entry_equals entries[1], :path => 'AddedFile.txt', :kind => 'file', :url => exproot + '/trunk/AddedFile.txt', :root => exproot, :revision => '0'
     end
   end
 end

data/test/unit/svnx/info/entry_test.rb

@@ -8,13 +8,14 @@ module SVNx::Info
   class EntryTestCase < SVNx::Info::TestCase
     include Loggable
     def test_entry_from_xml
-      xmllines = get_test_lines_one_entry
+      xmllines = Resources::WIQTR_INFO_WIQUERY_CORE_POM_XML.readlines
       
       expdata = {
         :url  => 'file:///home/jpace/Programs/Subversion/Repositories/wiquery/trunk/wiquery-core/pom.xml',
         :kind => 'file',
         :path => 'wiquery-core/pom.xml',
-        :root => 'file:///home/jpace/Programs/Subversion/Repositories/wiquery'
+        :root => 'file:///home/jpace/Programs/Subversion/Repositories/wiquery',
+        :revision => '1950'
       }
 
       entry = Entry.new :xmllines => xmllines

data/test/unit/svnx/status/entries_test.rb

@@ -11,7 +11,7 @@ module SVNx::Status
       entries = Entries.new :xmllines => get_test_lines_all
 
       assert_equal 4, entries.size
-      assert_status_entry_equals 'added',   'Orig.java', entries[0]
+      assert_status_entry_equals 'added',   'AddedFile.txt', entries[0]
       assert_status_entry_equals 'deleted', 'LICENSE', entries[1]
       assert_status_entry_equals 'modified', 'pom.xml', entries[2]
       assert_status_entry_equals 'modified', 'wiquery-core/src/main/java/org/odlabs/wiquery/core/effects/EffectBehavior.java', entries[3]