pvn 0.0.7 → 0.0.8

data/lib/pvn/svn/svnelement.rb

@@ -1,89 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'rubygems'
-require 'riel'
-require 'pvn/base/util'
-require 'pvn/svn/svninfo'
-
-module PVN
-  class SVNElement
-    include Loggable
-    attr_reader :name
-
-    require 'pvn/svn/svnroot'
-    
-    def initialize args
-      RIEL::Log.info "args: #{args}"
-
-      # $$$ this should handle local paths and full urls.
-      
-      # technically, name is what svn info calls "URL"
-      name = args[:name]
-      if name.nil? && (fname = args[:filename])
-        name = fname
-
-        if false
-          debug "fname  : #{fname}"
-
-          fullpath = Pathname.new(fname).expand_path
-          debug "fullpath: #{fullpath}".yellow
-
-          svnroot = SVNRootElement.new
-          debug "svnroot: #{svnroot}"
-          sri = svnroot.info
-          debug "svnroot.info[:url]: #{sri[:url]}"
-          debug "svnroot.info[:path]: #{sri[:path]}"
-          name = svnroot.info[:url] + '/' + fname
-          debug "name: #{name}"
-        end
-      end
-
-      @name = name
-      RIEL::Log.info "@name: #{@name}".green
-    end
-
-    def to_command subcmd, revcl, *args
-      cmd = "svn #{subcmd}"
-      debug "cmd: #{cmd}"
-      debug "args: #{args}"
-      args = args.flatten
-
-      # revcl is [ -r, 3484 ]
-      if revcl
-        cmd << " -r #{revcl}"
-      end
-      cmd << " " << Util::quote_list(args)
-      debug "cmd: #{cmd}".cyan
-      cmd
-    end
-
-    def info
-      SVN::Info.new :name => @name
-    end
-
-    def line_count revision = nil
-      lc = nil
-      
-      cmd = to_command "cat", revision, @name
-      ::IO.popen cmd do |io|
-        lc = io.readlines.size
-        debug "lc: #{lc.inspect}"
-      end
-
-      lc
-    end
-    
-    def to_s
-      @name.to_s
-    end
-
-    def inspect
-      @name
-    end
-
-    def <=>(other)
-      @name <=> other.name
-    end
-  end
-end

data/lib/pvn/svn/svninfo.rb

