pvn 0.0.1

data/lib/system/command/cachefile.rb

@@ -0,0 +1,39 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'system/command/line'
+
+module System
+  class CacheFile
+    include Loggable
+    
+    def initialize cache_dir, args
+      # pwd = Pathname.pwd.split_path.join('')
+      # info "pwd: #{pwd}"
+      @args = args
+      @pn = Pathname.new(cache_dir) + args.join('-').gsub('/', '\/')
+      info "pn: #{@pn}".yellow
+    end
+
+    def readlines
+      if @pn.exist?
+        info "reading from cache file: #{@pn}".cyan
+        @pn.readlines
+      else
+        cl = CommandLine.new @args
+        output = cl.execute
+
+        @pn.parent.mkpath
+        info "saving output to cache file: #{@pn}"
+        File.put_via_temp_file @pn.to_s do
+          output
+        end
+        output
+      end
+    end
+
+    def to_s
+      @pn.to_s
+    end
+  end
+end

data/lib/system/command/caching.rb

@@ -0,0 +1,36 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'system/command/line'
+require 'system/command/cachefile'
+
+module System
+  class CachingCommandLine < CommandLine
+    # caches its input and values.
+    @@cache_dir = '/tmp' + Pathname.new($0).expand_path
+
+    class << self
+      def cache_dir
+        @@cache_dir
+      end
+
+      def cache_dir= dir
+        @@cache_dir = dir
+      end
+    end
+
+    def cache_dir
+      @@cache_dir
+    end
+
+    def cache_file
+      pwd = Pathname.pwd.split_path.join('')
+      CacheFile.new cache_dir, @args
+    end
+
+    def execute
+      cachefile = cache_file
+      @output = cachefile.readlines
+    end
+  end
+end

data/lib/system/command/line.rb

@@ -0,0 +1,47 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'system/command/arg'
+require 'open3'
+
+module System
+  class CommandLine
+    include Loggable
+
+    attr_reader :output
+
+    def initialize args = Array.new
+      @args = args.dup
+    end
+
+    def << arg
+      # @args << Argument.new(arg)
+      @args << arg
+    end
+
+    def execute
+      cmd = to_command
+
+      # cmd << " 2>&1"
+
+      # I want to use popen3, but the version that works (sets $?) is in 1.9.x,
+      # not 1.8.x:
+      IO.popen(cmd + " 2>&1") do |io|
+        @output = io.readlines
+      end
+
+      if $? && $?.exitstatus != 0
+        info "cmd: #{cmd}".red
+        info "$?: #{$?.inspect}".red
+        info "$?.exitstatus: #{$? && $?.exitstatus}".red
+        raise "ERROR running command '#{cmd}': #{@output[-1]}"
+      end
+
+      @output
+    end
+
+    def to_command
+      @args.join ' '
+    end
+  end
+end

data/lib/system/command.rb

@@ -0,0 +1,72 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'system/cmdexec'
+require 'synoption/optionable'
+require 'pvn/subcommands/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/svnx/log/test.rb

@@ -0,0 +1,43 @@
+#!/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 = LogCommandArgs.new :limit => 2, :verbose => false, :use_cache => false
+      lc = 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/app_test.rb

@@ -0,0 +1,22 @@
+require 'tc'
+require 'pvn/app'
+
+class TestPVNCli < PVN::TestCase
+  def setup
+    PVN::App::Runner.execute @stdout_io = StringIO.new, Array.new
+    @stdout_io.rewind
+    @stdout = @stdout_io.read
+  end
+  
+  def test_print_default_output
+    # assert_match(/To update this executable/, @stdout)
+  end
+  
+  def xxx_test_help
+    io = StringIO.new
+    PVN::App::Runner.execute io, %w{ --help }
+    io.rewind
+    io = io.read
+    # assert_match(/To update this executable/, io)
+  end
+end

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

@@ -0,0 +1,35 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'pvn/log/tc'
+require 'svnx/log/entries'
+require 'pvn/io/element'
+
+module PVN::IO::IOElement
+  class LogTestCase ###$$$ < PVN::Log::TestCase
+    def assert_log_entries_size expsize, dirlog
+      assert_equal expsize, dirlog.entries.size
+    end
+
+    def assert_log_command exp_n_entries, localpath, args = Hash.new
+      dir = PVN::IO::Element.new :local => localpath
+      cmdargs = SVNx::LogCommandArgs.new args
+
+      dirlog = dir.log cmdargs
+      # info "dirlog: #{dirlog}".yellow
+      dirlog.entries.each do |entry|
+        # info "entry: #{entry}".blue
+      end
+
+      assert_log_entries_size exp_n_entries, dirlog
+    end
+    
+    def test_options_none
+      assert_log_command 163, '/Programs/wiquery/trunk'
+    end
+    
+    def test_option_limit
+      assert_log_command 15, '/Programs/wiquery/trunk', :limit => 15
+    end
+  end
+end

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

@@ -0,0 +1,90 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'tc'
+require 'svnx/log/entries'
+require 'pvn/io/element'
+require 'pvn/log/formatter/entry_formatter'
+
+require 'resources'
+
+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"
+    ENTRIES = SVNx::Log::Entries.new :xmllines => TEST_LINES
+
+    def show_all entries, from_head, from_tail
+      ef = EntriesFormatter.new true, entries, from_head, from_tail
+      puts ef.format
+    end
+
+    def assert_format explines, entry, use_colors, idx, from_head, from_tail, total
+      ef = EntryFormatter.new use_colors, entry, idx, from_head, from_tail, total
+
+      fmtlines = ef.format
+      assert_equal explines, fmtlines
+    end
+
+    def test_colors_from_head_not_from_tail_index_0
+      entries = ENTRIES
+      explines = [
+                  "\e[1m1950\e[0m      \e[1m-1\e[0m        \e[36m\e[1mjpace\e[0m\e[0m                    \e[35m\e[1m2011-12-05T12:41:52.385786Z\e[0m\e[0m",
+                  "",
+                  "\e[37mTesting.\e[0m",
+                  "",
+                  "    \e[33m/trunk/buildNumber.properties\e[0m"
+                 ]
+      assert_format explines, entries[0], true, 0, true, false, 15
+    end
+
+    def test_colors_from_head_not_from_tail_index_4
+      entries = ENTRIES
+      explines = [
+                  "\e[1m1950\e[0m      \e[1m-5\e[0m        \e[36m\e[1mjpace\e[0m\e[0m                    \e[35m\e[1m2011-12-05T12:41:52.385786Z\e[0m\e[0m",
+                  "",
+                  "\e[37mTesting.\e[0m",
+                  "",
+                  "    \e[33m/trunk/buildNumber.properties\e[0m"
+                 ]
+      assert_format explines, entries[0], true, 4, true, false, 15
+    end
+
+    def test_no_colors_from_head_from_tail_index_4
+      entries = ENTRIES
+      explines = [
+                  "1950      -5   +10  jpace                    2011-12-05T12:41:52.385786Z",
+                  "",
+                  "Testing.",
+                  "",
+                  "    /trunk/buildNumber.properties"
+                 ]
+      assert_format explines, entries[0], false, 4, true, true, 15
+    end
+
+    def test_colors_from_head_from_tail_index_4
+      entries = ENTRIES
+      explines = [
+                  "\e[1m1950\e[0m      \e[1m-5\e[0m   \e[1m+10\e[0m  \e[36m\e[1mjpace\e[0m\e[0m                    \e[35m\e[1m2011-12-05T12:41:52.385786Z\e[0m\e[0m",
+                  "",
+                  "\e[37mTesting.\e[0m",
+                  "",
+                  "    \e[33m/trunk/buildNumber.properties\e[0m"
+                 ]
+      assert_format explines, entries[0], true, 4, true, true, 15
+    end
+
+    def test_no_colors_from_head_not_from_tail_index_4
+      entries = ENTRIES
+      explines = [
+                  "1950      -5        jpace                    2011-12-05T12:41:52.385786Z",
+                  "",
+                  "Testing.",
+                  "",
+                  "    /trunk/buildNumber.properties"
+                 ]
+      assert_format explines, entries[0], false, 4, true, false, 15
+    end
+  end
+end

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

@@ -0,0 +1,123 @@
+#!/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.instance.test_lines '/Programs/wiquery/trunk', "svn", "log", "--xml", "pom.xml"
+    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 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_raises(RuntimeError) do 
+        assert_revision_entry nil, -35
+      end
+    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_raises(RuntimeError) do 
+        assert_revision_entry nil, '-35'
+      end
+    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_raises(RuntimeError) do 
+        assert_revision_entry nil, '+35'
+      end
+    end
+
+    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/pvn/subcommands/log/command_test.rb

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

@@ -0,0 +1,85 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'tc'
+require 'pvn/subcommands/log/options'
+
+module PVN; module App; module Log; end; end; end
+
+module PVN::App::Log
+  class OptionsTest < PVN::TestCase
+    def assert_options exp, args
+      options = PVN::Subcommands::Log::OptionSet.new 
+      options.process args
+
+      assert_equal exp[:limit], options.limit
+      assert_equal exp[:revision], options.revision
+      
+      exppaths = exp[:path] ? [ exp[:path] ] : exp[:paths]
+      assert_equal exppaths, options.paths
+    end
+
+    def test_default
+      expdata = Hash.new
+      expdata[:limit] = 5
+      expdata[:paths] = Array.new
+      assert_options expdata, Array.new
+    end
+
+    def test_limit
+      expdata = Hash.new
+      expdata[:limit] = 15
+      expdata[:paths] = Array.new
+      assert_options expdata, %w{ --limit 15 }
+    end
+
+    def test_help
+      expdata = Hash.new
+      expdata[:limit] = 5
+      expdata[:revision] = nil
+      expdata[:paths] = Array.new
+      expdata[:help] = true
+      assert_options expdata, %w{ --help }
+    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 }
+    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 }
+    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 }
+    end
+  end
+end

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

@@ -0,0 +1,67 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'tc'
+require 'pvn/subcommands/revision/multiple_revisions_option'
+
+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
+    end
+
+    def assert_post_process exp, vals, path = '/Programs/wiquery/trunk'
+      ropt = PVN::MultipleRevisionsRegexpOption.new
+      vals.each do |val|
+        ropt.set_value val
+      end
+      ropt.post_process nil, [ path ]
+      act = ropt.value
+      assert_equal exp, act, "vals: #{vals}; path: #{path}"
+    end
+
+    def test_post_process_single_middling
+      assert_post_process [ '1887' ], [ '-7' ]
+    end
+
+    def test_post_process_single_latest
+      assert_post_process [ '1950' ], '-1'
+    end
+
+    def test_post_process_single_oldest
+      assert_post_process [ '412' ], '-163'
+    end
+
+    def test_post_process_single_tagval_unconverted
+      assert_post_process [ '7' ], '-r7'
+    end
+
+    def test_post_process_single_tagrange_unconverted
+      assert_post_process [ '7:177' ], '-r7:177'
+    end
+
+    def test_post_process_multiple_middling
+      assert_post_process [ '1887', '1950' ], [ '-7', '-1' ]
+    end
+
+    def test_post_process_multiple_relative_tagval_unconverted
+      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
+  end
+end