@@ -1,42 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'rubygems'
-require 'riel'
-
-module SVN
-  # Info has the results of "svn info <file>", where the values returned are
-  # keys and values in a Hash.
-  class Info < Hash
-    include Loggable
-    
-    def initialize args
-      RIEL::Log.info "args: #{args}".green
-      @name = args[:name]
-      super()
-       
-      execute
-    end
-
-    def execute
-      cmd = "svn info #{@name}"
-      output = %x{#{cmd}}
-
-      kv_re = Regexp.new '^(.*?):\s*(.*)'
-      
-      info = Hash.new
-      output.split("\n").each do |line|
-        key, value = kv_re.match(line)[1, 2]
-       
-        # debug "key: #{key}"
-        # debug "value: #{value}"
-
-        keysym = key.downcase.gsub(' ', '_').to_sym
-        # debug "keysym: #{keysym}"
-
-        self[keysym] = value
-      end
-      info
-    end
-  end
-end

data/lib/pvn/svn/svnroot.rb

@@ -1,29 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'rubygems'
-require 'riel'
-
-module PVN
-  class SVNRootElement < SVNElement
-    include Loggable
-    attr_reader :name
-
-    # returns the topmost directory for the repo root of the given (defaulting
-    # to current) directory
-    def self.new dirname = '.'
-      dir = Pathname.new(dirname).expand_path
-      
-      while dir.to_s != '/'
-        elmt = SVNElement.new :name => dir
-        elmtinfo = elmt.info
-        return elmt if elmtinfo[:repository_root] == elmtinfo[:url]
-        return elmt if !(dir.parent + '.svn').exist?
-        return nil  if elmtinfo[:repository_root].nil?
-        dir += '..'
-      end
-
-      nil
-    end    
-  end
-end

data/lib/pvn/upp/uppcmd.rb

@@ -1,112 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'system/command'
-
-module PVN
-  class UppOptionSet < OptionSet
-    attr_accessor :revision
-    
-    def initialize
-      super
-      # @revision = add RevisionOption.new
-    end
-  end
-
-  class UppCommand < Command
-    DEFAULT_LIMIT = 5
-    COMMAND = "upp"
-
-    self.doc do |doc|
-      doc.subcommands = [ COMMAND ]
-      doc.description = "Updates the local repository, in parallel for speed."
-      doc.usage       = ""
-      doc.summary     = [ "Updates the local repository, using parallel tasks. This is",
-                          "signficantly faster () for projects with multiple",
-                          "subprojects defined as externals." ]
-      doc.examples   << [ "pvn upp", "Updates the local repository." ]
-    end
-
-    def initialize args
-      # insanely simple
-
-      externals = get_all_externals
-
-      upcmds = Array.new
-      externals.each do |ext|
-        puts "ext: #{ext}"
-        upcmds << "cd #{ext} && svn up 2>&1"
-      end
-
-      upcmds << "svn up --ignore-externals . 2>&1"
-      
-      cmds_to_threads = upcmds.map do |upcmd|
-        thr = Thread.new do
-          IO.popen(upcmd) do |io|
-            io.readlines
-          end
-        end
-        [ upcmd, thr ]
-      end
-
-      cmds_to_threads.each do |cmd, thread|
-        puts cmd
-        puts thread.value
-      end
-    end
-
-    def external_to_local fd, line
-      # spaces?
-      local, url = line.split
-
-      # I've seen externals defined "backwards" (local url)
-      if local.index(%r{\w+://})
-        url, local = local, url
-      end
-
-      fd + "/" + local
-    end
-
-    def get_externals fd
-      externals = Array.new
-      pgcmd = "svn pg #{fd}"
-      IO.popen(pgcmd) do |io|
-        io.each do |line|
-          next if line.strip.empty?
-          
-          # spaces?
-          local, url = line.split
-
-          # I've seen externals defined "backwards" (local url)
-          if local.index(%r{\w+://})
-            url, local = local, url
-          end
-
-          externals << "#{fd}/#{local}"
-        end
-      end
-
-      externals
-    end
-
-    def get_all_externals
-      externals = Array.new
-
-      # get properties list (this could probably be cached, but it's relatively fast)
-      proplistcmd = "svn pl -R"
-      fd = nil
-      fdre = Regexp.new '^Properties on \'(.*)\':$'
-      extre = Regexp.new '^\s*svn:externals$'
-      IO.popen(proplistcmd) do |io|
-        io.each do |line|
-          if md = fdre.match(line)
-            fd = md[1]
-          elsif fd && extre.match(line)
-            externals.concat get_externals(fd)
-          end
-        end
-      end
-      externals
-    end
-  end
-end

data/lib/pvn/wherecmd.rb

@@ -1,55 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'rubygems'
-require 'riel'
-require 'system/command'
-require 'pvn/io/fselement'
-require 'pvn/svn/svnelement'
-require 'pvn/svn/svnroot'
-require 'pvn/io/element'
-
-module PVN
-  class WhereOptionSet < OptionSet
-    attr_accessor :revision
-    
-    def initialize
-      super
-      # @revision = add RevisionRegexpOption.new
-    end
-  end
-
-  class WhereCommand < Command
-    DEFAULT_LIMIT = 5
-    COMMAND = "where"
-
-    self.doc do |doc|
-      doc.subcommands = [ COMMAND ]
-      doc.description = "Shows the Subversion mapping from the given URL or file."
-      doc.usage       = "[OPTIONS] [FILE|URL]..."
-      doc.summary     = [ "Shows the Subversion mapping from the URL or file. If the ",
-                          "argument is a URL, then the local file/directory is displayed.",
-                          "If the argument is a file, then the URL for the Subversion",
-                          "repository is printed." ]
-      # 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.
-
-      args[:command_args].each do |arg|
-        info "arg: #{arg}".on_black
-
-        if arg.index(%r{^\w+:\/\/})
-          info "url: #{arg}".on_red
-        else
-          info "file: #{arg}".red
-          el = Element.new :file => arg
-          info "el: #{el}"
-          info "el.local: #{el.local}"
-          info "el.svn: #{el.svn}"
-        end
-      end
-    end
-  end
-end

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

@@ -1,153 +0,0 @@
-#!/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/pvn/subcommands/log/command_test.rb

@@ -1,22 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'tc'
-require 'pvn/subcommands/log/command'
-
-module PVN; module App; module Log; end; end; end
-
-module PVN::App::Log
-  class CommandTest < PVN::TestCase
-    
-    def test_path
-      PVN::Subcommands::Log::Command.new %w{ /Programs/wiquery/trunk/pom.xml }
-    end
-    
-    def test_invalid_path
-      assert_raises(RuntimeError) do
-        PVN::Subcommands::Log::Command.new %w{ /this/doesnt/exist }
-      end
-    end
-  end
-end

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

@@ -1,43 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'integration/tc'
-require 'svnx/log/tc'
-require 'svnx/log/command'
-require 'svnx/log/entry'
-
-module SVNx::Log
-  class EntryTestCase < PVN::IntegrationTestCase
-    include Loggable
-
-    def assert_log_entry_equals entry, expdata
-      assert_equal expdata[0], entry.revision
-      assert_equal expdata[1], entry.author
-      assert_equal expdata[2], entry.date
-      assert_equal expdata[3], entry.message
-      entry.paths.each_with_index do |path, idx|
-        info path.inspect.yellow
-        assert_equal expdata[4 + idx][:kind], path.kind
-        assert_equal expdata[4 + idx][:action], path.action
-        assert_equal expdata[4 + idx][:name], path.name
-      end
-    end
-    
-    def test_entry_from_command
-      lcargs = SVNx::LogCommandArgs.new :limit => 2, :verbose => false, :use_cache => false
-      lc = SVNx::LogCommand.new lcargs
-      
-      lc.execute
-      output = lc.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' }
-
-      doc = REXML::Document.new output.join('')
-
-      entry = Entry.new :xmlelement => doc.elements[1].elements[2]
-      assert_log_entry_equals entry, expdata
-    end
-  end
-end

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

@@ -1,110 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'tc'
-require 'svnx/log/entries'
-require 'pvn/revision/entry'
-
-require 'resources'
-
-module PVN::Revision
-  class TestCase < PVN::TestCase
-    def setup
-      @xmllines = Resources::WIQTR_LOG_POM_XML.readlines
-    end
-
-    def assert_revision_entry exp_value, value
-      rev = PVN::Revision::Entry.new :xmllines => @xmllines, :value => value
-      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
-
-    def test_absolute_most_recent
-      assert_revision_entry 1907, 1907
-    end
-
-    def test_absolute_least_recent
-      assert_revision_entry 412, 412
-    end
-
-    def test_absolute_midrange_as_string
-      assert_revision_entry 733, '733'
-    end
-
-    def test_absolute_most_recent_as_string
-      assert_revision_entry 1907, '1907'
-    end
-
-    def test_absolute_least_recent_as_string
-      assert_revision_entry 412, '412'
-    end
-
-    def test_svn_word
-      assert_revision_entry 'HEAD', 'HEAD'
-      %w{ HEAD BASE COMMITTED PREV }.each do |word|
-        assert_revision_entry word, word
-      end
-    end
-
-    def test_negative_most_recent
-      assert_revision_entry 1907, -1
-    end
-
-    def test_negative_second_most_recent
-      assert_revision_entry 1887, -2
-    end
-
-    def test_negative_least_recent
-      assert_revision_entry 412, -34
-    end
-
-    def test_negative_too_far_back
-      assert_revision_entry_raises(-35)
-    end
-
-    def test_negative_most_recent_as_string
-      assert_revision_entry 1907, '-1'
-    end
-
-    def test_negative_second_most_recent_as_string
-      assert_revision_entry 1887, '-2'
-    end
-
-    def test_negative_least_recent_as_string
-      assert_revision_entry 412, '-34'
-    end
-
-    def test_negative_too_far_back_as_string
-      assert_revision_entry_raises '-35'
-    end
-
-    def test_positive_most_recent
-      assert_revision_entry 1907, '+34'
-    end
-
-    def test_positive_second_most_recent
-      assert_revision_entry 1887, '+33'
-    end
-
-    def test_positive_least_recent
-      assert_revision_entry 412, '+1'
-    end
-
-    def test_positive_too_far_forward
-      assert_revision_entry_raises '+35'
-    end
-
-    def xxxtest_range_svn_word_to_number
-      assert_revision_entry 'BASE:1', 'BASE:1'
-    end
-  end
-end